Remove references to global var.