removed some old lines of code