removed unused imports and type parameters