Cleanup unused parameters

Changelog:
- Cleaning up unused parameters
Ok I need to ping @gubatron I'm not sure on this one. He wrote it.