Removed unnecessary userStates code