Cleanup parameters even more