don't double delete on cancel
Merge branch 'secunload' into testing