Remove some old commented out code