Removed unused imports

o While in those files: java-7-ified, checkstyled and fixed warnings