Cleaning up the new/revised state change management
Cleanup the refactor -- start eliminating the old objects.