Remove some no-longer-used variables.