removed some old commented code