cleanup deprecated methods and java 8 javadoc complaints