Fix up some deprecation warnings, and clean up coremod code that's going
away.
More javadoc cleanup