Clean up couple of old methods, correct Javadoc.
Corrected typo.