removed some old unused functions