Fixed compilation error and removed some unused classes
Javadoc and some code cleanup