removed unused imports and cleanup unused param