fix deprecation warnings
fix deprecation warnings
javadoc updates
remove deprecated method
javadoc updates
Merge branch 'javadocs-updates'