flake8 fixes for rebased commits

app/dao/services_dao.py

@@ -9,8 +9,8 @@ from sqlalchemy.sql.expression import and_, asc, case, func
 from app import db
 from app.dao.dao_utils import VersionOptions, autocommit, version_class
 from app.dao.date_util import get_current_financial_year
-from app.dao.email_branding_dao import dao_get_email_branding_by_name
-from app.dao.letter_branding_dao import dao_get_letter_branding_by_name
+# from app.dao.email_branding_dao import dao_get_email_branding_by_name
+# from app.dao.letter_branding_dao import dao_get_letter_branding_by_name
 from app.dao.organisation_dao import dao_get_organisation_by_email_address
 from app.dao.service_sms_sender_dao import insert_service_sms_sender
 from app.dao.service_user_dao import dao_get_service_user
@@ -46,8 +46,7 @@ from app.models import (
     User,
     VerifyCode,
 )
-from app.utils import (
-    email_address_is_nhs,
+from app.utils import (  # email_address_is_nhs,
     escape_special_characters,
     get_archived_db_column_value,
     get_london_midnight_in_utc,

app/organisation/rest.py

@@ -103,8 +103,6 @@ def update_organisation(organisation_id):
     data = request.get_json()
     validate(data, post_update_organisation_schema)
 
-    organisation = dao_get_organisation_by_id(organisation_id)
-
     result = dao_update_organisation(organisation_id, **data)
 
     if data.get('agreement_signed') is True: