More java-doc. Removed several unused methods.