Fix some references to /usr/bin/rm, and some commented-out rm
invocations.