removed unused imports and comments