Updates for JDK 7.0 language level
Remove dead imports.
Dump unnecessary ;