PEP8 conformity; removed outcommented code
Merge pull request #3359 from MartinThoma/master

PEP8 conformity; removed outcommented code