got rid of some old commented out code