#156, ensure the entire piece is under a removeFiles so we always clean up the garbage