Removed unecessary classes