Cleanup based on examination of public API (javadocs)