Deleted a few unecessary classes