Clean up

* Removed old and unused classes
* Removed unused imports
JAR file

* Created JAR file