Merge "Clean up updateState()"