more TOD cleanup utils.