diff --git a/demo/test/support/live_resource_tests.ex b/demo/test/support/live_resource_tests.ex
index 67274d335..c2dd40735 100644
--- a/demo/test/support/live_resource_tests.ex
+++ b/demo/test/support/live_resource_tests.ex
@@ -234,7 +234,6 @@ defmodule Demo.Support.LiveResourceTests do
       item = unquote(item)
       display_field = unquote(display_field)
       display_value = unquote(display_value)
-      success_message = unquote(success_message)
 
       result =
         conn
@@ -253,10 +252,12 @@ defmodule Demo.Support.LiveResourceTests do
         |> assert_path(base_path)
         |> refute_has("td", text: display_value, exact: true)
 
-      if success_message do
-        result |> assert_has("div", text: success_message, exact: true)
-      else
-        result
+      case unquote(success_message) do
+        message when is_nil(message) ->
+          result
+
+        message ->
+          assert_has(result, "div", text: message, exact: true)
       end
     end
   end
@@ -271,7 +272,6 @@ defmodule Demo.Support.LiveResourceTests do
       item = unquote(item)
       display_field = unquote(display_field)
       display_value = unquote(display_value)
-      success_message = unquote(success_message)
 
       result =
         conn
@@ -291,10 +291,12 @@ defmodule Demo.Support.LiveResourceTests do
         |> assert_path(base_path)
         |> refute_has("td", text: display_value, exact: true)
 
-      if success_message do
-        result |> assert_has("div", text: success_message, exact: true)
-      else
-        result
+      case unquote(success_message) do
+        message when is_nil(message) ->
+          result
+
+        message ->
+          assert_has(result, "div", text: message, exact: true)
       end
     end
   end
diff --git a/lib/backpex/field.ex b/lib/backpex/field.ex
index 7dc82554d..2e549be99 100644
--- a/lib/backpex/field.ex
+++ b/lib/backpex/field.ex
@@ -259,7 +259,7 @@ defmodule Backpex.Field do
   end
 
   defmacro __before_compile__(_env) do
-    quote do
+    quote generated: true do
       import Ecto.Query
 
       @impl Phoenix.LiveComponent
diff --git a/lib/backpex/html/core_components.ex b/lib/backpex/html/core_components.ex
index 8d31e6858..fdb84fff6 100644
--- a/lib/backpex/html/core_components.ex
+++ b/lib/backpex/html/core_components.ex
@@ -4,8 +4,6 @@ defmodule Backpex.HTML.CoreComponents do
   """
   use BackpexWeb, :html
 
-  require Backpex
-
   @doc """
   Renders a Heroicons icon.
   """
diff --git a/lib/backpex/item_actions/item_action.ex b/lib/backpex/item_actions/item_action.ex
index 3502f1783..06b6eedd9 100644
--- a/lib/backpex/item_actions/item_action.ex
+++ b/lib/backpex/item_actions/item_action.ex
@@ -117,7 +117,7 @@ defmodule Backpex.ItemAction do
   defmacro __before_compile__(env) do
     validate_handle_or_link!(env)
 
-    quote do
+    quote generated: true do
       @after_compile Backpex.ItemAction
 
       @impl Backpex.ItemAction
diff --git a/lib/backpex/live_resource.ex b/lib/backpex/live_resource.ex
index cd99d8a8a..1be692652 100644
--- a/lib/backpex/live_resource.ex
+++ b/lib/backpex/live_resource.ex
@@ -12,8 +12,6 @@ defmodule Backpex.LiveResource do
   alias Backpex.Resource
   alias Backpex.Router
 
-  require Backpex
-
   @options_schema [
     adapter: [
       doc: "The data layer adapter to use.",
@@ -366,7 +364,7 @@ defmodule Backpex.LiveResource do
 
   # credo:disable-for-next-line Credo.Check.Refactor.CyclomaticComplexity
   defmacro __before_compile__(_env) do
-    quote do
+    quote generated: true do
       import Backpex.HTML.Layout
       import Backpex.HTML.Resource
 
diff --git a/lib/backpex/live_resource/show.ex b/lib/backpex/live_resource/show.ex
index 62f17dcf1..5770c7a63 100644
--- a/lib/backpex/live_resource/show.ex
+++ b/lib/backpex/live_resource/show.ex
@@ -7,8 +7,6 @@ defmodule Backpex.LiveResource.Show do
   alias Backpex.Resource
   alias Backpex.Router
 
-  require Backpex
-
   def mount(params, _session, socket, live_resource) do
     socket
     |> Backpex.LiveResource.maybe_subscribe_to_pubsub(live_resource)
diff --git a/lib/backpex_web.ex b/lib/backpex_web.ex
index 6052833f6..d4eb67cdd 100644
--- a/lib/backpex_web.ex
+++ b/lib/backpex_web.ex
@@ -23,7 +23,6 @@ defmodule BackpexWeb do
   """
   def field do
     quote do
-      use Phoenix.Component
       use Phoenix.LiveComponent
       alias Backpex.HTML
       alias Backpex.HTML.Form, as: BackpexForm