diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 6d33bf3b27f3..0f74a22feb9f 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -3825,7 +3825,7 @@ packages:
     dependencies:
       semver: 7.5.1
       shelljs: 0.8.5
-      typescript: 5.2.0-dev.20230523
+      typescript: 5.2.0-dev.20230524
     dev: false
 
   /ecdsa-sig-formatter/1.0.11:
@@ -8368,14 +8368,20 @@ packages:
     hasBin: true
     dev: false
 
+  /typescript/4.8.4:
+    resolution: {integrity: sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==}
+    engines: {node: '>=4.2.0'}
+    hasBin: true
+    dev: false
+
   /typescript/5.0.4:
     resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==}
     engines: {node: '>=12.20'}
     hasBin: true
     dev: false
 
-  /typescript/5.2.0-dev.20230523:
-    resolution: {integrity: sha512-LrDMumdesS4xcmqzEwLqbg33EtWQeSSXqrydFklXphBiv5+aETXiyUnUStkje8syf4+6j0MQTW0KzijiLS+rew==}
+  /typescript/5.2.0-dev.20230524:
+    resolution: {integrity: sha512-1XzSUJCt31jm7jIZ3vBKzK46ZxnmqX2VdVg/dur9AIaz9WmidrABs7F8H8d4onpIV8RYD/L6xW6MXR5EHjl+LA==}
     engines: {node: '>=14.17'}
     hasBin: true
     dev: false
@@ -14948,7 +14954,7 @@ packages:
     dev: false
 
   file:projects/arm-subscriptions.tgz:
-    resolution: {integrity: sha512-Eo6Okn9MfBzDiO911iU5Jgj7YZOYO1FTeYR5adc6qAIZqRiFy3gr9G1MP+oGafOPt2NMYOVeng44dMzG/G7TKg==, tarball: file:projects/arm-subscriptions.tgz}
+    resolution: {integrity: sha512-F6dUmsAseDNuW/eeEgUC5HXyIRplk7cXd0dlMTnR/tqtcYkCrHyQpF50NzN5QwEHS3iEdwxdKR45dPnHFzay+A==, tarball: file:projects/arm-subscriptions.tgz}
     name: '@rush-temp/arm-subscriptions'
     version: 0.0.0
     dependencies:
@@ -14962,13 +14968,14 @@ packages:
       '@types/node': 14.18.47
       chai: 4.3.7
       cross-env: 7.0.3
-      mkdirp: 1.0.4
+      dotenv: 16.0.3
+      mkdirp: 2.1.6
       mocha: 7.2.0
       rimraf: 3.0.2
       rollup: 2.79.1
       rollup-plugin-sourcemaps: 0.6.3_ehqevut6loiv2j3zjuhqc62mru
       tslib: 2.5.2
-      typescript: 5.0.4
+      typescript: 4.8.4
       uglify-js: 3.17.4
     transitivePeerDependencies:
       - supports-color
diff --git a/sdk/subscription/arm-subscriptions/LICENSE b/sdk/subscription/arm-subscriptions/LICENSE
index 5d1d36e0af80..3a1d9b6f24f7 100644
--- a/sdk/subscription/arm-subscriptions/LICENSE
+++ b/sdk/subscription/arm-subscriptions/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Microsoft
+Copyright (c) 2023 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/sdk/subscription/arm-subscriptions/_meta.json b/sdk/subscription/arm-subscriptions/_meta.json
index 20c925dd32b1..4cb7edd24cc9 100644
--- a/sdk/subscription/arm-subscriptions/_meta.json
+++ b/sdk/subscription/arm-subscriptions/_meta.json
@@ -1,8 +1,8 @@
 {
-  "commit": "52a770004c3019a067e9dcdbb2e95b4992d42728",
+  "commit": "9eba6eb27c98106f70168a7a8842f30c308fa81a",
   "readme": "specification/subscription/resource-manager/readme.md",
-  "autorest_command": "autorest --version=3.8.4 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\subscription\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.3.20221108.1 --generate-sample=true",
+  "autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/subscription/resource-manager/readme.md --use=@autorest/typescript@6.0.0-rc.10",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
-  "release_tool": "@azure-tools/js-sdk-release-tools@2.4.2",
-  "use": "@autorest/typescript@6.0.0-rc.3.20221108.1"
+  "release_tool": "@azure-tools/js-sdk-release-tools@2.7.0",
+  "use": "@autorest/typescript@6.0.0-rc.10"
 }
