7.0 fix flakes8

You could probably get rid of the commented-out code, no?