diff --git a/app/models/event_badge_models.py b/app/models/event_badge_models.py
index 4ace251..b78c6a2 100644
--- a/app/models/event_badge_models.py
+++ b/app/models/event_badge_models.py
@@ -83,7 +83,7 @@ class Event_Badge_Base(BaseModel):
     city: Optional[str]
 
     county: Optional[str] # NOTE: This is for a county within a state or province
-    
+
     country_subdivision_code: Optional[str]
     state_province: Optional[str]
     state_province_abb: Optional[str]
@@ -243,25 +243,25 @@ class Event_Badge_Basic_Base(BaseModel):
 
     email: Optional[str]
 
-    address_line_1: Optional[str]
-    address_line_2: Optional[str]
-    address_line_3: Optional[str]
+    # address_line_1: Optional[str]
+    # address_line_2: Optional[str]
+    # address_line_3: Optional[str]
 
-    city: Optional[str]
+    # city: Optional[str]
 
-    county: Optional[str] # NOTE: This is for a county within a state or province
+    # county: Optional[str] # NOTE: This is for a county within a state or province
 
-    country_subdivision_code: Optional[str]
-    state_province: Optional[str]
-    state_province_abb: Optional[str]
+    # country_subdivision_code: Optional[str]
+    # state_province: Optional[str]
+    # state_province_abb: Optional[str]
 
-    postal_code: Optional[str]
+    # postal_code: Optional[str]
 
     country_alpha_2_code: Optional[str]
     country: Optional[str]
 
     # full_address: Optional[str]
-    location: Optional[str] # Actual location name shown on badge and other "public" areas
+    # location: Optional[str] # Actual location name shown on badge and other "public" areas
     # location_short: Optional[str] # Auto generated short version
     # location_long: Optional[str] # Auto generated long version
     display_location: Optional[str] # Override location
diff --git a/app/models/event_exhibit_tracking_models.py b/app/models/event_exhibit_tracking_models.py
index 4251d09..ed61f6b 100644
--- a/app/models/event_exhibit_tracking_models.py
+++ b/app/models/event_exhibit_tracking_models.py
@@ -69,22 +69,22 @@ class Event_Exhibit_Tracking_Base(BaseModel):
 
     event_badge_email: Optional[str]
 
-    event_badge_address_line_1: Optional[str]
-    event_badge_address_line_2: Optional[str]
-    event_badge_address_line_3: Optional[str]
-    
-    event_badge_city: Optional[str]
+    # event_badge_address_line_1: Optional[str]
+    # event_badge_address_line_2: Optional[str]
+    # event_badge_address_line_3: Optional[str]
 
-    event_badge_country_subdivision_code: Optional[str]
-    event_badge_state_province_abb: Optional[str]
-    event_badge_state_province: Optional[str]
+    # event_badge_city: Optional[str]
 
-    event_badge_postal_code: Optional[str]
+    # event_badge_country_subdivision_code: Optional[str]
+    # event_badge_state_province_abb: Optional[str]
+    # event_badge_state_province: Optional[str]
+
+    # event_badge_postal_code: Optional[str]
 
     event_badge_country_alpha_2_code: Optional[str]
     event_badge_country: Optional[str]
 
-    event_badge_location: Optional[str]
+    # event_badge_location: Optional[str]
     event_badge_display_location: Optional[str]
 
     event_person_informal_name: Optional[str]