remove some old unused code