Refactoring
Remove unused exception + flake8.