Removing unused classes, cleaning up used classes