Fixed cleanup date calculation