\ No newline at end of file
diff --git a/sdk/subscription/arm-subscriptions/package.json b/sdk/subscription/arm-subscriptions/package.json
index f6ff8d91f977..4832fe95e023 100644
--- a/sdk/subscription/arm-subscriptions/package.json
+++ b/sdk/subscription/arm-subscriptions/package.json
@@ -8,10 +8,10 @@
     "node": ">=14.0.0"
   },
   "dependencies": {
-    "@azure/core-lro": "^2.2.0",
+    "@azure/core-lro": "^2.5.0",
     "@azure/abort-controller": "^1.0.0",
     "@azure/core-paging": "^1.2.0",
-    "@azure/core-client": "^1.6.1",
+    "@azure/core-client": "^1.7.0",
     "@azure/core-auth": "^1.3.0",
     "@azure/core-rest-pipeline": "^1.8.0",
     "tslib": "^2.2.0"
@@ -33,12 +33,13 @@
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-multi-entry": "^6.0.0",
     "@rollup/plugin-node-resolve": "^13.1.3",
-    "mkdirp": "^1.0.4",
+    "mkdirp": "^2.1.2",
     "rollup": "^2.66.1",
     "rollup-plugin-sourcemaps": "^0.6.3",
-    "typescript": "~5.0.0",
+    "typescript": "~4.8.0",
     "uglify-js": "^3.4.9",
     "rimraf": "^3.0.0",
+    "dotenv": "^16.0.0",
     "@azure/identity": "^2.0.1",
     "@azure-tools/test-recorder": "^3.0.0",
     "@azure-tools/test-credential": "^1.0.0",
@@ -49,7 +50,6 @@
     "@types/node": "^14.0.0",
     "@azure/dev-tool": "^1.0.0"
   },
-  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/subscription/arm-subscriptions",
   "repository": {
     "type": "git",
     "url": "https://github.com/Azure/azure-sdk-for-js.git"
@@ -111,12 +111,5 @@
     ]
   },
   "autoPublish": true,
-  "//sampleConfiguration": {
-    "productName": "",
-    "productSlugs": [
-      "azure"
-    ],
-    "disableDocsMs": true,
-    "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-subscriptions?view=azure-node-preview"
-  }
-}
+  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/subscription/arm-subscriptions"
+}
\ No newline at end of file
diff --git a/sdk/subscription/arm-subscriptions/review/arm-subscriptions.api.md b/sdk/subscription/arm-subscriptions/review/arm-subscriptions.api.md
index b58f5417f295..0847057a4300 100644
--- a/sdk/subscription/arm-subscriptions/review/arm-subscriptions.api.md
+++ b/sdk/subscription/arm-subscriptions/review/arm-subscriptions.api.md
@@ -6,9 +6,9 @@
 
 import * as coreAuth from '@azure/core-auth';
 import * as coreClient from '@azure/core-client';
+import { OperationState } from '@azure/core-lro';
 import { PagedAsyncIterableIterator } from '@azure/core-paging';
-import { PollerLike } from '@azure/core-lro';
-import { PollOperationState } from '@azure/core-lro';
+import { SimplePollerLike } from '@azure/core-lro';
 
 // @public
 export type AcceptOwnership = string;
