javadocs added/some unused methods deleted