removed some old unused code