Make state not fail on first run.
Remove unused context in state.