I'll remove it from this pr though I still need it for lateness detection. Let's discuss on the other pr.