Javadoc & remove dead code