PDIO-306 Prevent data cleanup from starting prematurely