Clean up state machine for internal support
Merge pull request #302 from twitter/waiting-state-fix

Clean up state machine for internal support