remove unused cleanup attr
Merge branch 'cleanup-stale-checks' into all-in-one