Remove some old commented code