removed dead methods, and javadoc