Clean up the freeze method