remove some old code