Remove dead code & Pep8.