remove-user.sh: improve robustness