Javadoc comments and unused file removed