Merge "Removing some unused classes"