diff --git a/app/models/chat.rb b/app/models/chat.rb
index 7367c9b12..d47dcccac 100644
--- a/app/models/chat.rb
+++ b/app/models/chat.rb
@@ -75,10 +75,6 @@ class Chat < ApplicationRecord
   end
 
   def conversation_messages
-    if debug_mode?
-      messages
-    else
-      messages.where(type: [ "UserMessage", "AssistantMessage" ])
-    end
+    messages.where(type: [ "UserMessage", "AssistantMessage" ])
   end
 end
diff --git a/app/models/developer_message.rb b/app/models/developer_message.rb
deleted file mode 100644
index 3ba9b3ead..000000000
--- a/app/models/developer_message.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class DeveloperMessage < Message
-  def role
-    "developer"
-  end
-
-  private
-    def broadcast?
-      chat.debug_mode?
-    end
-end
diff --git a/app/views/developer_messages/_developer_message.html.erb b/app/views/developer_messages/_developer_message.html.erb
deleted file mode 100644
index d756442f1..000000000
--- a/app/views/developer_messages/_developer_message.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<%# locals: (developer_message:) %>
-
-<div id="<%= dom_id(developer_message) %>" class="my-2 <%= developer_message.debug? ? "bg-yellow-50 border-yellow-200" : "bg-blue-50 border-blue-200" %> px-3 py-2 rounded-lg max-w-[85%] ml-auto border">
-  <span class="text-secondary text-xs"><%= developer_message.debug? ? "Debug message (internal only)" : "System instruction (sent to AI)" %></span>
-  <p class="text-primary text-sm"><%= developer_message.content %></p>
-</div>
diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml
index cf3c6df8b..4145d3cf7 100644
--- a/test/fixtures/messages.yml
+++ b/test/fixtures/messages.yml
@@ -1,17 +1,3 @@
-chat1_developer:
-  type: DeveloperMessage
-  content: You are a personal finance assistant.  Be concise and helpful.
-  chat: one
-  created_at: 2025-03-20 12:00:00
-  debug: false
-
-chat1_developer_debug:
-  type: DeveloperMessage
-  content: An internal debug message
-  chat: one
-  created_at: 2025-03-20 12:00:02
-  debug: true
-
 chat1_user:
   type: UserMessage
   content: Can you help me understand my spending habits?
diff --git a/test/models/developer_message_test.rb b/test/models/developer_message_test.rb
deleted file mode 100644
index 26d3d8e2a..000000000
--- a/test/models/developer_message_test.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require "test_helper"
-
-class DeveloperMessageTest < ActiveSupport::TestCase
-  setup do
-    @chat = chats(:one)
-  end
-
-  test "does not broadcast" do
-    message = DeveloperMessage.create!(chat: @chat, content: "Some instructions")
-    message.update!(content: "updated")
-
-    assert_no_turbo_stream_broadcasts(@chat)
-  end
-
-  test "broadcasts if debug mode is enabled" do
-    with_env_overrides AI_DEBUG_MODE: "true" do
-      message = DeveloperMessage.create!(chat: @chat, content: "Some instructions")
-      message.update!(content: "updated")
-
-      streams = capture_turbo_stream_broadcasts(@chat)
-      assert_equal 2, streams.size
-      assert_equal "append", streams.first["action"]
-      assert_equal "messages", streams.first["target"]
-      assert_equal "update", streams.last["action"]
-      assert_equal "developer_message_#{message.id}", streams.last["target"]
-    end
-  end
-end