@@ -5,7 +5,6 @@ import "./index.css";
 import { Routes, Route } from "react-router-dom";
 import { EuiProvider, EuiErrorBoundary } from "@elastic/eui";
 import { ThemeProvider, useTheme } from "./contexts/ThemeContext";
-import { UIVersionProvider } from "./contexts/UIVersionContext";
 
 import ProjectOverviewPage from "./pages/ProjectOverviewPage";
 import Layout from "./pages/Layout";
@@ -79,13 +78,11 @@ const FeastUISansProviders = ({
 
   return (
     <ThemeProvider>
-      <UIVersionProvider>
-        <FeastUISansProvidersInner
-          basename={basename}
-          projectListContext={projectListContext}
-          feastUIConfigs={feastUIConfigs}
-        />
-      </UIVersionProvider>
+      <FeastUISansProvidersInner
+        basename={basename}
+        projectListContext={projectListContext}
+        feastUIConfigs={feastUIConfigs}
+      />
     </ThemeProvider>
   );
 };
 
@@ -26,7 +26,6 @@ import RegistrySearch, {
 } from "../components/RegistrySearch";
 import GlobalSearchShortcut from "../components/GlobalSearchShortcut";
 import CommandPalette from "../components/CommandPalette";
-import UIVersionToggle from "../components/UIVersionToggle";
 
 const Layout = () => {
   // Registry Path Context has to be inside Layout
@@ -257,9 +256,7 @@ const Layout = () => {
                         categories={globalCategories}
                       />
                     </EuiFlexItem>
-                    <EuiFlexItem grow={false}>
-                      <UIVersionToggle />
-                    </EuiFlexItem>
+                    <EuiFlexItem grow={false}></EuiFlexItem>
                   </EuiFlexGroup>
                 </div>
               )}
 
@@ -26,7 +26,6 @@ import BatchSourcePropertiesView from "./BatchSourcePropertiesView";
 import FeatureViewEdgesList from "../entities/FeatureViewEdgesList";
 import RequestDataSourceSchemaTable from "./RequestDataSourceSchemaTable";
 import useLoadDataSource from "./useLoadDataSource";
-import { useUIVersion } from "../../contexts/UIVersionContext";
 
 const buildEditFormData = (ds: any): DataSourceFormData => {
   const spec = ds.spec || ds;
@@ -130,7 +129,6 @@ const DataSourceOverviewTab = () => {
     useLoadDataSource(dsName);
   const isEmpty = data === undefined;
 
-  const { isV2 } = useUIVersion();
   const [isEditModalOpen, setIsEditModalOpen] = useState(false);
   const [successMessage, setSuccessMessage] = useState<string | null>(null);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
@@ -192,21 +190,17 @@ const DataSourceOverviewTab = () => {
               <EuiSpacer size="m" />
             </>
           )}
-          {isV2 && (
-            <>
-              <EuiFlexGroup justifyContent="flexEnd">
-                <EuiFlexItem grow={false}>
-                  <EuiButtonEmpty
-                    iconType="pencil"
-                    onClick={() => setIsEditModalOpen(true)}
-                  >
-                    Edit Data Source
-                  </EuiButtonEmpty>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-              <EuiSpacer size="s" />
-            </>
-          )}
+          <EuiFlexGroup justifyContent="flexEnd">
+            <EuiFlexItem grow={false}>
+              <EuiButtonEmpty
+                iconType="pencil"
+                onClick={() => setIsEditModalOpen(true)}
+              >
+                Edit Data Source
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+          <EuiSpacer size="s" />
           <EuiFlexGroup>
             <EuiFlexItem>
               <EuiFlexGroup>
 
@@ -24,7 +24,6 @@ import DataSourceFormModal, {
   DataSourceFormData,
 } from "../../components/DataSourceFormModal";
 import { useApplyDataSource } from "../../queries/mutations/useDataSourceMutations";
-import { useUIVersion } from "../../contexts/UIVersionContext";
 import useResourceQuery, {
   dataSourceListPath,
 } from "../../queries/useResourceQuery";
@@ -105,8 +104,6 @@ const formDataToPayload = (formData: DataSourceFormData, project: string) => {
 
 const Index = () => {
   const { projectName } = useParams();
-  const { isV2 } = useUIVersion();
-
   const { isLoading, isSuccess, isError, data } = useLoadDatasources();
 
   const [isModalOpen, setIsModalOpen] = useState(false);
@@ -147,18 +144,14 @@ const Index = () => {
         iconType={DataSourceIcon}
         pageTitle="Data Sources"
         rightSideItems={[
-          ...(isV2
-            ? [
-                <EuiButton
-                  fill
-                  iconType="plus"
-                  onClick={() => setIsModalOpen(true)}
-                  key="create"
-                >
-                  Create Data Source
-                </EuiButton>,
-              ]
-            : []),
+          <EuiButton
+            fill
+            iconType="plus"
+            onClick={() => setIsModalOpen(true)}
+            key="create"
+          >
+            Create Data Source
+          </EuiButton>,
           <ExportButton
             data={filterResult ?? []}
             fileName="data_sources"
 
@@ -31,7 +31,6 @@ import { toDate } from "../../utils/timestamp";
 import FeatureViewEdgesList from "./FeatureViewEdgesList";
 import useFeatureViewEdgesByEntity from "./useFeatureViewEdgesByEntity";
 import useLoadEntity from "./useLoadEntity";
-import { useUIVersion } from "../../contexts/UIVersionContext";
 import { useApplyEntity } from "../../queries/mutations/useEntityMutations";
 
 const buildEditFormData = (entity: feast.core.IEntity): EntityFormData => {
@@ -63,7 +62,6 @@ const EntityOverviewTab = () => {
   const fvEdgesSuccess = fvEdges.isSuccess;
   const fvEdgesData = fvEdges.data;
 
-  const { isV2 } = useUIVersion();
   const [isEditModalOpen, setIsEditModalOpen] = useState(false);
   const [successMessage, setSuccessMessage] = useState<string | null>(null);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
@@ -130,21 +128,17 @@ const EntityOverviewTab = () => {
               <EuiSpacer size="m" />
             </>
           )}
-          {isV2 && (
-            <>
-              <EuiFlexGroup justifyContent="flexEnd">
-                <EuiFlexItem grow={false}>
-                  <EuiButtonEmpty
-                    iconType="pencil"
-                    onClick={() => setIsEditModalOpen(true)}
-                  >
-                    Edit Entity
-                  </EuiButtonEmpty>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-              <EuiSpacer size="s" />
-            </>
-          )}
+          <EuiFlexGroup justifyContent="flexEnd">
+            <EuiFlexItem grow={false}>
+              <EuiButtonEmpty
+                iconType="pencil"
+                onClick={() => setIsEditModalOpen(true)}
+              >
+                Edit Entity
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+          <EuiSpacer size="s" />
           <EuiFlexGroup>
             <EuiFlexItem>
               <EuiPanel hasBorder={true}>
 
@@ -19,7 +19,6 @@ import EntityFormModal, {
   EntityFormData,
 } from "../../components/EntityFormModal";
 import { useApplyEntity } from "../../queries/mutations/useEntityMutations";
-import { useUIVersion } from "../../contexts/UIVersionContext";
 import useResourceQuery, {
   entityListPath,
 } from "../../queries/useResourceQuery";
@@ -48,8 +47,6 @@ const formDataToPayload = (formData: EntityFormData, project: string) => ({
 
 const Index = () => {
   const { projectName } = useParams();
-  const { isV2 } = useUIVersion();
-
   const { isLoading, isSuccess, isError, data } = useLoadEntities();
 
   const [isModalOpen, setIsModalOpen] = useState(false);
@@ -84,18 +81,14 @@ const Index = () => {
         iconType={EntityIcon}
         pageTitle="Entities"
         rightSideItems={[
-          ...(isV2
-            ? [
-                <EuiButton
-                  fill
-                  iconType="plus"
-                  onClick={() => setIsModalOpen(true)}
-                  key="create"
-                >
-                  Create Entity
-                </EuiButton>,
-              ]
-            : []),
+          <EuiButton
+            fill
+            iconType="plus"
+            onClick={() => setIsModalOpen(true)}
+            key="create"
+          >
+            Create Entity
+          </EuiButton>,
           <ExportButton
             data={data ?? []}
             fileName="entities"
 
@@ -35,7 +35,6 @@ import FeatureViewFormModal, {
   FeatureViewFormData,
 } from "../../components/FeatureViewFormModal";
 import { useApplyFeatureView } from "../../queries/mutations/useFeatureViewMutations";
-import { useUIVersion } from "../../contexts/UIVersionContext";
 import useResourceQuery, {
   featureViewListPath,
   restFeatureViewsToMergedList,
@@ -125,8 +124,6 @@ const formDataToPayload = (formData: FeatureViewFormData, project: string) => ({
 
 const Index = () => {
   const { projectName } = useParams();
-  const { isV2 } = useUIVersion();
-
   const { isLoading, isSuccess, isError, data } = useLoadFeatureViews();
 
   const entitiesQuery = useResourceQuery<any[]>({
@@ -213,18 +210,14 @@ const Index = () => {
         iconType={FeatureViewIcon}
         pageTitle="Feature Views"
         rightSideItems={[
-          ...(isV2
-            ? [
-                <EuiButton
-                  fill
-                  iconType="plus"
-                  onClick={handleCreateClick}
-                  key="create"
-                >
-                  Create Feature View
-                </EuiButton>,
-              ]
-            : []),
+          <EuiButton
+            fill
+            iconType="plus"
+            onClick={handleCreateClick}
+            key="create"
+          >
+            Create Feature View
+          </EuiButton>,
           <ExportButton
             data={filterResult ?? []}
             fileName="feature_views"