more removes
Updated javadocs