Allow remove in other context, but deal with edge cases by doing so.
Merge branch 'master' of github.com:safedisk/safedisk