not using states, removing
removing the commented-out removeThenAdd stuff