Removed hack for flake8