Fix imports and delete unused parameter