Safe delete shortcut refinements