separating deletion from cleanup fase