diff --git a/src/SelfServe/SqlX/SqlX.rp.ts b/src/SelfServe/SqlX/SqlX.rp.ts
index 9bbcbaa59..3d6f2799e 100644
--- a/src/SelfServe/SqlX/SqlX.rp.ts
+++ b/src/SelfServe/SqlX/SqlX.rp.ts
@@ -25,7 +25,6 @@ export const getPath = (subscriptionId: string, resourceGroup: string, name: str
 };
 
 export const updateDedicatedGatewayResource = async (sku: string, instances: number): Promise<void> => {
-  // TODO: write RP call to update dedicated gateway provisioning
   const path = getPath(userContext.subscriptionId, userContext.resourceGroup, userContext.databaseAccount.name);
   const body: UpdateDedicatedGatewayRequestParameters = {
     properties: {
@@ -62,7 +61,6 @@ export const getCurrentProvisioningState = async (): Promise<DedicatedGatewayRes
 };
 
 export const refreshDedicatedGatewayProvisioning = async (): Promise<RefreshResult> => {
-  // TODO: write RP call to check if dedicated gateway update has gone through
   try {
     const response = await getDedicatedGatewayResource();
     if (response.properties.status === ResourceStatus.Running.toString()) {
diff --git a/src/SelfServe/SqlX/SqlX.tsx b/src/SelfServe/SqlX/SqlX.tsx
index 55ff57c2d..bfe2ad1b8 100644
--- a/src/SelfServe/SqlX/SqlX.tsx
+++ b/src/SelfServe/SqlX/SqlX.tsx
@@ -48,17 +48,14 @@ const skuDropDownItems: ChoiceItem[] = [
 ];
 
 const getSkus = async (): Promise<ChoiceItem[]> => {
-  // TODO: get SKUs from getRegionSpecificSkus() RP call and return array of {label:..., key:...}.
   return skuDropDownItems;
 };
 
 const getInstancesMin = async (): Promise<number> => {
-  // TODO: get SKUs from getRegionSpecificSkus() RP call and return array of {label:..., key:...}.
   return 1;
 };
 
 const getInstancesMax = async (): Promise<number> => {
-  // TODO: get SKUs from getRegionSpecificSkus() RP call and return array of {label:..., key:...}.
   return 5;
 };
 
@@ -120,7 +117,6 @@ export default class SqlX extends SelfServeBaseClass {
   };
 
   public initialize = async (): Promise<Map<string, SmartUiInput>> => {
-    // TODO: RP call to check if dedicated gateway has already been provisioned.
     // Based on the RP call enableDedicatedGateway will be true if it has not yet been enabled and false if it has.
     const defaults = new Map<string, SmartUiInput>();
     const enableDedicatedGateway = false;