Make Pylint a little happier with removing: C1001
Merge pull request #535 from chadlung/master

Make Pylint a little happier with removing: C1001