Removing unecessary classes