code clean up. Removed unused imports.