Changing cleanup handling