All the deleted code is because this defers to XFormPillow for basic cleanup