Remove a big blob of old commented code