Re: Review Request 216: clean up target and failure unit files on cleanup, too