Cleaning up in the code

Deleted some unused classes and code lines