Remove leftover code for mapping many variables at once