Merge "Remove unused method" into sc-dev