Janky State Machine clean up changes and merges