Removed old state machine