Added removal of the classes after JAR is generated
Removed unused variables