Remove set -x and do not fail when nothing is removed