Removing some unused classes