Added missing javadocs
Removed comments and unused code