BUG-5001: clean up state transitions