simplify TokenMapper now that it's 2D-only