Drop -f from rm calls
-f is not needed because we should have permissions to remove all files, and it
also silences errors which we don't want.
It turns out that most of those 'rm' calls weren't doing anything, because the
files were not there.
[skip changelog]