Revert "Revert "remove dead code" aka Reintroduce status set" This reverts commit 6afadfbd4c.
6afadfbd4c