Drop unused imports
Fix Javadoc reference
Comment unused variable