@@ -123,7 +123,7 @@ CSV / JSON fields (ordered for CSV; JSON objects contain the same keys):
 > [!TIP]
 > The Device Group field will only be populated for groups that are Central compatible device groups. Classic Central groups will not appear in this export.
 
-> Location fields from Floorplan ID through Longitude are populated only when `--include-floorplan` (or `--include-raw-location`) is provided. The Raw Location column is additionally gated behind `--include-raw-location`; passing this flag also implies `--include-floorplan`, so no separate flag is needed. All other location columns remain present with blank/null values when location data is unavailable.
+> Location fields from Floorplan ID through Longitude are only added to the CSV/JSON when `--include-floorplan` (or `--include-raw-location`) is provided. The Raw Location column is additionally gated behind `--include-raw-location`; passing this flag also implies `--include-floorplan`. When neither flag is provided, location columns are omitted entirely from outputs.
 
 
 If no data is returned from the APIs or post-processing yields an empty list, the script prints "No data to save." 
@@ -132,7 +132,7 @@ If no data is returned from the APIs or post-processing yields an empty list, th
 
 - Authentication / tokens: Ensure your credentials file contains a top-level `unified` section with `workspace_id`, `client_id`, `client_secret`, and `cluster_name` or `base_url`.
 - Empty output: Confirm that devices exist in Central inventory and that GLP subscriptions/devices exist for the account.
-- Missing location fields: Confirm APs have `siteId` values and floorplan/device-location data exists for the site. Devices remain in the output with blank/null location fields when location data is unavailable.
+-- Missing location fields: Confirm APs have `siteId` values and floorplan/device-location data exists for the site. If you want location columns in the output, run with `--include-floorplan` (or `--include-raw-location`).
 - SDK compatibility: If API calls fail unexpectedly, confirm the installed pycentral version matches tested versions (v2.0a22) or update helpers accordingly.
 
 ## Support
 
@@ -11,13 +11,12 @@
     process_list,
     process_glp_device,
     processed_data,
-    ensure_tokens_available,
     get_all_device_inventory,
     derive_site_ids_with_aps,
     fetch_device_locations,
 )
 
