removed unused imports and methods