Remove a bunch of unused variables (from review #5065)