updated javadocs, and removal of old @deprecated methods