diff --git a/src/components/featureToggle/featureToggle.tsx b/src/components/featureToggle/featureToggle.tsx
index e19eac088..a9b74de2f 100644
--- a/src/components/featureToggle/featureToggle.tsx
+++ b/src/components/featureToggle/featureToggle.tsx
@@ -12,9 +12,6 @@ export const enum FeatureToggle {
   finsights = 'cost-management.ui.finsights', // RHEL support for FINsights https://issues.redhat.com/browse/COST-3306
   ibm = 'cost-management.ui.ibm', // IBM https://issues.redhat.com/browse/COST-935
   ocpCloudGroupBys = 'cost-management.ui.ocp-cloud-group-bys', // https://issues.redhat.com/browse/COST-5514
-  ocpCloudNetworking = 'cost-management.ui.ocp-cloud-networking', // https://issues.redhat.com/browse/COST-4781
-  ocpProjectStorage = 'cost-management.ui.ocp-project-storage', // https://issues.redhat.com/browse/COST-4856
-  ros = 'cost-management.ui.ros', // ROS support https://issues.redhat.com/browse/COST-3477
 }
 
 const useIsToggleEnabled = (toggle: FeatureToggle) => {
@@ -50,18 +47,6 @@ export const useIsOcpCloudGroupBysToggleEnabled = () => {
   return useIsToggleEnabled(FeatureToggle.ocpCloudGroupBys);
 };
 
-export const useIsOcpCloudNetworkingToggleEnabled = () => {
-  return useIsToggleEnabled(FeatureToggle.ocpCloudNetworking);
-};
-
-export const useIsOcpProjectStorageToggleEnabled = () => {
-  return useIsToggleEnabled(FeatureToggle.ocpProjectStorage);
-};
-
-export const useIsRosToggleEnabled = () => {
-  return useIsToggleEnabled(FeatureToggle.ros);
-};
-
 // The FeatureToggle component saves feature toggles in store for places where Unleash hooks not available
 export const useFeatureToggle = () => {
   const dispatch = useDispatch();
@@ -74,9 +59,6 @@ export const useFeatureToggle = () => {
   const isFinsightsToggleEnabled = useIsFinsightsToggleEnabled();
   const isIbmToggleEnabled = useIsIbmToggleEnabled();
   const isOcpCloudGroupBysToggleEnabled = useIsOcpCloudGroupBysToggleEnabled();
-  const isOcpCloudNetworkingToggleEnabled = useIsOcpCloudNetworkingToggleEnabled();
-  const isOcpProjectStorageToggleEnabled = useIsOcpProjectStorageToggleEnabled();
-  const isRosToggleEnabled = useIsRosToggleEnabled();
 
   const fetchUser = callback => {
     auth.getUser().then(user => {
@@ -95,9 +77,6 @@ export const useFeatureToggle = () => {
         isFinsightsToggleEnabled,
         isIbmToggleEnabled,
         isOcpCloudGroupBysToggleEnabled,
-        isOcpCloudNetworkingToggleEnabled,
-        isOcpProjectStorageToggleEnabled,
-        isRosToggleEnabled,
       })
     );
     if (isDebugToggleEnabled) {
@@ -112,9 +91,6 @@ export const useFeatureToggle = () => {
     isFinsightsToggleEnabled,
     isIbmToggleEnabled,
     isOcpCloudGroupBysToggleEnabled,
-    isOcpCloudNetworkingToggleEnabled,
-    isOcpProjectStorageToggleEnabled,
-    isRosToggleEnabled,
   ]);
 };
 
diff --git a/src/components/permissions/permissions.tsx b/src/components/permissions/permissions.tsx
index 3ad91ede1..e145ee677 100644
--- a/src/components/permissions/permissions.tsx
+++ b/src/components/permissions/permissions.tsx
@@ -34,7 +34,6 @@ interface PermissionsOwnProps extends ChromeComponentProps {
 interface PermissionsStateProps {
   isFinsightsToggleEnabled?: boolean;
   isIbmToggleEnabled?: boolean;
-  isRosToggleEnabled?: boolean;
   userAccess: UserAccess;
   userAccessError: AxiosError;
   userAccessFetchStatus: FetchStatus;
@@ -48,7 +47,6 @@ const PermissionsBase: React.FC<PermissionsProps> = ({
   // chrome,
   isFinsightsToggleEnabled,
   isIbmToggleEnabled,
-  isRosToggleEnabled,
   userAccess,
   userAccessError,
   userAccessFetchStatus,
@@ -66,7 +64,7 @@ const PermissionsBase: React.FC<PermissionsProps> = ({
     const oci = hasOciAccess(userAccess);
     const ocp = hasOcpAccess(userAccess);
     const rhel = isFinsightsToggleEnabled && hasRhelAccess(userAccess);
-    const ros = isRosToggleEnabled && hasRosAccess(userAccess);
+    const ros = hasRosAccess(userAccess);
     const settings = costModel || hasSettingsAccess(userAccess);
 
     switch (pathname) {
@@ -135,7 +133,6 @@ const mapStateToProps = createMapStateToProps<PermissionsOwnProps, PermissionsSt
   return {
     isFinsightsToggleEnabled: FeatureToggleSelectors.selectIsFinsightsToggleEnabled(state),
     isIbmToggleEnabled: FeatureToggleSelectors.selectIsIbmToggleEnabled(state),
-    isRosToggleEnabled: FeatureToggleSelectors.selectIsRosToggleEnabled(state),
     userAccess,
     userAccessError,
     userAccessFetchStatus,
diff --git a/src/routes/components/charts/historicalCostChart/__snapshots__/historicalCostChart.test.tsx.snap b/src/routes/components/charts/historicalCostChart/__snapshots__/historicalCostChart.test.tsx.snap
index f35661dea..eb7120c3a 100644
--- a/src/routes/components/charts/historicalCostChart/__snapshots__/historicalCostChart.test.tsx.snap
+++ b/src/routes/components/charts/historicalCostChart/__snapshots__/historicalCostChart.test.tsx.snap
@@ -336,10 +336,10 @@ exports[`null previous and current reports are handled 1`] = `
                 vector-effect="non-scaling-stroke"
                 width="79.2"
                 x="0"
-                y="57"
+                y="67"
               />
               <path
-                d="M 7.84, 73.156
+                d="M 7.84, 83.156
       h12.32
       v-4.312
       h-12.32
@@ -349,7 +349,7 @@ exports[`null previous and current reports are handled 1`] = `
                 style="fill: #8bc1f7;"
               />
               <path
-                d="M 47.44, 73.156
+                d="M 47.44, 83.156
       h12.320000000000007
       v-4.312
       h-12.320000000000007
@@ -363,7 +363,7 @@ exports[`null previous and current reports are handled 1`] = `
                 dx="0"
                 id="exampleCostChart-legend-ChartLabel-0"
                 x="30.8"
-                y="75.97"
+                y="85.97"
               >
                 <tspan
                   dx="0"
@@ -380,7 +380,7 @@ exports[`null previous and current reports are handled 1`] = `
                 dx="0"
                 id="exampleCostChart-legend-ChartLabel-1"
                 x="70.39999999999999"
-                y="75.97"
+                y="85.97"
               >
                 <tspan
                   dx="0"
@@ -705,10 +705,10 @@ exports[`reports are formatted to datums 1`] = `
                 vector-effect="non-scaling-stroke"
                 width="79.2"
                 x="0"
-                y="57"
+                y="67"
               />
               <path
-                d="M 7.84, 73.156
+                d="M 7.84, 83.156
       h12.32
       v-4.312
       h-12.32
@@ -718,7 +718,7 @@ exports[`reports are formatted to datums 1`] = `
                 style="fill: #8bc1f7;"
               />
               <path
-                d="M 47.44, 73.156
+                d="M 47.44, 83.156
       h12.320000000000007
       v-4.312
       h-12.320000000000007
@@ -732,7 +732,7 @@ exports[`reports are formatted to datums 1`] = `
                 dx="0"
                 id="exampleCostChart-legend-ChartLabel-0"
                 x="30.8"
-                y="75.97"
+                y="85.97"
               >
                 <tspan
                   dx="0"
@@ -749,7 +749,7 @@ exports[`reports are formatted to datums 1`] = `
                 dx="0"
                 id="exampleCostChart-legend-ChartLabel-1"
                 x="70.39999999999999"
-                y="75.97"
+                y="85.97"
               >
                 <tspan
                   dx="0"
diff --git a/src/routes/components/charts/historicalCostChart/historicalCostChart.tsx b/src/routes/components/charts/historicalCostChart/historicalCostChart.tsx
index a612b872d..f67692215 100644
--- a/src/routes/components/charts/historicalCostChart/historicalCostChart.tsx
+++ b/src/routes/components/charts/historicalCostChart/historicalCostChart.tsx
@@ -301,7 +301,12 @@ class HistoricalCostChartBase extends React.Component<HistoricalCostChartProps,
                 series.map((s, index) => {
                   return this.getChart(s, index);
                 })}
-              <ChartAxis label={xAxisLabel} style={chartStyles.xAxis} tickValues={[1, midDate, endDate]} />
+              <ChartAxis
+                label={xAxisLabel}
+                style={chartStyles.xAxis}
+                tickValues={[1, midDate, endDate]}
+                fixAxisLabelHeight
+              />
               <ChartAxis dependentAxis label={yAxisLabel} style={chartStyles.yAxis} />
             </Chart>
           </div>
diff --git a/src/routes/components/charts/historicalUsageChart/historicalUsageChart.tsx b/src/routes/components/charts/historicalUsageChart/historicalUsageChart.tsx
index afba816e7..c77b54ae7 100644
--- a/src/routes/components/charts/historicalUsageChart/historicalUsageChart.tsx
+++ b/src/routes/components/charts/historicalUsageChart/historicalUsageChart.tsx
@@ -405,7 +405,12 @@ class HistoricalUsageChartBase extends React.Component<HistoricalUsageChartProps
                 series.map((s, index) => {
                   return this.getChart(s, index);
                 })}
-              <ChartAxis label={xAxisLabel} style={chartStyles.xAxis} tickValues={[1, midDate, endDate]} />
+              <ChartAxis
+                label={xAxisLabel}
+                style={chartStyles.xAxis}
+                tickValues={[1, midDate, endDate]}
+                fixAxisLabelHeight
+              />
               <ChartAxis dependentAxis label={yAxisLabel} style={chartStyles.yAxis} />
             </Chart>
           </div>
diff --git a/src/routes/details/components/breakdown/breakdownBase.tsx b/src/routes/details/components/breakdown/breakdownBase.tsx
index fbf20ea0c..69d0dc8e3 100644
--- a/src/routes/details/components/breakdown/breakdownBase.tsx
+++ b/src/routes/details/components/breakdown/breakdownBase.tsx
@@ -71,7 +71,6 @@ export interface BreakdownStateProps {
   instancesComponent?: React.ReactNode;
   isAwsEc2InstancesToggleEnabled?: boolean;
   isOptimizationsTab?: boolean;
-  isRosToggleEnabled?: boolean;
   optimizationsBadgeComponent?: React.ReactNode;
   optimizationsComponent?: React.ReactNode;
   providers?: Providers;
@@ -136,7 +135,6 @@ class BreakdownBase extends React.Component<BreakdownProps, BreakdownState> {
       historicalDataComponent,
       instancesComponent,
       isAwsEc2InstancesToggleEnabled,
-      isRosToggleEnabled,
       optimizationsComponent,
     } = this.props;
 
@@ -159,7 +157,7 @@ class BreakdownBase extends React.Component<BreakdownProps, BreakdownState> {
         tab: BreakdownTab.instances,
       });
     }
-    if (optimizationsComponent && isRosToggleEnabled) {
+    if (optimizationsComponent) {
       availableTabs.push({
         contentRef: React.createRef(),
         showBadge: true,
diff --git a/src/routes/details/components/costOverview/costOverviewBase.tsx b/src/routes/details/components/costOverview/costOverviewBase.tsx
index 4875c98c9..0cae77a3c 100644
--- a/src/routes/details/components/costOverview/costOverviewBase.tsx
+++ b/src/routes/details/components/costOverview/costOverviewBase.tsx
@@ -43,7 +43,6 @@ interface CostOverviewOwnProps {
 }
 
 export interface CostOverviewStateProps {
-  isOcpProjectStorageToggleEnabled?: boolean;
   selectWidgets?: Record<number, any>;
   title?: string;
   widgets: number[];
@@ -358,8 +357,6 @@ class CostOverviewsBase extends React.Component<CostOverviewProps, any> {
 
   // Returns rendered widget based on type
   private renderWidget(widget: CostOverviewWidget) {
-    const { isOcpProjectStorageToggleEnabled } = this.props;
-
     switch (widget.type) {
       case CostOverviewWidgetType.cluster:
         return this.getClusterCard(widget);
@@ -374,9 +371,6 @@ class CostOverviewsBase extends React.Component<CostOverviewProps, any> {
       case CostOverviewWidgetType.pvc:
         return this.getPvcChart(widget);
       case CostOverviewWidgetType.reportSummary:
-        if (widget.reportType === ReportType.volume && !isOcpProjectStorageToggleEnabled) {
-          return null;
-        }
         return this.getReportSummaryCard(widget);
       case CostOverviewWidgetType.volumeUsage:
         return this.getVolumeUsageChart(widget);
diff --git a/src/routes/details/components/historicalData/historicalDataBase.tsx b/src/routes/details/components/historicalData/historicalDataBase.tsx
index e08e614b7..b791d0b0e 100644
--- a/src/routes/details/components/historicalData/historicalDataBase.tsx
+++ b/src/routes/details/components/historicalData/historicalDataBase.tsx
@@ -21,8 +21,6 @@ interface HistoricalDataOwnProps {
 }
 
 export interface HistoricalDataStateProps {
-  isOcpCloudNetworkingToggleEnabled?: boolean;
-  isOcpProjectStorageToggleEnabled?: boolean;
   selectWidgets?: Record<number, any>;
   widgets: number[];
 }
@@ -190,7 +188,7 @@ class HistoricalDatasBase extends React.Component<HistoricalDataProps, any> {
 
   // Returns rendered widget based on type
   private renderWidget(widgetId: number) {
-    const { isOcpCloudNetworkingToggleEnabled, isOcpProjectStorageToggleEnabled, selectWidgets } = this.props;
+    const { selectWidgets } = this.props;
 
     const widget = selectWidgets[widgetId];
     let result = null;
@@ -200,7 +198,7 @@ class HistoricalDatasBase extends React.Component<HistoricalDataProps, any> {
         result = this.getCostChart(widget);
         break;
       case HistoricalDataWidgetType.network:
-        result = isOcpCloudNetworkingToggleEnabled ? this.getNetworkChart(widget) : null;
+        result = this.getNetworkChart(widget);
         break;
       case HistoricalDataWidgetType.trend:
         result = this.getTrendChart(widget);
@@ -209,7 +207,7 @@ class HistoricalDatasBase extends React.Component<HistoricalDataProps, any> {
         result = this.getUsageChart(widget);
         break;
       case HistoricalDataWidgetType.volume:
-        result = isOcpProjectStorageToggleEnabled ? this.getVolumeChart(widget) : null;
+        result = this.getVolumeChart(widget);
         break;
     }
     return result !== null ? <GridItem key={`widget-${widgetId}`}>{result}</GridItem> : null;
diff --git a/src/routes/details/ocpBreakdown/costOverview.tsx b/src/routes/details/ocpBreakdown/costOverview.tsx
index 047a596d3..a88eb69d2 100644
--- a/src/routes/details/ocpBreakdown/costOverview.tsx
+++ b/src/routes/details/ocpBreakdown/costOverview.tsx
@@ -3,7 +3,6 @@ import type { CostOverviewStateProps } from 'routes/details/components/costOverv
 import { CostOverviewBase } from 'routes/details/components/costOverview';
 import { ocpCostOverviewSelectors } from 'store/breakdown/costOverview/ocpCostOverview';
 import { createMapStateToProps } from 'store/common';
-import { FeatureToggleSelectors } from 'store/featureToggle';
 
 interface OcpCostOverviewOwnProps {
   title?: string;
@@ -11,7 +10,6 @@ interface OcpCostOverviewOwnProps {
 
 const mapStateToProps = createMapStateToProps<OcpCostOverviewOwnProps, CostOverviewStateProps>((state, { title }) => {
   return {
-    isOcpProjectStorageToggleEnabled: FeatureToggleSelectors.selectIsOcpProjectStorageToggleEnabled(state),
     selectWidgets: ocpCostOverviewSelectors.selectWidgets(state),
     widgets: ocpCostOverviewSelectors.selectCurrentWidgets(state),
     title,
diff --git a/src/routes/details/ocpBreakdown/historicalData.tsx b/src/routes/details/ocpBreakdown/historicalData.tsx
index 0913d1b66..4ec1caf74 100644
--- a/src/routes/details/ocpBreakdown/historicalData.tsx
+++ b/src/routes/details/ocpBreakdown/historicalData.tsx
@@ -3,7 +3,6 @@ import type { HistoricalDataStateProps } from 'routes/details/components/histori
 import { HistoricalDataBase } from 'routes/details/components/historicalData';
 import { ocpHistoricalDataSelectors } from 'store/breakdown/historicalData/ocpHistoricalData';
 import { createMapStateToProps } from 'store/common';
-import { FeatureToggleSelectors } from 'store/featureToggle';
 
 interface OcpHistoricalDataOwnProps {
   // TBD...
@@ -12,8 +11,6 @@ interface OcpHistoricalDataOwnProps {
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const mapStateToProps = createMapStateToProps<OcpHistoricalDataOwnProps, HistoricalDataStateProps>((state, props) => {
   return {
-    isOcpCloudNetworkingToggleEnabled: FeatureToggleSelectors.selectIsOcpCloudNetworkingToggleEnabled(state),
-    isOcpProjectStorageToggleEnabled: FeatureToggleSelectors.selectIsOcpProjectStorageToggleEnabled(state),
     selectWidgets: ocpHistoricalDataSelectors.selectWidgets(state),
     widgets: ocpHistoricalDataSelectors.selectCurrentWidgets(state),
   };
diff --git a/src/routes/details/ocpBreakdown/ocpBreakdown.tsx b/src/routes/details/ocpBreakdown/ocpBreakdown.tsx
index cfe1c2a2e..bd9483270 100644
--- a/src/routes/details/ocpBreakdown/ocpBreakdown.tsx
+++ b/src/routes/details/ocpBreakdown/ocpBreakdown.tsx
@@ -18,7 +18,6 @@ import { getGroupById, getGroupByValue } from 'routes/utils/groupBy';
 import { filterProviders } from 'routes/utils/providers';
 import { getQueryState } from 'routes/utils/queryState';
 import { createMapStateToProps } from 'store/common';
-import { FeatureToggleSelectors } from 'store/featureToggle';
 import { providersQuery, providersSelectors } from 'store/providers';
 import { reportActions, reportSelectors } from 'store/reports';
 import { uiActions } from 'store/ui';
@@ -125,7 +124,6 @@ const mapStateToProps = createMapStateToProps<OcpBreakdownOwnProps, BreakdownSta
       <HistoricalData costDistribution={costDistribution} currency={currency} groupBy={groupBy} />
     ),
     isOptimizationsTab: queryFromRoute.optimizationsTab !== undefined,
-    isRosToggleEnabled: FeatureToggleSelectors.selectIsRosToggleEnabled(state),
     optimizationsComponent: groupBy === 'project' && groupByValue !== '*' ? <Optimizations /> : undefined,
     providers: filterProviders(providers, ProviderType.ocp),
     providersFetchStatus,
diff --git a/src/routes/details/ocpDetails/detailsTable.tsx b/src/routes/details/ocpDetails/detailsTable.tsx
index 7a63d2852..c994c8db6 100644
--- a/src/routes/details/ocpDetails/detailsTable.tsx
+++ b/src/routes/details/ocpDetails/detailsTable.tsx
@@ -40,7 +40,6 @@ interface DetailsTableOwnProps extends RouterComponentProps, WrappedComponentPro
   hiddenColumns?: Set<string>;
   isAllSelected?: boolean;
   isLoading?: boolean;
-  isRosToggleEnabled?: boolean;
   onSelect(items: ComputedReportItem[], isSelected: boolean);
   onSort(sortType: string, isSortAscending: boolean);
   orderBy?: any;
@@ -100,7 +99,6 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
       hiddenColumns,
       intl,
       isAllSelected,
-      isRosToggleEnabled,
       query,
       report,
       router,
@@ -133,7 +131,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
             name: '', // Default & Overhead column
           },
           {
-            hidden: !(isGroupByProject && isRosToggleEnabled),
+            hidden: !isGroupByProject,
             name: intl.formatMessage(messages.optimizations),
           },
           {
@@ -174,7 +172,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
             name: '', // Default & Overhead column
           },
           {
-            hidden: !(isGroupByProject && isRosToggleEnabled),
+            hidden: !isGroupByProject,
             name: intl.formatMessage(messages.optimizations),
           },
           {
@@ -304,7 +302,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
             ),
           },
           {
-            hidden: !(isGroupByProject && isRosToggleEnabled),
+            hidden: !isGroupByProject,
             value: !isPlatformProject && !isDisabled && (
               <AsyncComponent
                 scope="costManagementMfe"
diff --git a/src/routes/details/ocpDetails/ocpDetails.tsx b/src/routes/details/ocpDetails/ocpDetails.tsx
index f9f25b29c..36879065f 100644
--- a/src/routes/details/ocpDetails/ocpDetails.tsx
+++ b/src/routes/details/ocpDetails/ocpDetails.tsx
@@ -57,7 +57,6 @@ export interface OcpDetailsStateProps {
   costDistribution?: string;
   currency?: string;
   isAccountInfoEmptyStateToggleEnabled?: boolean;
-  isRosToggleEnabled?: boolean;
   providers: Providers;
   providersFetchStatus: FetchStatus;
   query: OcpQuery;
@@ -251,8 +250,7 @@ class OcpDetails extends React.Component<OcpDetailsProps, OcpDetailsState> {
   };
 
   private getTable = () => {
-    const { costDistribution, isRosToggleEnabled, query, report, reportFetchStatus, reportQueryString, router } =
-      this.props;
+    const { costDistribution, query, report, reportFetchStatus, reportQueryString, router } = this.props;
     const { hiddenColumns, isAllSelected, selectedItems } = this.state;
 
     const groupById = getIdKeyForGroupBy(query.group_by);
@@ -269,7 +267,6 @@ class OcpDetails extends React.Component<OcpDetailsProps, OcpDetailsState> {
         hiddenColumns={hiddenColumns}
         isAllSelected={isAllSelected}
         isLoading={reportFetchStatus === FetchStatus.inProgress}
-        isRosToggleEnabled={isRosToggleEnabled}
         onSelect={this.handleOnSelect}
         onSort={(sortType, isSortAscending) => handleOnSort(query, router, sortType, isSortAscending)}
         orderBy={query.order_by}
@@ -531,7 +528,6 @@ const mapStateToProps = createMapStateToProps<OcpDetailsOwnProps, OcpDetailsStat
     costDistribution,
     currency,
     isAccountInfoEmptyStateToggleEnabled: FeatureToggleSelectors.selectIsAccountInfoEmptyStateToggleEnabled(state),
-    isRosToggleEnabled: FeatureToggleSelectors.selectIsRosToggleEnabled(state),
     providers: filterProviders(providers, ProviderType.ocp),
     providersFetchStatus,
     query,
diff --git a/src/routes/overview/components/dashboardWidgetBase.tsx b/src/routes/overview/components/dashboardWidgetBase.tsx
index a3f9197e4..93f328a93 100644
--- a/src/routes/overview/components/dashboardWidgetBase.tsx
+++ b/src/routes/overview/components/dashboardWidgetBase.tsx
@@ -57,7 +57,6 @@ export interface DashboardWidgetStateProps extends DashboardWidget {
   forecastError?: AxiosError;
   forecastFetchStatus?: number;
   getIdKeyForTab?: (tab: string) => string;
-  isRosToggleEnabled?: boolean;
   previousReport?: Report;
   previousReportError?: AxiosError;
   previousReportFetchStatus?: number;
@@ -572,9 +571,9 @@ class DashboardWidgetBase extends React.Component<DashboardWidgetProps, Dashboar
   };
 
   public render() {
-    const { details, isRosToggleEnabled } = this.props;
+    const { details } = this.props;
     if (details.showOptimizations) {
-      return isRosToggleEnabled ? this.getOptimizationsSummary() : null;
+      return this.getOptimizationsSummary();
     }
     return details.showHorizontal ? this.getHorizontalLayout() : this.getVerticalLayout();
   }
diff --git a/src/routes/overview/ocpDashboard/ocpDashboardWidget.tsx b/src/routes/overview/ocpDashboard/ocpDashboardWidget.tsx
index a0ef86e3d..d263dbf65 100644
--- a/src/routes/overview/ocpDashboard/ocpDashboardWidget.tsx
+++ b/src/routes/overview/ocpDashboard/ocpDashboardWidget.tsx
@@ -5,7 +5,6 @@ import { DashboardWidgetBase } from 'routes/overview/components';
 import type { ComputedOcpReportItemsParams } from 'routes/utils/computedReport/getComputedOcpReportItems';
 import { createMapStateToProps } from 'store/common';
 import { ocpDashboardActions, ocpDashboardSelectors, OcpDashboardTab } from 'store/dashboard/ocpDashboard';
-import { FeatureToggleSelectors } from 'store/featureToggle';
 import { forecastSelectors } from 'store/forecasts';
 import { reportSelectors } from 'store/reports';
 import { getCurrency } from 'utils/sessionStorage';
@@ -112,9 +111,6 @@ const mapStateToProps = createMapStateToProps<DashboardWidgetOwnProps, Dashboard
             queries.tabs
           ),
         }),
-      ...(widget.details.showOptimizations && {
-        isRosToggleEnabled: FeatureToggleSelectors.selectIsRosToggleEnabled(state),
-      }),
     };
   }
 );
diff --git a/src/routes/settings/costModels/costModel/distribution.tsx b/src/routes/settings/costModels/costModel/distribution.tsx
index 4728cddc7..4238aa0c1 100644
--- a/src/routes/settings/costModels/costModel/distribution.tsx
+++ b/src/routes/settings/costModels/costModel/distribution.tsx
@@ -1,6 +1,5 @@
 import { Button, ButtonVariant, Card, CardBody, CardHeader, Title, TitleSizes } from '@patternfly/react-core';
 import type { CostModel } from 'api/costModels';
-import { useIsOcpCloudNetworkingToggleEnabled, useIsOcpProjectStorageToggleEnabled } from 'components/featureToggle';
 import messages from 'locales/messages';
 import React from 'react';
 import { useIntl } from 'react-intl';
@@ -27,8 +26,6 @@ const DistributionCardBase: React.FC<Props> = ({
   isUpdateDialogOpen,
 }) => {
   const intl = useIntl();
-  const isOcpCloudNetworkingToggleEnabled = useIsOcpCloudNetworkingToggleEnabled();
-  const isOcpProjectStorageToggleEnabled = useIsOcpProjectStorageToggleEnabled();
 
   return (
     <>
@@ -74,22 +71,18 @@ const DistributionCardBase: React.FC<Props> = ({
               value: current.distribution_info.worker_cost,
             })}
           </div>
-          {isOcpCloudNetworkingToggleEnabled && (
-            <div>
-              {intl.formatMessage(messages.distributeCosts, {
-                value: current.distribution_info.network_unattributed || false,
-                type: 'network',
-              })}
-            </div>
-          )}
-          {isOcpProjectStorageToggleEnabled && (
-            <div>
-              {intl.formatMessage(messages.distributeCosts, {
-                value: current.distribution_info.storage_unattributed || false,
-                type: 'storage',
-              })}
-            </div>
-          )}
+          <div>
+            {intl.formatMessage(messages.distributeCosts, {
+              value: current.distribution_info.network_unattributed || false,
+              type: 'network',
+            })}
+          </div>
+          <div>
+            {intl.formatMessage(messages.distributeCosts, {
+              value: current.distribution_info.storage_unattributed || false,
+              type: 'storage',
+            })}
+          </div>
         </CardBody>
       </Card>
     </>
diff --git a/src/routes/settings/costModels/costModel/updateDistributionDialog.tsx b/src/routes/settings/costModels/costModel/updateDistributionDialog.tsx
index 8d9ff31b9..8d0dd5414 100644
--- a/src/routes/settings/costModels/costModel/updateDistributionDialog.tsx
+++ b/src/routes/settings/costModels/costModel/updateDistributionDialog.tsx
@@ -22,7 +22,6 @@ import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import { createMapStateToProps } from 'store/common';
 import { costModelsActions, costModelsSelectors } from 'store/costModels';
-import { FeatureToggleSelectors } from 'store/featureToggle';
 
 import { styles } from './costCalc.styles';
 
@@ -33,8 +32,6 @@ interface UpdateDistributionDialogOwnProps extends WrappedComponentProps {
 interface UpdateDistributionDialogStateProps {
   error?: string;
   isLoading?: boolean;
-  isOcpCloudNetworkingToggleEnabled?: boolean;
-  isOcpProjectStorageToggleEnabled?: boolean;
 }
 
 interface UpdateDistributionDialogDispatchProps {
@@ -91,16 +88,7 @@ class UpdateDistributionDialogBase extends React.Component<
   };
 
   public render() {
-    const {
-      error,
-      current,
-      intl,
-      isLoading,
-      isOcpCloudNetworkingToggleEnabled,
-      isOcpProjectStorageToggleEnabled,
-      onClose,
-      updateCostModel,
-    } = this.props;
+    const { error, current, intl, isLoading, onClose, updateCostModel } = this.props;
     return (
       <Modal
         title={intl.formatMessage(messages.costDistribution)}
@@ -201,24 +189,20 @@ class UpdateDistributionDialogBase extends React.Component<
                   label={intl.formatMessage(messages.distributeWorker)}
                   onChange={this.handleDistributeWorkerUnallocatedChange}
                 />
-                {isOcpCloudNetworkingToggleEnabled && (
-                  <Checkbox
-                    aria-label={intl.formatMessage(messages.distributeNetwork)}
-                    id="distribute-network"
-                    isChecked={this.state.distributeNetwork}
-                    label={intl.formatMessage(messages.distributeNetwork)}
-                    onChange={this.handleDistributeNetworkChange}
-                  />
-                )}
-                {isOcpProjectStorageToggleEnabled && (
-                  <Checkbox
-                    aria-label={intl.formatMessage(messages.distributeStorage)}
-                    id="distribute-storage"
-                    isChecked={this.state.distributeStorage}
-                    label={intl.formatMessage(messages.distributeStorage)}
-                    onChange={this.handleDistributeStorageChange}
-                  />
-                )}
+                <Checkbox
+                  aria-label={intl.formatMessage(messages.distributeNetwork)}
+                  id="distribute-network"
+                  isChecked={this.state.distributeNetwork}
+                  label={intl.formatMessage(messages.distributeNetwork)}
+                  onChange={this.handleDistributeNetworkChange}
+                />
+                <Checkbox
+                  aria-label={intl.formatMessage(messages.distributeStorage)}
+                  id="distribute-storage"
+                  isChecked={this.state.distributeStorage}
+                  label={intl.formatMessage(messages.distributeStorage)}
+                  onChange={this.handleDistributeStorageChange}
+                />
               </FormGroup>
             </Form>
           </StackItem>
@@ -232,8 +216,6 @@ const mapStateToProps = createMapStateToProps<UpdateDistributionDialogOwnProps,
   state => {
     return {
       isLoading: costModelsSelectors.updateProcessing(state),
-      isOcpCloudNetworkingToggleEnabled: FeatureToggleSelectors.selectIsOcpCloudNetworkingToggleEnabled(state),
-      isOcpProjectStorageToggleEnabled: FeatureToggleSelectors.selectIsOcpProjectStorageToggleEnabled(state),
       error: costModelsSelectors.updateError(state),
     };
   }
diff --git a/src/routes/settings/costModels/costModelWizard/distribution.tsx b/src/routes/settings/costModels/costModelWizard/distribution.tsx
index d99749ee1..022655c24 100644
--- a/src/routes/settings/costModels/costModelWizard/distribution.tsx
+++ b/src/routes/settings/costModels/costModelWizard/distribution.tsx
@@ -16,7 +16,6 @@ import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import { Form } from 'routes/settings/costModels/components/forms/form';
 import { createMapStateToProps } from 'store/common';
-import { FeatureToggleSelectors } from 'store/featureToggle';
 
 import { CostModelContext } from './context';
 import { styles } from './wizard.styles';
@@ -26,15 +25,14 @@ interface DistributionOwnProps extends WrappedComponentProps {
 }
 
 interface DistributionStateProps {
-  isOcpCloudNetworkingToggleEnabled?: boolean;
-  isOcpProjectStorageToggleEnabled?: boolean;
+  // TBD...
 }
 
 type DistributionProps = DistributionOwnProps & DistributionStateProps;
 
 class DistributionBase extends React.Component<DistributionProps, DistributionStateProps> {
   public render() {
-    const { isOcpCloudNetworkingToggleEnabled, isOcpProjectStorageToggleEnabled, intl } = this.props;
+    const { intl } = this.props;
 
     return (
       <CostModelContext.Consumer>
@@ -114,24 +112,20 @@ class DistributionBase extends React.Component<DistributionProps, DistributionSt
                       label={intl.formatMessage(messages.distributeWorker)}
                       onChange={handleDistributeWorkerUnallocatedChange}
                     />
-                    {isOcpCloudNetworkingToggleEnabled && (
-                      <Checkbox
-                        aria-label={intl.formatMessage(messages.distributeNetwork)}
-                        id="distribute-network"
-                        isChecked={distributeNetwork}
-                        label={intl.formatMessage(messages.distributeNetwork)}
-                        onChange={handleDistributeNetworkChange}
-                      />
-                    )}
-                    {isOcpProjectStorageToggleEnabled && (
-                      <Checkbox
-                        aria-label={intl.formatMessage(messages.distributeStorage)}
-                        id="distribute-storage"
-                        isChecked={distributeStorage}
-                        label={intl.formatMessage(messages.distributeStorage)}
-                        onChange={handleDistributeStorageChange}
-                      />
-                    )}
+                    <Checkbox
+                      aria-label={intl.formatMessage(messages.distributeNetwork)}
+                      id="distribute-network"
+                      isChecked={distributeNetwork}
+                      label={intl.formatMessage(messages.distributeNetwork)}
+                      onChange={handleDistributeNetworkChange}
+                    />
+                    <Checkbox
+                      aria-label={intl.formatMessage(messages.distributeStorage)}
+                      id="distribute-storage"
+                      isChecked={distributeStorage}
+                      label={intl.formatMessage(messages.distributeStorage)}
+                      onChange={handleDistributeStorageChange}
+                    />
                   </FormGroup>
                 </Form>
               </StackItem>
@@ -143,10 +137,9 @@ class DistributionBase extends React.Component<DistributionProps, DistributionSt
   }
 }
 
-const mapStateToProps = createMapStateToProps<undefined, DistributionStateProps>(state => {
+const mapStateToProps = createMapStateToProps<undefined, DistributionStateProps>(() => {
   return {
-    isOcpCloudNetworkingToggleEnabled: FeatureToggleSelectors.selectIsOcpCloudNetworkingToggleEnabled(state),
-    isOcpProjectStorageToggleEnabled: FeatureToggleSelectors.selectIsOcpProjectStorageToggleEnabled(state),
+    // TBD...
   };
 });
 
diff --git a/src/routes/settings/costModels/costModelWizard/review.tsx b/src/routes/settings/costModels/costModelWizard/review.tsx
index d5707b0e2..6f1196bd3 100644
--- a/src/routes/settings/costModels/costModelWizard/review.tsx
+++ b/src/routes/settings/costModels/costModelWizard/review.tsx
@@ -28,7 +28,6 @@ import { connect } from 'react-redux';
 import { RateTable } from 'routes/settings/costModels/components/rateTable';
 import { WarningIcon } from 'routes/settings/costModels/components/warningIcon';
 import { createMapStateToProps } from 'store/common';
-import { FeatureToggleSelectors } from 'store/featureToggle';
 
 import { CostModelContext } from './context';
 
@@ -67,17 +66,12 @@ interface ReviewDetailsOwnProps extends WrappedComponentProps {
 }
 
 interface ReviewDetailsStateProps {
-  isOcpCloudNetworkingToggleEnabled?: boolean;
-  isOcpProjectStorageToggleEnabled?: boolean;
+  // TBD...
 }
 
 type ReviewDetailsProps = ReviewDetailsOwnProps & ReviewDetailsStateProps;
 
-const ReviewDetailsBase: React.FC<ReviewDetailsProps> = ({
-  intl,
-  isOcpCloudNetworkingToggleEnabled,
-  isOcpProjectStorageToggleEnabled,
-}) => (
+const ReviewDetailsBase: React.FC<ReviewDetailsProps> = ({ intl }) => (
   <CostModelContext.Consumer>
     {({
       checked,
@@ -172,22 +166,18 @@ const ReviewDetailsBase: React.FC<ReviewDetailsProps> = ({
                           value: distributeWorkerUnallocated,
                         })}
                       </TextListItem>
-                      {isOcpCloudNetworkingToggleEnabled && (
-                        <TextListItem component={TextListItemVariants.dd}>
-                          {intl.formatMessage(messages.distributeCosts, {
-                            value: distributeNetwork,
-                            type: 'network',
-                          })}
-                        </TextListItem>
-                      )}
-                      {isOcpProjectStorageToggleEnabled && (
-                        <TextListItem component={TextListItemVariants.dd}>
-                          {intl.formatMessage(messages.distributeCosts, {
-                            value: distributeStorage,
-                            type: 'storage',
-                          })}
-                        </TextListItem>
-                      )}
+                      <TextListItem component={TextListItemVariants.dd}>
+                        {intl.formatMessage(messages.distributeCosts, {
+                          value: distributeNetwork,
+                          type: 'network',
+                        })}
+                      </TextListItem>
+                      <TextListItem component={TextListItemVariants.dd}>
+                        {intl.formatMessage(messages.distributeCosts, {
+                          value: distributeStorage,
+                          type: 'storage',
+                        })}
+                      </TextListItem>
                     </>
                   )}
                   <TextListItem component={TextListItemVariants.dt}>
@@ -209,10 +199,9 @@ const ReviewDetailsBase: React.FC<ReviewDetailsProps> = ({
   </CostModelContext.Consumer>
 );
 
-const mapStateToProps = createMapStateToProps<undefined, ReviewDetailsStateProps>(state => {
+const mapStateToProps = createMapStateToProps<undefined, ReviewDetailsStateProps>(() => {
   return {
-    isOcpCloudNetworkingToggleEnabled: FeatureToggleSelectors.selectIsOcpCloudNetworkingToggleEnabled(state),
-    isOcpProjectStorageToggleEnabled: FeatureToggleSelectors.selectIsOcpProjectStorageToggleEnabled(state),
+    // TBD...
   };
 });
 
diff --git a/src/store/featureToggle/__snapshots__/featureToggle.test.ts.snap b/src/store/featureToggle/__snapshots__/featureToggle.test.ts.snap
index d83a00e99..45946a25e 100644
--- a/src/store/featureToggle/__snapshots__/featureToggle.test.ts.snap
+++ b/src/store/featureToggle/__snapshots__/featureToggle.test.ts.snap
@@ -10,8 +10,5 @@ exports[`default state 1`] = `
   "isFinsightsToggleEnabled": false,
   "isIbmToggleEnabled": false,
   "isOcpCloudGroupBysToggleEnabled": false,
-  "isOcpCloudNetworkingToggleEnabled": false,
-  "isOcpProjectStorageToggleEnabled": false,
-  "isRosToggleEnabled": false,
 }
 `;
diff --git a/src/store/featureToggle/featureToggle.test.ts b/src/store/featureToggle/featureToggle.test.ts
index 7ff31eb53..6c2ea9111 100644
--- a/src/store/featureToggle/featureToggle.test.ts
+++ b/src/store/featureToggle/featureToggle.test.ts
@@ -14,6 +14,12 @@ test('default state', async () => {
   expect(selectors.selectFeatureToggleState(store.getState())).toMatchSnapshot();
 });
 
+test('Account info empty state feature is enabled', async () => {
+  const store = createUIStore();
+  store.dispatch(actions.setFeatureToggle({ isAccountInfoEmptyStateToggleEnabled: true }));
+  expect(FeatureToggleSelectors.selectIsAccountInfoEmptyStateToggleEnabled(store.getState())).toBe(true);
+});
+
 test('AWS EC2 instances feature is enabled', async () => {
   const store = createUIStore();
   store.dispatch(actions.setFeatureToggle({ isAwsEc2InstancesToggleEnabled: true }));
@@ -44,20 +50,8 @@ test('IBM feature is enabled', async () => {
   expect(FeatureToggleSelectors.selectIsIbmToggleEnabled(store.getState())).toBe(true);
 });
 
-test('OCP on cloud networking feature is enabled', async () => {
-  const store = createUIStore();
-  store.dispatch(actions.setFeatureToggle({ isOcpCloudNetworkingToggleEnabled: true }));
-  expect(FeatureToggleSelectors.selectIsOcpCloudNetworkingToggleEnabled(store.getState())).toBe(true);
-});
-
-test('OCP project storage feature is enabled', async () => {
-  const store = createUIStore();
-  store.dispatch(actions.setFeatureToggle({ isOcpProjectStorageToggleEnabled: true }));
-  expect(FeatureToggleSelectors.selectIsOcpProjectStorageToggleEnabled(store.getState())).toBe(true);
-});
-
-test('ROS feature is enabled', async () => {
+test('OCP on cloud group bys feature is enabled', async () => {
   const store = createUIStore();
-  store.dispatch(actions.setFeatureToggle({ isRosToggleEnabled: true }));
-  expect(FeatureToggleSelectors.selectIsRosToggleEnabled(store.getState())).toBe(true);
+  store.dispatch(actions.setFeatureToggle({ isOcpCloudGroupBysToggleEnabled: true }));
+  expect(FeatureToggleSelectors.selectIsOcpCloudGroupBysToggleEnabled(store.getState())).toBe(true);
 });
diff --git a/src/store/featureToggle/featureToggleActions.ts b/src/store/featureToggle/featureToggleActions.ts
index 355af1728..ba0f03901 100644
--- a/src/store/featureToggle/featureToggleActions.ts
+++ b/src/store/featureToggle/featureToggleActions.ts
@@ -8,9 +8,6 @@ export interface FeatureToggleActionMeta {
   isFinsightsToggleEnabled?: boolean;
   isIbmToggleEnabled?: boolean;
   isOcpCloudGroupBysToggleEnabled?: boolean;
-  isOcpCloudNetworkingToggleEnabled?: boolean;
-  isOcpProjectStorageToggleEnabled?: boolean;
-  isRosToggleEnabled?: boolean;
 }
 
 export const setFeatureToggle = createAction('feature/init_feature_toggle')<FeatureToggleActionMeta>();
diff --git a/src/store/featureToggle/featureToggleReducer.ts b/src/store/featureToggle/featureToggleReducer.ts
index fadc7a4b2..f31821667 100644
--- a/src/store/featureToggle/featureToggleReducer.ts
+++ b/src/store/featureToggle/featureToggleReducer.ts
@@ -15,9 +15,6 @@ export type FeatureToggleState = Readonly<{
   isFinsightsToggleEnabled: boolean;
   isIbmToggleEnabled: boolean;
   isOcpCloudGroupBysToggleEnabled: boolean;
-  isOcpCloudNetworkingToggleEnabled: boolean;
-  isOcpProjectStorageToggleEnabled: boolean;
-  isRosToggleEnabled: boolean;
 }>;
 
 export const defaultState: FeatureToggleState = {
@@ -29,9 +26,6 @@ export const defaultState: FeatureToggleState = {
   isFinsightsToggleEnabled: false,
   isIbmToggleEnabled: false,
   isOcpCloudGroupBysToggleEnabled: false,
-  isOcpCloudNetworkingToggleEnabled: false,
-  isOcpProjectStorageToggleEnabled: false,
-  isRosToggleEnabled: false,
 };
 
 export const stateKey = 'FeatureToggle';
@@ -49,9 +43,6 @@ export function FeatureToggleReducer(state = defaultState, action: FeatureToggle
         isFinsightsToggleEnabled: action.payload.isFinsightsToggleEnabled,
         isIbmToggleEnabled: action.payload.isIbmToggleEnabled,
         isOcpCloudGroupBysToggleEnabled: action.payload.isOcpCloudGroupBysToggleEnabled,
-        isOcpCloudNetworkingToggleEnabled: action.payload.isOcpCloudNetworkingToggleEnabled,
-        isOcpProjectStorageToggleEnabled: action.payload.isOcpProjectStorageToggleEnabled,
-        isRosToggleEnabled: action.payload.isRosToggleEnabled,
       };
 
     default:
diff --git a/src/store/featureToggle/featureToggleSelectors.ts b/src/store/featureToggle/featureToggleSelectors.ts
index fdd6cc603..a3e1ec578 100644
--- a/src/store/featureToggle/featureToggleSelectors.ts
+++ b/src/store/featureToggle/featureToggleSelectors.ts
@@ -18,8 +18,3 @@ export const selectIsFinsightsToggleEnabled = (state: RootState) =>
 export const selectIsIbmToggleEnabled = (state: RootState) => selectFeatureToggleState(state).isIbmToggleEnabled;
 export const selectIsOcpCloudGroupBysToggleEnabled = (state: RootState) =>
   selectFeatureToggleState(state).isOcpCloudGroupBysToggleEnabled;
-export const selectIsOcpCloudNetworkingToggleEnabled = (state: RootState) =>
-  selectFeatureToggleState(state).isOcpCloudNetworkingToggleEnabled;
-export const selectIsOcpProjectStorageToggleEnabled = (state: RootState) =>
-  selectFeatureToggleState(state).isOcpProjectStorageToggleEnabled;
-export const selectIsRosToggleEnabled = (state: RootState) => selectFeatureToggleState(state).isRosToggleEnabled;