make Java 8 javadoc happy
remove unused imports
Merge pull request #714 from metamx/cleanup-javadocs

Cleanup javadocs