Re-add back in the slow way of determining of a clean-up should become a