diff --git a/models/staging/exchange/base/base_exchange__company_addresses.sql b/models/staging/exchange/base/base_exchange__company_addresses.sql
index a828656..de2a9ec 100644
--- a/models/staging/exchange/base/base_exchange__company_addresses.sql
+++ b/models/staging/exchange/base/base_exchange__company_addresses.sql
@@ -24,30 +24,6 @@ addresses_rename AS (
     FROM addresses
 ),
 
-remove_deleted_addresses AS (
-    SELECT 
-        *
-
-    FROM addresses_rename
-
-    WHERE 
-        deleted_datetime IS NULL
-),
-
-lastest_billing_and_non_billing_addresses AS (
-    SELECT 
-        *,
-        -- 1 will be latest updated address, rank by updated_at date
-        row_number() OVER 
-                    (PARTITION BY remove_deleted_addresses.company_id, remove_deleted_addresses.is_billing_address
-                    ORDER BY remove_deleted_addresses.updated_datetime DESC)                 AS lastest_address_rank
-
-    FROM remove_deleted_addresses
-    
-    QUALIFY
-        lastest_address_rank = 1
-),
-
 -- FINAL
 final__base_exchange__company_addresses AS (
 
@@ -75,7 +51,7 @@ final__base_exchange__company_addresses AS (
         -- metadata
         _dbt_ran_datetime
 
-    FROM lastest_billing_and_non_billing_addresses
+    FROM addresses_rename
 ) 
 
 SELECT * FROM final__base_exchange__company_addresses
\ No newline at end of file