@@ -42,7 +42,7 @@ export interface AcceptOwnershipStatusResponse {
 
 // @public
 export interface Alias {
-    beginCreate(aliasName: string, body: PutAliasRequest, options?: AliasCreateOptionalParams): Promise<PollerLike<PollOperationState<AliasCreateResponse>, AliasCreateResponse>>;
+    beginCreate(aliasName: string, body: PutAliasRequest, options?: AliasCreateOptionalParams): Promise<SimplePollerLike<OperationState<AliasCreateResponse>, AliasCreateResponse>>;
     beginCreateAndWait(aliasName: string, body: PutAliasRequest, options?: AliasCreateOptionalParams): Promise<AliasCreateResponse>;
     delete(aliasName: string, options?: AliasDeleteOptionalParams): Promise<void>;
     get(aliasName: string, options?: AliasGetOptionalParams): Promise<AliasGetResponse>;
@@ -414,7 +414,7 @@ export interface SubscriptionName {
 // @public
 export interface SubscriptionOperations {
     acceptOwnershipStatus(subscriptionId: string, options?: SubscriptionAcceptOwnershipStatusOptionalParams): Promise<SubscriptionAcceptOwnershipStatusResponse>;
-    beginAcceptOwnership(subscriptionId: string, body: AcceptOwnershipRequest, options?: SubscriptionAcceptOwnershipOptionalParams): Promise<PollerLike<PollOperationState<SubscriptionAcceptOwnershipResponse>, SubscriptionAcceptOwnershipResponse>>;
+    beginAcceptOwnership(subscriptionId: string, body: AcceptOwnershipRequest, options?: SubscriptionAcceptOwnershipOptionalParams): Promise<SimplePollerLike<OperationState<SubscriptionAcceptOwnershipResponse>, SubscriptionAcceptOwnershipResponse>>;
     beginAcceptOwnershipAndWait(subscriptionId: string, body: AcceptOwnershipRequest, options?: SubscriptionAcceptOwnershipOptionalParams): Promise<SubscriptionAcceptOwnershipResponse>;
     cancel(subscriptionId: string, options?: SubscriptionCancelOptionalParams): Promise<SubscriptionCancelResponse>;
     enable(subscriptionId: string, options?: SubscriptionEnableOptionalParams): Promise<SubscriptionEnableResponse>;
diff --git a/sdk/subscription/arm-subscriptions/src/lroImpl.ts b/sdk/subscription/arm-subscriptions/src/lroImpl.ts
index 518d5f053b4e..dd803cd5e28c 100644
--- a/sdk/subscription/arm-subscriptions/src/lroImpl.ts
+++ b/sdk/subscription/arm-subscriptions/src/lroImpl.ts
@@ -6,29 +6,37 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import { AbortSignalLike } from "@azure/abort-controller";
 import { LongRunningOperation, LroResponse } from "@azure/core-lro";
 
-export class LroImpl<T> implements LongRunningOperation<T> {
-  constructor(
-    private sendOperationFn: (args: any, spec: any) => Promise<LroResponse<T>>,
-    private args: Record<string, unknown>,
-    private spec: {
-      readonly requestBody?: unknown;
-      readonly path?: string;
-      readonly httpMethod: string;
-    } & Record<string, any>,
-    public requestPath: string = spec.path!,
-    public requestMethod: string = spec.httpMethod
-  ) {}
-  public async sendInitialRequest(): Promise<LroResponse<T>> {
-    return this.sendOperationFn(this.args, this.spec);
-  }
-  public async sendPollRequest(path: string): Promise<LroResponse<T>> {
-    const { requestBody, ...restSpec } = this.spec;
-    return this.sendOperationFn(this.args, {
-      ...restSpec,
-      path,
-      httpMethod: "GET"
-    });
-  }
+export function createLroSpec<T>(inputs: {
+  sendOperationFn: (args: any, spec: any) => Promise<LroResponse<T>>;
+  args: Record<string, unknown>;
+  spec: {
+    readonly requestBody?: unknown;
+    readonly path?: string;
+    readonly httpMethod: string;
+  } & Record<string, any>;
+}): LongRunningOperation<T> {
+  const { args, spec, sendOperationFn } = inputs;
+  return {
+    requestMethod: spec.httpMethod,
+    requestPath: spec.path!,
+    sendInitialRequest: () => sendOperationFn(args, spec),
+    sendPollRequest: (
+      path: string,
+      options?: { abortSignal?: AbortSignalLike }
+    ) => {
+      const { requestBody, ...restSpec } = spec;
+      return sendOperationFn(args, {
+        ...restSpec,
+        httpMethod: "GET",
+        path,
+        abortSignal: options?.abortSignal
+      });
+    }
+  };
 }
diff --git a/sdk/subscription/arm-subscriptions/src/operations/alias.ts b/sdk/subscription/arm-subscriptions/src/operations/alias.ts
index fbb5e1e0ff14..d8c468501d55 100644
--- a/sdk/subscription/arm-subscriptions/src/operations/alias.ts
+++ b/sdk/subscription/arm-subscriptions/src/operations/alias.ts
@@ -11,8 +11,12 @@ import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
 import { SubscriptionClient } from "../subscriptionClient";
-import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
-import { LroImpl } from "../lroImpl";
+import {
+  SimplePollerLike,
+  OperationState,
+  createHttpPoller
+} from "@azure/core-lro";
+import { createLroSpec } from "../lroImpl";
 import {
   PutAliasRequest,
   AliasCreateOptionalParams,
@@ -49,7 +53,7 @@ export class AliasImpl implements Alias {
     body: PutAliasRequest,
     options?: AliasCreateOptionalParams
   ): Promise<
-    PollerLike<PollOperationState<AliasCreateResponse>, AliasCreateResponse>
+    SimplePollerLike<OperationState<AliasCreateResponse>, AliasCreateResponse>
   > {
     const directSendOperation = async (
       args: coreClient.OperationArguments,
@@ -57,7 +61,7 @@ export class AliasImpl implements Alias {
     ): Promise<AliasCreateResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -90,13 +94,16 @@ export class AliasImpl implements Alias {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { aliasName, body, options },
-      createOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { aliasName, body, options },
+      spec: createOperationSpec
+    });
+    const poller = await createHttpPoller<
+      AliasCreateResponse,
+      OperationState<AliasCreateResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
     await poller.poll();
diff --git a/sdk/subscription/arm-subscriptions/src/operations/operations.ts b/sdk/subscription/arm-subscriptions/src/operations/operations.ts
index cc3e4bd2bf6d..11ec373079ad 100644
--- a/sdk/subscription/arm-subscriptions/src/operations/operations.ts
+++ b/sdk/subscription/arm-subscriptions/src/operations/operations.ts
@@ -143,7 +143,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.ErrorResponseBody
     }
   },
-  queryParameters: [Parameters.apiVersion1],
   urlParameters: [Parameters.$host, Parameters.nextLink],
   headerParameters: [Parameters.accept],
   serializer
diff --git a/sdk/subscription/arm-subscriptions/src/operations/subscriptionOperations.ts b/sdk/subscription/arm-subscriptions/src/operations/subscriptionOperations.ts
index a9800838cf2f..a5665b852540 100644
--- a/sdk/subscription/arm-subscriptions/src/operations/subscriptionOperations.ts
+++ b/sdk/subscription/arm-subscriptions/src/operations/subscriptionOperations.ts
@@ -11,8 +11,12 @@ import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
 import { SubscriptionClient } from "../subscriptionClient";
-import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
-import { LroImpl } from "../lroImpl";
+import {
+  SimplePollerLike,
+  OperationState,
+  createHttpPoller
+} from "@azure/core-lro";
+import { createLroSpec } from "../lroImpl";
 import {
   SubscriptionCancelOptionalParams,
   SubscriptionCancelResponse,
@@ -98,8 +102,8 @@ export class SubscriptionOperationsImpl implements SubscriptionOperations {
     body: AcceptOwnershipRequest,
     options?: SubscriptionAcceptOwnershipOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<SubscriptionAcceptOwnershipResponse>,
+    SimplePollerLike<
+      OperationState<SubscriptionAcceptOwnershipResponse>,
       SubscriptionAcceptOwnershipResponse
     >
   > {
@@ -109,7 +113,7 @@ export class SubscriptionOperationsImpl implements SubscriptionOperations {
     ): Promise<SubscriptionAcceptOwnershipResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -142,13 +146,16 @@ export class SubscriptionOperationsImpl implements SubscriptionOperations {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { subscriptionId, body, options },
-      acceptOwnershipOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { subscriptionId, body, options },
+      spec: acceptOwnershipOperationSpec
+    });
+    const poller = await createHttpPoller<
+      SubscriptionAcceptOwnershipResponse,
+      OperationState<SubscriptionAcceptOwnershipResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
     await poller.poll();
diff --git a/sdk/subscription/arm-subscriptions/src/operations/subscriptionPolicy.ts b/sdk/subscription/arm-subscriptions/src/operations/subscriptionPolicy.ts
index 4bcd43d6516c..783b9f259172 100644
--- a/sdk/subscription/arm-subscriptions/src/operations/subscriptionPolicy.ts
+++ b/sdk/subscription/arm-subscriptions/src/operations/subscriptionPolicy.ts
@@ -213,7 +213,6 @@ const listPolicyForTenantNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.ErrorResponseBody
     }
   },
-  queryParameters: [Parameters.apiVersion1],
   urlParameters: [Parameters.$host, Parameters.nextLink],
   headerParameters: [Parameters.accept],
   serializer
diff --git a/sdk/subscription/arm-subscriptions/src/operations/subscriptions.ts b/sdk/subscription/arm-subscriptions/src/operations/subscriptions.ts
index d612b33bb9e4..b1006d43ae26 100644
--- a/sdk/subscription/arm-subscriptions/src/operations/subscriptions.ts
+++ b/sdk/subscription/arm-subscriptions/src/operations/subscriptions.ts
@@ -248,7 +248,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.SubscriptionListResult
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [Parameters.$host, Parameters.nextLink],
   headerParameters: [Parameters.accept],
   serializer
diff --git a/sdk/subscription/arm-subscriptions/src/operations/tenants.ts b/sdk/subscription/arm-subscriptions/src/operations/tenants.ts
index 053198e4ed02..58a0293f575d 100644
--- a/sdk/subscription/arm-subscriptions/src/operations/tenants.ts
+++ b/sdk/subscription/arm-subscriptions/src/operations/tenants.ts
@@ -137,7 +137,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.TenantListResult
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [Parameters.$host, Parameters.nextLink],
   headerParameters: [Parameters.accept],
   serializer
diff --git a/sdk/subscription/arm-subscriptions/src/operationsInterfaces/alias.ts b/sdk/subscription/arm-subscriptions/src/operationsInterfaces/alias.ts
index 6cc57ed29fa6..4011d89fd140 100644
--- a/sdk/subscription/arm-subscriptions/src/operationsInterfaces/alias.ts
+++ b/sdk/subscription/arm-subscriptions/src/operationsInterfaces/alias.ts
@@ -6,7 +6,7 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PollerLike, PollOperationState } from "@azure/core-lro";
+import { SimplePollerLike, OperationState } from "@azure/core-lro";
 import {
   PutAliasRequest,
   AliasCreateOptionalParams,
@@ -33,7 +33,7 @@ export interface Alias {
     body: PutAliasRequest,
     options?: AliasCreateOptionalParams
   ): Promise<
-    PollerLike<PollOperationState<AliasCreateResponse>, AliasCreateResponse>
+    SimplePollerLike<OperationState<AliasCreateResponse>, AliasCreateResponse>
   >;
   /**
    * Create Alias Subscription.
diff --git a/sdk/subscription/arm-subscriptions/src/operationsInterfaces/subscriptionOperations.ts b/sdk/subscription/arm-subscriptions/src/operationsInterfaces/subscriptionOperations.ts
index ee66d9822d36..12a1612f91e7 100644
--- a/sdk/subscription/arm-subscriptions/src/operationsInterfaces/subscriptionOperations.ts
+++ b/sdk/subscription/arm-subscriptions/src/operationsInterfaces/subscriptionOperations.ts
@@ -6,7 +6,7 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PollerLike, PollOperationState } from "@azure/core-lro";
+import { SimplePollerLike, OperationState } from "@azure/core-lro";
 import {
   SubscriptionCancelOptionalParams,
   SubscriptionCancelResponse,
@@ -64,8 +64,8 @@ export interface SubscriptionOperations {
     body: AcceptOwnershipRequest,
     options?: SubscriptionAcceptOwnershipOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<SubscriptionAcceptOwnershipResponse>,
+    SimplePollerLike<
+      OperationState<SubscriptionAcceptOwnershipResponse>,
       SubscriptionAcceptOwnershipResponse
     >
   >;
diff --git a/sdk/subscription/arm-subscriptions/src/pagingHelper.ts b/sdk/subscription/arm-subscriptions/src/pagingHelper.ts
index d85fc13bce1e..269a2b9814b5 100644
--- a/sdk/subscription/arm-subscriptions/src/pagingHelper.ts
+++ b/sdk/subscription/arm-subscriptions/src/pagingHelper.ts
@@ -13,11 +13,11 @@ export interface PageInfo {
 const pageMap = new WeakMap<object, PageInfo>();
 
 /**
- * Given a result page from a pageable operation, returns a
- * continuation token that can be used to begin paging from
+ * Given the last `.value` produced by the `byPage` iterator,
+ * returns a continuation token that can be used to begin paging from
  * that point later.
- * @param page A result object from calling .byPage() on a paged operation.
- * @returns The continuation token that can be passed into byPage().
+ * @param page An object from accessing `value` on the IteratorResult from a `byPage` iterator.
+ * @returns The continuation token that can be passed into byPage() during future calls.
  */
 export function getContinuationToken(page: unknown): string | undefined {
   if (typeof page !== "object" || page === null) {
diff --git a/sdk/subscription/arm-subscriptions/tsconfig.json b/sdk/subscription/arm-subscriptions/tsconfig.json
index 9889c4c576e3..3e6ae96443f3 100644
--- a/sdk/subscription/arm-subscriptions/tsconfig.json
+++ b/sdk/subscription/arm-subscriptions/tsconfig.json
@@ -15,17 +15,11 @@
     ],
     "declaration": true,
     "outDir": "./dist-esm",
-    "importHelpers": true,
-    "paths": {
-      "@azure/arm-subscriptions": [
-        "./src/index"
-      ]
-    }
+    "importHelpers": true
   },
   "include": [
     "./src/**/*.ts",
-    "./test/**/*.ts",
-    "samples-dev/**/*.ts"
+    "./test/**/*.ts"
   ],
   "exclude": [
     "node_modules"