Added Javadoc Comments, removed unused methods