Merge "Deleting unused code." into sc-dev