diff --git a/client-react/src/pages/static-app/configuration/Configuration.types.ts b/client-react/src/pages/static-app/configuration/Configuration.types.ts
index 38a017a4fd..ff9993a7ae 100644
--- a/client-react/src/pages/static-app/configuration/Configuration.types.ts
+++ b/client-react/src/pages/static-app/configuration/Configuration.types.ts
@@ -159,7 +159,6 @@ export interface ConfigurationFormProps {
   refresh: (currentEnvironment?: ArmObj<Environment>) => Promise<void>;
   selectedEnvironmentVariableResponse?: ArmObj<KeyValue<string>>;
   staticSiteSku: StaticSiteSku;
-  showNewConfiguration: boolean;
   formData?: ConfigurationFormData;
   location?: string;
 }
@@ -176,8 +175,6 @@ export interface ConfigurationPivotProps {
   selectedEnvironmentVariableResponse?: ArmObj<KeyValue<string>>;
   staticSiteSku: StaticSiteSku;
   refresh: (currentEnvironment?: ArmObj<Environment>) => Promise<void>;
-  showAppSettings: boolean;
-  showNewConfiguration: boolean;
 }
 
 export enum StaticSiteSku {
diff --git a/client-react/src/pages/static-app/configuration/ConfigurationDataLoader.tsx b/client-react/src/pages/static-app/configuration/ConfigurationDataLoader.tsx
index 6e4eb0fced..6223c4955f 100644
--- a/client-react/src/pages/static-app/configuration/ConfigurationDataLoader.tsx
+++ b/client-react/src/pages/static-app/configuration/ConfigurationDataLoader.tsx
@@ -8,7 +8,6 @@ import { PortalContext } from '../../../PortalContext';
 import { ArmObj } from '../../../models/arm-obj';
 import { KeyValue } from '../../../models/portal-models';
 import { Environment } from '../../../models/static-site/environment';
-import { ExperimentationConstants } from '../../../utils/CommonConstants';
 import { LogCategories } from '../../../utils/LogCategories';
 import { usePortalLogging } from '../../../utils/hooks/usePortalLogging';
 import RbacConstants from '../../../utils/rbac-constants';
@@ -44,7 +43,6 @@ const ConfigurationDataLoader: React.FC<ConfigurationDataLoaderProps> = (props:
   const [codeFormValidationSchema, setCodeFormValidationSchema] = useState<ConfigurationYupValidationSchemaType>();
   const [staticSiteSku, setStaticSiteSku] = useState(StaticSiteSku.Standard);
   const [location, setLocation] = useState<string>();
-  const [showNewConfiguration, setShowNewConfiguration] = useState(false);
 
   const portalContext = useContext(PortalContext);
   const { t } = useTranslation();
@@ -229,12 +227,6 @@ const ConfigurationDataLoader: React.FC<ConfigurationDataLoaderProps> = (props:
     [fetchData]
   );
 
-  useEffect(() => {
-    portalContext
-      .getBooleanFlight(ExperimentationConstants.TreatmentFlight.swaConfigurationNew)
-      .then((isEnabled: boolean) => setShowNewConfiguration(isEnabled));
-  }, [portalContext]);
-
   useEffect(() => {
     fetchData();
 
@@ -259,7 +251,6 @@ const ConfigurationDataLoader: React.FC<ConfigurationDataLoaderProps> = (props:
         selectedEnvironmentVariableResponse={selectedEnvironmentVariableResponse}
         staticSiteSku={staticSiteSku}
         validationSchema={codeFormValidationSchema}
-        showNewConfiguration={showNewConfiguration}
       />
     </ConfigurationContext.Provider>
   );
diff --git a/client-react/src/pages/static-app/configuration/ConfigurationForm.tsx b/client-react/src/pages/static-app/configuration/ConfigurationForm.tsx
index e450209135..cb68bbbc76 100644
--- a/client-react/src/pages/static-app/configuration/ConfigurationForm.tsx
+++ b/client-react/src/pages/static-app/configuration/ConfigurationForm.tsx
@@ -23,7 +23,7 @@ import {
   StagingEnvironmentPolicyTypes,
 } from './Configuration.types';
 import ConfigurationCommandBar from './ConfigurationCommandBar';
-import ConfigurationPivot from './ConfigurationPivot';
+import ConfigurationSnippets from './ConfigurationSnippets';
 
 const ConfigurationForm: React.FC<ConfigurationFormProps> = (props: ConfigurationFormProps) => {
   const {
@@ -36,7 +36,6 @@ const ConfigurationForm: React.FC<ConfigurationFormProps> = (props: Configuratio
     resourceId,
     selectedEnvironmentVariableResponse,
     validationSchema,
-    showNewConfiguration,
   } = props;
 
   const [isDiscardConfirmDialogVisible, setIsDiscardConfirmDialogVisible] = useState(false);
@@ -317,13 +316,13 @@ const ConfigurationForm: React.FC<ConfigurationFormProps> = (props: Configuratio
             </>
           </div>
           <div>
-            <ConfigurationPivot
-              {...props}
-              refresh={props.refresh}
-              isLoading={isLoading || formProps.isSubmitting}
+            <ConfigurationSnippets
+              hasWritePermissions={hasWritePermissions}
+              refresh={refresh}
+              disabled={isLoading || !hasWritePermissions || formProps.isSubmitting}
               formProps={formProps}
-              showAppSettings={false}
-              showNewConfiguration={showNewConfiguration}
+              isLoading={isLoading}
+              resourceId={resourceId}
             />
           </div>
         </div>
diff --git a/client-react/src/pages/static-app/configuration/ConfigurationPivot.tsx b/client-react/src/pages/static-app/configuration/ConfigurationPivot.tsx
deleted file mode 100644
index 954560aaac..0000000000
--- a/client-react/src/pages/static-app/configuration/ConfigurationPivot.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import { IPivotItemProps, Pivot, PivotItem } from '@fluentui/react';
-import { useCallback, useContext, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { PortalContext } from '../../../PortalContext';
-import { ThemeContext } from '../../../ThemeContext';
-import CustomTabRenderer from '../../app/app-settings/Sections/CustomTabRenderer';
-import { getTelemetryInfo } from '../StaticSiteUtility';
-import Configuration from './Configuration';
-import { ConfigurationPivotProps, StaticSiteSku } from './Configuration.types';
-import ConfigurationGeneralSettings from './ConfigurationGeneralSettings';
-import { useStyles } from './ConfigurationPivot.styles';
-import ConfigurationSnippets from './ConfigurationSnippets';
-
-const ConfigurationPivot: React.FC<ConfigurationPivotProps> = (props: ConfigurationPivotProps) => {
-  const { isLoading, hasWritePermissions, formProps, staticSiteSku, refresh, resourceId, showAppSettings, showNewConfiguration } = props;
-
-  const styles = useStyles();
-  const { t } = useTranslation();
-  const [selectedKey, setSelectedKey] = useState('appSettings');
-
-  const theme = useContext(ThemeContext);
-  const portalContext = useContext(PortalContext);
-
-  const onLinkClick = useCallback(
-    (item?: PivotItem) => {
-      if (item?.props.itemKey) {
-        setSelectedKey(item.props.itemKey);
-        portalContext.log(
-          getTelemetryInfo('info', 'tabClicked', 'clicked', {
-            tabName: item.props.itemKey,
-          })
-        );
-      }
-    },
-    [portalContext]
-  );
-
-  const isAppSettingsDirty = useCallback((): boolean => {
-    return !!formProps.values?.isAppSettingsDirty;
-  }, [formProps.values?.isAppSettingsDirty]);
-
-  const isGeneralSettingsDirty = useCallback((): boolean => {
-    return !!formProps.values?.isGeneralSettingsDirty;
-  }, [formProps.values?.isGeneralSettingsDirty]);
-
-  return (
-    <>
-      {showNewConfiguration ? (
-        <ConfigurationSnippets
-          hasWritePermissions={hasWritePermissions}
-          refresh={refresh}
-          disabled={isLoading || !hasWritePermissions}
-          formProps={formProps}
-          isLoading={isLoading}
-          resourceId={resourceId}
-        />
-      ) : (
-        <Pivot selectedKey={selectedKey} styles={styles.pivot} onLinkClick={onLinkClick}>
-          {showAppSettings && (
-            <PivotItem
-              itemKey="appSettings"
-              headerText={t('staticSite_applicationSettings')}
-              ariaLabel={t('staticSite_applicationSettings')}
-              onRenderItemLink={(link: IPivotItemProps, defaultRenderer: (link: IPivotItemProps) => JSX.Element) =>
-                CustomTabRenderer(link, defaultRenderer, theme, isAppSettingsDirty, t('modifiedTag'))
-              }>
-              <Configuration {...props} />
-            </PivotItem>
-          )}
-          <PivotItem
-            itemKey="generalSettings"
-            headerText={t('staticSite_generalSettings')}
-            ariaLabel={t('staticSite_generalSettings')}
-            onRenderItemLink={(link: IPivotItemProps, defaultRenderer: (link: IPivotItemProps) => JSX.Element) =>
-              CustomTabRenderer(link, defaultRenderer, theme, isGeneralSettingsDirty, t('modifiedTag'))
-            }>
-            <ConfigurationGeneralSettings
-              disabled={isLoading || !hasWritePermissions || staticSiteSku === StaticSiteSku.Free}
-              formProps={formProps}
-              isLoading={isLoading}
-              staticSiteSku={staticSiteSku}
-            />
-          </PivotItem>
-          <PivotItem
-            itemKey="snippets"
-            headerText={t('staticSite_snippets')}
-            ariaLabel={t('staticSite_snippets')}
-            onRenderItemLink={(link: IPivotItemProps, defaultRenderer: (link: IPivotItemProps) => JSX.Element) =>
-              CustomTabRenderer(link, defaultRenderer, theme, () => false, t('modifiedTag'))
-            }>
-            <ConfigurationSnippets
-              hasWritePermissions={hasWritePermissions}
-              refresh={refresh}
-              disabled={isLoading || !hasWritePermissions}
-              formProps={formProps}
-              isLoading={isLoading}
-              resourceId={resourceId}
-            />
-          </PivotItem>
-        </Pivot>
-      )}
-    </>
-  );
-};
-
-export default ConfigurationPivot;