Prune unused variables

These were actually using API that went away in #2352, but they're also
unused in the simplate anyway.