Cleanups - state.cpp