cleanup unused imports
javadocs