removing more NPR stuff