Clean up some more dead code and broken Javadoc.