Fix cleaning with the new integer changes