Removed unused imports.
Some cleanup.