Remove unused class
Add some javadoc