apply: split out removal and creation into different phases.