Removed unused imports to get clean code