remove unused class and update javadocs