Javadoc updated and removed unused methods