don't try to detect bug1810 more than once
fix pyflakes
correct fix for pyflakes
Unnecessary code removed