Remove commented out code. pep8/pyflakes