Remove unnecessary code, shore up some JavaDocs