diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 9f3761bf6..53ddb45f4 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -15,7 +15,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse
 from dateutil.relativedelta import relativedelta  # type: ignore
 from epplibwrapper.errors import ErrorCode, RegistryError
-from waffle.admin import FlagAdmin, SwitchAdmin
+from waffle.admin import FlagAdmin
 from waffle.models import Sample
 from registrar.models import Contact, Domain, DomainRequest, DraftDomain, User, Website
 from registrar.utility.errors import FSMDomainRequestError, FSMErrorCodes
diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py
index b3c450206..3f3af135a 100644
--- a/src/registrar/config/settings.py
+++ b/src/registrar/config/settings.py
@@ -326,20 +326,13 @@ SERVER_EMAIL = "root@get.gov"
 # endregion
 
 # region: Waffle feature flags-----------------------------------------------------------###
-# If Waffle encounters a reference to a flag that is not in the database, should Waffle create the flag?
+# If Waffle encounters a reference to a flag that is not in the database, create the flag automagically.
 WAFFLE_CREATE_MISSING_FLAGS = True
 
-# If Waffle encounters a reference to a switch that is not in the database, should Waffle create the switch?
-WAFFLE_CREATE_MISSING_SWITCHES = True
-
 # The model that will be used to keep track of flags. Extends AbstractUserFlag.
 # Used to replace the default flag class (for customization purposes).
 WAFFLE_FLAG_MODEL = "registrar.WaffleFlag"
 
-# The model that will be used to keep track of switches. Extends AbstractBaseSwitch.
-# Used to replace the default switch class (for customization purposes).
-WAFFLE_SWITCH_MODEL = "registrar.WaffleSwitch"
-
 # endregion
 
 # region: Headers-----------------------------------------------------------###
diff --git a/src/registrar/tests/test_emails.py b/src/registrar/tests/test_emails.py
index 831852d82..0e8431733 100644
--- a/src/registrar/tests/test_emails.py
+++ b/src/registrar/tests/test_emails.py
@@ -19,7 +19,7 @@ class TestEmails(TestCase):
 
     @boto3_mocking.patching
     @override_flag("disable_email_sending", active=True)
-    def test_disable_email_switch(self):
+    def test_disable_email_flag(self):
         """Test if the 'disable_email_sending' stops emails from being sent """
         with boto3_mocking.clients.handler_for("sesv2", self.mock_client_class):
             expected_message = "Email sending is disabled due to"
diff --git a/src/registrar/utility/email.py b/src/registrar/utility/email.py
index 40ca2186e..973aa8716 100644
--- a/src/registrar/utility/email.py
+++ b/src/registrar/utility/email.py
@@ -38,7 +38,7 @@ def send_templated_email(
     """
 
     if flag_is_active(None, "disable_email_sending") and not settings.IS_PRODUCTION:
-        message = "Could not send email. Email sending is disabled due to switch 'disable_email_sending'."
+        message = "Could not send email. Email sending is disabled due to flag 'disable_email_sending'."
         raise EmailSendingError(message)
 
     template = get_template(template_name)