Adds Javadoc and removes some unused methods