removed some old commented out code