Merge "Remove unused code" into sc-dev