Remove unused class
Javadoc fixes