ctrl-c cleanup only in sync operation
Removed somewhat broken improved security feature

This reverts commit cc67db95fa8a15f26e90f9be19f49c05eea74f0e.