A lot of javadoc updates and dead code removal