Remove unused imports

Reorganized imports using Eclipse