removed unused imports and vars