removed unused imports and commented code