[WIP] Cleanup unused parameters

Changelog:
- Cleaning up unused parameters