Clean up the deparam function