Some more cleanup.
Reorganize imports
Remove empty javadocs
Remove unneeded casts
Add missing Override annotations