Added checkpoint set check to cleanup job