Code cleanup in Dirty tracking module