Add command to remove tmp file and fix issue w/ sender running twice