tokens now get erased properly when there is no map and it gets moved