removed unused imports and comented code