Cleanup unused parameters

Changelog:
- Cleaning up unused parameters
Why not also remove `**kwargs` one line above?