Remove setup state because it was only going to be used for its transitions
Laid some groundwork for executing state