Cleanup state.h