fix lingering problems with javadocs
remove unused imports after cleaning up javadocs