flake8 unused variable cleanup