remove some deprecated lines