Code tidyup
Removing old statebuilders