Removed more javadoc cruft