Removed unneeded overrides and updated JavaDocs to be accurate.