javadoc updates, removed use of deprecated API