Cleaned code

Removed unused imports