style tweak
Decouple delete workflow from DM2 & refactor slightly (more to come soonish)