Cleanup unused parameters

Changelog:
- Cleaning up unused parameters
isn't DataStore more explicit?