removed unused imports and some commented stuff