Rather than use the command module, we use the file module
which is idempotent. We also remove the conditional for the
clean up so that it's easier to switch between back-ends
and still have the clean-up happen.
Change-Id: I5d77bbd236d1cb7d45bc4dda4206475b5663b1c0