We should remove all these old commented out lines. They're in the git history if we needed them.