removed some old unnecessary code