removed deprecated lines