diff --git a/NewTreeCommandsPlan.md b/NewTreeCommandsPlan.md
index d4c5cb3f..3976b86e 100644
--- a/NewTreeCommandsPlan.md
+++ b/NewTreeCommandsPlan.md
@@ -2,7 +2,7 @@
 
 We're improving the `data export tree` and `data import tree` commands, but doing it in phases.
 
-## Phase 1: Beta the new commands. [Now]
+## Phase 1: Beta the new commands. [Completed]
 
 Our plan:
 
@@ -29,7 +29,7 @@ Other differences:
 - `data import beta tree --files` (and not `--plan`) imports the files in parallel. Files can only reference each other if you specify `--plan`.
 - `data import tree` outputs deprecation warnings for both `--content-type` and `--config-help` flags.
 
-## Phase 2: GA the new commands, put the old ones under the `legacy` sub-topic. [July 10, 2024]
+## Phase 2: GA the new commands, put the old ones under the `legacy` sub-topic. [Now]
 
 Our plan:
 
@@ -43,7 +43,7 @@ Our plan:
 
 Our plan:
 
-1. Update `data export tree --plan` to stop writing the unused `saveRefs` and `resolveRefs` properties on plan files, and stop returning them in JSON output.
+1. Update `data export tree --plan` to stop writing the unused `saveRefs` and `resolveRefs` properties on plan files, and stop returning them in JSON output, and remove the warning about that change.
 1. Tighten the schema to remove the `object` part of `files`, and remove `saveRefs` and `resolveRefs`.
 1. Check messages for any that aren't being used, then remove them.
 1. Remove the `beta` alias from `data import tree` and `data export tree`.
diff --git a/command-snapshot.json b/command-snapshot.json
index e1776817..e557cdd7 100644
--- a/command-snapshot.json
+++ b/command-snapshot.json
@@ -74,14 +74,14 @@
   },
   {
     "alias": [],
-    "command": "data:export:beta:tree",
+    "command": "data:export:legacy:tree",
     "flagAliases": ["apiversion", "outputdir", "targetusername", "u"],
     "flagChars": ["d", "o", "p", "q", "x"],
     "flags": ["api-version", "flags-dir", "json", "loglevel", "output-dir", "plan", "prefix", "query", "target-org"],
     "plugin": "@salesforce/plugin-data"
   },
   {
-    "alias": ["force:data:tree:export"],
+    "alias": ["force:data:tree:export", "data:export:beta:tree"],
     "command": "data:export:tree",
     "flagAliases": ["apiversion", "outputdir", "targetusername", "u"],
     "flagChars": ["d", "o", "p", "q", "x"],
@@ -109,15 +109,7 @@
   },
   {
     "alias": [],
-    "command": "data:import:beta:tree",
-    "flagAliases": ["apiversion", "sobjecttreefiles", "targetusername", "u"],
-    "flagChars": ["f", "o", "p"],
-    "flags": ["api-version", "files", "flags-dir", "json", "loglevel", "plan", "target-org"],
-    "plugin": "@salesforce/plugin-data"
-  },
-  {
-    "alias": ["force:data:tree:import"],
-    "command": "data:import:tree",
+    "command": "data:import:legacy:tree",
     "flagAliases": ["apiversion", "confighelp", "contenttype", "sobjecttreefiles", "targetusername", "u"],
     "flagChars": ["c", "f", "o", "p"],
     "flags": [
@@ -133,6 +125,14 @@
     ],
     "plugin": "@salesforce/plugin-data"
   },
