diff --git a/.cursor/rules/follow_claude_memory.mdc b/.cursor/rules/follow_claude_memory.mdc
deleted file mode 100644
index 63df700..0000000
--- a/.cursor/rules/follow_claude_memory.mdc
+++ /dev/null
@@ -1,4 +0,0 @@
----
-alwaysApply: true
----
-Retrieve @CLAUDE.md for project overview
diff --git a/models/gold/defi/defi__ez_dex_swaps.sql b/models/gold/defi/defi__ez_dex_swaps.sql
index 576a571..627925e 100644
--- a/models/gold/defi/defi__ez_dex_swaps.sql
+++ b/models/gold/defi/defi__ez_dex_swaps.sql
@@ -15,6 +15,7 @@ WITH base_swaps AS (
         block_timestamp,
         tx_digest,
         event_index,
+        event_module,
         platform_address,
         pool_address,
         amount_in_raw,
@@ -44,6 +45,7 @@ WITH base_swaps AS (
         block_timestamp,
         tx_digest,
         event_index,
+        event_module,
         platform_address,
         pool_address,
         amount_in_raw,
diff --git a/models/silver/defi/silver__dex_swaps.sql b/models/silver/defi/silver__dex_swaps.sql
index 99feb8a..2ccb59a 100644
--- a/models/silver/defi/silver__dex_swaps.sql
+++ b/models/silver/defi/silver__dex_swaps.sql
@@ -38,6 +38,7 @@ WITH core_events AS (
         AND
 {% endif %}
         (
+            -- primary swap resources for this model
             event_resource ILIKE '%swap%'
             OR event_resource IN (
                 'Swap',
@@ -51,20 +52,26 @@ WITH core_events AS (
             OR event_resource ILIKE '%sell%'
         )
         
+        -- exclude modules that require special handling
         AND event_resource NOT IN (
-            'RepayFlashSwapEvent'
+            'RepayFlashSwapEvent',
+            'ScallopSwapEvent',
+            'OrderFilled',
+            'OrderInfo'
         )
-
-        -- exclude dex modules that require special handling
         AND transaction_module NOT IN (
             'aftermath', 
-            'scallop', 
-            'steamm_cpmm'
+            'scallop'
         )
+        AND transaction_module NOT ILIKE '%steamm%'
+
+        -- exclude limit orders from base model
+        AND event_module NOT IN ('settle')
 
         -- limit to 30 days for dev
         AND block_timestamp >= sysdate() - interval '30 days'
 ),
+
 core_transactions AS (
     SELECT
         tx_digest,