diff --git a/atst/domain/environments.py b/atst/domain/environments.py
index 2d9eef35..ace75a3a 100644
--- a/atst/domain/environments.py
+++ b/atst/domain/environments.py
@@ -1,8 +1,7 @@
-from sqlalchemy import text, func
+from sqlalchemy import text
 from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy.orm import load_only
 from typing import List
-from contextlib import contextmanager
 
 from atst.database import db
 from atst.models import Environment, Application, Portfolio, TaskOrder, CLIN
diff --git a/atst/jobs.py b/atst/jobs.py
index cad4877b..fa07c9da 100644
--- a/atst/jobs.py
+++ b/atst/jobs.py
@@ -1,8 +1,7 @@
 from flask import current_app as app
 import pendulum
-from celery.utils.log import get_task_logger
-from sqlalchemy import func, orm, sql
-from sqlalchemy import update
+from sqlalchemy import func, sql
+from contextlib import contextmanager
 
 from atst.database import db
 from atst.queue import celery
@@ -10,8 +9,6 @@ from atst.models import EnvironmentJobFailure, EnvironmentRoleJobFailure
 from atst.domain.csp.cloud import CloudProviderInterface, GeneralCSPException
 from atst.domain.environments import Environments
 
-logger = get_task_logger(__name__)
-
 
 class RecordEnvironmentFailure(celery.Task):
     def on_failure(self, exc, task_id, args, kwargs, einfo):
@@ -48,9 +45,6 @@ def send_notification_mail(recipients, subject, body):
     app.mailer.send(recipients, subject, body)
 
 
-from contextlib import contextmanager
-
-
 class ClaimFailedException(Exception):
     pass
 
@@ -60,7 +54,7 @@ def claim_for_update(resource):
     rows_updated = (
         db.session.query(resource.__class__)
         .filter_by(id=resource.id, claimed_at=None)
-        .update({"claimed_at": func.now()}, synchronize_session="fetch")
+        .update({"claimed_at": func.now()}, synchronize_session=False)
     )
     if rows_updated < 1:
         raise ClaimFailedException(
@@ -75,7 +69,7 @@ def claim_for_update(resource):
         db.session.query(resource.__class__).filter(
             resource.__class__.id == resource.id
         ).filter(resource.__class__.claimed_at != None).update(
-            {"claimed_at": sql.null()}, synchronize_session="fetch"
+            {"claimed_at": sql.null()}, synchronize_session=False
         )
 
 
diff --git a/atst/models/environment.py b/atst/models/environment.py
index a6774434..9f86d198 100644
--- a/atst/models/environment.py
+++ b/atst/models/environment.py
@@ -2,12 +2,10 @@ from sqlalchemy import Column, ForeignKey, String, TIMESTAMP
 from sqlalchemy.orm import relationship
 from sqlalchemy.dialects.postgresql import JSONB
 from enum import Enum
-import contextlib
 
 from atst.models import Base
 from atst.models.types import Id
 from atst.models import mixins
-from atst.database import db
 
 
 class Environment(