remove some deprecated names