deleted some old commented out code