Javadoc comments and delete extraneous code