Remove additional unneeded variables.