Add delete on terminate