-CSV_COLUMNS = [
+BASE_COLUMNS = [
     # Device information columns
     "Serial Number",
     "Mac Address",
@@ -40,29 +39,27 @@
     "Subscription Tier",
     "Subscription Type",
     "Subscription End Time",
-    # Location fields (may be empty)
+]
+
+LOCATION_COLUMNS = [
     "Floorplan ID",
     "Building ID",
     "X Coordinate",
     "Y Coordinate",
     "Floor Coordinate Unit",
     "Latitude",
     "Longitude",
-    "Raw Location",
 ]
 
+RAW_LOCATION_COLUMN = "Raw Location"
+
 LOCATION_FETCH_WORKERS = 3
 
 
 def main():
     args = parse_args()
     new_central_conn = NewCentralBase(token_info=args.credentials, log_level="ERROR")
-    try:
-        ensure_tokens_available(new_central_conn)
-    except Exception as e:
-        print(f"Error: {e}")
-        return
-
+    
     devices_api = Devices()
     subscriptions_api = Subscriptions()
 
@@ -95,25 +92,38 @@ def main():
         else:
             print("No site IDs with APs found; skipping floorplan/device-location fetch.")
 
-    processed = process_all_data(raw_data, processed_locations)
+    processed = process_all_data(
+        raw_data,
+        processed_locations,
+        processed_inventory,
+        processed_devices,
+    )
 
     # Save results to CSV and structured JSON
-    output = processed_data(**processed)
-    effective_columns = (
-        CSV_COLUMNS
-        if args.include_raw_location
-        else [col for col in CSV_COLUMNS if col != "Raw Location"]
+    output = processed_data(
+        **processed,
+        include_floorplan=(args.include_floorplan or args.include_raw_location),
+        include_raw_location=args.include_raw_location,
     )
+
+    # Build columns based on flags: omit location columns unless requested
+    effective_columns = list(BASE_COLUMNS)
+    if args.include_floorplan or args.include_raw_location:
+        effective_columns += LOCATION_COLUMNS
+    if args.include_raw_location:
+        effective_columns.append(RAW_LOCATION_COLUMN)
     if output:
         # Prepare CSV rows: ensure Raw Location is serialized to a JSON string
         csv_rows = []
         for row in output:
             r = row.copy()
-            raw = r.get("Raw Location", "")
-            if isinstance(raw, (dict, list)):
-                r["Raw Location"] = json.dumps(raw, ensure_ascii=False)
-            elif raw is None:
-                r["Raw Location"] = ""
+            # only serialize Raw Location when it's part of effective columns
+            if RAW_LOCATION_COLUMN in effective_columns:
+                raw = r.get(RAW_LOCATION_COLUMN, "")
+                if isinstance(raw, (dict, list)):
+                    r[RAW_LOCATION_COLUMN] = json.dumps(raw, ensure_ascii=False)
+                elif raw is None:
+                    r[RAW_LOCATION_COLUMN] = ""
             csv_rows.append(r)
 
         df = pd.DataFrame(csv_rows)
@@ -199,15 +209,24 @@ def validate_file_format(file_path):
     return file_path
 
 
-def process_all_data(raw_data, processed_locations=None):
-    """Process raw API data into structured format. Accept optional processed_locations map."""
-    processed_inventory = process_list(
-        _safe("device_inventory", raw_data), "serialNumber"
-    )
+def process_all_data(
+    raw_data, processed_locations=None, processed_inventory=None, processed_devices=None
+):
+    """Process raw API data into structured format.
+
+    Accept optional precomputed `processed_inventory` and `processed_devices` to
+    avoid recomputing large mappings when callers already have them.
+    """
+    # compute only if not provided to preserve backward compatibility
+    if processed_inventory is None:
+        processed_inventory = process_list(
+            _safe("device_inventory", raw_data), "serialNumber"
+        )
+    if processed_devices is None:
+        processed_devices = process_monitoring_data(_safe("monitoring_devices", raw_data))
+
     return {
-        "processed_devices": process_monitoring_data(
-            _safe("monitoring_devices", raw_data)
-        ),
+        "processed_devices": processed_devices,
         "processed_inventory": processed_inventory,
         "processed_glp_devices": process_glp_device(
             process_list(_safe("glp_devices", raw_data), "serialNumber"),
 
@@ -65,6 +65,8 @@ def processed_data(
     processed_glp_devices=None,
     processed_subs=None,
     processed_locations=None,
+    include_floorplan: bool = False,
+    include_raw_location: bool = False,
 ):
     """Build list of device dicts for CSV output.
 
@@ -126,41 +128,27 @@ def processed_data(
                     "Subscription End Time": iso_to_human(sub.get("endTime", "")),
                 }
             )
-        # attach location fields if present (do not omit rows if missing)
-        loc = processed_locations.get(serial_number, {}) or {}
-        entry.update(
-            {
-                "Floorplan ID": loc.get("floorplan_id", ""),
-                "Building ID": loc.get("building_id", ""),
-                "X Coordinate": loc.get("floor_x", ""),
-                "Y Coordinate": loc.get("floor_y", ""),
-                "Floor Coordinate Unit": loc.get("floor_coordinate_unit", ""),
-                "Latitude": loc.get("device_latitude", ""),
-                "Longitude": loc.get("device_longitude", ""),
-                "Raw Location": loc.get("raw_location", ""),
-            }
-        )
+        # attach location fields only when requested (do not omit rows if missing)
+        if include_floorplan:
+            loc = processed_locations.get(serial_number, {}) or {}
+            entry.update(
+                {
+                    "Floorplan ID": loc.get("floorplan_id", ""),
+                    "Building ID": loc.get("building_id", ""),
+                    "X Coordinate": loc.get("floor_x", ""),
+                    "Y Coordinate": loc.get("floor_y", ""),
+                    "Floor Coordinate Unit": loc.get("floor_coordinate_unit", ""),
+                    "Latitude": loc.get("device_latitude", ""),
+                    "Longitude": loc.get("device_longitude", ""),
+                }
+            )
+            if include_raw_location:
+                # include raw_location (may be dict) only when explicitly requested
+                entry["Raw Location"] = loc.get("raw_location", "")
         result.append(entry)
     return result
 
 
-def ensure_tokens_available(new_central_conn):
-    """Ensure unified token information can reach Central and GLP APIs."""
-    tokens = getattr(new_central_conn, "token_info", None)
-    if not tokens or "unified" not in tokens:
-        raise Exception(
-            "Unified token information is missing. Provide a valid PyCentral "
-            "unified credentials file with client_id, client_secret, workspace_id, "
-            "and cluster_name or base_url."
-        )
-    routes = getattr(new_central_conn, "_app_routes", {})
-    missing_routes = {"new_central", "glp"} - set(routes)
-    if missing_routes:
-        raise Exception(
-            "Unified credentials must enable both Central and GLP API routes. "
-            "Provide workspace_id and cluster_name or base_url under unified."
-        )
-    return True
 
 
 def get_all_device_inventory(MonitoringDevices, central_conn):