Clean-up state machine in StateController

[lte678]

To call the logic in StateController a state machine pattern is very generous. It should be cleaned up.