remove unused code and Javadoc