+  {
+    "alias": ["force:data:tree:import", "data:import:beta:tree"],
+    "command": "data:import:tree",
+    "flagAliases": ["apiversion", "sobjecttreefiles", "targetusername", "u"],
+    "flagChars": ["f", "o", "p"],
+    "flags": ["api-version", "files", "flags-dir", "json", "loglevel", "plan", "target-org"],
+    "plugin": "@salesforce/plugin-data"
+  },
   {
     "alias": ["force:data:soql:query"],
     "command": "data:query",
diff --git a/messages/tree.export.md b/messages/tree.export.md
index b609d25f..49bf7f15 100644
--- a/messages/tree.export.md
+++ b/messages/tree.export.md
@@ -30,7 +30,7 @@ Directory in which to generate the JSON files; default is current directory.
 
 - Export records retrieved with the specified SOQL query into a single JSON file in the current directory; the command uses your default org:
 
-  <%= config.bin %> <%= command.id %> --query "SELECT Id, Name, (SELECT Name, Address__c FROM Properties__r) FROM Broker__c"
+  <%= config.bin %> <%= command.id %> --query "SELECT Id, Name, (SELECT Name, Address**c FROM Properties**r) FROM Broker\_\_c"
 
 - Export data using a SOQL query in the "query.txt" file and generate JSON files for each object and a plan that aggregates them:
 
@@ -43,3 +43,11 @@ Directory in which to generate the JSON files; default is current directory.
 # PrefixSlashError
 
 `--prefix` cannot contain a forward slash or backslash.
+
+# PlanJsonWarning
+
+Starting on Nov 10, 2024, the JSON output for `--plan` will no longer include the `saveRefs` and `resolveRefs` properties.
+
+# LegacyDeprecation
+
+Starting on Nov 10, 2024, this command will no longer be available. Use `data export tree` instead.
diff --git a/messages/tree.import.beta.md b/messages/tree.import.beta.md
deleted file mode 100644
index 92748eb1..00000000
--- a/messages/tree.import.beta.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# summary
-
-Import data from one or more JSON files into an org.
-
-# description
-
-The JSON files that contain the data are in sObject tree format, which is a collection of nested, parent-child records with a single root record. Use the "<%= config.bin %> data export tree" command to generate these JSON files.
-
-If you used the --plan flag when exporting the data to generate a plan definition file, use the --plan flag to reference the file when you import. If you're not using a plan, use the --files flag to list the files. If you specify multiple JSON files that depend on each other in a parent-child relationship, be sure you list them in the correct order.
-
-# flags.files.summary
-
-Comma-separated and in-order JSON files that contain the records, in sObject tree format, that you want to insert.
-
-# flag.files.description
-
-Each file can contain up to 200 total records. For more information, see the REST API Developer Guide. (https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_composite_sobject_tree.htm)
-
-# flags.plan.summary
-
-Plan definition file to insert multiple data files.
-
-# flags.plan.description
-
-Unlike the `--files` flag, the files listed in the plan definition file **can** contain more then 200 records. These will be automatically batched to comply with that limit.
-
-The file order matters--records with lookups to records in another file should be listed AFTER that file Example: you're loading Account and Contact records, and the contacts have references to those Accounts. The Accounts file should come before the Contacts file.
-
-The plan definition file has the following schema:
-
-- items(object) - SObject Type: Definition of records to be insert per SObject Type
-  - sobject(string) - Name of SObject: Child file references must have SObject roots of this type
-  - files(array) - Files: An array of files paths to load
-
-# examples
-
-- Import the records contained in two JSON files into the org with alias "my-scratch":
-
-  <%= config.bin %> <%= command.id %> --files Contact.json,Account.json --target-org my-scratch
-
-- Import records using a plan definition file into your default org:
-
-  <%= config.bin %> <%= command.id %> --plan Account-Contact-plan.json
diff --git a/messages/tree.import.legacy.md b/messages/tree.import.legacy.md
new file mode 100644
index 00000000..070e545f
--- /dev/null
+++ b/messages/tree.import.legacy.md
@@ -0,0 +1,60 @@
+# summary
+
+Import data from one or more JSON files into an org.
+
+# description
+
+The JSON files that contain the data are in sObject tree format, which is a collection of nested, parent-child records with a single root record. Use the "<%= config.bin %> data export tree" command to generate these JSON files.
+
+If you used the --plan flag when exporting the data to generate a plan definition file, use the --plan flag to reference the file when you import. If you're not using a plan, use the --files flag to list the files. If you specify multiple JSON files that depend on each other in a parent-child relationship, be sure you list them in the correct order.
+
+The sObject Tree API supports requests that contain up to 200 records. For more information, see the REST API Developer Guide. (https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_composite_sobject_tree.htm)
+
+# flags.files.summary
+
+Comma-separated and in-order JSON files that contain the records, in sObject tree format, that you want to insert.
+
+# flags.plan.summary
+
+Plan definition file to insert multiple data files.
+
+# flags.content-type.summary
+
+Content type of import files if their extention is not .json.
+
+# flags.content-type.deprecation
+
+The `config-type` flag is deprecated and will be moved to a `legacy` command after July 10, 2024. It will be completely removed after Nov 10, 2024. Use the new `data tree beta import` command.
+
+# flags.config-help.summary
+
+Display schema information for the --plan configuration file to stdout; if you specify this flag, all other flags except --json are ignored.
+
+# flags.config-help.deprecation
+
+The `config-help` flag is deprecated and will be moved to a `legacy` command after July 10, 2024. It will be completely removed after Nov 10, 2024. Use the new `data tree beta import` command.
+
+# examples
+
+- Import the records contained in two JSON files into the org with alias "my-scratch":
+
+  <%= config.bin %> <%= command.id %> --files Contact.json,Account.json --target-org my-scratch
+
+- Import records using a plan definition file into your default org:
+
+  <%= config.bin %> <%= command.id %> --plan Account-Contact-plan.json
+
+# schema-help
+
+schema(array) - Data Import Plan: Schema for SFDX Toolbelt's data import plan JSON.
+
+- items(object) - SObject Type: Definition of records to be insert per SObject Type
+  - sobject(string) - Name of SObject: Child file references must have SObject roots of this type
+  - saveRefs(boolean) - Save References: Post-save, save references (Name/ID) to be used for reference replacement in subsequent saves. Applies to all data files for this SObject type.
+  - resolveRefs(boolean) - Resolve References: Pre-save, replace @<reference> with ID from previous save. Applies to all data files for this SObject type.
+  - files(array) - Files: An array of files paths to load
+  - items(string|object) - Filepath: Filepath string or object to point to a JSON or XML file having data defined in SObject Tree format.
+
+# deprecation
+
+After Nov 10, 2024, this command will no longer be available. Use `data export tree`.
diff --git a/messages/tree.import.md b/messages/tree.import.md
index 8a7d3167..f570622d 100644
--- a/messages/tree.import.md
+++ b/messages/tree.import.md
@@ -8,31 +8,29 @@ The JSON files that contain the data are in sObject tree format, which is a coll
 
 If you used the --plan flag when exporting the data to generate a plan definition file, use the --plan flag to reference the file when you import. If you're not using a plan, use the --files flag to list the files. If you specify multiple JSON files that depend on each other in a parent-child relationship, be sure you list them in the correct order.
 
-The sObject Tree API supports requests that contain up to 200 records. For more information, see the REST API Developer Guide. (https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_composite_sobject_tree.htm)
-
 # flags.files.summary
 
 Comma-separated and in-order JSON files that contain the records, in sObject tree format, that you want to insert.
 
-# flags.plan.summary
-
-Plan definition file to insert multiple data files.
+# flag.files.description
 
-# flags.content-type.summary
+Each file can contain up to 200 total records. For more information, see the REST API Developer Guide. (https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_composite_sobject_tree.htm)
 
-Content type of import files if their extention is not .json.
+# flags.plan.summary
 
-# flags.content-type.deprecation
+Plan definition file to insert multiple data files.
 
-The `config-type` flag is deprecated and will be moved to a `legacy` command after July 10, 2024. It will be completely removed after Nov 10, 2024. Use the new `data tree beta import` command.
+# flags.plan.description
 
-# flags.config-help.summary
+Unlike when you use the `--files` flag, the files listed in the plan definition file **can** contain more then 200 records. When the CLI executes the import, it automatically batches the records to comply with the 200 record limit set by the API.
 
-Display schema information for the --plan configuration file to stdout; if you specify this flag, all other flags except --json are ignored.
+The order in which you list the files in the plan definition file matters. Specifically, records with lookups to records in another file should be listed AFTER that file. For example, let's say you're loading Account and Contact records, and the contacts have references to those accounts. Be sure you list the Accounts file before the Contacts file.
 
-# flags.config-help.deprecation
+The plan definition file has the following schema:
 
-The `config-help` flag is deprecated and will be moved to a `legacy` command after July 10, 2024. It will be completely removed after Nov 10, 2024. Use the new `data tree beta import` command.
+- items(object) - SObject Type: Definition of records to be insert per SObject Type
+  - sobject(string) - Name of SObject: Child file references must have SObject roots of this type
+  - files(array) - Files: An array of files paths to load
 
 # examples
 
@@ -43,14 +41,3 @@ The `config-help` flag is deprecated and will be moved to a `legacy` command aft
 - Import records using a plan definition file into your default org:
 
   <%= config.bin %> <%= command.id %> --plan Account-Contact-plan.json
-
-# schema-help
-
-schema(array) - Data Import Plan: Schema for SFDX Toolbelt's data import plan JSON.
-
-- items(object) - SObject Type: Definition of records to be insert per SObject Type
-  - sobject(string) - Name of SObject: Child file references must have SObject roots of this type
-  - saveRefs(boolean) - Save References: Post-save, save references (Name/ID) to be used for reference replacement in subsequent saves. Applies to all data files for this SObject type.
-  - resolveRefs(boolean) - Resolve References: Pre-save, replace @<reference> with ID from previous save. Applies to all data files for this SObject type.
-  - files(array) - Files: An array of files paths to load
-  - items(string|object) - Filepath: Filepath string or object to point to a JSON or XML file having data defined in SObject Tree format.
diff --git a/src/commands/data/export/beta/tree.ts b/src/commands/data/export/legacy/tree.ts
similarity index 77%
rename from src/commands/data/export/beta/tree.ts
rename to src/commands/data/export/legacy/tree.ts
index c5660996..97b7e8d5 100644
--- a/src/commands/data/export/beta/tree.ts
+++ b/src/commands/data/export/legacy/tree.ts
@@ -7,8 +7,8 @@
 
 import { Messages } from '@salesforce/core';
 import { SfCommand, Flags, Ux } from '@salesforce/sf-plugins-core';
-import { orgFlags, prefixValidation } from '../../../../flags.js';
-import { ExportConfig, runExport } from '../../../../export.js';
+import { orgFlags } from '../../../../flags.js';
+import { ExportApi, ExportConfig } from '../../../../api/data/tree/exportApi.js';
 import type { DataPlanPart, SObjectTreeFileContents } from '../../../../types.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
@@ -18,9 +18,12 @@ export default class Export extends SfCommand<DataPlanPart[] | SObjectTreeFileCo
   public static readonly summary = messages.getMessage('summary');
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessages('examples');
-  // TODO: when you remove the beta state, put the force: aliases back in
-  public static readonly state = 'beta';
-
+  public static readonly hidden = true;
+  public static readonly state = 'deprecated';
+  public static readonly deprecationOptions = {
+    to: 'data tree export',
+    message: messages.getMessage('LegacyDeprecation'),
+  };
   public static readonly flags = {
     ...orgFlags,
     query: Flags.string({
@@ -35,7 +38,6 @@ export default class Export extends SfCommand<DataPlanPart[] | SObjectTreeFileCo
     prefix: Flags.string({
       char: 'x',
       summary: messages.getMessage('flags.prefix.summary'),
-      parse: prefixValidation,
     }),
     'output-dir': Flags.directory({
       char: 'd',
@@ -47,14 +49,14 @@ export default class Export extends SfCommand<DataPlanPart[] | SObjectTreeFileCo
 
   public async run(): Promise<DataPlanPart[] | SObjectTreeFileContents> {
     const { flags } = await this.parse(Export);
+    const ux = new Ux({ jsonEnabled: this.jsonEnabled() });
+    const exportApi = new ExportApi(flags['target-org'], ux);
     const exportConfig: ExportConfig = {
       outputDir: flags['output-dir'],
       plan: flags.plan,
       prefix: flags.prefix,
       query: flags.query,
-      conn: flags['target-org'].getConnection(flags['api-version']),
-      ux: new Ux({ jsonEnabled: this.jsonEnabled() }),
     };
-    return runExport(exportConfig);
+    return exportApi.export(exportConfig);
   }
 }
diff --git a/src/commands/data/export/tree.ts b/src/commands/data/export/tree.ts
index d9c61c38..f8ed4aad 100644
--- a/src/commands/data/export/tree.ts
+++ b/src/commands/data/export/tree.ts
@@ -7,8 +7,8 @@
 
 import { Messages } from '@salesforce/core';
 import { SfCommand, Flags, Ux } from '@salesforce/sf-plugins-core';
-import { orgFlags } from '../../../flags.js';
-import { ExportApi, ExportConfig } from '../../../api/data/tree/exportApi.js';
+import { orgFlags, prefixValidation } from '../../../flags.js';
+import { ExportConfig, runExport } from '../../../export.js';
 import type { DataPlanPart, SObjectTreeFileContents } from '../../../types.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
@@ -18,7 +18,7 @@ export default class Export extends SfCommand<DataPlanPart[] | SObjectTreeFileCo
   public static readonly summary = messages.getMessage('summary');
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessages('examples');
-  public static readonly aliases = ['force:data:tree:export'];
+  public static readonly aliases = ['force:data:tree:export', 'data:export:beta:tree'];
   public static readonly deprecateAliases = true;
 
   public static readonly flags = {
@@ -35,6 +35,7 @@ export default class Export extends SfCommand<DataPlanPart[] | SObjectTreeFileCo
     prefix: Flags.string({
       char: 'x',
       summary: messages.getMessage('flags.prefix.summary'),
+      parse: prefixValidation,
     }),
     'output-dir': Flags.directory({
       char: 'd',
@@ -45,19 +46,18 @@ export default class Export extends SfCommand<DataPlanPart[] | SObjectTreeFileCo
   };
 
   public async run(): Promise<DataPlanPart[] | SObjectTreeFileContents> {
-    this.info(
-      'Try the the new "sf data export beta tree" command.  It support SOQL queries with up to 5 levels of objects!'
-    );
-
     const { flags } = await this.parse(Export);
-    const ux = new Ux({ jsonEnabled: this.jsonEnabled() });
-    const exportApi = new ExportApi(flags['target-org'], ux);
+    if (flags.plan) {
+      this.warn(messages.getMessage('PlanJsonWarning'));
+    }
     const exportConfig: ExportConfig = {
       outputDir: flags['output-dir'],
       plan: flags.plan,
       prefix: flags.prefix,
       query: flags.query,
+      conn: flags['target-org'].getConnection(flags['api-version']),
+      ux: new Ux({ jsonEnabled: this.jsonEnabled() }),
     };
-    return exportApi.export(exportConfig);
+    return runExport(exportConfig);
   }
 }
diff --git a/src/commands/data/import/beta/tree.ts b/src/commands/data/import/beta/tree.ts
deleted file mode 100644
index c945f123..00000000
--- a/src/commands/data/import/beta/tree.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2020, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-
-import { Messages } from '@salesforce/core';
-import { SfCommand, Flags, arrayWithDeprecation } from '@salesforce/sf-plugins-core';
-import { importFromPlan } from '../../../../api/data/tree/importPlan.js';
-import { importFromFiles } from '../../../../api/data/tree/importFiles.js';
-import { orgFlags } from '../../../../flags.js';
-import type { ImportResult } from '../../../../api/data/tree/importTypes.js';
-
-Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
-const messages = Messages.loadMessages('@salesforce/plugin-data', 'tree.import.beta');
-
-/**
- * Command that provides data import capability via the SObject Tree Save API.
- */
-export default class Import extends SfCommand<ImportResult[]> {
-  public static readonly summary = messages.getMessage('summary');
-  public static readonly description = messages.getMessage('description');
-  public static readonly examples = messages.getMessages('examples');
-
-  // TODO: when you remove the beta state, put the force: aliases back in
-  public static readonly state = 'beta';
-
-  public static readonly flags = {
-    ...orgFlags,
-    files: arrayWithDeprecation({
-      char: 'f',
-      summary: messages.getMessage('flags.files.summary'),
-      exactlyOne: ['files', 'plan'],
-      aliases: ['sobjecttreefiles'],
-      deprecateAliases: true,
-    }),
-    plan: Flags.file({
-      char: 'p',
-      summary: messages.getMessage('flags.plan.summary'),
-      exactlyOne: ['files', 'plan'],
-      exists: true,
-    }),
-  };
-
-  public async run(): Promise<ImportResult[]> {
-    const { flags } = await this.parse(Import);
-
-    const conn = flags['target-org'].getConnection(flags['api-version']);
-    const results = flags.plan ? await importFromPlan(conn, flags.plan) : await importFromFiles(conn, flags.files);
-
-    this.styledHeader('Import Results');
-    this.table(results, {
-      refId: { header: 'Reference ID' },
-      type: { header: 'Type' },
-      id: { header: 'ID' },
-    });
-    return results;
-  }
-}
diff --git a/src/commands/data/import/legacy/tree.ts b/src/commands/data/import/legacy/tree.ts
new file mode 100644
index 00000000..9d0de2f5
--- /dev/null
+++ b/src/commands/data/import/legacy/tree.ts
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+import { Messages } from '@salesforce/core';
+import { getString, JsonMap } from '@salesforce/ts-types';
+import { SfCommand, Flags, arrayWithDeprecation } from '@salesforce/sf-plugins-core';
+import type { ImportResult } from '../../../../api/data/tree/importTypes.js';
+import { ImportApi, ImportConfig } from '../../../../api/data/tree/importApi.js';
+import { orgFlags } from '../../../../flags.js';
+
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/plugin-data', 'tree.import.legacy');
+
+/**
+ * Command that provides data import capability via the SObject Tree Save API.
+ */
+export default class Import extends SfCommand<ImportResult[] | JsonMap> {
+  public static readonly summary = messages.getMessage('summary');
+  public static readonly description = messages.getMessage('description');
+  public static readonly examples = messages.getMessages('examples');
+  public static readonly hidden = true;
+  public static readonly state = 'deprecated';
+  public static deprecationOptions = {
+    message: messages.getMessage('deprecation'),
+  };
+
+  public static readonly flags = {
+    ...orgFlags,
+    files: arrayWithDeprecation({
+      char: 'f',
+      summary: messages.getMessage('flags.files.summary'),
+      exclusive: ['plan'],
+      aliases: ['sobjecttreefiles'],
+      deprecateAliases: true,
+    }),
+    plan: Flags.file({
+      char: 'p',
+      summary: messages.getMessage('flags.plan.summary'),
+      exists: true,
+    }),
+    'content-type': Flags.string({
+      char: 'c',
+      summary: messages.getMessage('flags.content-type.summary'),
+      hidden: true,
+      aliases: ['contenttype'],
+      deprecateAliases: true,
+      deprecated: { message: messages.getMessage('flags.content-type.deprecation') },
+    }),
+    // displays the schema for a data import plan
+    'config-help': Flags.boolean({
+      summary: messages.getMessage('flags.config-help.summary'),
+      aliases: ['confighelp'],
+      deprecateAliases: true,
+      hidden: true,
+      deprecated: { message: messages.getMessage('flags.config-help.deprecation') },
+    }),
+  };
+
+  public async run(): Promise<ImportResult[] | JsonMap> {
+    const { flags } = await this.parse(Import);
+    const importApi = new ImportApi(flags['target-org']);
+
+    if (flags['config-help']) {
+      // Display config help and return
+      const schema = importApi.getSchema();
+      this.log(messages.getMessage('schema-help'));
+
+      return schema;
+    }
+
+    const importConfig: ImportConfig = {
+      sobjectTreeFiles: flags.files,
+      contentType: flags['content-type'],
+      plan: flags.plan,
+    };
+
+    const importResults = await importApi.import(importConfig);
+
+    const processedResult: ImportResult[] = (importResults.responseRefs ?? []).map((ref) => {
+      const type = getString(importResults.sobjectTypes, ref.referenceId, 'Unknown');
+      return { refId: ref.referenceId, type, id: ref.id };
+    });
+
+    this.styledHeader('Import Results');
+    this.table(processedResult, {
+      refId: { header: 'Reference ID' },
+      type: { header: 'Type' },
+      id: { header: 'ID' },
+    });
+
+    return processedResult;
+  }
+}
diff --git a/src/commands/data/import/tree.ts b/src/commands/data/import/tree.ts
index 909006bf..0d9f34b2 100644
--- a/src/commands/data/import/tree.ts
+++ b/src/commands/data/import/tree.ts
@@ -6,11 +6,11 @@
  */
 
 import { Messages } from '@salesforce/core';
-import { getString, JsonMap } from '@salesforce/ts-types';
 import { SfCommand, Flags, arrayWithDeprecation } from '@salesforce/sf-plugins-core';
-import type { ImportResult } from '../../../api/data/tree/importTypes.js';
-import { ImportApi, ImportConfig } from '../../../api/data/tree/importApi.js';
+import { importFromPlan } from '../../../api/data/tree/importPlan.js';
+import { importFromFiles } from '../../../api/data/tree/importFiles.js';
 import { orgFlags } from '../../../flags.js';
+import type { ImportResult } from '../../../api/data/tree/importTypes.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-data', 'tree.import');
@@ -18,11 +18,11 @@ const messages = Messages.loadMessages('@salesforce/plugin-data', 'tree.import')
 /**
  * Command that provides data import capability via the SObject Tree Save API.
  */
-export default class Import extends SfCommand<ImportResult[] | JsonMap> {
+export default class Import extends SfCommand<ImportResult[]> {
   public static readonly summary = messages.getMessage('summary');
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessages('examples');
-  public static readonly aliases = ['force:data:tree:import'];
+  public static readonly aliases = ['force:data:tree:import', 'data:import:beta:tree'];
   public static readonly deprecateAliases = true;
 
   public static readonly flags = {
@@ -30,69 +30,31 @@ export default class Import extends SfCommand<ImportResult[] | JsonMap> {
     files: arrayWithDeprecation({
       char: 'f',
       summary: messages.getMessage('flags.files.summary'),
-      exclusive: ['plan'],
+      exactlyOne: ['files', 'plan'],
       aliases: ['sobjecttreefiles'],
       deprecateAliases: true,
     }),
     plan: Flags.file({
       char: 'p',
       summary: messages.getMessage('flags.plan.summary'),
+      description: messages.getMessage('flags.plan.description'),
+      exactlyOne: ['files', 'plan'],
       exists: true,
     }),
-    'content-type': Flags.string({
-      char: 'c',
-      summary: messages.getMessage('flags.content-type.summary'),
-      hidden: true,
-      aliases: ['contenttype'],
-      deprecateAliases: true,
-      deprecated: { message: messages.getMessage('flags.content-type.deprecation') },
-    }),
-    // displays the schema for a data import plan
-    'config-help': Flags.boolean({
-      summary: messages.getMessage('flags.config-help.summary'),
-      aliases: ['confighelp'],
-      deprecateAliases: true,
-      hidden: true,
-      deprecated: { message: messages.getMessage('flags.config-help.deprecation') },
-    }),
   };
 
-  public async run(): Promise<ImportResult[] | JsonMap> {
+  public async run(): Promise<ImportResult[]> {
     const { flags } = await this.parse(Import);
-    const importApi = new ImportApi(flags['target-org']);
-
-    if (flags['config-help']) {
-      // Display config help and return
-      const schema = importApi.getSchema();
-      this.log(messages.getMessage('schema-help'));
 
-      return schema;
-    }
-
-    const importConfig: ImportConfig = {
-      sobjectTreeFiles: flags.files,
-      contentType: flags['content-type'],
-      plan: flags.plan,
-    };
-
-    const importResults = await importApi.import(importConfig);
-
-    const processedResult: ImportResult[] = (importResults.responseRefs ?? []).map((ref) => {
-      const type = getString(importResults.sobjectTypes, ref.referenceId, 'Unknown');
-      return { refId: ref.referenceId, type, id: ref.id };
-    });
+    const conn = flags['target-org'].getConnection(flags['api-version']);
+    const results = flags.plan ? await importFromPlan(conn, flags.plan) : await importFromFiles(conn, flags.files);
 
     this.styledHeader('Import Results');
-    this.table(processedResult, {
+    this.table(results, {
       refId: { header: 'Reference ID' },
       type: { header: 'Type' },
       id: { header: 'ID' },
     });
-
-    this.info(
-      'Be sure to check out the new "sf data import beta tree".  It handles more records and objects with lookups to the same object (ex: parent account)'
-    );
-
-    return processedResult;
+    return results;
   }
 }
diff --git a/src/commands/data/query.ts b/src/commands/data/query.ts
index 250b66c9..c7537832 100644
--- a/src/commands/data/query.ts
+++ b/src/commands/data/query.ts
@@ -93,7 +93,7 @@ export class DataSoqlQueryCommand extends SfCommand<unknown> {
    * When the user is using global '--json' flag an instance of SfdxResult is returned.
    * This is necessary since '--json' flag reports results in the form of SfdxResult
    * and bypasses the definition of start result. The goal is to have the output
-   * from '--json' and '--resulformat json' be the same.
+   * from '--json' and '--result-format json' be the same.
    *
    * The DataSoqlQueryResult is necessary to communicate user selections to the reporters.
    * The 'this' object available during display() function does not include user input to
@@ -105,7 +105,7 @@ export class DataSoqlQueryCommand extends SfCommand<unknown> {
     const flags = (await this.parse(DataSoqlQueryCommand)).flags;
 
     try {
-      // soqlqueryfile will be present if flags.query isn't. Oclif exactlyOne isn't quite that clever
+      // --file will be present if flags.query isn't. Oclif exactlyOne isn't quite that clever
       const queryString = flags.query ?? fs.readFileSync(flags.file as string, 'utf8');
       const conn = flags['target-org'].getConnection(flags['api-version']);
       if (flags['result-format'] !== 'json') this.spinner.start(messages.getMessage('queryRunningMessage'));
@@ -178,14 +178,14 @@ export class DataSoqlQueryCommand extends SfCommand<unknown> {
     connection: Connection | Connection['tooling'],
     query: string,
     logger: Logger,
-    maxFetch: number | undefined,
-    allRows: boolean | undefined = false
+    maxFetch = 50_000,
+    allRows = false
   ): Promise<SoqlQueryResult> {
     logger.debug('running query');
 
     const result = await connection.query(query, {
       autoFetch: true,
-      maxFetch: maxFetch ?? 50_000,
+      maxFetch,
       scanAll: allRows,
     });
     if (result.records.length && result.totalSize > result.records.length) {
diff --git a/src/commands/data/resume.ts b/src/commands/data/resume.ts
index 1af92f0d..3d0d7a25 100644
--- a/src/commands/data/resume.ts
+++ b/src/commands/data/resume.ts
@@ -16,11 +16,6 @@ Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-data', 'data.resume');
 
 export default class Status extends SfCommand<StatusResult> {
-  public static readonly state = 'deprecated';
-  public static readonly deprecationOptions = {
-    to: 'force:data:bulk:status',
-    message: 'Use force:data:bulk:status instead',
-  };
   public static readonly summary = messages.getMessage('summary');
   public static readonly description = messages.getMessage('description');
   public static readonly examples = messages.getMessages('examples');
diff --git a/test/commands/data/export/legacy/tree.test.ts b/test/commands/data/export/legacy/tree.test.ts
new file mode 100644
index 00000000..ea51375f
--- /dev/null
+++ b/test/commands/data/export/legacy/tree.test.ts
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+import fs from 'node:fs';
+import { resolve } from 'node:path';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { AnyJson, ensureJsonMap, ensureString, isString } from '@salesforce/ts-types';
+import { expect } from 'chai';
+import { TestContext, MockTestOrgData } from '@salesforce/core/testSetup';
+import { Config } from '@oclif/core/config';
+import Export from '../../../../../src/commands/data/export/legacy/tree.js';
+const query = 'SELECT Id, Name from Account';
+
+// Query response used by the connection stub.
+const queryResponse = {
+  totalSize: 1,
+  done: true,
+  records: [
+    {
+      attributes: {
+        type: 'Account',
+        url: '/services/data/v51.0/sobjects/Account/0019A00000GNvvAQAT',
+      },
+      Id: '0019A00000GNvvAQAT',
+      Name: 'Sample Account for Entitlements',
+    },
+  ],
+};
+
+// Abbreviated response of Account SObject metadata used by the connection stub.
+const ACCOUNT_META = {
+  name: 'Account',
+  childRelationships: [
+    { childSObject: 'Case', field: 'AccountId', relationshipName: 'Cases' },
+    {
+      childSObject: 'Contact',
+      field: 'AccountId',
+      relationshipName: 'Contacts',
+    },
+  ],
+  fields: [
+    { name: 'Name', referenceTo: [], type: 'string' },
+    { name: 'Type', referenceTo: [], type: 'picklist' },
+    { name: 'Industry', referenceTo: [], type: 'picklist' },
+  ],
+};
+
+type ExportResult = {
+  status: string;
+  message?: string;
+  result: AnyJson;
+};
+
+describe('data:export:legacy:tree', () => {
+  const $$ = new TestContext();
+  const testOrg = new MockTestOrgData();
+  const config = new Config({
+    root: resolve(dirname(fileURLToPath(import.meta.url)), '../../../package.json'),
+  });
+
+  beforeEach(async () => {
+    await $$.stubAuths(testOrg);
+    await config.load();
+  });
+
+  afterEach(async () => {
+    $$.restore();
+  });
+
+  it('returns Account record', async () => {
+    $$.SANDBOX.stub(fs, 'writeFileSync').returns();
+    $$.fakeConnectionRequest = (request: AnyJson): Promise<AnyJson> => {
+      if (isString(request) && request.includes('sobjects/Account/describe')) {
+        return Promise.resolve(ACCOUNT_META);
+      } else {
+        const requestMap = ensureJsonMap(request);
+        if (ensureString(requestMap.url).includes('query?q=SELECT')) {
+          return Promise.resolve(queryResponse);
+        }
+      }
+      return Promise.resolve({});
+    };
+    const cmd = new Export(['--target-org', 'test@org.com', '--query', query, '--json'], config);
+
+    const result = (await cmd.run()) as unknown as ExportResult;
+    expect(result).to.deep.equal({
+      records: [
+        {
+          attributes: {
+            type: 'Account',
+            referenceId: 'AccountRef1',
+          },
+          Name: 'Sample Account for Entitlements',
+        },
+      ],
+    });
+  });
+});
diff --git a/test/commands/data/import/tree.test.ts b/test/commands/data/import/legacy/tree.test.ts
similarity index 96%
rename from test/commands/data/import/tree.test.ts
rename to test/commands/data/import/legacy/tree.test.ts
index 6ca103f4..dcc75c3f 100644
--- a/test/commands/data/import/tree.test.ts
+++ b/test/commands/data/import/legacy/tree.test.ts
@@ -13,7 +13,7 @@ import { AnyJson, ensureJsonMap, ensureString } from '@salesforce/ts-types';
 import { expect } from 'chai';
 import { TestContext, MockTestOrgData, shouldThrow } from '@salesforce/core/testSetup';
 import { Config } from '@oclif/core/config';
-import Import from '../../../../src/commands/data/import/tree.js';
+import Import from '../../../../../src/commands/data/import/legacy/tree.js';
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 const dataImportPlanSchema = JSON.parse(fs.readFileSync('schema/dataImportPlanSchema.json', 'utf-8'));
 
@@ -40,7 +40,7 @@ const expectedImportResult = [
   },
 ];
 
-describe('data:tree:import', () => {
+describe('data:tree:legacy:import', () => {
   const $$ = new TestContext();
   const testOrg = new MockTestOrgData();
   const config = new Config({
@@ -83,6 +83,7 @@ describe('data:tree:import', () => {
           '..',
           '..',
           '..',
+          '..',
           'api',
           'data',
           'tree',
@@ -109,6 +110,7 @@ describe('data:tree:import', () => {
           '..',
           '..',
           '..',
+          '..',
           'api',
           'data',
           'tree',
diff --git a/test/commands/data/tree/dataTreeCommonChild.nut.ts b/test/commands/data/tree/dataTreeCommonChild.nut.ts
index 6ae77ac8..9b5ace94 100644
--- a/test/commands/data/tree/dataTreeCommonChild.nut.ts
+++ b/test/commands/data/tree/dataTreeCommonChild.nut.ts
@@ -43,7 +43,7 @@ describe('data:tree commands with a polymorphic whatId (on tasks) shared between
 
     // Import data to the default org.
     execCmd<ImportResult[]>(
-      `data:import:beta:tree --plan ${path.join(
+      `data:import:tree --plan ${path.join(
         '.',
         'data',
         'commonChild',
@@ -55,7 +55,7 @@ describe('data:tree commands with a polymorphic whatId (on tasks) shared between
     );
 
     execCmd(
-      `data:export:beta:tree --query "${query}" --prefix ${prefix} --outputdir ${path.join(
+      `data:export:tree --query "${query}" --prefix ${prefix} --outputdir ${path.join(
         '.',
         'export_data'
       )} --plan --json`,
@@ -64,7 +64,7 @@ describe('data:tree commands with a polymorphic whatId (on tasks) shared between
 
     // Import data to the 2nd org org.
     execCmd(
-      `data:import:beta:tree --target-org ${importAlias} --plan ${path.join(
+      `data:import:tree --target-org ${importAlias} --plan ${path.join(
         '.',
         'export_data',
         `${prefix}-Account-Opportunity-Task-Case-plan.json`
diff --git a/test/commands/data/tree/dataTreeDeepBeta.nut.ts b/test/commands/data/tree/dataTreeDeepBeta.nut.ts
index a1c76098..a5b14d36 100644
--- a/test/commands/data/tree/dataTreeDeepBeta.nut.ts
+++ b/test/commands/data/tree/dataTreeDeepBeta.nut.ts
@@ -38,7 +38,7 @@ describe('data:tree beta commands with more than 2 levels', () => {
 
   it('should error with invalid soql', () => {
     const result = execCmd(
-      `data:export:beta:tree --query 'SELECT' --prefix ${prefix} --outputdir ${path.join('.', 'export_data')}`
+      `data:export:tree --query 'SELECT' --prefix ${prefix} --outputdir ${path.join('.', 'export_data')}`
     );
     const stdError = getString(result, 'shellOutput.stderr', '').toLowerCase();
     const errorKeywords = ['malformed', 'check the soql', 'invalid soql query'];
@@ -50,12 +50,12 @@ describe('data:tree beta commands with more than 2 levels', () => {
       "SELECT Id, Name, Phone, Website, NumberOfEmployees, Industry, (SELECT Lastname, Title, Email FROM Contacts) FROM Account  WHERE Name LIKE 'SampleAccount%'";
 
     // Import data to the default org.
-    execCmd(`data:import:beta:tree --plan ${path.join('.', 'data', 'deep', 'accounts-contacts-plan.json')} --json`, {
+    execCmd(`data:import:tree --plan ${path.join('.', 'data', 'deep', 'accounts-contacts-plan.json')} --json`, {
       ensureExitCode: 0,
     });
 
     execCmd(
-      `data:export:beta:tree --query "${query}" --prefix ${prefix} --outputdir ${path.join(
+      `data:export:tree --query "${query}" --prefix ${prefix} --outputdir ${path.join(
         '.',
         'export_data'
       )} --plan --json`,
@@ -64,7 +64,7 @@ describe('data:tree beta commands with more than 2 levels', () => {
 
     // Import data to the default org.
     execCmd(
-      `data:import:beta:tree --target-org importOrg --plan ${path.join(
+      `data:import:tree --target-org importOrg --plan ${path.join(
         '.',
         'export_data',
         `${prefix}-Account-Contact-plan.json`
diff --git a/test/commands/data/tree/dataTreeJunction.nut.ts b/test/commands/data/tree/dataTreeJunction.nut.ts
index 56193cad..7a9c13d2 100644
--- a/test/commands/data/tree/dataTreeJunction.nut.ts
+++ b/test/commands/data/tree/dataTreeJunction.nut.ts
@@ -36,7 +36,7 @@ describe('data:tree commands', () => {
 
   it('new tree can import junction objects', () => {
     const importResult = execCmd<ImportResult[]>(
-      `data:import:beta:tree --plan ${path.join(
+      `data:import:tree --plan ${path.join(
         'data',
         'junction',
         'Account-AccountContactRelation-Contact-plan.json'
@@ -50,13 +50,13 @@ describe('data:tree commands', () => {
     const query =
       "select Id, Name, (Select Id, FirstName, LastName, (select AccountId, ContactId from AccountContactRoles) from Contacts), (select Id, ContactId, AccountId from AccountContactRelations where Account.Name != 'We Know Everybody') from Account where Name != 'Sample Account for Entitlements'";
 
-    execCmd(`data:export:beta:tree --query "${query}" --outputdir ${path.join('.', 'export_data')} --plan --json`, {
+    execCmd(`data:export:tree --query "${query}" --outputdir ${path.join('.', 'export_data')} --plan --json`, {
       ensureExitCode: 0,
     });
 
     // Import data to the default org.
     const importResult = execCmd<ImportResult[]>(
-      `data:import:beta:tree --target-org importOrg --plan ${path.join(
+      `data:import:tree --target-org importOrg --plan ${path.join(
         '.',
         'export_data',
         'Account-AccountContactRelation-Contact-plan.json'
diff --git a/test/commands/data/tree/dataTreeMissingRef.nut.ts b/test/commands/data/tree/dataTreeMissingRef.nut.ts
index 5a5afcb8..9c510f54 100644
--- a/test/commands/data/tree/dataTreeMissingRef.nut.ts
+++ b/test/commands/data/tree/dataTreeMissingRef.nut.ts
@@ -31,7 +31,7 @@ describe('data:tree beta commands with a missing reference', () => {
 
   it('import breaks recursion and fails with good error when a ref is missing', () => {
     const failResult = execCmd<ImportResult[]>(
-      `data:import:beta:tree --plan ${path.join('.', 'data', 'missingRef', 'Account-Opportunity-plan.json')} --json`,
+      `data:import:tree --plan ${path.join('.', 'data', 'missingRef', 'Account-Opportunity-plan.json')} --json`,
       {
         ensureExitCode: 'nonZero',
       }
@@ -44,7 +44,7 @@ describe('data:tree beta commands with a missing reference', () => {
 
   it('import breaks recursion and fails with good error when a ref is missing', () => {
     const failResult = execCmd<ImportResult[]>(
-      `data:import:beta:tree --plan ${path.join('.', 'data', 'missingSelfRef', 'Account-plan.json')} --json`,
+      `data:import:tree --plan ${path.join('.', 'data', 'missingSelfRef', 'Account-plan.json')} --json`,
       {
         ensureExitCode: 'nonZero',
       }
diff --git a/test/commands/data/tree/dataTreeMoreThan200.nut.ts b/test/commands/data/tree/dataTreeMoreThan200.nut.ts
index 491b3110..bd67a0db 100644
--- a/test/commands/data/tree/dataTreeMoreThan200.nut.ts
+++ b/test/commands/data/tree/dataTreeMoreThan200.nut.ts
@@ -42,7 +42,7 @@ describe('data:tree commands with more than 200 records are batches in safe grou
 
     // Import data to the default org.
     const importResult = execCmd<ImportResult[]>(
-      `data:import:beta:tree --plan ${path.join('.', 'data', 'moreThan200', 'Account-plan.json')} --json`,
+      `data:import:tree --plan ${path.join('.', 'data', 'moreThan200', 'Account-plan.json')} --json`,
       {
         ensureExitCode: 0,
       }
@@ -50,7 +50,7 @@ describe('data:tree commands with more than 200 records are batches in safe grou
     expect(importResult.jsonOutput?.result.length).to.equal(265, 'Expected 265 records to be imported');
 
     execCmd(
-      `data:export:beta:tree --query "${query}" --prefix ${prefix} --outputdir ${path.join(
+      `data:export:tree --query "${query}" --prefix ${prefix} --outputdir ${path.join(
         '.',
         'export_data'
       )} --plan --json`,
@@ -59,7 +59,7 @@ describe('data:tree commands with more than 200 records are batches in safe grou
 
     // Import data to the 2nd org org.
     execCmd(
-      `data:import:beta:tree --target-org ${importAlias} --plan ${path.join(
+      `data:import:tree --target-org ${importAlias} --plan ${path.join(
         '.',
         'export_data',
         `${prefix}-Account-plan.json`
diff --git a/test/commands/data/tree/dataTreeSelfReferencing.nut.ts b/test/commands/data/tree/dataTreeSelfReferencing.nut.ts
index c5978a05..64da6a1e 100644
--- a/test/commands/data/tree/dataTreeSelfReferencing.nut.ts
+++ b/test/commands/data/tree/dataTreeSelfReferencing.nut.ts
@@ -39,25 +39,18 @@ describe('data:tree commands with records that refer to other records of the sam
     const query = "SELECT Id, Name, ParentId FROM Account where name != 'Sample Account for Entitlements'";
 
     // Import data to the default org.
-    execCmd(`data:import:beta:tree --plan ${path.join('.', 'data', 'self-referencing', 'Account-plan.json')} --json`, {
+    execCmd(`data:import:tree --plan ${path.join('.', 'data', 'self-referencing', 'Account-plan.json')} --json`, {
       ensureExitCode: 0,
     });
 
     execCmd(
-      `data:export:beta:tree --query "${query}" --prefix INT --outputdir ${path.join(
-        '.',
-        'export_data'
-      )} --plan --json`,
+      `data:export:tree --query "${query}" --prefix INT --outputdir ${path.join('.', 'export_data')} --plan --json`,
       { ensureExitCode: 0 }
     );
 
     // Import data to the 2nd org org.
     execCmd(
-      `data:import:beta:tree --target-org importOrg --plan ${path.join(
-        '.',
-        'export_data',
-        'INT-Account-plan.json'
-      )} --json`,
+      `data:import:tree --target-org importOrg --plan ${path.join('.', 'export_data', 'INT-Account-plan.json')} --json`,
       {
         ensureExitCode: 0,
       }
diff --git a/test/test-files/data-project/data/accounts-contacts-plan.json b/test/test-files/data-project/data/accounts-contacts-plan.json
index b8595838..ec332a31 100644
--- a/test/test-files/data-project/data/accounts-contacts-plan.json
+++ b/test/test-files/data-project/data/accounts-contacts-plan.json
@@ -3,21 +3,15 @@
     "sobject": "Account",
     "saveRefs": false,
     "files": [
-      {
-        "file": "accounts-only.json",
-        "saveRefs": true
-      }
+      "accounts-only.json"
     ]
   },
   {
-    "sobject": "Account",
+    "sobject": "Contact",
     "resolveRefs": false,
     "files": [
-      {
-        "file": "contacts-only-1.json",
-        "resolveRefs": true
-      },
+      "contacts-only-1.json",
       "contacts-only-2.json"
     ]
   }
-]
+]
\ No newline at end of file