Merge "Removing some unused classes" into sc-dev