Clean the state tracking up more