GDS-1202 javadoc + API cleanup