First batch of changes to remove StateType
Mores changes to remove StateType
Changes to remove StateType

Unit tests are still not compiling