refactor staleness tagging