remove deprecated methods
fix javadoc errors/warnings