remove some old commented out code