removed obsolete methods
updated javadoc