Cleaning up the Transform