took out a few unecessary classes