Cleanup params more