Cleanup unused params