diff --git a/datahub-web-react/knip.json b/datahub-web-react/knip.json
new file mode 100644
index 00000000000000..7b5f4b0defdd06
--- /dev/null
+++ b/datahub-web-react/knip.json
@@ -0,0 +1,3 @@
+{
+    "ignore": ["src/generated.ts", "src/alchemy-components/**", "functions/**", ".storybook/**"]
+}
diff --git a/datahub-web-react/src/CustomThemeProvider.tsx b/datahub-web-react/src/CustomThemeProvider.tsx
index fc0b091b7723fe..4b547030aca41d 100644
--- a/datahub-web-react/src/CustomThemeProvider.tsx
+++ b/datahub-web-react/src/CustomThemeProvider.tsx
@@ -1,7 +1,6 @@
 import React, { useState } from 'react';
 import { ThemeProvider } from 'styled-components';
 
-import { useIsThemeV2 } from '@app/useIsThemeV2';
 import { useCustomThemeId } from '@app/useSetAppTheme';
 import themes from '@conf/theme/themes';
 import { Theme } from '@conf/theme/types';
@@ -12,12 +11,9 @@ interface Props {
 }
 
 const CustomThemeProvider = ({ children }: Props) => {
-    // Note: AppConfigContext not provided yet, so both of these calls rely on the DEFAULT_APP_CONFIG
-    const isThemeV2 = useIsThemeV2();
     const customThemeId = useCustomThemeId();
 
-    // Note: If custom theme id is a json file, it will only be loaded later in useSetAppTheme
-    const defaultTheme = isThemeV2 ? themes.themeV2 : themes.themeV1;
+    const defaultTheme = themes.themeV2;
     const customTheme = customThemeId ? themes[customThemeId] : null;
     const [theme, setTheme] = useState<Theme>(customTheme ?? defaultTheme);
 
diff --git a/datahub-web-react/src/Mocks.tsx b/datahub-web-react/src/Mocks.tsx
index 774c6cc79eabf0..c70d9f130086ed 100644
--- a/datahub-web-react/src/Mocks.tsx
+++ b/datahub-web-react/src/Mocks.tsx
@@ -5,7 +5,6 @@ import { VIEW_ENTITY_PAGE } from '@app/entity/shared/constants';
 import { GenericEntityProperties } from '@app/entity/shared/types';
 import { ViewBuilderState } from '@app/entity/view/types';
 import { EntityCapabilityType } from '@app/entityV2/Entity';
-import { FetchedEntity } from '@app/lineage/types';
 import { DEFAULT_APP_CONFIG } from '@src/appConfigContext';
 
 import { AppConfigDocument, GetEntityCountsDocument } from '@graphql/app.generated';
@@ -32,8 +31,6 @@ import { GetTagDocument } from '@graphql/tag.generated';
 import { GetUserDocument } from '@graphql/user.generated';
 import {
     AppConfig,
-    BusinessAttribute,
-    Container,
     DataFlow,
     DataHubView,
     DataHubViewFilter,
@@ -53,7 +50,6 @@ import {
     MlModelGroup,
     Owner,
     OwnershipType,
-    PlatformPrivileges,
     PlatformType,
     RecommendationRenderType,
     RelationshipDirection,
@@ -62,7 +58,7 @@ import {
     SearchResult,
 } from '@types';
 
-export const entityPrivileges: EntityPrivileges = {
+const entityPrivileges: EntityPrivileges = {
     canEditLineage: true,
     canEditDomains: true,
     canEditDataProducts: true,
@@ -727,7 +723,7 @@ export const dataset3 = {
     versionProperties: null,
 } as Dataset;
 
-export const dataset3WithSchema = {
+const dataset3WithSchema = {
     dataset: {
         __typename: 'Dataset',
         schemaMetadata: {
@@ -793,7 +789,7 @@ export const dataset3WithSchema = {
     },
 };
 
-export const dataset4 = {
+const dataset4 = {
     ...dataset3,
     name: 'Fourth Test Dataset',
     urn: 'urn:li:dataset:4',
@@ -806,7 +802,7 @@ export const dataset4 = {
     },
 };
 
-export const dataset5 = {
+const dataset5 = {
     ...dataset3,
     name: 'Fifth Test Dataset',
     urn: 'urn:li:dataset:5',
@@ -820,7 +816,7 @@ export const dataset5 = {
     },
 };
 
-export const dataset6 = {
+const dataset6 = {
     ...dataset3,
     name: 'Sixth Test Dataset',
     urn: 'urn:li:dataset:6',
@@ -835,258 +831,6 @@ export const dataset6 = {
     },
 };
 
-export const dataset7 = {
-    ...dataset3,
-    name: 'Seventh Test Dataset',
-    urn: 'urn:li:dataset:7',
-    properties: {
-        name: 'Seventh Test Dataset',
-        description: 'This and here we have yet another Dataset (YAN). Are there more?',
-        origin: 'PROD',
-        customProperties: [{ key: 'propertyAKey', value: 'propertyAValue' }],
-        externalUrl: 'https://data.hub',
-    },
-};
-
-export const dataset3WithLineage = {
-    ...dataset3,
-    upstream: {
-        start: 0,
-        count: 2,
-        total: 2,
-        relationships: [
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Outgoing,
-                entity: dataset7,
-            },
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Outgoing,
-                entity: dataset4,
-            },
-        ],
-    },
-    downstream: {
-        start: 0,
-        count: 0,
-        total: 0,
-        relationships: [],
-    },
-};
-
-export const dataset4WithLineage = {
-    ...dataset4,
-    upstream: {
-        start: 0,
-        count: 2,
-        total: 2,
-        relationships: [
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Outgoing,
-                entity: dataset6,
-            },
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Outgoing,
-                entity: dataset5,
-            },
-        ],
-    },
-    downstream: {
-        start: 0,
-        count: 1,
-        total: 1,
-        relationships: [
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Incoming,
-                entity: dataset3,
-            },
-        ],
-    },
-};
-
-export const dataset5WithCyclicalLineage = {
-    ...dataset5,
-    upstream: {
-        start: 0,
-        count: 1,
-        total: 1,
-        relationships: [
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Outgoing,
-                entity: dataset3,
-            },
-        ],
-    },
-    downstream: {
-        start: 0,
-        count: 1,
-        total: 1,
-        relationships: [
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Incoming,
-                entity: dataset7,
-            },
-        ],
-    },
-};
-
-export const dataset5WithLineage = {
-    ...dataset5,
-    upstream: null,
-    downstream: {
-        start: 0,
-        count: 3,
-        total: 3,
-        relationships: [
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Incoming,
-                entity: dataset7,
-            },
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Incoming,
-                entity: dataset6,
-            },
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Incoming,
-                entity: dataset4,
-            },
-        ],
-    },
-};
-
-export const dataset6WithLineage = {
-    ...dataset6,
-    upstream: {
-        start: 0,
-        count: 1,
-        total: 1,
-        relationships: [
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Outgoing,
-                entity: dataset5,
-            },
-        ],
-    },
-    downstream: {
-        start: 0,
-        count: 1,
-        total: 1,
-        relationships: [
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Incoming,
-                entity: dataset4,
-            },
-        ],
-    },
-};
-
-export const dataset7WithLineage = {
-    ...dataset7,
-    upstream: {
-        start: 0,
-        count: 1,
-        total: 1,
-        relationships: [
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Outgoing,
-                entity: dataset5,
-            },
-        ],
-    },
-    downstream: {
-        start: 0,
-        count: 1,
-        total: 1,
-        relationships: [
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Incoming,
-                entity: dataset3,
-            },
-        ],
-    },
-};
-
-export const dataset7WithSelfReferentialLineage = {
-    ...dataset7,
-    upstream: {
-        start: 0,
-        count: 2,
-        total: 2,
-        relationships: [
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Outgoing,
-                entity: dataset5,
-            },
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Outgoing,
-                entity: dataset7,
-            },
-        ],
-    },
-    downstream: {
-        start: 0,
-        count: 2,
-        total: 2,
-        relationships: [
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Incoming,
-                entity: dataset3,
-            },
-            {
-                type: 'DownstreamOf',
-                direction: RelationshipDirection.Incoming,
-                entity: dataset7,
-            },
-        ],
-    },
-};
-
-export const container1 = {
-    urn: 'urn:li:container:DATABASE',
-    type: EntityType.Container,
-    platform: dataPlatform,
-    lastIngested: null,
-    exists: true,
-    properties: {
-        name: 'database1',
-        externalUrl: null,
-        __typename: 'ContainerProperties',
-    },
-    autoRenderAspects: [],
-    __typename: 'Container',
-} as Container;
-
-export const container2 = {
-    urn: 'urn:li:container:SCHEMA',
-    type: EntityType.Container,
-    platform: dataPlatform,
-    lastIngested: null,
-    exists: true,
-    properties: {
-        name: 'schema1',
-        externalUrl: null,
-        __typename: 'ContainerProperties',
-    },
-    autoRenderAspects: [],
-    __typename: 'Container',
-} as Container;
-
 export const glossaryTerm1 = {
     urn: 'urn:li:glossaryTerm:1',
     type: EntityType.GlossaryTerm,
@@ -1211,7 +955,7 @@ const glossaryTerm2 = {
     __typename: 'GlossaryTerm',
 };
 
-export const glossaryTerm3 = {
+const glossaryTerm3 = {
     urn: 'urn:li:glossaryTerm:example.glossaryterm2',
     type: 'GLOSSARY_TERM',
     name: 'glossaryterm2',
@@ -1330,19 +1074,6 @@ export const glossaryNode4 = {
     __typename: 'GlossaryNode',
 } as GlossaryNode;
 
-export const glossaryNode5 = {
-    urn: 'urn:li:glossaryNode:example.glossarynode5',
-    type: 'GLOSSARY_NODE',
-    properties: {
-        name: 'Glossary Node 5',
-    },
-    parentNodes: {
-        count: 1,
-        nodes: [glossaryNode4],
-    },
-    __typename: 'GlossaryNode',
-} as GlossaryNode;
-
 export const sampleTag = {
     urn: 'urn:li:tag:abc-sample-tag',
     type: EntityType.Tag,
@@ -1375,7 +1106,7 @@ export const sampleTag = {
     autoRenderAspects: [],
 };
 
-export const dataFlow1 = {
+const dataFlow1 = {
     __typename: 'DataFlow',
     urn: 'urn:li:dataFlow:1',
     type: EntityType.DataFlow,
@@ -1545,107 +1276,6 @@ export const dataJob1 = {
     health: [],
 } as DataJob;
 
-export const businessAttribute = {
-    urn: 'urn:li:businessAttribute:ba1',
-    type: EntityType.BusinessAttribute,
-    __typename: 'BusinessAttribute',
-    properties: {
-        name: 'TestBusinessAtt-2',
-        description: 'lorem upsum updated 12',
-        created: {
-            time: 1705857132786,
-        },
-        lastModified: {
-            time: 1705857132786,
-        },
-        glossaryTerms: {
-            terms: [
-                {
-                    term: {
-                        urn: 'urn:li:glossaryTerm:1',
-                        type: EntityType.GlossaryTerm,
-                        hierarchicalName: 'SampleHierarchicalName',
-                        name: 'SampleName',
-                    },
-                    attribution: null,
-                    associatedUrn: 'urn:li:businessAttribute:ba1',
-                },
-            ],
-            __typename: 'GlossaryTerms',
-        },
-        tags: {
-            __typename: 'GlobalTags',
-            tags: [
-                {
-                    tag: {
-                        urn: 'urn:li:tag:abc-sample-tag',
-                        __typename: 'Tag',
-                        type: EntityType.Tag,
-                        name: 'abc-sample-tag',
-                    },
-                    __typename: 'TagAssociation',
-                    associatedUrn: 'urn:li:businessAttribute:ba1',
-                    attribution: null,
-                },
-                {
-                    tag: {
-                        urn: 'urn:li:tag:TestTag',
-                        __typename: 'Tag',
-                        type: EntityType.Tag,
-                        name: 'TestTag',
-                    },
-                    __typename: 'TagAssociation',
-                    associatedUrn: 'urn:li:businessAttribute:ba1',
-                    attribution: null,
-                },
-            ],
-        },
-        customProperties: [
-            {
-                key: 'prop2',
-                value: 'val2',
-                associatedUrn: 'urn:li:businessAttribute:ba1',
-                __typename: 'CustomPropertiesEntry',
-            },
-            {
-                key: 'prop1',
-                value: 'val1',
-                associatedUrn: 'urn:li:businessAttribute:ba1',
-                __typename: 'CustomPropertiesEntry',
-            },
-            {
-                key: 'prop3',
-                value: 'val3',
-                associatedUrn: 'urn:li:businessAttribute:ba1',
-                __typename: 'CustomPropertiesEntry',
-            },
-        ],
-    },
-    ownership: {
-        owners: [
-            {
-                owner: {
-                    ...user1,
-                },
-                associatedUrn: 'urn:li:businessAttribute:ba',
-                type: 'DATAOWNER',
-                attribution: null,
-            },
-            {
-                owner: {
-                    ...user2,
-                },
-                associatedUrn: 'urn:li:businessAttribute:ba',
-                type: 'DELEGATE',
-                attribution: null,
-            },
-        ],
-        lastModified: {
-            time: 0,
-        },
-    },
-} as BusinessAttribute;
-
 export const dataJob2 = {
     __typename: 'DataJob',
     urn: 'urn:li:dataJob:2',
@@ -1799,7 +1429,7 @@ export const dataJob3 = {
     health: [],
 } as DataJob;
 
-export const mlModel = {
+const mlModel = {
     __typename: 'MLModel',
     urn: 'urn:li:mlModel:(urn:li:dataPlatform:sagemaker,trustmodel,PROD)',
     type: EntityType.Mlmodel,
@@ -1885,29 +1515,7 @@ export const mlModel = {
     autoRenderAspects: [],
 } as MlModel;
 
-export const dataset1FetchedEntity = {
-    urn: dataset1.urn,
-    name: dataset1.name,
-    type: dataset1.type,
-    upstreamChildren: [],
-    downstreamChildren: [
-        { type: EntityType.Dataset, entity: dataset2 },
-        { type: EntityType.DataJob, entity: dataJob1 },
-    ],
-} as FetchedEntity;
-
-export const dataset2FetchedEntity = {
-    urn: dataset2.urn,
-    name: 'test name',
-    type: dataset2.type,
-    upstreamChildren: [
-        { type: EntityType.Dataset, entity: dataset1 },
-        { type: EntityType.DataJob, entity: dataJob1 },
-    ],
-    downstreamChildren: [],
-} as FetchedEntity;
-
-export const mlModelGroup = {
+const mlModelGroup = {
     __typename: 'MLModelGroup',
     urn: 'urn:li:mlModelGroup:(urn:li:dataPlatform:sagemaker,another-group,PROD)',
     type: EntityType.MlmodelGroup,
@@ -1976,7 +1584,7 @@ export const mlModelGroup = {
     deprecation: null,
 } as MlModelGroup;
 
-export const recommendationModules = [
+const recommendationModules = [
     {
         title: 'Most Popular',
         moduleId: 'MostPopular',
@@ -4053,35 +3661,6 @@ export const mocksWithSearchFlagsOff = [
     },
 ];
 
-export const platformPrivileges: PlatformPrivileges = {
-    viewAnalytics: true,
-    managePolicies: true,
-    manageIdentities: true,
-    generatePersonalAccessTokens: true,
-    manageDomains: true,
-    manageIngestion: true,
-    manageSecrets: true,
-    manageTokens: true,
-    viewTests: false,
-    manageTests: true,
-    manageGlossaries: true,
-    manageUserCredentials: true,
-    manageTags: true,
-    viewManageTags: true,
-    createTags: true,
-    createDomains: true,
-    manageGlobalViews: true,
-    manageOwnershipTypes: true,
-    manageGlobalAnnouncements: true,
-    createBusinessAttributes: true,
-    manageBusinessAttributes: true,
-    manageStructuredProperties: true,
-    viewStructuredPropertiesPage: true,
-    manageApplications: true,
-    manageFeatures: true,
-    manageHomePageTemplates: true,
-};
-
 export const DomainMock1 = {
     urn: 'urn:li:domain:afbdad41-c523-469f-9b62-de94f938f702',
     id: 'afbdad41-c523-469f-9b62-de94f938f702',
@@ -4117,7 +3696,7 @@ export const DomainMock1 = {
     supportedCapabilities: () => new Set(),
 } as Entity<any>;
 
-export const DomainMock2 = {
+const DomainMock2 = {
     urn: 'urn:li:domain:bebdad41-c523-469f-9b62-de94f938f603',
     id: 'bebdad41-c523-469f-9b62-de94f938f603',
     type: 'DOMAIN',
@@ -4404,25 +3983,3 @@ export const mockFineGrainedLineages1: GenericEntityProperties = {
         },
     ],
 };
-
-export const useEntityDataFunc = () => {
-    const value = {
-        entityData: {
-            parentContainers: {
-                containers: [
-                    {
-                        properties: {
-                            name: 'name1',
-                        },
-                    },
-                    {
-                        properties: {
-                            name: 'name2',
-                        },
-                    },
-                ],
-            },
-        },
-    };
-    return value;
-};
diff --git a/datahub-web-react/src/app/AdminConsole.tsx b/datahub-web-react/src/app/AdminConsole.tsx
deleted file mode 100644
index fba4ea98ee3d10..00000000000000
--- a/datahub-web-react/src/app/AdminConsole.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import { BankOutlined, BarChartOutlined, MenuOutlined } from '@ant-design/icons';
-import { Menu } from 'antd';
-import Sider from 'antd/lib/layout/Sider';
-import React, { useState } from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { useUserContext } from '@app/context/useUserContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { useAppConfig } from '@app/useAppConfig';
-
-const ToggleContainer = styled.div`
-    background-color: ${ANTD_GRAY[4]};
-    border-top-right-radius: 2px;
-    border-bottom-right-radius: 2px;
-`;
-
-const ControlMenu = styled(Menu)`
-    padding-top: 28px;
-    height: 100%;
-`;
-
-const ControlSlideOut = styled(Sider)`
-    && {
-        height: 100vh;
-        position: fixed;
-        left: 0px;
-        z-index: 10000;
-    }
-`;
-
-/**
- * Container for all views behind an authentication wall.
- */
-export const AdminConsole = (): JSX.Element => {
-    const me = useUserContext();
-
-    const [adminConsoleOpen, setAdminConsoleOpen] = useState(false);
-    const { config } = useAppConfig();
-
-    const isAnalyticsEnabled = config?.analyticsConfig?.enabled;
-    const isPoliciesEnabled = config?.policiesConfig?.enabled;
-
-    const showAnalytics = (isAnalyticsEnabled && me && me?.platformPrivileges?.viewAnalytics) || false;
-    const showPolicyBuilder = (isPoliciesEnabled && me && me?.platformPrivileges?.managePolicies) || false;
-    const showAdminConsole = showAnalytics || showPolicyBuilder;
-
-    const onMenuItemClick = () => {
-        setAdminConsoleOpen(false);
-    };
-
-    const onCollapse = (collapsed) => {
-        if (collapsed) {
-            setAdminConsoleOpen(false);
-        } else {
-            setAdminConsoleOpen(true);
-        }
-    };
-
-    const toggleView = (
-        <ToggleContainer style={{}}>
-            <MenuOutlined style={{ color: ANTD_GRAY[9] }} />
-        </ToggleContainer>
-    );
-
-    return (
-        <>
-            {showAdminConsole && (
-                <ControlSlideOut
-                    zeroWidthTriggerStyle={{ top: '50%' }}
-                    collapsible
-                    collapsed={!adminConsoleOpen}
-                    onCollapse={onCollapse}
-                    collapsedWidth="0"
-                    trigger={toggleView}
-                >
-                    <ControlMenu selectable={false} mode="inline" onSelect={onMenuItemClick}>
-                        {showAnalytics && (
-                            <Menu.Item key="analytics" icon={<BarChartOutlined />}>
-                                <Link onClick={onMenuItemClick} to="/analytics">
-                                    Analytics
-                                </Link>
-                            </Menu.Item>
-                        )}
-                        {showPolicyBuilder && (
-                            <Menu.Item key="permissions" icon={<BankOutlined />}>
-                                <Link onClick={onMenuItemClick} to="/permissions">
-                                    Permissions
-                                </Link>
-                            </Menu.Item>
-                        )}
-                    </ControlMenu>
-                </ControlSlideOut>
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/ProtectedRoutes.tsx b/datahub-web-react/src/app/ProtectedRoutes.tsx
index 3cadb9c1d3e4b1..e69cd36f51021b 100644
--- a/datahub-web-react/src/app/ProtectedRoutes.tsx
+++ b/datahub-web-react/src/app/ProtectedRoutes.tsx
@@ -6,7 +6,6 @@ import styled from 'styled-components';
 import DataHubTitle from '@app/DataHubTitle';
 import EmbedRoutes from '@app/EmbedRoutes';
 import { SearchRoutes } from '@app/SearchRoutes';
-import { HomePage } from '@app/home/HomePage';
 import { HomePage as HomePageV2 } from '@app/homeV2/HomePage';
 import { IntroduceYourself } from '@app/homeV2/introduce/IntroduceYourself';
 import { useSetUserPersona } from '@app/homeV2/persona/useUserPersona';
@@ -14,7 +13,7 @@ import { HomePage as HomePageV3 } from '@app/homeV3/HomePage';
 import { useShowHomePageRedesign } from '@app/homeV3/context/hooks/useShowHomePageRedesign';
 import { useSetUserTitle } from '@app/identity/user/useUserTitle';
 import { OnboardingContextProvider } from '@app/onboarding/OnboardingContextProvider';
-import { useIsThemeV2, useSetThemeIsV2 } from '@app/useIsThemeV2';
+import { useSetThemeIsV2 } from '@app/useIsThemeV2';
 import { useSetAppTheme } from '@app/useSetAppTheme';
 import { useSetNavBarRedesignEnabled } from '@app/useShowNavBarRedesign';
 import { NEW_ROUTE_MAP, PageRoutes } from '@conf/Global';
@@ -34,16 +33,9 @@ export const ProtectedRoutes = (): JSX.Element => {
     useSetUserTitle();
     useSetNavBarRedesignEnabled();
 
-    const isThemeV2 = useIsThemeV2();
     const showHomepageRedesign = useShowHomePageRedesign();
+    const FinalHomePage = showHomepageRedesign ? HomePageV3 : HomePageV2;
 
-    let FinalHomePage;
-
-    if (isThemeV2) {
-        FinalHomePage = showHomepageRedesign ? HomePageV3 : HomePageV2;
-    } else {
-        FinalHomePage = HomePage;
-    }
     const location = useLocation();
     const history = useHistory();
 
@@ -57,7 +49,7 @@ export const ProtectedRoutes = (): JSX.Element => {
     return (
         <OnboardingContextProvider>
             <DataHubTitle />
-            <StyledLayout className={isThemeV2 ? 'themeV2' : undefined}>
+            <StyledLayout className="themeV2">
                 <Switch>
                     <Route exact path="/" render={() => <FinalHomePage />} />
                     <Route path={PageRoutes.EMBED} render={() => <EmbedRoutes />} />
diff --git a/datahub-web-react/src/app/SearchRoutes.tsx b/datahub-web-react/src/app/SearchRoutes.tsx
index dbb741782a5f93..8fc2e9c27518e7 100644
--- a/datahub-web-react/src/app/SearchRoutes.tsx
+++ b/datahub-web-react/src/app/SearchRoutes.tsx
@@ -6,22 +6,14 @@ import { ManageApplications } from '@app/applications/ManageApplications';
 import { BrowseResultsPage } from '@app/browse/BrowseResultsPage';
 import { BusinessAttributes } from '@app/businessAttribute/BusinessAttributes';
 import { useUserContext } from '@app/context/useUserContext';
-import DomainRoutes from '@app/domain/DomainRoutes';
-import { ManageDomainsPage } from '@app/domain/ManageDomainsPage';
 import DomainRoutesV2 from '@app/domainV2/DomainRoutes';
 import { ManageDomainsPage as ManageDomainsPageV2 } from '@app/domainV2/ManageDomainsPage';
-import { EntityPage } from '@app/entity/EntityPage';
 import { EntityPage as EntityPageV2 } from '@app/entityV2/EntityPage';
-import GlossaryRoutes from '@app/glossary/GlossaryRoutes';
 import GlossaryRoutesV2 from '@app/glossaryV2/GlossaryRoutes';
 import StructuredProperties from '@app/govern/structuredProperties/StructuredProperties';
-import { ManageIngestionPage } from '@app/ingest/ManageIngestionPage';
 import { ManageIngestionPage as ManageIngestionPageV2 } from '@app/ingestV2/ManageIngestionPage';
-import { SearchPage } from '@app/search/SearchPage';
-import { SearchablePage } from '@app/search/SearchablePage';
 import { SearchPage as SearchPageV2 } from '@app/searchV2/SearchPage';
 import { SearchablePage as SearchablePageV2 } from '@app/searchV2/SearchablePage';
-import { SettingsPage } from '@app/settings/SettingsPage';
 import { SettingsPage as SettingsPageV2 } from '@app/settingsV2/SettingsPage';
 import { NoPageFound } from '@app/shared/NoPageFound';
 import { ManageTags } from '@app/tags/ManageTags';
@@ -32,7 +24,6 @@ import {
     useIsNestedDomainsEnabled,
 } from '@app/useAppConfig';
 import { useEntityRegistry } from '@app/useEntityRegistry';
-import { useIsThemeV2 } from '@app/useIsThemeV2';
 import { PageRoutes } from '@conf/Global';
 
 /**
@@ -46,8 +37,6 @@ export const SearchRoutes = (): JSX.Element => {
         ? entityRegistry.getEntitiesForSearchRoutes()
         : entityRegistry.getNonGlossaryEntities();
     const { config, loaded } = useAppConfig();
-    const isThemeV2 = useIsThemeV2();
-    const FinalSearchablePage = isThemeV2 ? SearchablePageV2 : SearchablePage;
 
     const businessAttributesFlag = useBusinessAttributesFlag();
     const appConfigContextLoaded = useIsAppConfigContextLoaded();
@@ -64,25 +53,16 @@ export const SearchRoutes = (): JSX.Element => {
     const showAnalytics = (config?.analyticsConfig?.enabled && me && me?.platformPrivileges?.viewAnalytics) || false;
 
     return (
-        <FinalSearchablePage>
+        <SearchablePageV2>
             <Switch>
                 {entities.map((entity) => (
                     <Route
                         key={entity.getPathName()}
                         path={`/${entity.getPathName()}/:urn`}
-                        render={() =>
-                            isThemeV2 ? (
-                                <EntityPageV2 entityType={entity.type} />
-                            ) : (
-                                <EntityPage entityType={entity.type} />
-                            )
-                        }
+                        render={() => <EntityPageV2 entityType={entity.type} />}
                     />
                 ))}
-                <Route
-                    path={PageRoutes.SEARCH_RESULTS}
-                    render={() => (isThemeV2 ? <SearchPageV2 /> : <SearchPage />)}
-                />
+                <Route path={PageRoutes.SEARCH_RESULTS} render={() => <SearchPageV2 />} />
                 <Route path={PageRoutes.BROWSE_RESULTS} render={() => <BrowseResultsPage />} />
                 {showTags ? <Route path={PageRoutes.MANAGE_TAGS} render={() => <ManageTags />} /> : null}
                 <Route path={PageRoutes.MANAGE_APPLICATIONS} render={() => <ManageApplications />} />
@@ -97,27 +77,13 @@ export const SearchRoutes = (): JSX.Element => {
                 />
                 <Route path={PageRoutes.PERMISSIONS} render={() => <Redirect to="/settings/permissions" />} />
                 <Route path={PageRoutes.IDENTITIES} render={() => <Redirect to="/settings/identities" />} />
-                {isNestedDomainsEnabled && (
-                    <Route
-                        path={`${PageRoutes.DOMAIN}*`}
-                        render={() => (isThemeV2 ? <DomainRoutesV2 /> : <DomainRoutes />)}
-                    />
-                )}
-                {!isNestedDomainsEnabled && (
-                    <Route
-                        path={PageRoutes.DOMAINS}
-                        render={() => (isThemeV2 ? <ManageDomainsPageV2 /> : <ManageDomainsPage />)}
-                    />
-                )}
+                {isNestedDomainsEnabled && <Route path={`${PageRoutes.DOMAIN}*`} render={() => <DomainRoutesV2 />} />}
+                {!isNestedDomainsEnabled && <Route path={PageRoutes.DOMAINS} render={() => <ManageDomainsPageV2 />} />}
 
-                {!showIngestV2 && <Route path={PageRoutes.INGESTION} render={() => <ManageIngestionPage />} />}
                 {showIngestV2 && <Route path={PageRoutes.INGESTION} render={() => <ManageIngestionPageV2 />} />}
 
-                <Route path={PageRoutes.SETTINGS} render={() => (isThemeV2 ? <SettingsPageV2 /> : <SettingsPage />)} />
-                <Route
-                    path={`${PageRoutes.GLOSSARY}*`}
-                    render={() => (isThemeV2 ? <GlossaryRoutesV2 /> : <GlossaryRoutes />)}
-                />
+                <Route path={PageRoutes.SETTINGS} render={() => <SettingsPageV2 />} />
+                <Route path={`${PageRoutes.GLOSSARY}*`} render={() => <GlossaryRoutesV2 />} />
                 {showStructuredProperties && (
                     <Route path={PageRoutes.STRUCTURED_PROPERTIES} render={() => <StructuredProperties />} />
                 )}
@@ -135,6 +101,6 @@ export const SearchRoutes = (): JSX.Element => {
                 />
                 {me.loaded && loaded && <Route component={NoPageFound} />}
             </Switch>
-        </FinalSearchablePage>
+        </SearchablePageV2>
     );
 };
diff --git a/datahub-web-react/src/app/analytics/event.ts b/datahub-web-react/src/app/analytics/event.ts
index b69a4806c6b8f5..ddf4bf642b2d4b 100644
--- a/datahub-web-react/src/app/analytics/event.ts
+++ b/datahub-web-react/src/app/analytics/event.ts
@@ -34,7 +34,6 @@ export enum EventType {
     HomePageSearchEvent,
     SearchResultsViewEvent,
     SearchResultClickEvent,
-    EntitySearchResultClickEvent,
     SearchFiltersClearAllEvent,
     SearchFiltersShowMoreEvent,
     BrowseResultClickEvent,
@@ -191,7 +190,7 @@ interface BaseEvent {
 /**
  * Viewed a page on the UI.
  */
-export interface PageViewEvent extends BaseEvent {
+interface PageViewEvent extends BaseEvent {
     type: EventType.PageViewEvent;
     originPath: string;
 }
@@ -199,14 +198,14 @@ export interface PageViewEvent extends BaseEvent {
 /**
  * Viewed the Introduce Yourself page on the UI.
  */
-export interface IntroduceYourselfViewEvent extends BaseEvent {
+interface IntroduceYourselfViewEvent extends BaseEvent {
     type: EventType.IntroduceYourselfViewEvent;
 }
 
 /**
  * Submitted the "Introduce Yourself" page through the UI.
  */
-export interface IntroduceYourselfSubmitEvent extends BaseEvent {
+interface IntroduceYourselfSubmitEvent extends BaseEvent {
     type: EventType.IntroduceYourselfSubmitEvent;
     role: string;
     platformUrns: Array<string>;
@@ -215,21 +214,21 @@ export interface IntroduceYourselfSubmitEvent extends BaseEvent {
 /**
  * Skipped the "Introduce Yourself" page through the UI.
  */
-export interface IntroduceYourselfSkipEvent extends BaseEvent {
+interface IntroduceYourselfSkipEvent extends BaseEvent {
     type: EventType.IntroduceYourselfSkipEvent;
 }
 
 /**
  * Viewed the Home Page on the UI.
  */
-export interface HomePageViewEvent extends BaseEvent {
+interface HomePageViewEvent extends BaseEvent {
     type: EventType.HomePageViewEvent;
 }
 
 /**
  * Logged on successful new user sign up.
  */
-export interface SignUpEvent extends BaseEvent {
+interface SignUpEvent extends BaseEvent {
     type: EventType.SignUpEvent;
     title: string;
 }
@@ -237,28 +236,28 @@ export interface SignUpEvent extends BaseEvent {
 /**
  * Logged on user successful login.
  */
-export interface LogInEvent extends BaseEvent {
+interface LogInEvent extends BaseEvent {
     type: EventType.LogInEvent;
 }
 
 /**
  * Logged on user successful logout.
  */
-export interface LogOutEvent extends BaseEvent {
+interface LogOutEvent extends BaseEvent {
     type: EventType.LogOutEvent;
 }
 
 /**
  * Logged on user resetting their credentials
  */
-export interface ResetCredentialsEvent extends BaseEvent {
+interface ResetCredentialsEvent extends BaseEvent {
     type: EventType.ResetCredentialsEvent;
 }
 
 /**
  * Logged on user successful search query.
  */
-export interface SearchEvent extends BaseEvent {
+interface SearchEvent extends BaseEvent {
     type: EventType.SearchEvent;
     query: string;
     entityTypeFilter?: EntityType;
@@ -271,7 +270,7 @@ export interface SearchEvent extends BaseEvent {
 /**
  * Logged on user successful search query from the home page.
  */
-export interface HomePageSearchEvent extends BaseEvent {
+interface HomePageSearchEvent extends BaseEvent {
     type: EventType.HomePageSearchEvent;
     query: string;
     entityTypeFilter?: EntityType;
@@ -283,7 +282,7 @@ export interface HomePageSearchEvent extends BaseEvent {
 /**
  * Logged on user search result click.
  */
-export interface SearchResultsViewEvent extends BaseEvent {
+interface SearchResultsViewEvent extends BaseEvent {
     type: EventType.SearchResultsViewEvent;
     query: string;
     entityTypeFilter?: EntityType;
@@ -299,7 +298,7 @@ export interface SearchResultsViewEvent extends BaseEvent {
 /**
  * Logged on user search result click.
  */
-export interface SearchResultClickEvent extends BaseEvent {
+interface SearchResultClickEvent extends BaseEvent {
     type: EventType.SearchResultClickEvent;
     query: string;
     entityUrn: string;
@@ -310,12 +309,12 @@ export interface SearchResultClickEvent extends BaseEvent {
     pageNumber: number;
 }
 
-export interface SearchFiltersClearAllEvent extends BaseEvent {
+interface SearchFiltersClearAllEvent extends BaseEvent {
     type: EventType.SearchFiltersClearAllEvent;
     total: number;
 }
 
-export interface SearchFiltersShowMoreEvent extends BaseEvent {
+interface SearchFiltersShowMoreEvent extends BaseEvent {
     type: EventType.SearchFiltersShowMoreEvent;
     activeFilterCount: number;
     hiddenFilterCount: number;
@@ -324,7 +323,7 @@ export interface SearchFiltersShowMoreEvent extends BaseEvent {
 /**
  * Logged on user browse result click.
  */
-export interface BrowseResultClickEvent extends BaseEvent {
+interface BrowseResultClickEvent extends BaseEvent {
     type: EventType.BrowseResultClickEvent;
     browsePath: string;
     entityType: EntityType;
@@ -336,7 +335,7 @@ export interface BrowseResultClickEvent extends BaseEvent {
 /**
  * Logged on user browse result click from the home page.
  */
-export interface HomePageBrowseResultClickEvent extends BaseEvent {
+interface HomePageBrowseResultClickEvent extends BaseEvent {
     type: EventType.HomePageBrowseResultClickEvent;
     entityType: EntityType;
 }
@@ -344,7 +343,7 @@ export interface HomePageBrowseResultClickEvent extends BaseEvent {
 /**
  * Logged when a user opens or closes the browse v2 sidebar
  */
-export interface BrowseV2ToggleSidebarEvent extends BaseEvent {
+interface BrowseV2ToggleSidebarEvent extends BaseEvent {
     type: EventType.BrowseV2ToggleSidebarEvent;
     action: 'open' | 'close';
 }
@@ -390,7 +389,7 @@ export interface BrowseV2EntityLinkClickEvent extends BaseEvent {
 /**
  * Logged when user views an entity profile.
  */
-export interface EntityViewEvent extends BaseEvent {
+interface EntityViewEvent extends BaseEvent {
     type: EventType.EntityViewEvent;
     entityType: EntityType;
     entityUrn: string;
@@ -399,7 +398,7 @@ export interface EntityViewEvent extends BaseEvent {
 /**
  * Logged when user views a particular section of an entity profile.
  */
-export interface EntitySectionViewEvent extends BaseEvent {
+interface EntitySectionViewEvent extends BaseEvent {
     type: EventType.EntitySectionViewEvent;
     entityType: EntityType;
     entityUrn: string;
@@ -434,7 +433,7 @@ export enum ExternalLinkType {
     Default = 'DEFAULT_EXTERNAL_URL',
 }
 
-export interface EntityActionEvent extends BaseEvent {
+interface EntityActionEvent extends BaseEvent {
     type: EventType.EntityActionEvent;
     actionType: string;
     entityType?: EntityType;
@@ -442,13 +441,13 @@ export interface EntityActionEvent extends BaseEvent {
     externalLinkType?: ExternalLinkType;
 }
 
-export interface BatchEntityActionEvent extends BaseEvent {
+interface BatchEntityActionEvent extends BaseEvent {
     type: EventType.BatchEntityActionEvent;
     actionType: string;
     entityUrns: string[];
 }
 
-export interface RecommendationImpressionEvent extends BaseEvent {
+interface RecommendationImpressionEvent extends BaseEvent {
     type: EventType.RecommendationImpressionEvent;
     moduleId: string;
     renderType: RecommendationRenderType;
@@ -456,7 +455,7 @@ export interface RecommendationImpressionEvent extends BaseEvent {
     // TODO: Determine whether we need to collect context parameters.
 }
 
-export interface RecommendationClickEvent extends BaseEvent {
+interface RecommendationClickEvent extends BaseEvent {
     type: EventType.RecommendationClickEvent;
     renderId: string; // TODO : Determine whether we need a render id to join with click event.
     moduleId: string;
@@ -465,7 +464,7 @@ export interface RecommendationClickEvent extends BaseEvent {
     index?: number;
 }
 
-export interface HomePageRecommendationClickEvent extends BaseEvent {
+interface HomePageRecommendationClickEvent extends BaseEvent {
     type: EventType.HomePageRecommendationClickEvent;
     renderId: string; // TODO : Determine whether we need a render id to join with click event.
     moduleId: string;
@@ -474,7 +473,7 @@ export interface HomePageRecommendationClickEvent extends BaseEvent {
     index?: number;
 }
 
-export interface VisualLineageViewEvent extends BaseEvent {
+interface VisualLineageViewEvent extends BaseEvent {
     type: EventType.VisualLineageViewEvent;
     entityType: EntityType;
     numUpstreams: number;
@@ -486,12 +485,12 @@ export interface VisualLineageViewEvent extends BaseEvent {
     hasExpandableDownstreamsV3?: boolean;
 }
 
-export interface VisualLineageExpandGraphEvent extends BaseEvent {
+interface VisualLineageExpandGraphEvent extends BaseEvent {
     type: EventType.VisualLineageExpandGraphEvent;
     targetEntityType?: EntityType;
 }
 
-export interface SearchAcrossLineageEvent extends BaseEvent {
+interface SearchAcrossLineageEvent extends BaseEvent {
     type: EventType.SearchAcrossLineageEvent;
     query: string;
     entityTypeFilter?: EntityType;
@@ -499,7 +498,7 @@ export interface SearchAcrossLineageEvent extends BaseEvent {
     originPath: string;
     maxDegree?: string;
 }
-export interface SearchAcrossLineageResultsViewEvent extends BaseEvent {
+interface SearchAcrossLineageResultsViewEvent extends BaseEvent {
     type: EventType.SearchAcrossLineageResultsViewEvent;
     query: string;
     entityTypeFilter?: EntityType;
@@ -511,7 +510,7 @@ export interface SearchAcrossLineageResultsViewEvent extends BaseEvent {
     isSchemaFieldContext?: boolean;
 }
 
-export interface DownloadAsCsvEvent extends BaseEvent {
+interface DownloadAsCsvEvent extends BaseEvent {
     type: EventType.DownloadAsCsvEvent;
     query: string;
     // optional parameter if its coming from inside an entity page
@@ -519,48 +518,48 @@ export interface DownloadAsCsvEvent extends BaseEvent {
     path: string;
 }
 
-export interface CreateAccessTokenEvent extends BaseEvent {
+interface CreateAccessTokenEvent extends BaseEvent {
     type: EventType.CreateAccessTokenEvent;
     accessTokenType: string;
     duration: string;
 }
 
-export interface RevokeAccessTokenEvent extends BaseEvent {
+interface RevokeAccessTokenEvent extends BaseEvent {
     type: EventType.RevokeAccessTokenEvent;
 }
 
-export interface CreateGroupEvent extends BaseEvent {
+interface CreateGroupEvent extends BaseEvent {
     type: EventType.CreateGroupEvent;
 }
-export interface CreateInviteLinkEvent extends BaseEvent {
+interface CreateInviteLinkEvent extends BaseEvent {
     type: EventType.CreateInviteLinkEvent;
     roleUrn?: string;
 }
 
-export interface CreateResetCredentialsLinkEvent extends BaseEvent {
+interface CreateResetCredentialsLinkEvent extends BaseEvent {
     type: EventType.CreateResetCredentialsLinkEvent;
     userUrn: string;
 }
 
-export interface DeleteEntityEvent extends BaseEvent {
+interface DeleteEntityEvent extends BaseEvent {
     type: EventType.DeleteEntityEvent;
     entityUrn: string;
     entityType: EntityType;
 }
 
-export interface SelectUserRoleEvent extends BaseEvent {
+interface SelectUserRoleEvent extends BaseEvent {
     type: EventType.SelectUserRoleEvent;
     roleUrn: string;
     userUrn: string;
 }
 
-export interface SelectGroupRoleEvent extends BaseEvent {
+interface SelectGroupRoleEvent extends BaseEvent {
     type: EventType.SelectGroupRoleEvent;
     roleUrn: string;
     groupUrn?: string;
 }
 
-export interface BatchSelectUserRoleEvent extends BaseEvent {
+interface BatchSelectUserRoleEvent extends BaseEvent {
     type: EventType.BatchSelectUserRoleEvent;
     roleUrn: string;
     userUrns: string[];
@@ -568,67 +567,67 @@ export interface BatchSelectUserRoleEvent extends BaseEvent {
 
 // Policy events
 
-export interface CreatePolicyEvent extends BaseEvent {
+interface CreatePolicyEvent extends BaseEvent {
     type: EventType.CreatePolicyEvent;
 }
 
-export interface UpdatePolicyEvent extends BaseEvent {
+interface UpdatePolicyEvent extends BaseEvent {
     type: EventType.UpdatePolicyEvent;
     policyUrn: string;
 }
 
-export interface DeactivatePolicyEvent extends BaseEvent {
+interface DeactivatePolicyEvent extends BaseEvent {
     type: EventType.DeactivatePolicyEvent;
     policyUrn: string;
 }
 
-export interface ActivatePolicyEvent extends BaseEvent {
+interface ActivatePolicyEvent extends BaseEvent {
     type: EventType.ActivatePolicyEvent;
     policyUrn: string;
 }
 
-export interface ShowSimplifiedHomepageEvent extends BaseEvent {
+interface ShowSimplifiedHomepageEvent extends BaseEvent {
     type: EventType.ShowSimplifiedHomepageEvent;
 }
 
-export interface ShowStandardHomepageEvent extends BaseEvent {
+interface ShowStandardHomepageEvent extends BaseEvent {
     type: EventType.ShowStandardHomepageEvent;
 }
 
-export interface ShowV2ThemeEvent extends BaseEvent {
+interface ShowV2ThemeEvent extends BaseEvent {
     type: EventType.ShowV2ThemeEvent;
 }
 
-export interface RevertV2ThemeEvent extends BaseEvent {
+interface RevertV2ThemeEvent extends BaseEvent {
     type: EventType.RevertV2ThemeEvent;
 }
 
-export interface HomePageExploreAllClickEvent extends BaseEvent {
+interface HomePageExploreAllClickEvent extends BaseEvent {
     type: EventType.HomePageExploreAllClickEvent;
 }
 
-export interface SearchBarExploreAllClickEvent extends BaseEvent {
+interface SearchBarExploreAllClickEvent extends BaseEvent {
     type: EventType.SearchBarExploreAllClickEvent;
 }
 
-export interface SearchResultsExploreAllClickEvent extends BaseEvent {
+interface SearchResultsExploreAllClickEvent extends BaseEvent {
     type: EventType.SearchResultsExploreAllClickEvent;
 }
 
 // Business glossary events
 
-export interface CreateGlossaryEntityEvent extends BaseEvent {
+interface CreateGlossaryEntityEvent extends BaseEvent {
     type: EventType.CreateGlossaryEntityEvent;
     entityType: EntityType;
     parentNodeUrn?: string;
 }
 
-export interface CreateDomainEvent extends BaseEvent {
+interface CreateDomainEvent extends BaseEvent {
     type: EventType.CreateDomainEvent;
     parentDomainUrn?: string;
 }
 
-export interface MoveDomainEvent extends BaseEvent {
+interface MoveDomainEvent extends BaseEvent {
     type: EventType.MoveDomainEvent;
     oldParentDomainUrn?: string;
     parentDomainUrn?: string;
@@ -636,38 +635,38 @@ export interface MoveDomainEvent extends BaseEvent {
 
 // Managed Ingestion Events
 
-export interface IngestionTestConnectionEvent extends BaseEvent {
+interface IngestionTestConnectionEvent extends BaseEvent {
     type: EventType.IngestionTestConnectionEvent;
     sourceType: string;
     sourceUrn?: string;
     outcome?: string;
 }
 
-export interface IngestionViewAllClickEvent extends BaseEvent {
+interface IngestionViewAllClickEvent extends BaseEvent {
     type: EventType.IngestionViewAllClickEvent;
     executionUrn?: string;
 }
 
-export interface IngestionViewAllClickWarningEvent extends BaseEvent {
+interface IngestionViewAllClickWarningEvent extends BaseEvent {
     type: EventType.IngestionViewAllClickWarningEvent;
     executionUrn?: string;
 }
 
-export interface IngestionExecutionResultViewedEvent extends BaseEvent {
+interface IngestionExecutionResultViewedEvent extends BaseEvent {
     type: EventType.IngestionExecutionResultViewedEvent;
     executionUrn: string;
     executionStatus: string;
     viewedSection: string;
 }
 
-export interface IngestionSourceConfigurationImpressionEvent extends BaseEvent {
+interface IngestionSourceConfigurationImpressionEvent extends BaseEvent {
     type: EventType.IngestionSourceConfigurationImpressionEvent;
     viewedSection: 'SELECT_TEMPLATE' | 'DEFINE_RECIPE' | 'CREATE_SCHEDULE' | 'NAME_SOURCE';
     sourceType?: string;
     sourceUrn?: string;
 }
 
-export interface CreateIngestionSourceEvent extends BaseEvent {
+interface CreateIngestionSourceEvent extends BaseEvent {
     type: EventType.CreateIngestionSourceEvent;
     sourceType: string;
     sourceUrn?: string;
@@ -676,7 +675,7 @@ export interface CreateIngestionSourceEvent extends BaseEvent {
     outcome?: string;
 }
 
-export interface UpdateIngestionSourceEvent extends BaseEvent {
+interface UpdateIngestionSourceEvent extends BaseEvent {
     type: EventType.UpdateIngestionSourceEvent;
     sourceType: string;
     sourceUrn: string;
@@ -685,22 +684,22 @@ export interface UpdateIngestionSourceEvent extends BaseEvent {
     outcome?: string;
 }
 
-export interface DeleteIngestionSourceEvent extends BaseEvent {
+interface DeleteIngestionSourceEvent extends BaseEvent {
     type: EventType.DeleteIngestionSourceEvent;
 }
 
-export interface ExecuteIngestionSourceEvent extends BaseEvent {
+interface ExecuteIngestionSourceEvent extends BaseEvent {
     type: EventType.ExecuteIngestionSourceEvent;
     sourceType?: string;
     sourceUrn?: string;
 }
 
 // TODO: Find a way to use this event
-export interface SsoEvent extends BaseEvent {
+interface SsoEvent extends BaseEvent {
     type: EventType.SsoEvent;
 }
 
-export interface ManuallyCreateLineageEvent extends BaseEvent {
+interface ManuallyCreateLineageEvent extends BaseEvent {
     type: EventType.ManuallyCreateLineageEvent;
     direction: Direction;
     sourceEntityType?: EntityType;
@@ -709,7 +708,7 @@ export interface ManuallyCreateLineageEvent extends BaseEvent {
     destinationEntityPlatform?: string;
 }
 
-export interface ManuallyDeleteLineageEvent extends BaseEvent {
+interface ManuallyDeleteLineageEvent extends BaseEvent {
     type: EventType.ManuallyDeleteLineageEvent;
     direction: Direction;
     sourceEntityType?: EntityType;
@@ -721,7 +720,7 @@ export interface ManuallyDeleteLineageEvent extends BaseEvent {
 /**
  * Emitted when a new View is created.
  */
-export interface CreateViewEvent extends BaseEvent {
+interface CreateViewEvent extends BaseEvent {
     type: EventType.CreateViewEvent;
     viewType?: DataHubViewType;
     filterFields: string[];
@@ -732,7 +731,7 @@ export interface CreateViewEvent extends BaseEvent {
 /**
  * Emitted when an existing View is updated.
  */
-export interface UpdateViewEvent extends BaseEvent {
+interface UpdateViewEvent extends BaseEvent {
     type: EventType.UpdateViewEvent;
     viewType?: DataHubViewType;
     urn: string;
@@ -744,7 +743,7 @@ export interface UpdateViewEvent extends BaseEvent {
 /**
  * Emitted when a user sets or clears their personal default view.
  */
-export interface SetUserDefaultViewEvent extends BaseEvent {
+interface SetUserDefaultViewEvent extends BaseEvent {
     type: EventType.SetUserDefaultViewEvent;
     urn: string | null;
     viewType: DataHubViewType | null;
@@ -753,36 +752,36 @@ export interface SetUserDefaultViewEvent extends BaseEvent {
 /**
  * Emitted when a user sets or clears the global default view.
  */
-export interface SetGlobalDefaultViewEvent extends BaseEvent {
+interface SetGlobalDefaultViewEvent extends BaseEvent {
     type: EventType.SetGlobalDefaultViewEvent;
     urn: string | null;
 }
 
-export interface LineageGraphTimeRangeSelectionEvent extends BaseEvent {
+interface LineageGraphTimeRangeSelectionEvent extends BaseEvent {
     type: EventType.LineageGraphTimeRangeSelectionEvent;
     relativeStartDate: string;
     relativeEndDate: string;
 }
 
-export interface LineageTabTimeRangeSelectionEvent extends BaseEvent {
+interface LineageTabTimeRangeSelectionEvent extends BaseEvent {
     type: EventType.LineageTabTimeRangeSelectionEvent;
     relativeStartDate: string;
     relativeEndDate: string;
 }
 
-export interface CreateQueryEvent extends BaseEvent {
+interface CreateQueryEvent extends BaseEvent {
     type: EventType.CreateQueryEvent;
 }
 
-export interface UpdateQueryEvent extends BaseEvent {
+interface UpdateQueryEvent extends BaseEvent {
     type: EventType.UpdateQueryEvent;
 }
 
-export interface DeleteQueryEvent extends BaseEvent {
+interface DeleteQueryEvent extends BaseEvent {
     type: EventType.DeleteQueryEvent;
 }
 
-export interface SelectAutoCompleteOption extends BaseEvent {
+interface SelectAutoCompleteOption extends BaseEvent {
     type: EventType.SelectAutoCompleteOption;
     optionType: string;
     entityType?: EntityType;
@@ -791,52 +790,51 @@ export interface SelectAutoCompleteOption extends BaseEvent {
     apiVariant?: SearchBarApi;
 }
 
-export interface SelectQuickFilterEvent extends BaseEvent {
+interface SelectQuickFilterEvent extends BaseEvent {
     type: EventType.SelectQuickFilterEvent;
     quickFilterType: string;
     quickFilterValue: string;
 }
 
-export interface DeselectQuickFilterEvent extends BaseEvent {
+interface DeselectQuickFilterEvent extends BaseEvent {
     type: EventType.DeselectQuickFilterEvent;
     quickFilterType: string;
     quickFilterValue: string;
 }
 
-export interface EmbedProfileViewEvent extends BaseEvent {
+interface EmbedProfileViewEvent extends BaseEvent {
     type: EventType.EmbedProfileViewEvent;
     entityType: string;
     entityUrn: string;
 }
 
-export interface EmbedProfileViewInDataHubEvent extends BaseEvent {
+interface EmbedProfileViewInDataHubEvent extends BaseEvent {
     type: EventType.EmbedProfileViewInDataHubEvent;
     entityType: string;
     entityUrn: string;
 }
 
-export interface EmbedLookupNotFoundEvent extends BaseEvent {
+interface EmbedLookupNotFoundEvent extends BaseEvent {
     type: EventType.EmbedLookupNotFoundEvent;
     url: string;
     reason: EmbedLookupNotFoundReason;
 }
 
-export interface CreateBusinessAttributeEvent extends BaseEvent {
+interface CreateBusinessAttributeEvent extends BaseEvent {
     type: EventType.CreateBusinessAttributeEvent;
     name: string;
 }
 
 export enum DocRequestCTASource {
-    TaskCenter = 'TaskCenter',
     AssetPage = 'AssetPage',
 }
 
-export interface ClickDocRequestCTA extends BaseEvent {
+interface ClickDocRequestCTA extends BaseEvent {
     type: EventType.ClickDocRequestCTA;
     source: DocRequestCTASource;
 }
 
-export interface ExpandLineageEvent extends BaseEvent {
+interface ExpandLineageEvent extends BaseEvent {
     type: EventType.ExpandLineageEvent;
     direction: LineageDirection;
     levelsExpanded: '1' | 'all';
@@ -844,14 +842,14 @@ export interface ExpandLineageEvent extends BaseEvent {
     entityType: EntityType;
 }
 
-export interface ContractLineageEvent extends BaseEvent {
+interface ContractLineageEvent extends BaseEvent {
     type: EventType.ContractLineageEvent;
     direction: LineageDirection;
     entityUrn: string;
     entityType?: EntityType;
 }
 
-export interface ShowHideLineageColumnsEvent extends BaseEvent {
+interface ShowHideLineageColumnsEvent extends BaseEvent {
     type: EventType.ShowHideLineageColumnsEvent;
     action: 'show' | 'hide';
     entityUrn: string;
@@ -859,14 +857,14 @@ export interface ShowHideLineageColumnsEvent extends BaseEvent {
     entityPlatformUrn?: string;
 }
 
-export interface SearchLineageColumnsEvent extends BaseEvent {
+interface SearchLineageColumnsEvent extends BaseEvent {
     type: EventType.SearchLineageColumnsEvent;
     entityUrn: string;
     entityType: EntityType;
     searchTextLength: number;
 }
 
-export interface FilterLineageColumnsEvent extends BaseEvent {
+interface FilterLineageColumnsEvent extends BaseEvent {
     type: EventType.FilterLineageColumnsEvent;
     action: 'enable' | 'disable';
     entityUrn: string;
@@ -874,7 +872,7 @@ export interface FilterLineageColumnsEvent extends BaseEvent {
     shownCount: number;
 }
 
-export interface DrillDownLineageEvent extends BaseEvent {
+interface DrillDownLineageEvent extends BaseEvent {
     type: EventType.DrillDownLineageEvent;
     action: 'select' | 'deselect';
     entityUrn: string;
@@ -884,7 +882,7 @@ export interface DrillDownLineageEvent extends BaseEvent {
     dataType?: string;
 }
 
-export interface CreateStructuredPropertyClickEvent extends BaseEvent {
+interface CreateStructuredPropertyClickEvent extends BaseEvent {
     type: EventType.CreateStructuredPropertyClickEvent;
 }
 
@@ -904,21 +902,21 @@ interface StructuredPropertyEvent extends BaseEvent {
     showInColumnsTable: boolean;
 }
 
-export interface CreateStructuredPropertyEvent extends StructuredPropertyEvent {
+interface CreateStructuredPropertyEvent extends StructuredPropertyEvent {
     type: EventType.CreateStructuredPropertyEvent;
 }
 
-export interface EditStructuredPropertyEvent extends StructuredPropertyEvent {
+interface EditStructuredPropertyEvent extends StructuredPropertyEvent {
     type: EventType.EditStructuredPropertyEvent;
     propertyUrn: string;
 }
 
-export interface DeleteStructuredPropertyEvent extends StructuredPropertyEvent {
+interface DeleteStructuredPropertyEvent extends StructuredPropertyEvent {
     type: EventType.DeleteStructuredPropertyEvent;
     propertyUrn: string;
 }
 
-export interface ViewStructuredPropertyEvent extends BaseEvent {
+interface ViewStructuredPropertyEvent extends BaseEvent {
     type: EventType.ViewStructuredPropertyEvent;
     propertyUrn: string;
 }
@@ -929,21 +927,21 @@ interface StructuredPropertyOnAssetEvent extends BaseEvent {
     assetUrn: string;
     assetType: EntityType;
 }
-export interface ApplyStructuredPropertyEvent extends StructuredPropertyOnAssetEvent {
+interface ApplyStructuredPropertyEvent extends StructuredPropertyOnAssetEvent {
     type: EventType.ApplyStructuredPropertyEvent;
     values: PropertyValueInput[];
 }
 
-export interface UpdateStructuredPropertyOnAssetEvent extends StructuredPropertyOnAssetEvent {
+interface UpdateStructuredPropertyOnAssetEvent extends StructuredPropertyOnAssetEvent {
     type: EventType.UpdateStructuredPropertyOnAssetEvent;
     values: PropertyValueInput[];
 }
 
-export interface RemoveStructuredPropertyEvent extends StructuredPropertyOnAssetEvent {
+interface RemoveStructuredPropertyEvent extends StructuredPropertyOnAssetEvent {
     type: EventType.RemoveStructuredPropertyEvent;
 }
 
-export interface LinkAssetVersionEvent extends BaseEvent {
+interface LinkAssetVersionEvent extends BaseEvent {
     type: EventType.LinkAssetVersionEvent;
     newAssetUrn: string;
     oldAssetUrn?: string;
@@ -951,14 +949,14 @@ export interface LinkAssetVersionEvent extends BaseEvent {
     entityType: EntityType;
 }
 
-export interface UnlinkAssetVersionEvent extends BaseEvent {
+interface UnlinkAssetVersionEvent extends BaseEvent {
     type: EventType.UnlinkAssetVersionEvent;
     assetUrn: string;
     versionSetUrn?: string;
     entityType: EntityType;
 }
 
-export interface ShowAllVersionsEvent extends BaseEvent {
+interface ShowAllVersionsEvent extends BaseEvent {
     type: EventType.ShowAllVersionsEvent;
     assetUrn: string;
     versionSetUrn?: string;
@@ -967,12 +965,12 @@ export interface ShowAllVersionsEvent extends BaseEvent {
     uiLocation: 'preview' | 'more-options';
 }
 
-export interface ClickUserProfileEvent extends BaseEvent {
+interface ClickUserProfileEvent extends BaseEvent {
     type: EventType.ClickUserProfile;
     location?: 'statsTabTopUsers'; // add more locations here
 }
 
-export interface ClickViewDocumentationEvent extends BaseEvent {
+interface ClickViewDocumentationEvent extends BaseEvent {
     type: EventType.ClickViewDocumentation;
     link: string;
     location: 'statsTab'; // add more locations here
@@ -983,10 +981,9 @@ export enum HomePageModule {
     Discover = 'Discover',
     Announcements = 'Announcements',
     PersonalSidebar = 'PersonalSidebar',
-    SidebarAnnouncements = 'SidebarAnnouncements',
-}
+    }
 
-export interface HomePageClickEvent extends BaseEvent {
+interface HomePageClickEvent extends BaseEvent {
     type: EventType.HomePageClick;
     module: HomePageModule;
     section?: string;
@@ -994,67 +991,67 @@ export interface HomePageClickEvent extends BaseEvent {
     value?: string; // what was actually clicked ie. an entity urn to go to a page, or "View all" for a section
 }
 
-export interface SearchBarFilterEvent extends BaseEvent {
+interface SearchBarFilterEvent extends BaseEvent {
     type: EventType.SearchBarFilter;
     field: string; // the filter field
     values: string[]; // the values being filtered for
 }
 
-export interface NavBarExpandCollapseEvent extends BaseEvent {
+interface NavBarExpandCollapseEvent extends BaseEvent {
     type: EventType.NavBarExpandCollapse;
     isExpanding: boolean; // whether this action is expanding or collapsing the nav bar
 }
 
-export interface NavBarItemClickEvent extends BaseEvent {
+interface NavBarItemClickEvent extends BaseEvent {
     type: EventType.NavBarItemClick;
     label: string; // the label of the item that is clicks from the nav sidebar
 }
 
-export interface FilterStatsPageEvent extends BaseEvent {
+interface FilterStatsPageEvent extends BaseEvent {
     type: EventType.FilterStatsPage;
     platform: string | null;
 }
 
-export interface FilterStatsChartLookBackEvent extends BaseEvent {
+interface FilterStatsChartLookBackEvent extends BaseEvent {
     type: EventType.FilterStatsChartLookBack;
     lookBackValue: string;
     chartName: string;
 }
 
-export interface WelcomeToDataHubModalViewEvent extends BaseEvent {
+interface WelcomeToDataHubModalViewEvent extends BaseEvent {
     type: EventType.WelcomeToDataHubModalViewEvent;
 }
 
-export interface WelcomeToDataHubModalInteractEvent extends BaseEvent {
+interface WelcomeToDataHubModalInteractEvent extends BaseEvent {
     type: EventType.WelcomeToDataHubModalInteractEvent;
     currentSlide: number;
     totalSlides: number;
 }
 
-export interface WelcomeToDataHubModalExitEvent extends BaseEvent {
+interface WelcomeToDataHubModalExitEvent extends BaseEvent {
     type: EventType.WelcomeToDataHubModalExitEvent;
     currentSlide: number;
     totalSlides: number;
     exitMethod: 'close_button' | 'get_started_button' | 'outside_click' | 'escape_key';
 }
 
-export interface WelcomeToDataHubModalClickViewDocumentationEvent extends BaseEvent {
+interface WelcomeToDataHubModalClickViewDocumentationEvent extends BaseEvent {
     type: EventType.WelcomeToDataHubModalClickViewDocumentationEvent;
     url: string;
 }
 
-export interface ProductTourButtonClickEvent extends BaseEvent {
+interface ProductTourButtonClickEvent extends BaseEvent {
     type: EventType.ProductTourButtonClickEvent;
     originPage: string; // Page where the button was clicked
 }
 
-export interface ClickProductUpdateEvent extends BaseEvent {
+interface ClickProductUpdateEvent extends BaseEvent {
     type: EventType.ClickProductUpdate;
     id: string;
     url: string;
 }
 
-export interface HomePageTemplateModuleCreateEvent extends BaseEvent {
+interface HomePageTemplateModuleCreateEvent extends BaseEvent {
     type: EventType.HomePageTemplateModuleCreate;
     templateUrn: string;
     isPersonal: boolean;
@@ -1062,7 +1059,7 @@ export interface HomePageTemplateModuleCreateEvent extends BaseEvent {
     location: PageTemplateSurfaceType;
 }
 
-export interface HomePageTemplateModuleAddEvent extends BaseEvent {
+interface HomePageTemplateModuleAddEvent extends BaseEvent {
     type: EventType.HomePageTemplateModuleAdd;
     templateUrn: string;
     isPersonal: boolean;
@@ -1070,7 +1067,7 @@ export interface HomePageTemplateModuleAddEvent extends BaseEvent {
     location: PageTemplateSurfaceType;
 }
 
-export interface HomePageTemplateModuleUpdateEvent extends BaseEvent {
+interface HomePageTemplateModuleUpdateEvent extends BaseEvent {
     type: EventType.HomePageTemplateModuleUpdate;
     templateUrn: string;
     isPersonal: boolean;
@@ -1078,7 +1075,7 @@ export interface HomePageTemplateModuleUpdateEvent extends BaseEvent {
     location: PageTemplateSurfaceType;
 }
 
-export interface HomePageTemplateModuleDeleteEvent extends BaseEvent {
+interface HomePageTemplateModuleDeleteEvent extends BaseEvent {
     type: EventType.HomePageTemplateModuleDelete;
     templateUrn: string;
     isPersonal: boolean;
@@ -1086,99 +1083,99 @@ export interface HomePageTemplateModuleDeleteEvent extends BaseEvent {
     location: PageTemplateSurfaceType;
 }
 
-export interface HomePageTemplateModuleMoveEvent extends BaseEvent {
+interface HomePageTemplateModuleMoveEvent extends BaseEvent {
     type: EventType.HomePageTemplateModuleMove;
     templateUrn: string;
     isPersonal: boolean;
     location: PageTemplateSurfaceType;
 }
 
-export interface HomePageTemplateModuleModalCreateOpenEvent extends BaseEvent {
+interface HomePageTemplateModuleModalCreateOpenEvent extends BaseEvent {
     type: EventType.HomePageTemplateModuleModalCreateOpen;
     moduleType: DataHubPageModuleType;
     location: PageTemplateSurfaceType;
 }
 
-export interface HomePageTemplateModuleModalEditOpenEvent extends BaseEvent {
+interface HomePageTemplateModuleModalEditOpenEvent extends BaseEvent {
     type: EventType.HomePageTemplateModuleModalEditOpen;
     moduleType: DataHubPageModuleType;
     location: PageTemplateSurfaceType;
 }
 
-export interface HomePageTemplateModuleModalCancelEvent extends BaseEvent {
+interface HomePageTemplateModuleModalCancelEvent extends BaseEvent {
     type: EventType.HomePageTemplateModuleModalCancel;
     moduleType: DataHubPageModuleType;
     location: PageTemplateSurfaceType;
 }
 
-export interface HomePageTemplateGlobalTemplateEditingStartEvent extends BaseEvent {
+interface HomePageTemplateGlobalTemplateEditingStartEvent extends BaseEvent {
     type: EventType.HomePageTemplateGlobalTemplateEditingStart;
 }
 
-export interface HomePageTemplateGlobalTemplateEditingDoneEvent extends BaseEvent {
+interface HomePageTemplateGlobalTemplateEditingDoneEvent extends BaseEvent {
     type: EventType.HomePageTemplateGlobalTemplateEditingDone;
 }
 
-export interface HomePageTemplateResetToGlobalTemplateEvent extends BaseEvent {
+interface HomePageTemplateResetToGlobalTemplateEvent extends BaseEvent {
     type: EventType.HomePageTemplateResetToGlobalTemplate;
 }
 
-export interface HomePageTemplateModuleAssetClickEvent extends BaseEvent {
+interface HomePageTemplateModuleAssetClickEvent extends BaseEvent {
     type: EventType.HomePageTemplateModuleAssetClick;
     moduleType: DataHubPageModuleType;
     assetUrn: string;
     location: PageTemplateSurfaceType;
 }
 
-export interface HomePageTemplateModuleExpandClickEvent extends BaseEvent {
+interface HomePageTemplateModuleExpandClickEvent extends BaseEvent {
     type: EventType.HomePageTemplateModuleExpandClick;
     moduleType: DataHubPageModuleType;
     assetUrn: string;
     location: PageTemplateSurfaceType;
 }
 
-export interface HomePageTemplateModuleViewAllClickEvent extends BaseEvent {
+interface HomePageTemplateModuleViewAllClickEvent extends BaseEvent {
     type: EventType.HomePageTemplateModuleViewAllClick;
     moduleType: DataHubPageModuleType;
     location: PageTemplateSurfaceType;
 }
 
-export interface HomePageTemplateModuleLinkClickEvent extends BaseEvent {
+interface HomePageTemplateModuleLinkClickEvent extends BaseEvent {
     type: EventType.HomePageTemplateModuleLinkClick;
     link: string;
 }
 
-export interface HomePageTemplateModuleAnnouncementDismissEvent extends BaseEvent {
+interface HomePageTemplateModuleAnnouncementDismissEvent extends BaseEvent {
     type: EventType.HomePageTemplateModuleAnnouncementDismiss;
 }
 
-export interface SetDeprecationEvent extends BaseEvent {
+interface SetDeprecationEvent extends BaseEvent {
     type: EventType.SetDeprecation;
     entityUrns: string[];
     deprecated: boolean;
     resources?: ResourceRefInput[];
 }
 
-export interface AssetPageAddSummaryElementEvent extends BaseEvent {
+interface AssetPageAddSummaryElementEvent extends BaseEvent {
     type: EventType.AssetPageAddSummaryElement;
     templateUrn: string;
     elementType: SummaryElementType;
 }
 
-export interface AssetPageRemoveSummaryElementEvent extends BaseEvent {
+interface AssetPageRemoveSummaryElementEvent extends BaseEvent {
     type: EventType.AssetPageRemoveSummaryElement;
     templateUrn: string;
     elementType: SummaryElementType;
 }
 
-export interface AssetPageReplaceSummaryElementEvent extends BaseEvent {
+interface AssetPageReplaceSummaryElementEvent extends BaseEvent {
     type: EventType.AssetPageReplaceSummaryElement;
     templateUrn: string;
     currentElementType: SummaryElementType;
     newElementType: SummaryElementType;
 }
 
-export interface FileUploadAttemptEvent extends BaseEvent {
+interface FileUploadAttemptEvent extends BaseEvent {
     type: EventType.FileUploadAttemptEvent;
     fileType: string;
     fileSize: number;
@@ -1188,7 +1185,7 @@ export interface FileUploadAttemptEvent extends BaseEvent {
     schemaFieldUrn?: string;
 }
 
-export interface FileUploadFailedEvent extends BaseEvent {
+interface FileUploadFailedEvent extends BaseEvent {
     type: EventType.FileUploadFailedEvent;
     fileType: string;
     fileSize: number;
@@ -1200,7 +1197,7 @@ export interface FileUploadFailedEvent extends BaseEvent {
     comment?: string;
 }
 
-export interface FileUploadSucceededEvent extends BaseEvent {
+interface FileUploadSucceededEvent extends BaseEvent {
     type: EventType.FileUploadSucceededEvent;
     fileType: string;
     fileSize: number;
@@ -1210,7 +1207,7 @@ export interface FileUploadSucceededEvent extends BaseEvent {
     schemaFieldUrn?: string;
 }
 
-export interface FileDownloadViewEvent extends BaseEvent {
+interface FileDownloadViewEvent extends BaseEvent {
     type: EventType.FileDownloadViewEvent;
     // These fields aren't accessible while downloading
     // fileType: string;
diff --git a/datahub-web-react/src/app/analytics/plugin/mixpanel.ts b/datahub-web-react/src/app/analytics/plugin/mixpanel.ts
index 755f8c825ea7b1..02cb1b276e9ae0 100644
--- a/datahub-web-react/src/app/analytics/plugin/mixpanel.ts
+++ b/datahub-web-react/src/app/analytics/plugin/mixpanel.ts
@@ -6,7 +6,7 @@ const mixpanelConfigs = analyticsConfig.mixpanel;
 const isEnabled: boolean = mixpanelConfigs || false;
 const token = isEnabled ? mixpanelConfigs.token : undefined;
 
-export const getMixpanelPlugin = (t: string) => {
+const getMixpanelPlugin = (t: string) => {
     // Mixpanel does not really have a page view event.
     // (Technically they have $mp_web_page_view as per
     // https://github.com/mixpanel/mixpanel-js/blob/41e7958af75263a1dc00e960952c27ca655579b2/src/mixpanel-core.js#L1269
diff --git a/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx b/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx
index ccd17a69051452..21cf0a40fa66bf 100644
--- a/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx
+++ b/datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx
@@ -9,15 +9,14 @@ import { useUserContext } from '@app/context/useUserContext';
 import { ANTD_GRAY } from '@app/entity/shared/constants';
 import filterSearchQuery from '@app/search/utils/filterSearchQuery';
 import { Message } from '@app/shared/Message';
-import { useIsThemeV2 } from '@app/useIsThemeV2';
 import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
 
 import { useGetAnalyticsChartsQuery, useGetMetadataAnalyticsChartsQuery } from '@graphql/analytics.generated';
 import { useListDomainsQuery } from '@graphql/domain.generated';
 import { useGetHighlightsQuery } from '@graphql/highlights.generated';
 
-const PageContainer = styled.div<{ isV2: boolean; $isShowNavBarRedesign?: boolean }>`
-    background-color: ${(props) => (props.isV2 ? '#fff' : 'inherit')};
+const PageContainer = styled.div<{ $isShowNavBarRedesign?: boolean }>`
+    background-color: #fff;
     ${(props) =>
         props.$isShowNavBarRedesign &&
         `
@@ -29,12 +28,12 @@ const PageContainer = styled.div<{ isV2: boolean; $isShowNavBarRedesign?: boolea
     ${(props) =>
         !props.$isShowNavBarRedesign &&
         `
-        margin-right: ${props.isV2 ? '24px' : '0'};
-        margin-bottom: ${props.isV2 ? '24px' : '0'};
+        margin-right: 24px;
+        margin-bottom: 24px;
     `}
     border-radius: ${(props) => {
-        if (props.isV2 && props.$isShowNavBarRedesign) return props.theme.styles['border-radius-navbar-redesign'];
-        return props.isV2 ? '8px' : '0';
+        if (props.$isShowNavBarRedesign) return props.theme.styles['border-radius-navbar-redesign'];
+        return '8px';
     }};
 `;
 
@@ -75,7 +74,6 @@ const StyledSearchBar = styled(Input)`
 `;
 
 export const AnalyticsPage = () => {
-    const isV2 = useIsThemeV2();
     const isShowNavBarRedesign = useShowNavBarRedesign();
     const me = useUserContext();
     const canManageDomains = me?.platformPrivileges?.createDomains;
@@ -118,7 +116,7 @@ export const AnalyticsPage = () => {
 
     const isLoading = highlightLoading || chartLoading || domainLoading || metadataAnalyticsLoading;
     return (
-        <PageContainer isV2={isV2} $isShowNavBarRedesign={isShowNavBarRedesign}>
+        <PageContainer $isShowNavBarRedesign={isShowNavBarRedesign}>
             {isLoading && <Message type="loading" content="Loading…" style={{ marginTop: '10%' }} />}
             <HighlightGroup>
                 {highlightError && (
diff --git a/datahub-web-react/src/app/applications/CreateNewApplicationModal/ApplicationDetailsSection.tsx b/datahub-web-react/src/app/applications/CreateNewApplicationModal/ApplicationDetailsSection.tsx
index 09f5dc1f90908f..5c0dd5c815cbae 100644
--- a/datahub-web-react/src/app/applications/CreateNewApplicationModal/ApplicationDetailsSection.tsx
+++ b/datahub-web-react/src/app/applications/CreateNewApplicationModal/ApplicationDetailsSection.tsx
@@ -2,7 +2,7 @@ import { Input } from '@components';
 import React from 'react';
 import styled from 'styled-components';
 
-export interface ApplicationDetailsProps {
+interface ApplicationDetailsProps {
     applicationName: string;
     setApplicationName: React.Dispatch<React.SetStateAction<string>>;
     applicationDescription: string;
diff --git a/datahub-web-react/src/app/auth/LogIn.tsx b/datahub-web-react/src/app/auth/LogIn.tsx
index 4ad99d03cdd2e1..ddd2a8c47d179f 100644
--- a/datahub-web-react/src/app/auth/LogIn.tsx
+++ b/datahub-web-react/src/app/auth/LogIn.tsx
@@ -63,7 +63,7 @@ const SsoTextSpan = styled.span`
     padding-top: 6px;
 `;
 
-export type LogInProps = Record<string, never>;
+type LogInProps = Record<string, never>;
 
 export const LogIn: React.VFC<LogInProps> = () => {
     const isLoggedIn = useReactiveVar(isLoggedInVar);
diff --git a/datahub-web-react/src/app/auth/ResetCredentials.tsx b/datahub-web-react/src/app/auth/ResetCredentials.tsx
index e66663d39717bb..0f1acc21f93ea0 100644
--- a/datahub-web-react/src/app/auth/ResetCredentials.tsx
+++ b/datahub-web-react/src/app/auth/ResetCredentials.tsx
@@ -50,7 +50,7 @@ const StyledFormItem = styled(Form.Item)`
     }
 `;
 
-export type ResetCredentialsProps = Record<string, never>;
+type ResetCredentialsProps = Record<string, never>;
 
 export const ResetCredentials: React.VFC<ResetCredentialsProps> = () => {
     const isLoggedIn = useReactiveVar(isLoggedInVar);
diff --git a/datahub-web-react/src/app/auth/SignUp.tsx b/datahub-web-react/src/app/auth/SignUp.tsx
index bbcc2a5c228630..8b6b569cb2c08b 100644
--- a/datahub-web-react/src/app/auth/SignUp.tsx
+++ b/datahub-web-react/src/app/auth/SignUp.tsx
@@ -65,7 +65,7 @@ const StyledFormItem = styled(Form.Item)`
     }
 `;
 
-export type SignUpProps = Record<string, never>;
+type SignUpProps = Record<string, never>;
 
 export const SignUp: React.VFC<SignUpProps> = () => {
     const history = useHistory();
diff --git a/datahub-web-react/src/app/browse/BrowseResultCard.tsx b/datahub-web-react/src/app/browse/BrowseResultCard.tsx
index fc248d15637ce3..bcdbff95bcff6d 100644
--- a/datahub-web-react/src/app/browse/BrowseResultCard.tsx
+++ b/datahub-web-react/src/app/browse/BrowseResultCard.tsx
@@ -21,7 +21,7 @@ const ResultCard = styled(Card)`
     }
 `;
 
-export interface BrowseResultProps {
+interface BrowseResultProps {
     url: string;
     name: string;
     count?: number | undefined;
diff --git a/datahub-web-react/src/app/buildEntityRegistry.ts b/datahub-web-react/src/app/buildEntityRegistry.ts
deleted file mode 100644
index fd1c0b69384fe8..00000000000000
--- a/datahub-web-react/src/app/buildEntityRegistry.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { RoleEntity } from '@app/entity/Access/RoleEntity';
-import EntityRegistry from '@app/entity/EntityRegistry';
-import { ApplicationEntity } from '@app/entity/application/ApplicationEntity';
-import { BusinessAttributeEntity } from '@app/entity/businessAttribute/BusinessAttributeEntity';
-import { ChartEntity } from '@app/entity/chart/ChartEntity';
-import { ContainerEntity } from '@app/entity/container/ContainerEntity';
-import { DashboardEntity } from '@app/entity/dashboard/DashboardEntity';
-import { DataContractEntity } from '@app/entity/dataContract/DataContractEntity';
-import { DataFlowEntity } from '@app/entity/dataFlow/DataFlowEntity';
-import { DataJobEntity } from '@app/entity/dataJob/DataJobEntity';
-import { DataPlatformEntity } from '@app/entity/dataPlatform/DataPlatformEntity';
-import { DataPlatformInstanceEntity } from '@app/entity/dataPlatformInstance/DataPlatformInstanceEntity';
-import { DataProcessInstanceEntity } from '@app/entity/dataProcessInstance/DataProcessInstanceEntity';
-import { DataProductEntity } from '@app/entity/dataProduct/DataProductEntity';
-import { DatasetEntity } from '@app/entity/dataset/DatasetEntity';
-import { DomainEntity } from '@app/entity/domain/DomainEntity';
-import { ERModelRelationshipEntity } from '@app/entity/ermodelrelationships/ERModelRelationshipEntity';
-import GlossaryNodeEntity from '@app/entity/glossaryNode/GlossaryNodeEntity';
-import { GlossaryTermEntity } from '@app/entity/glossaryTerm/GlossaryTermEntity';
-import { GroupEntity } from '@app/entity/group/Group';
-import { MLFeatureEntity } from '@app/entity/mlFeature/MLFeatureEntity';
-import { MLFeatureTableEntity } from '@app/entity/mlFeatureTable/MLFeatureTableEntity';
-import { MLModelEntity } from '@app/entity/mlModel/MLModelEntity';
-import { MLModelGroupEntity } from '@app/entity/mlModelGroup/MLModelGroupEntity';
-import { MLPrimaryKeyEntity } from '@app/entity/mlPrimaryKey/MLPrimaryKeyEntity';
-import { RestrictedEntity } from '@app/entity/restricted/RestrictedEntity';
-import { SchemaFieldPropertiesEntity } from '@app/entity/schemaField/SchemaFieldPropertiesEntity';
-import { StructuredPropertyEntity } from '@app/entity/structuredProperty/StructuredPropertyEntity';
-import { TagEntity } from '@app/entity/tag/Tag';
-import { UserEntity } from '@app/entity/user/User';
-
-export default function buildEntityRegistry() {
-    const registry = new EntityRegistry();
-    registry.register(new DatasetEntity());
-    registry.register(new DataContractEntity());
-    registry.register(new DashboardEntity());
-    registry.register(new ChartEntity());
-    registry.register(new UserEntity());
-    registry.register(new GroupEntity());
-    registry.register(new TagEntity());
-    registry.register(new DataFlowEntity());
-    registry.register(new DataJobEntity());
-    registry.register(new GlossaryTermEntity());
-    registry.register(new MLFeatureEntity());
-    registry.register(new MLPrimaryKeyEntity());
-    registry.register(new MLFeatureTableEntity());
-    registry.register(new MLModelEntity());
-    registry.register(new MLModelGroupEntity());
-    registry.register(new DomainEntity());
-    registry.register(new ContainerEntity());
-    registry.register(new GlossaryNodeEntity());
-    registry.register(new RoleEntity());
-    registry.register(new DataPlatformEntity());
-    registry.register(new DataProductEntity());
-    registry.register(new DataPlatformInstanceEntity());
-    registry.register(new ERModelRelationshipEntity());
-    registry.register(new RestrictedEntity());
-    registry.register(new BusinessAttributeEntity());
-    registry.register(new SchemaFieldPropertiesEntity());
-    registry.register(new StructuredPropertyEntity());
-    registry.register(new DataProcessInstanceEntity());
-    registry.register(new ApplicationEntity());
-    return registry;
-}
diff --git a/datahub-web-react/src/app/businessAttribute/AttributeBrowser.tsx b/datahub-web-react/src/app/businessAttribute/AttributeBrowser.tsx
deleted file mode 100644
index 451ff4f2050fd7..00000000000000
--- a/datahub-web-react/src/app/businessAttribute/AttributeBrowser.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import React, { useEffect } from 'react';
-import styled from 'styled-components/macro';
-
-import AttributeItem from '@app/businessAttribute/AttributeItem';
-import { sortBusinessAttributes } from '@app/businessAttribute/businessAttributeUtils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { ListBusinessAttributesQuery, useListBusinessAttributesQuery } from '@graphql/businessAttribute.generated';
-
-const BrowserWrapper = styled.div`
-    color: #262626;
-    font-size: 12px;
-    max-height: calc(100% - 47px);
-    padding: 10px 20px 20px 20px;
-    overflow: auto;
-`;
-
-interface Props {
-    isSelecting?: boolean;
-    hideTerms?: boolean;
-    refreshBrowser?: boolean;
-    selectAttribute?: (urn: string, displayName: string) => void;
-    attributeData?: ListBusinessAttributesQuery;
-}
-
-function AttributeBrowser(props: Props) {
-    const { isSelecting, hideTerms, refreshBrowser, selectAttribute, attributeData } = props;
-
-    const { refetch: refetchAttributes } = useListBusinessAttributesQuery({
-        variables: {
-            start: 0,
-            count: 10,
-            query: '*',
-        },
-    });
-
-    const displayedAttributes = attributeData?.listBusinessAttributes?.businessAttributes || [];
-
-    const entityRegistry = useEntityRegistry();
-    const sortedAttributes = displayedAttributes.sort((termA, termB) =>
-        sortBusinessAttributes(entityRegistry, termA, termB),
-    );
-
-    useEffect(() => {
-        if (refreshBrowser) {
-            refetchAttributes();
-        }
-    }, [refreshBrowser, refetchAttributes]);
-
-    return (
-        <BrowserWrapper>
-            {!hideTerms &&
-                sortedAttributes.map((attribute) => (
-                    <AttributeItem
-                        key={attribute.urn}
-                        attribute={attribute}
-                        isSelecting={isSelecting}
-                        selectAttribute={selectAttribute}
-                    />
-                ))}
-        </BrowserWrapper>
-    );
-}
-
-export default AttributeBrowser;
diff --git a/datahub-web-react/src/app/businessAttribute/AttributeItem.tsx b/datahub-web-react/src/app/businessAttribute/AttributeItem.tsx
deleted file mode 100644
index 1b3e3e73a24f87..00000000000000
--- a/datahub-web-react/src/app/businessAttribute/AttributeItem.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-const AttributeWrapper = styled.div`
-    font-weight: normal;
-    margin-bottom: 4px;
-`;
-
-const nameStyles = `
-    color: #262626;
-    display: inline-block;
-    height: 100%;
-    padding: 3px 4px;
-    width: 100%;
-`;
-
-export const NameWrapper = styled.span<{ showSelectStyles?: boolean }>`
-    ${nameStyles}
-
-    &:hover {
-        ${(props) =>
-            props.showSelectStyles &&
-            `
-                background-color: ${ANTD_GRAY[3]};
-                cursor: pointer;
-        `}
-    }
-`;
-
-interface Props {
-    attribute: any;
-    isSelecting?: boolean;
-    selectAttribute?: (urn: string, displayName: string) => void;
-}
-
-function AttributeItem(props: Props) {
-    const { attribute, isSelecting, selectAttribute } = props;
-
-    const entityRegistry = useEntityRegistry();
-
-    function handleSelectAttribute() {
-        if (selectAttribute) {
-            const displayName = entityRegistry.getDisplayName(attribute.type, attribute);
-            selectAttribute(attribute.urn, displayName);
-        }
-    }
-
-    return (
-        <AttributeWrapper>
-            {isSelecting && (
-                <NameWrapper showSelectStyles={!!selectAttribute} onClick={handleSelectAttribute}>
-                    {entityRegistry.getDisplayName(attribute.type, attribute)}
-                </NameWrapper>
-            )}
-        </AttributeWrapper>
-    );
-}
-
-export default AttributeItem;
diff --git a/datahub-web-react/src/app/businessAttribute/businessAttributeUtils.ts b/datahub-web-react/src/app/businessAttribute/businessAttributeUtils.ts
index 20b56bd5cee854..30f723add3db34 100644
--- a/datahub-web-react/src/app/businessAttribute/businessAttributeUtils.ts
+++ b/datahub-web-react/src/app/businessAttribute/businessAttributeUtils.ts
@@ -1,12 +1,6 @@
 import EntityRegistry from '@app/entity/EntityRegistry';
 
-import { Entity, EntityType } from '@types';
-
-export function sortBusinessAttributes(entityRegistry: EntityRegistry, nodeA?: Entity | null, nodeB?: Entity | null) {
-    const nodeAName = entityRegistry.getDisplayName(EntityType.BusinessAttribute, nodeA) || '';
-    const nodeBName = entityRegistry.getDisplayName(EntityType.BusinessAttribute, nodeB) || '';
-    return nodeAName.localeCompare(nodeBName);
-}
+import { EntityType } from '@types';
 
 export function getRelatedEntitiesUrl(entityRegistry: EntityRegistry, urn: string) {
     return `${entityRegistry.getEntityUrl(EntityType.BusinessAttribute, urn)}/${encodeURIComponent(
diff --git a/datahub-web-react/src/app/context/userContext.tsx b/datahub-web-react/src/app/context/userContext.tsx
index a5c9fa63097e18..670f12215b0210 100644
--- a/datahub-web-react/src/app/context/userContext.tsx
+++ b/datahub-web-react/src/app/context/userContext.tsx
@@ -43,7 +43,7 @@ export type UserContextType = {
     refetchUser: () => any;
 };
 
-export const DEFAULT_LOCAL_STATE: LocalState = {
+const DEFAULT_LOCAL_STATE: LocalState = {
     selectedViewUrn: undefined,
 };
 
@@ -58,7 +58,7 @@ export const DEFAULT_STATE: State = {
     customState: DEFAULT_CUSTOM_STATE,
 };
 
-export const DEFAULT_CONTEXT = {
+const DEFAULT_CONTEXT = {
     loaded: false,
     urn: undefined,
     user: undefined,
diff --git a/datahub-web-react/src/app/dataviz/ChartCard.tsx b/datahub-web-react/src/app/dataviz/ChartCard.tsx
deleted file mode 100644
index 033797dbd0dbd8..00000000000000
--- a/datahub-web-react/src/app/dataviz/ChartCard.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-const Card = styled.div`
-    display: flex;
-    flex-direction: column;
-    padding: 1rem;
-    background-color: white;
-    box-shadow: 0px 3px 6px 0px ${ANTD_GRAY[5]};
-    border-radius: 8px;
-
-    text {
-        fill: ${ANTD_GRAY[8]};
-        font-weight: 400 !important;
-    }
-`;
-
-const Header = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-`;
-
-const Body = styled.div`
-    position: relative;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-`;
-
-const Heading = styled(Typography.Text)`
-	display: block;
-	font-size: 14px;s
-	font-weight: 600;
-	color: ${ANTD_GRAY[8]};
-	min-width: 300px;
-`;
-
-interface Props {
-    title: string;
-    chart: React.ReactElement;
-    flex?: number;
-}
-
-export const ChartCard = ({ title, chart, flex = 1 }: Props) => (
-    <Card style={{ flex }}>
-        <Header>
-            <Heading>{title}</Heading>
-        </Header>
-        <Body>{chart}</Body>
-    </Card>
-);
diff --git a/datahub-web-react/src/app/dataviz/ChartLoading.tsx b/datahub-web-react/src/app/dataviz/ChartLoading.tsx
deleted file mode 100644
index 393791aba6603f..00000000000000
--- a/datahub-web-react/src/app/dataviz/ChartLoading.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import React from 'react';
-
-export const ChartLoading = () => <>Chart</>;
diff --git a/datahub-web-react/src/app/dataviz/Legend.tsx b/datahub-web-react/src/app/dataviz/Legend.tsx
deleted file mode 100644
index 77ba80835502f2..00000000000000
--- a/datahub-web-react/src/app/dataviz/Legend.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { LegendItem, LegendLabel, LegendOrdinal } from '@visx/legend';
-import React from 'react';
-
-interface Props {
-    scale: any;
-}
-
-export const Legend = ({ scale }: Props) => {
-    return (
-        <LegendOrdinal scale={scale}>
-            {(labels) => (
-                <div style={{ display: 'flex', flexDirection: 'row' }}>
-                    {labels.map((label) => (
-                        <LegendItem
-                            key={`legend-quantile-${label.text}-${label.value}-${Math.random() * 2024}`}
-                            margin="0 20px 0 0"
-                        >
-                            <svg width={8} height={8}>
-                                <rect fill={label.value} width={8} height={8} />
-                            </svg>
-                            <LegendLabel align="left" margin="0 0 0 5px">
-                                {label.text}
-                            </LegendLabel>
-                        </LegendItem>
-                    ))}
-                </div>
-            )}
-        </LegendOrdinal>
-    );
-};
diff --git a/datahub-web-react/src/app/dataviz/bar/BarChart.tsx b/datahub-web-react/src/app/dataviz/bar/BarChart.tsx
deleted file mode 100644
index 1e97dcd1070278..00000000000000
--- a/datahub-web-react/src/app/dataviz/bar/BarChart.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { ParentSize } from '@visx/responsive';
-import { Axis, BarSeries, BarStack, Grid, XYChart } from '@visx/xychart';
-import dayjs from 'dayjs';
-import React from 'react';
-
-import { Legend } from '@app/dataviz/Legend';
-import { ChartWrapper } from '@app/dataviz/components';
-import { abbreviateNumber } from '@app/dataviz/utils';
-
-export const BarChart = <Data extends object, DataKeys>({
-    data,
-    dataKeys,
-    xAccessor,
-    yAccessor,
-    colorAccessor,
-    tickFormat = 'MMM D',
-    yAxisLabel,
-}: {
-    data: any;
-    dataKeys: DataKeys;
-    xAccessor: (d: Data) => string;
-    yAccessor: (d: any, key: string) => string;
-    colorAccessor: (d: string) => string;
-    tickFormat?: string;
-    yAxisLabel?: string;
-}) => {
-    if (!Array.isArray(dataKeys)) throw new Error('Datakeys must be an array');
-
-    const multipleData = dataKeys.length > 1;
-    const margin = { top: 20, right: 20, bottom: 30, left: 60 };
-    const tickCount = Math.max(1, Math.min(data.length, 10));
-
-    return (
-        <ChartWrapper>
-            <ParentSize>
-                {({ width }) => {
-                    if (!width) return null;
-
-                    return (
-                        <>
-                            <XYChart
-                                width={width}
-                                height={255}
-                                xScale={{ type: 'band', nice: true, invert: true, paddingInner: 0.3 }}
-                                yScale={{ type: 'linear' }}
-                                margin={margin}
-                                captureEvents={false}
-                            >
-                                <Grid columns={false} numTicks={tickCount} lineStyle={{ stroke: '#EAEAEA' }} />
-                                {multipleData ? (
-                                    <BarStack>
-                                        {dataKeys
-                                            .slice()
-                                            .reverse()
-                                            .map((dK) => (
-                                                <BarSeries
-                                                    key={dK}
-                                                    dataKey={dK}
-                                                    data={data}
-                                                    xAccessor={xAccessor}
-                                                    yAccessor={(d) => yAccessor(d, dK)}
-                                                    colorAccessor={() => colorAccessor(dK)}
-                                                />
-                                            ))}
-                                    </BarStack>
-                                ) : (
-                                    <BarSeries
-                                        dataKey={dataKeys[0]}
-                                        data={data}
-                                        xAccessor={xAccessor}
-                                        yAccessor={(d) => yAccessor(d, dataKeys[0])}
-                                        colorAccessor={() => colorAccessor(dataKeys[0])}
-                                        radiusTop
-                                    />
-                                )}
-                                <Axis
-                                    orientation="bottom"
-                                    numTicks={Math.round(width / 100)}
-                                    tickFormat={(d) => dayjs(d).format(tickFormat)}
-                                    hideAxisLine
-                                />
-                                {/* Left Axis is for COUNT/NUMBER values only */}
-                                <Axis
-                                    orientation="left"
-                                    label={yAxisLabel}
-                                    labelOffset={20}
-                                    numTicks={tickCount}
-                                    tickLineProps={{ strokeWidth: 1 }}
-                                    tickFormat={(value) => (Number.isInteger(value) ? value : '')}
-                                    tickComponent={({ x, y, formattedValue }) => (
-                                        <text x={x} y={y} dy={3} dx={-3} fontSize="10" textAnchor="end">
-                                            <tspan>{abbreviateNumber(formattedValue)}</tspan>
-                                        </text>
-                                    )}
-                                    hideAxisLine
-                                />
-                            </XYChart>
-                            <Legend scale={colorAccessor} />
-                        </>
-                    );
-                }}
-            </ParentSize>
-        </ChartWrapper>
-    );
-};
diff --git a/datahub-web-react/src/app/dataviz/bar/HorizontalBarChart.tsx b/datahub-web-react/src/app/dataviz/bar/HorizontalBarChart.tsx
deleted file mode 100644
index 9119708e738d47..00000000000000
--- a/datahub-web-react/src/app/dataviz/bar/HorizontalBarChart.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-/* eslint-disable @typescript-eslint/dot-notation, no-param-reassign */
-import { AxisLeft } from '@visx/axis';
-import { ParentSize } from '@visx/responsive';
-import { scaleBand, scaleLinear } from '@visx/scale';
-import { Bar, BarStackHorizontal } from '@visx/shape';
-import { Grid, XYChart } from '@visx/xychart';
-import React from 'react';
-
-import { Legend } from '@app/dataviz/Legend';
-import { ChartWrapper } from '@app/dataviz/components';
-import { COMPLETED_COLOR, IN_PROGRESS_COLOR, NOT_STARTED_COLOR } from '@app/dataviz/constants';
-
-export const HorizontalBarChart = <Data extends object, DataKeys>({
-    data,
-    dataKeys,
-    yAccessor,
-    colorAccessor,
-}: {
-    data: Data[];
-    dataKeys: DataKeys;
-    yAccessor: (d: Data) => string;
-    colorAccessor: (d: string) => string;
-}) => {
-    if (!data || !data.length || !dataKeys) return null;
-    if (!Array.isArray(dataKeys)) throw new Error('Datakeys must be an array');
-
-    const totals = data.reduce((allTotals, currentDate) => {
-        const total = dataKeys.reduce((dailyTotal, k) => {
-            dailyTotal += Number(currentDate[k]);
-            return dailyTotal;
-        }, 0);
-        allTotals.push(total);
-        return allTotals;
-    }, [] as number[]);
-
-    const xScale = scaleLinear<number>({
-        domain: [0, Math.max(...totals)],
-        nice: true,
-    });
-
-    const yScale = scaleBand<string>({
-        domain: data.map(yAccessor),
-        padding: 0.2,
-    });
-
-    return (
-        <ChartWrapper>
-            <ParentSize>
-                {({ width: parentWidth }) => {
-                    if (!parentWidth) return null;
-
-                    const margin = { top: 20, right: 0, bottom: 0, left: 120 };
-                    const baseHeight = data.length < 2 ? 180 : 280;
-                    const xMax = parentWidth - margin.left - margin.right;
-                    const yMax = baseHeight - margin.top - margin.bottom;
-
-                    xScale.rangeRound([0, xMax]);
-                    yScale.rangeRound([yMax, 0]);
-
-                    return (
-                        <>
-                            <XYChart
-                                width={parentWidth}
-                                height={baseHeight}
-                                margin={margin}
-                                xScale={{ type: 'linear' }}
-                                yScale={{ type: 'band', paddingInner: 0.3 }}
-                                captureEvents={false}
-                            >
-                                <Grid numTicks={5} lineStyle={{ stroke: '#EAEAEA' }} rows={false} />
-
-                                <BarStackHorizontal
-                                    data={data}
-                                    keys={dataKeys.slice().reverse()}
-                                    width={parentWidth}
-                                    height={baseHeight}
-                                    y={yAccessor}
-                                    xScale={xScale}
-                                    yScale={yScale}
-                                    color={colorAccessor}
-                                >
-                                    {(barStacks) =>
-                                        barStacks.map((barStack) =>
-                                            barStack.bars.map((bar) => {
-                                                // Use the bar color to determine which label to display for Doc Initiatives
-                                                let label = null;
-                                                if (bar.color === COMPLETED_COLOR) label = bar.bar.data['Completed'];
-                                                if (bar.color === IN_PROGRESS_COLOR)
-                                                    label = bar.bar.data['In Progress'];
-                                                if (bar.color === NOT_STARTED_COLOR)
-                                                    label = bar.bar.data['Not Started'];
-
-                                                if (label === '0') return null;
-
-                                                const { x, y, width, height } = bar;
-                                                const { left } = margin;
-
-                                                const newX = x + left + 10;
-                                                const barWidth = width + 5;
-
-                                                let textX = barWidth <= 20 ? newX + barWidth - 5 : newX + barWidth - 15;
-                                                if (barWidth > 300) textX = newX + barWidth - 20;
-
-                                                return (
-                                                    <g key={`barstack-horizontal-${barStack.index}-${bar.index}`}>
-                                                        <Bar
-                                                            x={newX}
-                                                            y={y}
-                                                            width={barWidth}
-                                                            height={height}
-                                                            fill={bar.color}
-                                                        />
-                                                        {label && (
-                                                            <text
-                                                                className="horizontalBarChartInlineLabel"
-                                                                x={textX}
-                                                                y={y + height / 2}
-                                                                dy=".33em"
-                                                                textAnchor="end"
-                                                                fontSize={11}
-                                                            >
-                                                                {label}
-                                                            </text>
-                                                        )}
-                                                    </g>
-                                                );
-                                            }),
-                                        )
-                                    }
-                                </BarStackHorizontal>
-                                <AxisLeft
-                                    hideAxisLine
-                                    scale={yScale}
-                                    tickLabelProps={{
-                                        fontSize: 11,
-                                        textAnchor: 'end',
-                                        dy: '0.33em',
-                                        x: margin.left,
-                                        width: 135,
-                                    }}
-                                    tickLineProps={{
-                                        x1: margin.left + 5,
-                                        x2: margin.left + 10,
-                                    }}
-                                />
-                            </XYChart>
-                            <Legend scale={colorAccessor} />
-                        </>
-                    );
-                }}
-            </ParentSize>
-        </ChartWrapper>
-    );
-};
diff --git a/datahub-web-react/src/app/dataviz/bar/HorizontalFullBarChart.tsx b/datahub-web-react/src/app/dataviz/bar/HorizontalFullBarChart.tsx
deleted file mode 100644
index 81fca3e6ccb5e0..00000000000000
--- a/datahub-web-react/src/app/dataviz/bar/HorizontalFullBarChart.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-/* eslint-disable @typescript-eslint/dot-notation, no-param-reassign */
-import { AxisLeft } from '@visx/axis';
-import { ParentSize } from '@visx/responsive';
-import { scaleBand, scaleLinear } from '@visx/scale';
-import { Bar, BarStackHorizontal } from '@visx/shape';
-import { Grid, XYChart } from '@visx/xychart';
-import React from 'react';
-
-import { Legend } from '@app/dataviz/Legend';
-import { ChartWrapper } from '@app/dataviz/components';
-import { COMPLETED_COLOR, IN_PROGRESS_COLOR, NOT_STARTED_COLOR } from '@app/dataviz/constants';
-
-export const HorizontalFullBarChart = <Data extends object, DataKeys>({
-    data,
-    dataKeys,
-    yAccessor,
-    colorAccessor,
-}: {
-    data: Data[];
-    dataKeys: DataKeys;
-    yAccessor: (d: Data) => string;
-    colorAccessor: (d: string) => string;
-}) => {
-    if (!data || !data.length || !dataKeys) return null;
-    if (!Array.isArray(dataKeys)) throw new Error('Datakeys must be an array');
-
-    const totals = data.reduce((allTotals, currentDate) => {
-        const total = dataKeys.reduce((dailyTotal, k) => {
-            dailyTotal += Number(currentDate[k]);
-            return dailyTotal;
-        }, 0);
-        allTotals.push(total);
-        return allTotals;
-    }, [] as number[]);
-
-    const xScale = scaleLinear<number>({
-        domain: [0, Math.max(...totals)],
-        nice: true,
-    });
-
-    const yScale = scaleBand<string>({
-        domain: data.map(yAccessor),
-        padding: 0.2,
-    });
-
-    return (
-        <ChartWrapper>
-            <ParentSize>
-                {({ width: parentWidth }) => {
-                    if (!parentWidth) return null;
-
-                    const margin = { top: 20, right: 0, bottom: 0, left: 120 };
-                    const baseHeight = 280;
-                    const calculatedHeight = data.length > 4 ? baseHeight + data.length * 10 : baseHeight;
-                    const xMax = parentWidth - margin.left - margin.right;
-                    const yMax = calculatedHeight - margin.top - margin.bottom;
-
-                    xScale.rangeRound([0, xMax]);
-                    yScale.rangeRound([yMax, 0]);
-
-                    return (
-                        <>
-                            <XYChart
-                                width={parentWidth}
-                                height={baseHeight}
-                                margin={margin}
-                                xScale={{ type: 'linear' }}
-                                yScale={{ type: 'band', paddingInner: 0.3 }}
-                                captureEvents={false}
-                            >
-                                <Grid numTicks={5} lineStyle={{ stroke: '#EAEAEA' }} rows={false} />
-
-                                <BarStackHorizontal
-                                    data={data}
-                                    keys={dataKeys.slice().reverse()}
-                                    width={parentWidth}
-                                    y={yAccessor}
-                                    xScale={xScale}
-                                    yScale={yScale}
-                                    color={colorAccessor}
-                                >
-                                    {(barStacks) =>
-                                        barStacks.map((barStack) =>
-                                            barStack.bars.map((bar) => {
-                                                // Use the bar color to determine which label to display for Doc Initiatives
-                                                let label = null;
-                                                if (bar.color === COMPLETED_COLOR) label = bar.bar.data['Completed'];
-                                                if (bar.color === IN_PROGRESS_COLOR)
-                                                    label = bar.bar.data['In Progress'];
-                                                if (bar.color === NOT_STARTED_COLOR)
-                                                    label = bar.bar.data['Not Started'];
-
-                                                if (label === '0') return null;
-
-                                                const { x, y, width, height } = bar;
-                                                const { left } = margin;
-
-                                                const newX = x + left + 10;
-                                                const barWidth = width + 5;
-
-                                                let textX = barWidth <= 20 ? newX + barWidth - 5 : newX + barWidth - 10;
-                                                if (barWidth > 300) textX = newX + barWidth - 20;
-
-                                                return (
-                                                    <g key={`barstack-horizontal-${barStack.index}-${bar.index}`}>
-                                                        <Bar
-                                                            x={newX}
-                                                            y={y}
-                                                            width={barWidth}
-                                                            height={height}
-                                                            fill={bar.color}
-                                                        />
-                                                        {label && (
-                                                            <text
-                                                                className="horizontalBarChartInlineLabel"
-                                                                x={textX}
-                                                                y={y + height / 2}
-                                                                dy=".33em"
-                                                                textAnchor="end"
-                                                                fontSize={11}
-                                                            >
-                                                                {label}
-                                                            </text>
-                                                        )}
-                                                    </g>
-                                                );
-                                            }),
-                                        )
-                                    }
-                                </BarStackHorizontal>
-                                <AxisLeft
-                                    hideAxisLine
-                                    scale={yScale}
-                                    tickLabelProps={{
-                                        fontSize: 11,
-                                        textAnchor: 'end',
-                                        dy: '0.33em',
-                                        x: margin.left,
-                                        width: 135,
-                                    }}
-                                    tickLineProps={{
-                                        x1: margin.left + 5,
-                                        x2: margin.left + 10,
-                                    }}
-                                />
-                            </XYChart>
-                            <Legend scale={colorAccessor} />
-                        </>
-                    );
-                }}
-            </ParentSize>
-        </ChartWrapper>
-    );
-};
diff --git a/datahub-web-react/src/app/dataviz/candle/CandleStick.tsx b/datahub-web-react/src/app/dataviz/candle/CandleStick.tsx
deleted file mode 100644
index 35d4dd3a8bce24..00000000000000
--- a/datahub-web-react/src/app/dataviz/candle/CandleStick.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { GlyphCircle, GlyphDiamond } from '@visx/glyph';
-import { GlyphCircleProps } from '@visx/glyph/lib/glyphs/GlyphCircle';
-import { GlyphDiamondProps } from '@visx/glyph/lib/glyphs/GlyphDiamond';
-import { Group } from '@visx/group';
-import { Bar } from '@visx/shape';
-import { BarProps } from '@visx/shape/lib/shapes/Bar';
-import { AddSVGProps } from '@visx/shape/lib/types';
-import React from 'react';
-
-type DiamondProps = GlyphDiamondProps<any> & Omit<React.SVGProps<SVGPathElement>, keyof GlyphDiamondProps<any>>;
-type CircleProps = GlyphCircleProps<any> & Omit<React.SVGProps<SVGPathElement>, keyof GlyphCircleProps<any>>;
-type CandleBarProps = AddSVGProps<BarProps, SVGRectElement>;
-
-type Props = {
-    parentChartHeight: number;
-    candleHeight: number;
-    barWidth: number;
-    shapeSize: number;
-    leftOffset: number;
-    color: string;
-    shape:
-        | {
-              type: 'diamond';
-              extraProps?: DiamondProps;
-          }
-        | {
-              type: 'circle';
-              extraProps?: CircleProps;
-          };
-    markerOverlapPx?: number;
-    extraBarProps?: CandleBarProps;
-    opacity?: number;
-    wrapper?: (children: JSX.Element) => JSX.Element;
-};
-export const CandleStick = ({
-    parentChartHeight,
-    candleHeight,
-    barWidth,
-    shapeSize,
-    leftOffset,
-    color,
-    shape,
-    wrapper,
-    opacity,
-    markerOverlapPx,
-    extraBarProps,
-}: Props) => {
-    const yOffset = parentChartHeight - candleHeight;
-
-    const shapeProps: DiamondProps | CircleProps = {
-        top: yOffset,
-        left: leftOffset,
-        fill: color,
-        stroke: 'white',
-        strokeWidth: (markerOverlapPx ?? 1) > 1 ? 1 / (markerOverlapPx ?? 1) : 1,
-        filter: markerOverlapPx ? undefined : 'drop-shadow(0px 1px 2.5px rgb(0 0 0 / 0.1))',
-        size: shapeSize,
-        ...shape.extraProps,
-    };
-    const barProps: CandleBarProps = {
-        height: candleHeight,
-        width: barWidth,
-        x: leftOffset - barWidth / 2,
-        y: yOffset,
-        fill: color,
-        stroke: 'white',
-        strokeWidth: (markerOverlapPx ?? 1) > 1 ? 1 / (markerOverlapPx ?? 1) : 1,
-        ...extraBarProps,
-    };
-
-    const candleGroup = (
-        <Group opacity={opacity}>
-            <Bar {...barProps} />
-            {shape.type === 'diamond' ? <GlyphDiamond {...shapeProps} /> : <GlyphCircle {...shapeProps} />}
-        </Group>
-    );
-    return wrapper ? wrapper(candleGroup) : candleGroup;
-};
diff --git a/datahub-web-react/src/app/dataviz/components.ts b/datahub-web-react/src/app/dataviz/components.ts
deleted file mode 100644
index 9be7476522ce17..00000000000000
--- a/datahub-web-react/src/app/dataviz/components.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import styled from 'styled-components';
-
-export const ChartWrapper = styled.div`
-    width: 100%;
-    height: 100%;
-    position: relative;
-
-    .horizontalBarChartTick {
-        foreignObject {
-            text-align: right;
-        }
-    }
-
-    .horizontalBarChartInlineLabel {
-        fill: #fff;
-        font-weight: 600;
-        font-family: 'Manrope', sans-serif;
-    }
-
-    .visx-axis-label {
-        font-weight: 600 !important;
-        font-family: 'Manrope', sans-serif !important;
-    }
-`;
diff --git a/datahub-web-react/src/app/dataviz/constants.ts b/datahub-web-react/src/app/dataviz/constants.ts
deleted file mode 100644
index ba8b2d642ca68e..00000000000000
--- a/datahub-web-react/src/app/dataviz/constants.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export type STATUS = 'Completed' | 'In Progress' | 'Not Started';
-
-export const COMPLETED_COLOR = '#20D3BD';
-export const IN_PROGRESS_COLOR = '#7532A4';
-export const NOT_STARTED_COLOR = '#1677FF';
diff --git a/datahub-web-react/src/app/dataviz/index.ts b/datahub-web-react/src/app/dataviz/index.ts
deleted file mode 100644
index 070c56bb50351e..00000000000000
--- a/datahub-web-react/src/app/dataviz/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './ChartCard';
-export * from './ChartLoading';
-export * from './bar/BarChart';
-export * from './bar/HorizontalBarChart';
-export * from './bar/HorizontalFullBarChart';
-export * from './pie/PieChart';
diff --git a/datahub-web-react/src/app/dataviz/line/SimpleLineChart.tsx b/datahub-web-react/src/app/dataviz/line/SimpleLineChart.tsx
deleted file mode 100644
index e5329505aa0fdd..00000000000000
--- a/datahub-web-react/src/app/dataviz/line/SimpleLineChart.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { curveCatmullRom } from '@visx/curve';
-import { MarkerCircle } from '@visx/marker';
-import { ParentSize } from '@visx/responsive';
-import { scaleLinear, scaleTime } from '@visx/scale';
-import { LinePath } from '@visx/shape';
-import { extent, max } from '@visx/vendor/d3-array';
-import React from 'react';
-
-import { ChartWrapper } from '@app/dataviz/components';
-
-interface Props {
-    data: any;
-}
-
-type Data = {
-    date: string;
-    value: number;
-};
-
-export const SimpleLineChart = ({ data }: Props) => {
-    const getDate = (d: Data) => new Date(d.date);
-    const getValue = (d: Data) => d.value;
-
-    const markerEnd = 'url(#marker-circle)';
-
-    return (
-        <ChartWrapper>
-            <ParentSize>
-                {({ width }) => {
-                    if (!width) return null;
-
-                    const height = 20;
-
-                    const xScale = scaleTime<number>({
-                        range: [0, width - 10],
-                        domain: extent(data, getDate) as [Date, Date],
-                    });
-
-                    const yScale = scaleLinear<number>({
-                        range: [height / 2, 5],
-                        domain: [0, (max(data, getValue) || 0) as number],
-                        nice: true,
-                    });
-
-                    return (
-                        <svg width={width} height={height}>
-                            <defs>
-                                <linearGradient id="gradient" x1="0%" y1="0%" x2="100%" y2="100%">
-                                    <stop offset="0%" stopColor="#20D3BD" />
-                                    <stop offset="100%" stopColor="#9F33CC" />
-                                </linearGradient>
-                            </defs>
-                            <MarkerCircle id="marker-circle" fill="#9F33CC" stroke="#fff" strokeWidth={2} size={3} />
-                            <LinePath
-                                data={data}
-                                x={(d: Data) => xScale(getDate(d))}
-                                y={(d: Data) => yScale(getValue(d))}
-                                curve={curveCatmullRom}
-                                markerEnd={markerEnd}
-                                stroke="#9F33CC"
-                            />
-                        </svg>
-                    );
-                }}
-            </ParentSize>
-        </ChartWrapper>
-    );
-};
diff --git a/datahub-web-react/src/app/dataviz/pie/PieChart.tsx b/datahub-web-react/src/app/dataviz/pie/PieChart.tsx
deleted file mode 100644
index e89fef1f6790da..00000000000000
--- a/datahub-web-react/src/app/dataviz/pie/PieChart.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import { Annotation, Connector, Label } from '@visx/annotation';
-import { Pie } from '@visx/shape';
-import { PieArcDatum } from '@visx/shape/lib/shapes/Pie';
-import React from 'react';
-
-import { useDataAnnotationPosition } from '@app/dataviz/pie/usePieDataAnnotation';
-
-const PieDataAnnotation = ({
-    title,
-    arc,
-    path,
-    subtitle,
-}: {
-    title: string;
-    path: any;
-    arc: PieArcDatum<{ [x: string]: string }>;
-    subtitle?: string;
-}) => {
-    const { surfaceX, surfaceY, labelX, labelY } = useDataAnnotationPosition({ arc, path });
-
-    return (
-        <Annotation x={surfaceX} y={surfaceY} dx={labelX} dy={labelY}>
-            <Connector type="elbow" className="dark-width" />
-            <Label
-                showBackground={false}
-                showAnchorLine={false}
-                title={title}
-                titleFontWeight={600}
-                titleFontSize={12}
-                subtitle={subtitle}
-                subtitleFontSize={10}
-                width={85}
-            />
-        </Annotation>
-    );
-};
-
-export const PieChart = ({ data }: any) => {
-    const width = 380;
-    const height = 280;
-    const margin = { top: 50, right: 50, bottom: 50, left: 50 };
-
-    const innerWidth = width - margin.left - margin.right;
-    const innerHeight = height - margin.top - margin.bottom;
-    const radius = Math.min(innerWidth, innerHeight) * 0.45;
-    const centerY = innerHeight / 2;
-    const centerX = innerWidth / 2;
-
-    const pieSortValues = (a, b) => b - a;
-    const value = (d) => d.value;
-
-    const createValueLabel = (count: number) => {
-        let total = 0;
-        data.forEach((d) => {
-            total += d.value;
-        });
-        const percent = Math.round((count / total) * 100);
-        return `${percent}% (${count.toLocaleString()})`;
-    };
-
-    return (
-        <svg width={width} height={height}>
-            <g transform={`translate(${centerX + margin.left}, ${centerY + margin.top})`}>
-                <Pie data={data} pieValue={value} pieSortValues={pieSortValues} outerRadius={radius}>
-                    {(pie) => {
-                        return pie.arcs.map((arc) => {
-                            const { name } = arc.data;
-                            const { color } = arc.data;
-                            const arcPath = pie.path(arc);
-                            return (
-                                <g key={`arc-${name}`}>
-                                    <path d={arcPath || ''} fill={color} stroke="white" strokeWidth="2" />
-                                    {arc.endAngle - arc.startAngle !== 0 ? (
-                                        <PieDataAnnotation
-                                            arc={arc}
-                                            path={pie.path}
-                                            title={arc.data.name}
-                                            subtitle={createValueLabel(arc.value)}
-                                        />
-                                    ) : null}
-                                </g>
-                            );
-                        });
-                    }}
-                </Pie>
-            </g>
-        </svg>
-    );
-};
diff --git a/datahub-web-react/src/app/dataviz/pie/usePieDataAnnotation.ts b/datahub-web-react/src/app/dataviz/pie/usePieDataAnnotation.ts
deleted file mode 100644
index 1aeed5f169a848..00000000000000
--- a/datahub-web-react/src/app/dataviz/pie/usePieDataAnnotation.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { PieArcDatum } from '@visx/shape/lib/shapes/Pie';
-
-const useDataAnnotationPosition = ({
-    arc,
-    path,
-}: {
-    arc: PieArcDatum<{ [x: string]: string }>;
-    path: any;
-}): {
-    labelX: number;
-    labelY: number;
-    surfaceX: number;
-    surfaceY: number;
-} => {
-    const middleAngle = Math.PI / 2 - (arc.startAngle + (arc.endAngle - arc.startAngle) / 2);
-
-    const outerRadius: number = path.outerRadius()(arc);
-
-    const normalX = Math.cos(middleAngle);
-    const normalY = Math.sin(-middleAngle);
-
-    const labelX = normalX * outerRadius * 0.1 * (middleAngle < Math.PI ? 1 : -1);
-    const labelY = normalY * outerRadius * 0.1;
-
-    const surfaceX = normalX * outerRadius;
-    const surfaceY = normalY * outerRadius;
-
-    return {
-        labelX,
-        labelY,
-        surfaceX,
-        surfaceY,
-    };
-};
-
-export { useDataAnnotationPosition };
diff --git a/datahub-web-react/src/app/dataviz/stat/SingleStat.tsx b/datahub-web-react/src/app/dataviz/stat/SingleStat.tsx
deleted file mode 100644
index bce1553c2d7f57..00000000000000
--- a/datahub-web-react/src/app/dataviz/stat/SingleStat.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import React from 'react';
-
-export const SingleStat = () => {
-    return <>stat</>;
-};
diff --git a/datahub-web-react/src/app/dataviz/utils.ts b/datahub-web-react/src/app/dataviz/utils.ts
index 7ea4544375f34d..b631206beccee9 100644
--- a/datahub-web-react/src/app/dataviz/utils.ts
+++ b/datahub-web-react/src/app/dataviz/utils.ts
@@ -1,41 +1,4 @@
-import { scaleOrdinal } from '@visx/scale';
-import dayjs from 'dayjs';
 
-import { COMPLETED_COLOR, IN_PROGRESS_COLOR, NOT_STARTED_COLOR } from '@app/dataviz/constants';
-
-// Mock Data Util
-export const generateDateSeries = (numOfDays) =>
-    Array(numOfDays)
-        .fill(0)
-        .map((d, i) => ({
-            date: dayjs(new Date(Date.now() - 24 * 60 * 60 * 1000 * i)).format(),
-            value: Math.round(Math.max(10, Math.random() * 100 || 0)),
-        }));
-
-// Status Ordinal Scale
-export const statusOrdinalScale = scaleOrdinal({
-    domain: ['Not Started', 'In Progress', 'Completed'],
-    range: [NOT_STARTED_COLOR, IN_PROGRESS_COLOR, COMPLETED_COLOR],
-});
-
-// private utils to help with rounding y axis numbers
-const NUMERICAL_ABBREVIATIONS = ['k', 'm', 'b', 't'];
-function roundToPrecision(n: number, precision: number) {
-    const prec = 10 ** precision;
-    return Math.round(n * prec) / prec;
-}
-
-/**
- * ie. 24044 -> 24k
- * @param n
- */
-export const truncateNumberForDisplay = (n: number, skipRounding?: boolean): string => {
-    let base = Math.floor(Math.log(Math.abs(n)) / Math.log(1000));
-    const suffix = NUMERICAL_ABBREVIATIONS[Math.min(NUMERICAL_ABBREVIATIONS.length - 1, base - 1)];
-    base = NUMERICAL_ABBREVIATIONS.indexOf(suffix) + 1;
-    const roundedNumber = skipRounding ? n : Math.round(n);
-    return suffix ? roundToPrecision(n / 1000 ** base, 0) + suffix : `${roundedNumber}`;
-};
 
 // Number Abbreviations
 export const abbreviateNumber = (str) => {
@@ -48,83 +11,3 @@ export const abbreviateNumber = (str) => {
     const shortNumber = number / 10 ** (index * 3);
     return `${shortNumber}${suffix}`;
 };
-
-// Byte Abbreviations
-export const abbreviateBytes = (str): string => {
-    const bytes = parseFloat(str);
-    if (Number.isNaN(bytes)) return str;
-    if (bytes < 1024) return `${bytes} B`;
-    const units = ['B', 'KB', 'MB', 'GB', 'TB'];
-    const index = Math.floor(Math.log(bytes) / Math.log(1024));
-    const shortBytes = bytes / 1024 ** index;
-
-    return `${abbreviateNumber(shortBytes.toFixed())} ${units[index]}`;
-};
-
-type CalculateYScaleExtentForChartOptions = {
-    defaultYValue: number;
-    // Between 0-1, represents what % of the chart's height should be empty above and below.
-    // ie. if this is .1, then 10% of the chart's height will be empty.
-    yScaleBufferFactor?: number;
-};
-
-/**
- * Creates a yscale range for charts, with optional buffers
- * @param yValues
- * @param options
- */
-export const calculateYScaleExtentForChart = (
-    yValues: number[],
-    options: CalculateYScaleExtentForChartOptions = { defaultYValue: 0 },
-): { min: number; max: number } => {
-    let min = yValues.length ? Math.min(...yValues) : options.defaultYValue;
-    let max = yValues.length ? Math.max(...yValues) : options.defaultYValue;
-
-    // Add some extra range above and below so things aren't pushed to the edge
-    const { yScaleBufferFactor } = options;
-    if (yScaleBufferFactor) {
-        let yScaleBuffer = 0;
-        // Edge case: if max and min are the same, add some buffer above and below so the points are nicely centered
-        if (max === min) {
-            // Ie. Let's say max/min=1.5B. In this case we want to add ~100M buffer and and below
-            // This will make the y-axis display 1.4B at the bottom and 1.6B at the top,
-            // While nicely centering the data points.
-            const decimalPlaceValue = max.toString().length;
-            yScaleBuffer = 10 ** (decimalPlaceValue - 1);
-        } else {
-            // By default, the chart will put the min at the bottom edge and the max at the top edge.
-            // So if yScaleBufferFactor=0.1, then we want 10% of the chart at the top and bottom to be empty
-            const distance = max - min;
-            const newDistance = distance / (1 - yScaleBufferFactor);
-            yScaleBuffer = newDistance * yScaleBufferFactor;
-        }
-
-        min -= yScaleBuffer;
-        max += yScaleBuffer;
-    }
-
-    return { min, max };
-};
-
-/**
- * Gets the px overlap between two markers
- * @param marker1
- * @param marker2
- * @returns {number | undefined} undefined if no overlap
- */
-export function calculateOverlapBetweenTwoMarkers(
-    marker1: { xOffset: number; width: number },
-    marker2: { xOffset: number; width: number },
-): undefined | number {
-    let markerOverlapPx: number | undefined;
-
-    // Take width of the left and right half of the two markers (where they will collide)
-    const netWidth = marker1.width / 2 + marker2.width / 2;
-
-    // Calculate distance and potential overlap
-    const distance = Math.abs(marker1.xOffset - marker2.xOffset);
-    if (distance < netWidth) {
-        markerOverlapPx = netWidth - distance;
-    }
-    return markerOverlapPx;
-}
diff --git a/datahub-web-react/src/app/domain/CreateDomainModal.tsx b/datahub-web-react/src/app/domain/CreateDomainModal.tsx
deleted file mode 100644
index da49f25058bf30..00000000000000
--- a/datahub-web-react/src/app/domain/CreateDomainModal.tsx
+++ /dev/null
@@ -1,232 +0,0 @@
-import { Button, Collapse, Form, Input, Modal, Tag, Typography, message } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import analytics, { EventType } from '@app/analytics';
-import { useDomainsContext } from '@app/domain/DomainsContext';
-import DomainParentSelect from '@app/entity/shared/EntityDropdown/DomainParentSelect';
-import { validateCustomUrnId } from '@app/shared/textUtil';
-import { useEnterKeyListener } from '@app/shared/useEnterKeyListener';
-import { useIsNestedDomainsEnabled } from '@app/useAppConfig';
-
-import { useCreateDomainMutation } from '@graphql/domain.generated';
-
-const SuggestedNamesGroup = styled.div`
-    margin-top: 8px;
-`;
-
-const ClickableTag = styled(Tag)`
-    :hover {
-        cursor: pointer;
-    }
-`;
-
-const FormItem = styled(Form.Item)`
-    .ant-form-item-label {
-        padding-bottom: 2px;
-    }
-`;
-
-const FormItemWithMargin = styled(FormItem)`
-    margin-bottom: 16px;
-`;
-
-const FormItemNoMargin = styled(FormItem)`
-    margin-bottom: 0;
-`;
-
-const FormItemLabel = styled(Typography.Text)`
-    font-weight: 600;
-    color: #373d44;
-`;
-
-const AdvancedLabel = styled(Typography.Text)`
-    color: #373d44;
-`;
-
-type Props = {
-    onClose: () => void;
-    onCreate: (
-        urn: string,
-        id: string | undefined,
-        name: string,
-        description: string | undefined,
-        parentDomain?: string,
-    ) => void;
-};
-
-const SUGGESTED_DOMAIN_NAMES = ['Engineering', 'Marketing', 'Sales', 'Product'];
-
-const ID_FIELD_NAME = 'id';
-const NAME_FIELD_NAME = 'name';
-const DESCRIPTION_FIELD_NAME = 'description';
-
-export default function CreateDomainModal({ onClose, onCreate }: Props) {
-    const isNestedDomainsEnabled = useIsNestedDomainsEnabled();
-    const [createDomainMutation] = useCreateDomainMutation();
-    const { entityData } = useDomainsContext();
-    const [selectedParentUrn, setSelectedParentUrn] = useState<string>(
-        (isNestedDomainsEnabled && entityData?.urn) || '',
-    );
-    const [createButtonEnabled, setCreateButtonEnabled] = useState(false);
-    const [form] = Form.useForm();
-
-    const onCreateDomain = () => {
-        createDomainMutation({
-            variables: {
-                input: {
-                    id: form.getFieldValue(ID_FIELD_NAME),
-                    name: form.getFieldValue(NAME_FIELD_NAME),
-                    description: form.getFieldValue(DESCRIPTION_FIELD_NAME),
-                    parentDomain: selectedParentUrn || undefined,
-                },
-            },
-        })
-            .then(({ data, errors }) => {
-                if (!errors) {
-                    analytics.event({
-                        type: EventType.CreateDomainEvent,
-                        parentDomainUrn: selectedParentUrn || undefined,
-                    });
-                    message.success({
-                        content: `Created domain!`,
-                        duration: 3,
-                    });
-                    onCreate(
-                        data?.createDomain || '',
-                        form.getFieldValue(ID_FIELD_NAME),
-                        form.getFieldValue(NAME_FIELD_NAME),
-                        form.getFieldValue(DESCRIPTION_FIELD_NAME),
-                        selectedParentUrn || undefined,
-                    );
-                    form.resetFields();
-                }
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to create Domain!: \n ${e.message || ''}`, duration: 3 });
-            });
-        onClose();
-    };
-
-    // Handle the Enter press
-    useEnterKeyListener({
-        querySelectorToExecuteClick: '#createDomainButton',
-    });
-
-    return (
-        <Modal
-            title="Create New Domain"
-            open
-            onCancel={onClose}
-            footer={
-                <>
-                    <Button onClick={onClose} type="text">
-                        Cancel
-                    </Button>
-                    <Button
-                        id="createDomainButton"
-                        data-testid="create-domain-button"
-                        onClick={onCreateDomain}
-                        disabled={!createButtonEnabled}
-                    >
-                        Create
-                    </Button>
-                </>
-            }
-        >
-            <Form
-                form={form}
-                initialValues={{}}
-                layout="vertical"
-                onFieldsChange={() => {
-                    setCreateButtonEnabled(!form.getFieldsError().some((field) => field.errors.length > 0));
-                }}
-            >
-                {isNestedDomainsEnabled && (
-                    <FormItemWithMargin label={<FormItemLabel>Parent (optional)</FormItemLabel>}>
-                        <DomainParentSelect
-                            selectedParentUrn={selectedParentUrn}
-                            setSelectedParentUrn={setSelectedParentUrn}
-                        />
-                    </FormItemWithMargin>
-                )}
-                <FormItemWithMargin label={<FormItemLabel>Name</FormItemLabel>}>
-                    <FormItemNoMargin
-                        name={NAME_FIELD_NAME}
-                        rules={[
-                            {
-                                required: true,
-                                message: 'Enter a Domain name.',
-                            },
-                            { whitespace: true },
-                            { min: 1, max: 150 },
-                        ]}
-                        hasFeedback
-                    >
-                        <Input data-testid="create-domain-name" placeholder="A name for your domain" />
-                    </FormItemNoMargin>
-                    <SuggestedNamesGroup>
-                        {SUGGESTED_DOMAIN_NAMES.map((name) => {
-                            return (
-                                <ClickableTag
-                                    key={name}
-                                    onClick={() => {
-                                        form.setFieldsValue({
-                                            name,
-                                        });
-                                        setCreateButtonEnabled(true);
-                                    }}
-                                >
-                                    {name}
-                                </ClickableTag>
-                            );
-                        })}
-                    </SuggestedNamesGroup>
-                </FormItemWithMargin>
-                <FormItemWithMargin
-                    label={<FormItemLabel>Description</FormItemLabel>}
-                    help="You can always change the description later."
-                >
-                    <FormItemNoMargin
-                        name={DESCRIPTION_FIELD_NAME}
-                        rules={[{ whitespace: true }, { min: 1, max: 500 }]}
-                        hasFeedback
-                    >
-                        <Input.TextArea
-                            placeholder="A description for your domain"
-                            data-testid="create-domain-description"
-                        />
-                    </FormItemNoMargin>
-                </FormItemWithMargin>
-                <Collapse ghost>
-                    <Collapse.Panel header={<AdvancedLabel>Advanced Options</AdvancedLabel>} key="1">
-                        <FormItemWithMargin
-                            label={<Typography.Text strong>Domain Id</Typography.Text>}
-                            help="By default, a random UUID will be generated to uniquely identify this domain. If
-                                you'd like to provide a custom id instead to more easily keep track of this domain,
-                                you may provide it here. Be careful, you cannot easily change the domain id after
-                                creation."
-                        >
-                            <FormItemNoMargin
-                                name={ID_FIELD_NAME}
-                                rules={[
-                                    () => ({
-                                        validator(_, value) {
-                                            if (value && validateCustomUrnId(value)) {
-                                                return Promise.resolve();
-                                            }
-                                            return Promise.reject(new Error('Please enter a valid Domain id'));
-                                        },
-                                    }),
-                                ]}
-                            >
-                                <Input data-testid="create-domain-id" placeholder="engineering" />
-                            </FormItemNoMargin>
-                        </FormItemWithMargin>
-                    </Collapse.Panel>
-                </Collapse>
-            </Form>
-        </Modal>
-    );
-}
diff --git a/datahub-web-react/src/app/domain/DomainItemMenu.tsx b/datahub-web-react/src/app/domain/DomainItemMenu.tsx
deleted file mode 100644
index 99ccd357b0cabc..00000000000000
--- a/datahub-web-react/src/app/domain/DomainItemMenu.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { DeleteOutlined } from '@ant-design/icons';
-import { Dropdown, Menu, Modal, message } from 'antd';
-import React from 'react';
-
-import { MenuIcon } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useDeleteDomainMutation } from '@graphql/domain.generated';
-import { EntityType } from '@types';
-
-type Props = {
-    urn: string;
-    name: string;
-    onDelete?: () => void;
-};
-
-export default function DomainItemMenu({ name, urn, onDelete }: Props) {
-    const entityRegistry = useEntityRegistry();
-    const [deleteDomainMutation] = useDeleteDomainMutation();
-
-    const deleteDomain = () => {
-        deleteDomainMutation({
-            variables: {
-                urn,
-            },
-        })
-            .then(({ errors }) => {
-                if (!errors) {
-                    message.success('Deleted Domain!');
-                    onDelete?.();
-                }
-            })
-            .catch(() => {
-                message.destroy();
-                message.error({ content: `Failed to delete Domain!: An unknown error occurred.`, duration: 3 });
-            });
-    };
-
-    const onConfirmDelete = () => {
-        Modal.confirm({
-            title: `Delete Domain '${name}'`,
-            content: `Are you sure you want to remove this ${entityRegistry.getEntityName(EntityType.Domain)}?`,
-            onOk() {
-                deleteDomain();
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    const items = [
-        {
-            key: 0,
-            label: (
-                <Menu.Item onClick={onConfirmDelete} key="delete">
-                    <DeleteOutlined /> &nbsp;Delete
-                </Menu.Item>
-            ),
-        },
-    ];
-
-    return (
-        <Dropdown trigger={['click']} menu={{ items }}>
-            <MenuIcon data-testid={`dropdown-menu-${urn}`} fontSize={20} />
-        </Dropdown>
-    );
-}
diff --git a/datahub-web-react/src/app/domain/DomainListColumns.tsx b/datahub-web-react/src/app/domain/DomainListColumns.tsx
deleted file mode 100644
index 10368d6b3cfaa7..00000000000000
--- a/datahub-web-react/src/app/domain/DomainListColumns.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Tag, Tooltip, Typography } from 'antd';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import DomainItemMenu from '@app/domain/DomainItemMenu';
-import AvatarsGroup from '@app/shared/avatar/AvatarsGroup';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Maybe, Ownership } from '@types';
-
-interface DomainEntry {
-    name: string;
-    entities: string;
-    urn: string;
-    ownership?: Maybe<Ownership>;
-    url: string;
-}
-
-const AvatarGroupWrapper = styled.div`
-    margin-right: 10px;
-    display: inline-block;
-`;
-
-const DomainNameContainer = styled.div`
-    margin-left: 16px;
-    margin-right: 16px;
-    display: inline;
-`;
-
-export function DomainListMenuColumn(handleDelete: (urn: string) => void) {
-    return (record: DomainEntry) => (
-        <DomainItemMenu name={record.name} urn={record.urn} onDelete={() => handleDelete(record.urn)} />
-    );
-}
-
-export function DomainNameColumn(logoIcon: JSX.Element) {
-    return (record: DomainEntry) => (
-        <span data-testid={record.urn}>
-            <Link to={record.url}>
-                {logoIcon}
-                <DomainNameContainer>
-                    <Typography.Text>{record.name}</Typography.Text>
-                </DomainNameContainer>
-                <Tooltip title={`There are ${record.entities} entities in this domain.`}>
-                    <Tag>{record.entities} entities</Tag>
-                </Tooltip>
-            </Link>
-        </span>
-    );
-}
-
-export function DomainOwnersColumn(ownership: Maybe<Ownership>) {
-    const entityRegistry = useEntityRegistry();
-
-    if (!ownership) {
-        return null;
-    }
-
-    const { owners } = ownership;
-    if (!owners || owners.length === 0) {
-        return null;
-    }
-    return (
-        <AvatarGroupWrapper>
-            <AvatarsGroup size={24} owners={owners} entityRegistry={entityRegistry} maxCount={4} />
-        </AvatarGroupWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/domain/DomainRoutes.tsx b/datahub-web-react/src/app/domain/DomainRoutes.tsx
deleted file mode 100644
index 46c90c30bc3140..00000000000000
--- a/datahub-web-react/src/app/domain/DomainRoutes.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React, { useState } from 'react';
-import { Route, Switch } from 'react-router-dom';
-import styled from 'styled-components/macro';
-
-import { DomainsContext } from '@app/domain/DomainsContext';
-import ManageDomainsPageV2 from '@app/domain/nestedDomains/ManageDomainsPageV2';
-import ManageDomainsSidebar from '@app/domain/nestedDomains/ManageDomainsSidebar';
-import { EntityPage } from '@app/entity/EntityPage';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { PageRoutes } from '@conf/Global';
-
-import { EntityType } from '@types';
-
-const ContentWrapper = styled.div`
-    display: flex;
-    flex: 1;
-    overflow: hidden;
-`;
-
-export default function DomainRoutes() {
-    const entityRegistry = useEntityRegistry();
-    const [entityData, setEntityData] = useState<GenericEntityProperties | null>(null);
-    const [parentDomainsToUpdate, setParentDomainsToUpdate] = useState<string[]>([]);
-
-    return (
-        <DomainsContext.Provider value={{ entityData, setEntityData, parentDomainsToUpdate, setParentDomainsToUpdate }}>
-            <ContentWrapper>
-                <ManageDomainsSidebar />
-                <Switch>
-                    <Route
-                        key={entityRegistry.getPathName(EntityType.Domain)}
-                        path={`/${entityRegistry.getPathName(EntityType.Domain)}/:urn`}
-                        render={() => <EntityPage entityType={EntityType.Domain} />}
-                    />
-                    <Route path={PageRoutes.DOMAINS} render={() => <ManageDomainsPageV2 />} />
-                </Switch>
-            </ContentWrapper>
-        </DomainsContext.Provider>
-    );
-}
diff --git a/datahub-web-react/src/app/domain/DomainSearch.tsx b/datahub-web-react/src/app/domain/DomainSearch.tsx
deleted file mode 100644
index 975e7d3aac7f9c..00000000000000
--- a/datahub-web-react/src/app/domain/DomainSearch.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import { LoadingOutlined } from '@ant-design/icons';
-import React, { useRef, useState } from 'react';
-import styled from 'styled-components/macro';
-
-import DomainSearchResultItem from '@app/domain/DomainSearchResultItem';
-import { SearchBar } from '@app/search/SearchBar';
-import ClickOutside from '@app/shared/ClickOutside';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated';
-import { EntityType } from '@types';
-
-const DomainSearchWrapper = styled.div`
-    position: relative;
-`;
-
-const ResultsWrapper = styled.div`
-    background-color: white;
-    border-radius: 5px;
-    box-shadow:
-        0 3px 6px -4px rgb(0 0 0 / 12%),
-        0 6px 16px 0 rgb(0 0 0 / 8%),
-        0 9px 28px 8px rgb(0 0 0 / 5%);
-    max-height: 380px;
-    overflow: auto;
-    padding: 8px;
-    position: absolute;
-    max-height: 210px;
-    overflow: auto;
-    width: calc(100% - 24px);
-    left: 12px;
-    top: 45px;
-    z-index: 1;
-`;
-
-const LoadingWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 350px;
-    font-size: 30px;
-`;
-
-function DomainSearch() {
-    const [query, setQuery] = useState('');
-    const [isSearchBarFocused, setIsSearchBarFocused] = useState(false);
-    const entityRegistry = useEntityRegistry();
-    const { data, loading } = useGetSearchResultsForMultipleQuery({
-        variables: {
-            input: {
-                types: [EntityType.Domain],
-                query,
-                start: 0,
-                count: 50,
-            },
-        },
-    });
-
-    const searchResults = data?.searchAcrossEntities?.searchResults;
-    const timerRef = useRef(-1);
-
-    const handleQueryChange = (q: string) => {
-        window.clearTimeout(timerRef.current);
-        timerRef.current = window.setTimeout(() => {
-            setQuery(q);
-        }, 250);
-    };
-
-    const renderLoadingIndicator = () => (
-        <LoadingWrapper>
-            <LoadingOutlined />
-        </LoadingWrapper>
-    );
-
-    const renderSearchResults = () => (
-        <ResultsWrapper>
-            {searchResults?.map((result) => (
-                <DomainSearchResultItem
-                    key={result.entity.urn}
-                    entity={result.entity}
-                    entityRegistry={entityRegistry}
-                    query={query}
-                    onResultClick={() => setIsSearchBarFocused(false)}
-                />
-            ))}
-        </ResultsWrapper>
-    );
-
-    return (
-        <DomainSearchWrapper>
-            <ClickOutside onClickOutside={() => setIsSearchBarFocused(false)}>
-                <SearchBar
-                    initialQuery={query || ''}
-                    placeholderText="Search Domains"
-                    suggestions={[]}
-                    hideRecommendations
-                    style={{
-                        padding: 12,
-                        paddingBottom: 5,
-                    }}
-                    inputStyle={{
-                        height: 30,
-                        fontSize: 12,
-                    }}
-                    onSearch={() => null}
-                    onQueryChange={(q) => handleQueryChange(q)}
-                    entityRegistry={entityRegistry}
-                    onFocus={() => setIsSearchBarFocused(true)}
-                />
-                {loading && renderLoadingIndicator()}
-                {!loading && isSearchBarFocused && !!searchResults?.length && renderSearchResults()}
-            </ClickOutside>
-        </DomainSearchWrapper>
-    );
-}
-
-export default DomainSearch;
diff --git a/datahub-web-react/src/app/domain/DomainSearchResultItem.tsx b/datahub-web-react/src/app/domain/DomainSearchResultItem.tsx
deleted file mode 100644
index 96e92ce525d9d6..00000000000000
--- a/datahub-web-react/src/app/domain/DomainSearchResultItem.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-// Create a new component called SearchResultItem.js
-import React from 'react';
-import Highlight from 'react-highlighter';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components/macro';
-
-import DomainIcon from '@app/domain/DomainIcon';
-import { getParentDomains } from '@app/domain/utils';
-import { IconStyleType } from '@app/entity/Entity';
-import EntityRegistry from '@app/entity/EntityRegistry';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import ParentEntities from '@app/search/filters/ParentEntities';
-
-import { Entity, EntityType } from '@types';
-
-type Props = {
-    entity: Entity;
-    entityRegistry: EntityRegistry;
-    query: string;
-    onResultClick: () => void;
-};
-
-const SearchResult = styled(Link)`
-    color: #262626;
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    height: 100%;
-    padding: 6px 8px;
-    width: 100%;
-    &:hover {
-        background-color: ${ANTD_GRAY[3]};
-        color: #262626;
-    }
-`;
-
-const IconWrapper = styled.span``;
-
-const highlightMatchStyle = {
-    fontWeight: 'bold',
-    background: 'none',
-    padding: 0,
-};
-
-function DomainSearchResultItem({ entity, entityRegistry, query, onResultClick }: Props) {
-    return (
-        <SearchResult to={entityRegistry.getEntityUrl(entity.type, entity.urn)} onClick={onResultClick}>
-            <IconWrapper>
-                {entity.type === EntityType.Domain ? (
-                    <DomainIcon
-                        style={{
-                            fontSize: 16,
-                            color: '#BFBFBF',
-                        }}
-                    />
-                ) : (
-                    entityRegistry.getIcon(entity.type, 12, IconStyleType.ACCENT)
-                )}
-            </IconWrapper>
-            <div>
-                <ParentEntities parentEntities={getParentDomains(entity, entityRegistry)} />
-                <Highlight matchStyle={highlightMatchStyle} search={query}>
-                    {entityRegistry.getDisplayName(entity.type, entity)}
-                </Highlight>
-            </div>
-        </SearchResult>
-    );
-}
-
-export default DomainSearchResultItem;
diff --git a/datahub-web-react/src/app/domain/DomainsContext.tsx b/datahub-web-react/src/app/domain/DomainsContext.tsx
index da88ed1f3d582f..3a93fed0dfc683 100644
--- a/datahub-web-react/src/app/domain/DomainsContext.tsx
+++ b/datahub-web-react/src/app/domain/DomainsContext.tsx
@@ -2,14 +2,14 @@ import React, { useContext } from 'react';
 
 import { GenericEntityProperties } from '@app/entity/shared/types';
 
-export interface DomainsContextType {
+interface DomainsContextType {
     entityData: GenericEntityProperties | null;
     setEntityData: (entityData: GenericEntityProperties | null) => void;
     parentDomainsToUpdate: string[];
     setParentDomainsToUpdate: (values: string[]) => void;
 }
 
-export const DomainsContext = React.createContext<DomainsContextType>({
+const DomainsContext = React.createContext<DomainsContextType>({
     entityData: null,
     setEntityData: () => {},
     parentDomainsToUpdate: [], // used to tell domains to refetch their children count after updates (create, move, delete)
diff --git a/datahub-web-react/src/app/domain/DomainsList.tsx b/datahub-web-react/src/app/domain/DomainsList.tsx
deleted file mode 100644
index 8787a67d68c322..00000000000000
--- a/datahub-web-react/src/app/domain/DomainsList.tsx
+++ /dev/null
@@ -1,213 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Empty, Pagination, Typography } from 'antd';
-import * as QueryString from 'query-string';
-import { AlignType } from 'rc-table/lib/interface';
-import React, { useEffect, useState } from 'react';
-import { useLocation } from 'react-router';
-import styled from 'styled-components';
-
-import CreateDomainModal from '@app/domain/CreateDomainModal';
-import DomainIcon from '@app/domain/DomainIcon';
-import { DomainListMenuColumn, DomainNameColumn, DomainOwnersColumn } from '@app/domain/DomainListColumns';
-import { addToListDomainsCache, removeFromListDomainsCache } from '@app/domain/utils';
-import { StyledTable } from '@app/entity/shared/components/styled/StyledTable';
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import { getElasticCappedTotalValueText } from '@app/entity/shared/constants';
-import { OnboardingTour } from '@app/onboarding/OnboardingTour';
-import { DOMAINS_CREATE_DOMAIN_ID, DOMAINS_INTRO_ID } from '@app/onboarding/config/DomainsOnboardingConfig';
-import { SearchBar } from '@app/search/SearchBar';
-import { Message } from '@app/shared/Message';
-import { scrollToTop } from '@app/shared/searchUtils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useListDomainsQuery } from '@graphql/domain.generated';
-import { EntityType } from '@types';
-
-const DomainsContainer = styled.div``;
-
-export const DomainsPaginationContainer = styled.div`
-    display: flex;
-    justify-content: center;
-    padding: 12px;
-    padding-left: 16px;
-    border-bottom: 1px solid;
-    border-color: ${(props) => props.theme.styles['border-color-base']};
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-`;
-
-const PaginationInfo = styled(Typography.Text)`
-    padding: 0px;
-`;
-
-const DEFAULT_PAGE_SIZE = 25;
-
-export const DomainsList = () => {
-    const entityRegistry = useEntityRegistry();
-    const location = useLocation();
-    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
-    const paramsQuery = (params?.query as string) || undefined;
-    const [query, setQuery] = useState<undefined | string>(undefined);
-    useEffect(() => setQuery(paramsQuery), [paramsQuery]);
-
-    const [page, setPage] = useState(1);
-    const [isCreatingDomain, setIsCreatingDomain] = useState(false);
-
-    const pageSize = DEFAULT_PAGE_SIZE;
-    const start = (page - 1) * pageSize;
-
-    const { loading, error, data, client, refetch } = useListDomainsQuery({
-        variables: {
-            input: {
-                start,
-                count: pageSize,
-                query,
-            },
-        },
-        fetchPolicy: query && query.length > 0 ? 'no-cache' : 'cache-first',
-    });
-
-    const totalDomains = data?.listDomains?.total || 0;
-    const lastResultIndex = start + pageSize > totalDomains ? totalDomains : start + pageSize;
-    const domains = data?.listDomains?.domains || [];
-
-    const onChangePage = (newPage: number) => {
-        scrollToTop();
-        setPage(newPage);
-    };
-
-    const handleDelete = (urn: string) => {
-        removeFromListDomainsCache(client, urn, page, pageSize);
-        setTimeout(() => {
-            refetch?.();
-        }, 2000);
-    };
-
-    const allColumns = [
-        {
-            title: 'Name',
-            dataIndex: '',
-            key: 'name',
-            sorter: (sourceA, sourceB) => {
-                return sourceA.name.localeCompare(sourceB.name);
-            },
-            render: DomainNameColumn(
-                <DomainIcon
-                    style={{
-                        fontSize: 12,
-                        color: '#BFBFBF',
-                    }}
-                />,
-            ),
-        },
-        {
-            title: 'Owners',
-            dataIndex: 'ownership',
-            width: '10%',
-            key: 'ownership',
-            render: DomainOwnersColumn,
-        },
-        {
-            title: '',
-            dataIndex: '',
-            width: '5%',
-            align: 'right' as AlignType,
-            key: 'menu',
-            render: DomainListMenuColumn(handleDelete),
-        },
-    ];
-
-    const tableData = domains.map((domain) => {
-        const displayName = entityRegistry.getDisplayName(EntityType.Domain, domain);
-        const totalEntitiesText = getElasticCappedTotalValueText(domain.entities?.total || 0);
-        const url = entityRegistry.getEntityUrl(EntityType.Domain, domain.urn);
-
-        return {
-            urn: domain.urn,
-            name: displayName,
-            entities: totalEntitiesText,
-            ownership: domain.ownership,
-            url,
-        };
-    });
-
-    return (
-        <>
-            {!data && loading && <Message type="loading" content="Loading domains..." />}
-            {error && <Message type="error" content="Failed to load domains! An unexpected error occurred." />}
-            <OnboardingTour stepIds={[DOMAINS_INTRO_ID, DOMAINS_CREATE_DOMAIN_ID]} />
-            <DomainsContainer>
-                <TabToolbar>
-                    <Button id={DOMAINS_CREATE_DOMAIN_ID} type="text" onClick={() => setIsCreatingDomain(true)}>
-                        <PlusOutlined /> New Domain
-                    </Button>
-                    <SearchBar
-                        initialQuery={query || ''}
-                        placeholderText="Search domains..."
-                        suggestions={[]}
-                        style={{
-                            maxWidth: 220,
-                            padding: 0,
-                        }}
-                        inputStyle={{
-                            height: 32,
-                            fontSize: 12,
-                        }}
-                        onSearch={() => null}
-                        onQueryChange={(q) => setQuery(q && q.length > 0 ? q : undefined)}
-                        entityRegistry={entityRegistry}
-                        hideRecommendations
-                    />
-                </TabToolbar>
-                <StyledTable
-                    columns={allColumns}
-                    dataSource={tableData}
-                    rowKey="urn"
-                    pagination={false}
-                    locale={{ emptyText: <Empty description="No Domains!" image={Empty.PRESENTED_IMAGE_SIMPLE} /> }}
-                />
-                <DomainsPaginationContainer>
-                    <PaginationInfo>
-                        <b>
-                            {lastResultIndex > 0 ? (page - 1) * pageSize + 1 : 0} - {lastResultIndex}
-                        </b>
-                        of <b>{totalDomains}</b>
-                    </PaginationInfo>
-                    <Pagination
-                        current={page}
-                        pageSize={pageSize}
-                        total={totalDomains}
-                        showLessItems
-                        onChange={onChangePage}
-                        showSizeChanger={false}
-                    />
-                    <span />
-                </DomainsPaginationContainer>
-                {isCreatingDomain && (
-                    <CreateDomainModal
-                        onClose={() => setIsCreatingDomain(false)}
-                        onCreate={(urn, _, name, description) => {
-                            addToListDomainsCache(
-                                client,
-                                {
-                                    urn,
-                                    properties: {
-                                        name,
-                                        description: description || null,
-                                    },
-                                    ownership: null,
-                                    entities: null,
-                                    displayProperties: null,
-                                    institutionalMemory: null,
-                                },
-                                pageSize,
-                            );
-                            setTimeout(() => refetch(), 2000);
-                        }}
-                    />
-                )}
-            </DomainsContainer>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/domain/EmptyDomainDescription.tsx b/datahub-web-react/src/app/domain/EmptyDomainDescription.tsx
deleted file mode 100644
index b232aa3780c7c5..00000000000000
--- a/datahub-web-react/src/app/domain/EmptyDomainDescription.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-const StyledParagraph = styled(Typography.Paragraph)`
-    text-align: justify;
-    text-justify: inter-word;
-    margin: 40px 0;
-    font-size: 15px;
-`;
-
-function EmptyDomainDescription() {
-    return (
-        <>
-            <StyledParagraph type="secondary">
-                <strong style={{ color: ANTD_GRAY[8] }}>Welcome to your Data Domains!</strong> It looks like this space
-                is ready to be transformed into a well-organized data universe. Start by creating your first domain - a
-                high-level category for your data assets.
-            </StyledParagraph>
-            <StyledParagraph type="secondary">
-                <strong style={{ color: ANTD_GRAY[8] }}> Create Nested Domains:</strong> Want to dive deeper? You can
-                also create nested domains to add granularity and structure. Just like nesting Russian dolls, its all
-                about refining your organization.
-            </StyledParagraph>
-            <StyledParagraph type="secondary">
-                <strong style={{ color: ANTD_GRAY[8] }}>Build Data Products</strong>: Once your domains are set, go a
-                step further! Organize your data assets into data products to realize a data mesh architecture. Data
-                products empower you to treat data as a product, making it more accessible and manageable.
-            </StyledParagraph>
-            <StyledParagraph type="secondary">
-                Ready to embark on this data adventure? Click the Create Domain button to begin shaping your data
-                landscape!
-            </StyledParagraph>
-        </>
-    );
-}
-
-export default EmptyDomainDescription;
diff --git a/datahub-web-react/src/app/domain/EmptyDomainsSection.tsx b/datahub-web-react/src/app/domain/EmptyDomainsSection.tsx
deleted file mode 100644
index cffde970b4749e..00000000000000
--- a/datahub-web-react/src/app/domain/EmptyDomainsSection.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Empty, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-const EmptyDomainContainer = styled.div`
-    display: flex;
-    justify-content: center;
-    align-items: center;
-`;
-
-const StyledEmpty = styled(Empty)`
-    width: 35vw;
-    @media screen and (max-width: 1300px) {
-        width: 50vw;
-    }
-    @media screen and (max-width: 896px) {
-        overflow-y: auto;
-        max-height: 75vh;
-        &::-webkit-scrollbar {
-            width: 5px;
-            background: #d6d6d6;
-        }
-    }
-    padding: 60px 40px;
-    .ant-empty-image {
-        display: none;
-    }
-`;
-
-const StyledButton = styled(Button)`
-    margin: 18px 8px 0 0;
-`;
-
-const IconContainer = styled.span`
-    color: ${ANTD_GRAY[7]};
-    font-size: 40px;
-`;
-
-interface Props {
-    title?: string;
-    setIsCreatingDomain: React.Dispatch<React.SetStateAction<boolean>>;
-    description?: React.ReactNode;
-    icon?: React.ReactNode;
-}
-
-function EmptyDomainsSection(props: Props) {
-    const { title, description, setIsCreatingDomain, icon } = props;
-    return (
-        <EmptyDomainContainer>
-            <StyledEmpty
-                description={
-                    <>
-                        <IconContainer>{icon}</IconContainer>
-                        <Typography.Title level={4}>{title}</Typography.Title>
-                        {description}
-                    </>
-                }
-            >
-                <StyledButton onClick={() => setIsCreatingDomain(true)}>
-                    <PlusOutlined /> Create Domain
-                </StyledButton>
-            </StyledEmpty>
-        </EmptyDomainContainer>
-    );
-}
-
-export default EmptyDomainsSection;
diff --git a/datahub-web-react/src/app/domain/ManageDomainsPage.tsx b/datahub-web-react/src/app/domain/ManageDomainsPage.tsx
deleted file mode 100644
index d662377b5b51ba..00000000000000
--- a/datahub-web-react/src/app/domain/ManageDomainsPage.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { DomainsContext } from '@app/domain/DomainsContext';
-import { DomainsList } from '@app/domain/DomainsList';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-
-const PageContainer = styled.div`
-    padding-top: 20px;
-`;
-
-const PageHeaderContainer = styled.div`
-    && {
-        padding-left: 24px;
-    }
-`;
-
-const PageTitle = styled(Typography.Title)`
-    && {
-        margin-bottom: 12px;
-    }
-`;
-
-const ListContainer = styled.div``;
-
-export const ManageDomainsPage = () => {
-    const [entityData, setEntityData] = useState<GenericEntityProperties | null>(null);
-    const [parentDomainsToUpdate, setParentDomainsToUpdate] = useState<string[]>([]);
-
-    return (
-        <DomainsContext.Provider value={{ entityData, setEntityData, parentDomainsToUpdate, setParentDomainsToUpdate }}>
-            <PageContainer>
-                <PageHeaderContainer>
-                    <PageTitle level={3}>Domains</PageTitle>
-                    <Typography.Paragraph type="secondary">
-                        View your DataHub Domains. Take administrative actions.
-                    </Typography.Paragraph>
-                </PageHeaderContainer>
-                <ListContainer>
-                    <DomainsList />
-                </ListContainer>
-            </PageContainer>
-        </DomainsContext.Provider>
-    );
-};
diff --git a/datahub-web-react/src/app/domain/nestedDomains/DomainsSidebarHeader.tsx b/datahub-web-react/src/app/domain/nestedDomains/DomainsSidebarHeader.tsx
deleted file mode 100644
index 7e723e31837d1d..00000000000000
--- a/datahub-web-react/src/app/domain/nestedDomains/DomainsSidebarHeader.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { useApolloClient } from '@apollo/client';
-import { Button } from 'antd';
-import React, { useState } from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import CreateDomainModal from '@app/domain/CreateDomainModal';
-import { useDomainsContext } from '@app/domain/DomainsContext';
-import DomainsTitle from '@app/domain/nestedDomains/DomainsTitle';
-import { updateListDomainsCache } from '@app/domain/utils';
-import { ANTD_GRAY, ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-import { PageRoutes } from '@conf/Global';
-
-const HeaderWrapper = styled.div`
-    border-bottom: 1px solid ${ANTD_GRAY[4]};
-    padding: 16px;
-    font-size: 20px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-`;
-
-const StyledButton = styled(Button)`
-    box-shadow: none;
-    border-color: ${ANTD_GRAY_V2[6]};
-`;
-
-const StyledLink = styled(Link)`
-    color: inherit;
-
-    &:hover {
-        color: inherit;
-    }
-`;
-
-export default function DomainsSidebarHeader() {
-    const { setParentDomainsToUpdate } = useDomainsContext();
-    const [isCreatingDomain, setIsCreatingDomain] = useState(false);
-    const client = useApolloClient();
-
-    return (
-        <HeaderWrapper>
-            <StyledLink to={`${PageRoutes.DOMAINS}`}>
-                <DomainsTitle />
-            </StyledLink>
-            <StyledButton icon={<PlusOutlined />} onClick={() => setIsCreatingDomain(true)} />
-            {isCreatingDomain && (
-                <CreateDomainModal
-                    onClose={() => setIsCreatingDomain(false)}
-                    onCreate={(urn, id, name, description, parentDomain) => {
-                        updateListDomainsCache(client, urn, id, name, description, parentDomain);
-                        if (parentDomain) setParentDomainsToUpdate([parentDomain]);
-                    }}
-                />
-            )}
-        </HeaderWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/domain/nestedDomains/DomainsTitle.tsx b/datahub-web-react/src/app/domain/nestedDomains/DomainsTitle.tsx
deleted file mode 100644
index ea6a93a445ce7e..00000000000000
--- a/datahub-web-react/src/app/domain/nestedDomains/DomainsTitle.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import DomainIcon from '@app/domain/DomainIcon';
-
-const IconWrapper = styled.span`
-    margin-right: 10px;
-`;
-
-export default function DomainsTitle() {
-    return (
-        <span>
-            <IconWrapper>
-                <DomainIcon />
-            </IconWrapper>
-            Domains
-        </span>
-    );
-}
diff --git a/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsPageV2.tsx b/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsPageV2.tsx
deleted file mode 100644
index 3d7d3187f515c3..00000000000000
--- a/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsPageV2.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { useApolloClient } from '@apollo/client';
-import { Button } from 'antd';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components/macro';
-
-import CreateDomainModal from '@app/domain/CreateDomainModal';
-import { useDomainsContext } from '@app/domain/DomainsContext';
-import DomainsTitle from '@app/domain/nestedDomains/DomainsTitle';
-import RootDomains from '@app/domain/nestedDomains/RootDomains';
-import { updateListDomainsCache } from '@app/domain/utils';
-import { ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-import { OnboardingTour } from '@app/onboarding/OnboardingTour';
-import { DOMAINS_CREATE_DOMAIN_ID, DOMAINS_INTRO_ID } from '@app/onboarding/config/DomainsOnboardingConfig';
-
-const PageWrapper = styled.div`
-    background-color: ${ANTD_GRAY_V2[1]};
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-`;
-
-const Header = styled.div`
-    display: flex;
-    justify-content: space-between;
-    padding: 32px 24px;
-    font-size: 30px;
-    align-items: center;
-`;
-
-export default function ManageDomainsPageV2() {
-    const { setEntityData, setParentDomainsToUpdate } = useDomainsContext();
-    const [isCreatingDomain, setIsCreatingDomain] = useState(false);
-    const client = useApolloClient();
-
-    useEffect(() => {
-        setEntityData(null);
-    }, [setEntityData]);
-
-    return (
-        <PageWrapper>
-            <OnboardingTour stepIds={[DOMAINS_INTRO_ID, DOMAINS_CREATE_DOMAIN_ID]} />
-            <Header>
-                <DomainsTitle />
-                <Button
-                    type="primary"
-                    id={DOMAINS_CREATE_DOMAIN_ID}
-                    onClick={() => setIsCreatingDomain(true)}
-                    data-testid="domains-new-domain-button"
-                >
-                    <PlusOutlined /> New Domain
-                </Button>
-            </Header>
-            <RootDomains setIsCreatingDomain={setIsCreatingDomain} />
-            {isCreatingDomain && (
-                <CreateDomainModal
-                    onClose={() => setIsCreatingDomain(false)}
-                    onCreate={(urn, id, name, description, parentDomain) => {
-                        updateListDomainsCache(client, urn, id, name, description, parentDomain);
-                        if (parentDomain) setParentDomainsToUpdate([parentDomain]);
-                    }}
-                />
-            )}
-        </PageWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsSidebar.tsx b/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsSidebar.tsx
deleted file mode 100644
index a9f2a55941657a..00000000000000
--- a/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsSidebar.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React, { useState } from 'react';
-
-import DomainSearch from '@app/domain/DomainSearch';
-import DomainsSidebarHeader from '@app/domain/nestedDomains/DomainsSidebarHeader';
-import DomainNavigator from '@app/domain/nestedDomains/domainNavigator/DomainNavigator';
-import { ProfileSidebarResizer } from '@app/entity/shared/containers/profile/sidebar/ProfileSidebarResizer';
-import { MAX_BROWSER_WIDTH, MIN_BROWSWER_WIDTH } from '@app/glossary/BusinessGlossaryPage';
-import { SidebarWrapper } from '@app/shared/sidebar/components';
-
-export default function ManageDomainsSidebar() {
-    const [browserWidth, setBrowserWith] = useState(window.innerWidth * 0.2);
-
-    return (
-        <>
-            <SidebarWrapper width={browserWidth}>
-                <DomainsSidebarHeader />
-                <DomainSearch />
-                <DomainNavigator />
-            </SidebarWrapper>
-            <ProfileSidebarResizer
-                setSidePanelWidth={(width) =>
-                    setBrowserWith(Math.min(Math.max(width, MIN_BROWSWER_WIDTH), MAX_BROWSER_WIDTH))
-                }
-                initialSize={browserWidth}
-                isSidebarOnLeft
-            />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/domain/nestedDomains/RootDomains.tsx b/datahub-web-react/src/app/domain/nestedDomains/RootDomains.tsx
deleted file mode 100644
index fda3912e70ce96..00000000000000
--- a/datahub-web-react/src/app/domain/nestedDomains/RootDomains.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { ReadOutlined } from '@ant-design/icons';
-import React from 'react';
-import styled from 'styled-components';
-
-import EmptyDomainDescription from '@app/domain/EmptyDomainDescription';
-import EmptyDomainsSection from '@app/domain/EmptyDomainsSection';
-import useListDomains from '@app/domain/useListDomains';
-import { ResultWrapper } from '@app/search/SearchResultList';
-import { Message } from '@app/shared/Message';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType } from '@types';
-
-const DomainsWrapper = styled.div`
-    overflow: auto;
-    padding: 0 28px 16px 28px;
-`;
-
-interface Props {
-    setIsCreatingDomain: React.Dispatch<React.SetStateAction<boolean>>;
-}
-export default function RootDomains({ setIsCreatingDomain }: Props) {
-    const entityRegistry = useEntityRegistry();
-    const { loading, error, data, sortedDomains } = useListDomains({});
-
-    return (
-        <>
-            {!data && loading && <Message type="loading" content="Loading domains..." />}
-            {error && <Message type="error" content="Failed to load domains. An unexpected error occurred." />}
-            {!loading && (!data || !data?.listDomains?.domains?.length) && (
-                <EmptyDomainsSection
-                    icon={<ReadOutlined />}
-                    title="Organize your data"
-                    description={<EmptyDomainDescription />}
-                    setIsCreatingDomain={setIsCreatingDomain}
-                />
-            )}
-            <DomainsWrapper>
-                {sortedDomains?.map((domain) => (
-                    <ResultWrapper showUpdatedStyles>
-                        {entityRegistry.renderSearchResult(EntityType.Domain, { entity: domain, matchedFields: [] })}
-                    </ResultWrapper>
-                ))}
-            </DomainsWrapper>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/domain/utils.ts b/datahub-web-react/src/app/domain/utils.ts
index 9bb6ad994e6e3e..87a129634ccc91 100644
--- a/datahub-web-react/src/app/domain/utils.ts
+++ b/datahub-web-react/src/app/domain/utils.ts
@@ -1,11 +1,5 @@
 import { ApolloClient } from '@apollo/client';
-import { isEqual } from 'lodash';
-import { useEffect } from 'react';
-
-import { useDomainsContext } from '@app/domain/DomainsContext';
 import EntityRegistry from '@app/entity/EntityRegistry';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import usePrevious from '@app/shared/usePrevious';
 import { useEntityRegistry } from '@app/useEntityRegistry';
 
 import { ListDomainsDocument, ListDomainsQuery } from '@graphql/domain.generated';
@@ -14,7 +8,7 @@ import { Entity, EntityType } from '@types';
 /**
  * Add an entry to the list domains cache.
  */
-export const addToListDomainsCache = (client, newDomain, pageSize, parentDomain?: string) => {
+const addToListDomainsCache = (client, newDomain, pageSize, parentDomain?: string) => {
     // Read the data from our cache for this query.
     const currData: ListDomainsQuery | null = client.readQuery({
         query: ListDomainsDocument,
@@ -124,17 +118,6 @@ export const removeFromListDomainsCache = (client, urn, page, pageSize, parentDo
     });
 };
 
-export function useUpdateDomainEntityDataOnChange(entityData: GenericEntityProperties | null, entityType: EntityType) {
-    const { setEntityData } = useDomainsContext();
-    const previousEntityData = usePrevious(entityData);
-
-    useEffect(() => {
-        if (EntityType.Domain === entityType && !isEqual(entityData, previousEntityData)) {
-            setEntityData(entityData);
-        }
-    });
-}
-
 export function useSortedDomains<T extends Entity>(domains?: Array<T>, sortBy?: 'displayName') {
     const entityRegistry = useEntityRegistry();
     if (!domains || !sortBy) return domains;
diff --git a/datahub-web-react/src/app/domainV2/DomainsList.tsx b/datahub-web-react/src/app/domainV2/DomainsList.tsx
index 38835f2c83c006..4c5e13041bb99e 100644
--- a/datahub-web-react/src/app/domainV2/DomainsList.tsx
+++ b/datahub-web-react/src/app/domainV2/DomainsList.tsx
@@ -31,6 +31,7 @@ export const DomainsPaginationContainer = styled.div`
     padding: 12px;
     padding-left: 16px;
     border-bottom: 1px solid;
+    border-color: ${(props) => props.theme.styles['border-color-base']};
     display: flex;
     justify-content: space-between;
     align-items: center;
diff --git a/datahub-web-react/src/app/entity/Access/RoleEntity.tsx b/datahub-web-react/src/app/entity/Access/RoleEntity.tsx
deleted file mode 100644
index 5f9c7d8f51a3f1..00000000000000
--- a/datahub-web-react/src/app/entity/Access/RoleEntity.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import { TagFilled, TagOutlined } from '@ant-design/icons';
-import * as React from 'react';
-import styled from 'styled-components';
-
-import RoleEntityProfile from '@app/entity/Access/RoleEntityProfile';
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { urlEncodeUrn } from '@app/entity/shared/utils';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-
-import { useGetExternalRoleQuery } from '@graphql/accessrole.generated';
-import { EntityType, Role, SearchResult } from '@types';
-
-const PreviewTagIcon = styled(TagOutlined)`
-    font-size: 20px;
-`;
-// /**
-//  * Definition of the DataHub Access Role entity.
-//  */
-export class RoleEntity implements Entity<Role> {
-    type: EntityType = EntityType.Role;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <TagFilled style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <TagFilled style={{ fontSize, color: color || '#B37FEB' }} />;
-        }
-
-        return (
-            <TagOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getPathName: () => string = () => 'role';
-
-    getCollectionName: () => string = () => 'Roles';
-
-    getEntityName: () => string = () => 'Role';
-
-    useEntityQuery = useGetExternalRoleQuery;
-
-    renderProfile: (urn: string) => JSX.Element = (_) => <RoleEntityProfile />;
-
-    renderPreview = (_: PreviewType, data: Role) => (
-        <DefaultPreviewCard
-            description={data?.properties?.description || ''}
-            name={this.displayName(data)}
-            urn={data.urn}
-            url={`/${this.getPathName()}/${urlEncodeUrn(data.urn)}`}
-            logoComponent={<PreviewTagIcon />}
-            type="Role"
-            typeIcon={this.icon(14, IconStyleType.ACCENT)}
-        />
-    );
-
-    renderSearch = (result: SearchResult) => {
-        return this.renderPreview(PreviewType.SEARCH, result.entity as Role);
-    };
-
-    displayName = (data: Role) => {
-        return data.properties?.name || data.urn;
-    };
-
-    getOverridePropertiesFromEntity = (data: Role) => {
-        return {
-            name: data.properties?.name,
-        };
-    };
-
-    getGenericEntityProperties = (role: Role) => {
-        return getDataForEntityType({ data: role, entityType: this.type, getOverrideProperties: (data) => data });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([EntityCapabilityType.OWNERS]);
-    };
-
-    getGraphName = () => {
-        return 'roleEntity';
-    };
-}
diff --git a/datahub-web-react/src/app/entity/Access/RoleEntityProfile.tsx b/datahub-web-react/src/app/entity/Access/RoleEntityProfile.tsx
deleted file mode 100644
index 0d75fcc833da4e..00000000000000
--- a/datahub-web-react/src/app/entity/Access/RoleEntityProfile.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import { grey } from '@ant-design/colors';
-import { Divider, Typography } from 'antd';
-import React from 'react';
-import { useParams } from 'react-router';
-import styled from 'styled-components';
-
-import { decodeUrn } from '@app/entity/shared/utils';
-import { Message } from '@app/shared/Message';
-
-import { useGetExternalRoleQuery } from '@graphql/accessrole.generated';
-
-const PageContainer = styled.div`
-    padding: 32px 100px;
-`;
-
-const LoadingMessage = styled(Message)`
-    margin-top: 10%;
-`;
-
-type RolePageParams = {
-    urn: string;
-};
-
-const TitleLabel = styled(Typography.Text)`
-    &&& {
-        color: ${grey[2]};
-        font-size: 12px;
-        display: block;
-        line-height: 20px;
-        font-weight: 700;
-    }
-`;
-
-const DescriptionLabel = styled(Typography.Text)`
-    &&& {
-        text-align: left;
-        font-weight: bold;
-        font-size: 14px;
-        line-height: 28px;
-        color: rgb(38, 38, 38);
-    }
-`;
-
-const TitleText = styled(Typography.Text)`
-    &&& {
-        color: ${grey[10]};
-        font-weight: 700;
-        font-size: 20px;
-        line-height: 28px;
-        display: inline-block;
-        margin: 0px 7px;
-    }
-`;
-
-const { Paragraph } = Typography;
-
-export default function RoleEntityProfile() {
-    const { urn: encodedUrn } = useParams<RolePageParams>();
-    const urn = decodeUrn(encodedUrn);
-    const { data, loading } = useGetExternalRoleQuery({ variables: { urn } });
-
-    return (
-        <PageContainer>
-            {loading && <LoadingMessage type="loading" content="Loading..." />}
-            <TitleLabel>Role</TitleLabel>
-            <TitleText>{data?.role?.properties?.name}</TitleText>
-            <Divider />
-            {/* Role Description */}
-            <DescriptionLabel>About</DescriptionLabel>
-            <Paragraph style={{ fontSize: '12px', lineHeight: '15px', padding: '5px 0px' }}>
-                {data?.role?.properties?.description}
-            </Paragraph>
-        </PageContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/application/ApplicationEntitiesTab.tsx b/datahub-web-react/src/app/entity/application/ApplicationEntitiesTab.tsx
deleted file mode 100644
index 38944d16e3c9ac..00000000000000
--- a/datahub-web-react/src/app/entity/application/ApplicationEntitiesTab.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { SearchCardContext } from '@app/entityV2/shared/SearchCardContext';
-import { EmbeddedListSearchSection } from '@app/entityV2/shared/components/styled/search/EmbeddedListSearchSection';
-import { UnionType } from '@app/searchV2/utils/constants';
-
-export function ApplicationEntitiesTab() {
-    const { urn } = useEntityData();
-
-    const fixedOrFilters = [
-        {
-            field: 'applications',
-            values: [urn],
-        },
-    ];
-
-    return (
-        <SearchCardContext.Provider value={{ showRemovalFromList: true }}>
-            <EmbeddedListSearchSection
-                fixedFilters={{
-                    unionType: UnionType.OR,
-                    filters: fixedOrFilters,
-                }}
-                emptySearchQuery="*"
-                placeholderText="Filter assets..."
-                skipCache
-                applyView
-            />
-        </SearchCardContext.Provider>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/application/ApplicationEntity.tsx b/datahub-web-react/src/app/entity/application/ApplicationEntity.tsx
deleted file mode 100644
index b7144b0c399b7e..00000000000000
--- a/datahub-web-react/src/app/entity/application/ApplicationEntity.tsx
+++ /dev/null
@@ -1,259 +0,0 @@
-import {
-    AppstoreOutlined,
-    FileDoneOutlined,
-    FileOutlined,
-    ReadOutlined,
-    UnorderedListOutlined,
-} from '@ant-design/icons';
-import { ListBullets } from '@phosphor-icons/react';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entityV2/Entity';
-import { ApplicationEntitiesTab } from '@app/entityV2/application/ApplicationEntitiesTab';
-import { ApplicationSummaryTab } from '@app/entityV2/application/ApplicationSummaryTab';
-import { Preview } from '@app/entityV2/application/preview/Preview';
-import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions';
-import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes';
-import { EntityProfileTab } from '@app/entityV2/shared/constants';
-import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import { SidebarDomainSection } from '@app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import SidebarEntityHeader from '@app/entityV2/shared/containers/profile/sidebar/SidebarEntityHeader';
-import { SidebarGlossaryTermsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarGlossaryTermsSection';
-import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection';
-import StatusSection from '@app/entityV2/shared/containers/profile/sidebar/shared/StatusSection';
-import { getDataForEntityType } from '@app/entityV2/shared/containers/profile/utils';
-import SidebarNotesSection from '@app/entityV2/shared/sidebarSection/SidebarNotesSection';
-import SidebarStructuredProperties from '@app/entityV2/shared/sidebarSection/SidebarStructuredProperties';
-import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab';
-import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab';
-
-import { useGetApplicationQuery } from '@graphql/application.generated';
-import { Application, EntityType, SearchResult } from '@types';
-
-const headerDropdownItems = new Set([EntityMenuItems.SHARE, EntityMenuItems.DELETE, EntityMenuItems.EDIT]);
-
-type ApplicationWithChildren = Application & {
-    children?: {
-        total: number;
-    } | null;
-};
-
-/**
- * Definition of the DataHub Application entity.
- */
-export class ApplicationEntity implements Entity<Application> {
-    type: EntityType = EntityType.Application;
-
-    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <FileDoneOutlined className={TYPE_ICON_CLASS_NAME} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return (
-                <FileDoneOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#B37FEB' }} />
-            );
-        }
-
-        if (styleType === IconStyleType.SVG) {
-            return (
-                <path d="M832 64H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V96c0-17.7-14.3-32-32-32zm-600 72h560v208H232V136zm560 480H232V408h560v208zm0 272H232V680h560v208zM304 240a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0z" />
-            );
-        }
-
-        return (
-            <FileDoneOutlined
-                className={TYPE_ICON_CLASS_NAME}
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => true;
-
-    isLineageEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getPathName = () => 'application';
-
-    getEntityName = () => 'Application';
-
-    getCollectionName = () => 'Applications';
-
-    useEntityQuery = useGetApplicationQuery;
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            entityType={EntityType.Application}
-            useEntityQuery={useGetApplicationQuery}
-            useUpdateQuery={undefined}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            headerActionItems={new Set([])}
-            headerDropdownItems={headerDropdownItems}
-            isNameEditable
-            tabs={[
-                {
-                    id: EntityProfileTab.SUMMARY_TAB,
-                    name: 'Summary',
-                    component: ApplicationSummaryTab,
-                    icon: ReadOutlined,
-                },
-                {
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                    icon: FileOutlined,
-                },
-                {
-                    name: 'Assets',
-                    getCount: (entityData, _, loading) => {
-                        return !loading ? entityData?.children?.total : undefined;
-                    },
-                    component: ApplicationEntitiesTab,
-                    icon: AppstoreOutlined,
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                    icon: UnorderedListOutlined,
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-            sidebarTabs={this.getSidebarTabs()}
-        />
-    );
-
-    getSidebarSections = () => [
-        {
-            component: SidebarEntityHeader,
-        },
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarNotesSection,
-        },
-        {
-            component: SidebarOwnerSection,
-        },
-        {
-            component: SidebarDomainSection,
-            properties: {
-                updateOnly: true,
-            },
-        },
-        {
-            component: SidebarTagsSection,
-        },
-        {
-            component: SidebarGlossaryTermsSection,
-        },
-        {
-            component: SidebarStructuredProperties,
-        },
-        {
-            component: StatusSection,
-        },
-    ];
-
-    getSidebarTabs = () => [
-        {
-            name: 'Properties',
-            component: PropertiesTab,
-            description: 'View additional properties about this asset',
-            icon: ListBullets,
-        },
-    ];
-
-    renderPreview = (previewType: PreviewType, data: any) => {
-        const genericProperties = this.getGenericEntityProperties(data);
-        return (
-            <Preview
-                urn={data.urn}
-                data={genericProperties}
-                name={data.properties?.name || ''}
-                description={data.properties?.description}
-                owners={data.ownership?.owners}
-                globalTags={data.tags}
-                glossaryTerms={data.glossaryTerms}
-                domain={data.domain?.domain}
-                entityCount={(data as ApplicationWithChildren)?.children?.total || undefined}
-                externalUrl={data.properties?.externalUrl}
-                headerDropdownItems={headerDropdownItems}
-                previewType={previewType}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as Application;
-        const genericProperties = this.getGenericEntityProperties(data);
-        return (
-            <Preview
-                urn={data.urn}
-                data={genericProperties}
-                name={data.properties?.name || ''}
-                description={data.properties?.description}
-                owners={data.ownership?.owners}
-                globalTags={data.tags}
-                glossaryTerms={data.glossaryTerms}
-                domain={data.domain?.domain}
-                entityCount={(data as ApplicationWithChildren)?.children?.total || undefined}
-                externalUrl={data.properties?.externalUrl}
-                degree={(result as any).degree}
-                paths={(result as any).paths}
-                headerDropdownItems={headerDropdownItems}
-                previewType={PreviewType.SEARCH}
-            />
-        );
-    };
-
-    displayName = (data: Application) => {
-        return data?.properties?.name || data.urn;
-    };
-
-    getOverridePropertiesFromEntity = (data: Application) => {
-        const name = data?.properties?.name;
-        const externalUrl = data?.properties?.externalUrl;
-        const entityCount = (data as ApplicationWithChildren)?.children?.total || undefined;
-        const parentDomains = {
-            domains: (data?.domain && [data?.domain?.domain]) || [],
-            count: (data?.domain && 1) || 0,
-        };
-        return {
-            name,
-            externalUrl,
-            entityCount,
-            parentDomains,
-        };
-    };
-
-    getGenericEntityProperties = (data: Application) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.DOMAINS,
-        ]);
-    };
-
-    getGraphName = () => {
-        return 'application';
-    };
-}
diff --git a/datahub-web-react/src/app/entity/application/ApplicationSummaryTab.tsx b/datahub-web-react/src/app/entity/application/ApplicationSummaryTab.tsx
deleted file mode 100644
index 06b3d927794563..00000000000000
--- a/datahub-web-react/src/app/entity/application/ApplicationSummaryTab.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-
-import { AssetsSection } from '@app/entityV2/application/AssetsSections';
-import { SummaryTabWrapper } from '@app/entityV2/shared/summary/HeaderComponents';
-import SummaryAboutSection from '@app/entityV2/shared/summary/SummaryAboutSection';
-
-export const ApplicationSummaryTab = () => {
-    return (
-        <SummaryTabWrapper>
-            <AssetsSection />
-            <SummaryAboutSection />
-        </SummaryTabWrapper>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/application/AssetsSections.tsx b/datahub-web-react/src/app/entity/application/AssetsSections.tsx
deleted file mode 100644
index 2ad0f4dd056e2f..00000000000000
--- a/datahub-web-react/src/app/entity/application/AssetsSections.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import { AppstoreOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React from 'react';
-import { useHistory } from 'react-router';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import ContentSectionLoading from '@app/entityV2/domain/summary/ContentSectionLoading';
-import {
-    getContentsSummary,
-    getDomainEntitiesFilterUrl,
-    navigateToDomainEntities,
-} from '@app/entityV2/shared/containers/profile/sidebar/Domain/utils';
-import { SummaryTabHeaderTitle, SummaryTabHeaderWrapper } from '@app/entityV2/shared/summary/HeaderComponents';
-import { getContentTypeIcon } from '@app/entityV2/shared/summary/IconComponents';
-import { HorizontalList } from '@app/entityV2/shared/summary/ListComponents';
-import { pluralize } from '@app/shared/textUtil';
-import { EntityCountCard } from '@app/sharedV2/cards/EntityCountCard';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated';
-
-const AssetsSectionWrapper = styled.div`
-    flex: 1;
-    min-width: 100px;
-`;
-
-export const StyledHeaderWrapper = styled(SummaryTabHeaderWrapper)`
-    margin-bottom: 8px;
-`;
-
-export const AssetsSection = () => {
-    const history = useHistory();
-    const entityRegistry = useEntityRegistry();
-    const { urn, entityType } = useEntityData();
-
-    const { data, loading } = useGetSearchResultsForMultipleQuery({
-        skip: !urn,
-        variables: {
-            input: {
-                types: [],
-                query: '',
-                orFilters: [{ and: [{ field: 'applications', values: [urn] }] }],
-                count: 1000,
-            },
-        },
-        fetchPolicy: 'cache-first',
-    });
-
-    const contentsSummary = data?.searchAcrossEntities && getContentsSummary(data.searchAcrossEntities);
-    const contentsCount = contentsSummary?.total || 0;
-    const hasContents = contentsCount > 0;
-
-    if (!hasContents) {
-        return null;
-    }
-
-    return (
-        <AssetsSectionWrapper>
-            <StyledHeaderWrapper>
-                <SummaryTabHeaderTitle icon={<AppstoreOutlined />} title={`Assets (${contentsCount})`} />
-                <Button type="link" onClick={() => navigateToDomainEntities(urn, entityType, history, entityRegistry)}>
-                    View all
-                </Button>
-            </StyledHeaderWrapper>
-            {loading && <ContentSectionLoading />}
-
-            <HorizontalList>
-                {!loading &&
-                    contentsSummary?.types?.map((summary) => {
-                        const { type, count, entityType: summaryEntityType } = summary;
-                        const typeName = (
-                            type ||
-                            entityRegistry.getEntityName(summaryEntityType) ||
-                            summaryEntityType
-                        ).toLocaleLowerCase();
-                        const link = getDomainEntitiesFilterUrl(
-                            urn,
-                            entityType,
-                            entityRegistry,
-                            [summary.entityType],
-                            summary.type ? [summary.type] : undefined,
-                        );
-                        return (
-                            <EntityCountCard
-                                key={typeName}
-                                type={typeName}
-                                name={typeName}
-                                count={summary.count}
-                                icon={getContentTypeIcon(entityRegistry, summary.entityType, summary.type)}
-                                tooltipDescriptor={pluralize(count, typeName)}
-                                link={link}
-                            />
-                        );
-                    })}
-            </HorizontalList>
-        </AssetsSectionWrapper>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/application/preview/Preview.tsx b/datahub-web-react/src/app/entity/application/preview/Preview.tsx
deleted file mode 100644
index 3d0d594988b110..00000000000000
--- a/datahub-web-react/src/app/entity/application/preview/Preview.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import React from 'react';
-
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { EntityMenuActions, IconStyleType, PreviewType } from '@app/entityV2/Entity';
-import { EntityMenuItems } from '@app/entityV2/shared/EntityDropdown/EntityMenuActions';
-import DefaultPreviewCard from '@app/previewV2/DefaultPreviewCard';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Domain, EntityPath, EntityType, GlobalTags, GlossaryTerms, Owner } from '@types';
-
-interface Props {
-    urn: string;
-    data: GenericEntityProperties | null;
-    name: string;
-    description?: string | null;
-    owners?: Array<Owner> | null;
-    domain?: Domain | null;
-    globalTags?: GlobalTags | null;
-    glossaryTerms?: GlossaryTerms | null;
-    entityCount?: number;
-    externalUrl?: string | null;
-    degree?: number;
-    paths?: EntityPath[];
-    headerDropdownItems?: Set<EntityMenuItems>;
-    previewType: PreviewType;
-    actions?: EntityMenuActions;
-}
-
-export const Preview = ({
-    urn,
-    data,
-    name,
-    description,
-    owners,
-    globalTags,
-    domain,
-    glossaryTerms,
-    entityCount,
-    externalUrl,
-    degree,
-    paths,
-    headerDropdownItems,
-    previewType,
-    actions,
-}: Props): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.Application, urn)}
-            name={name || ''}
-            urn={urn}
-            data={data}
-            description={description || ''}
-            entityType={EntityType.Application}
-            typeIcon={entityRegistry.getIcon(EntityType.Application, 12, IconStyleType.ACCENT)}
-            qualifier={origin}
-            tags={globalTags || undefined}
-            owners={owners}
-            domain={domain}
-            parentEntities={domain ? [domain] : []}
-            glossaryTerms={glossaryTerms || undefined}
-            entityCount={entityCount}
-            externalUrl={externalUrl}
-            degree={degree}
-            paths={paths}
-            headerDropdownItems={headerDropdownItems}
-            previewType={previewType}
-            actions={actions}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/businessAttribute/BusinessAttributeEntity.tsx b/datahub-web-react/src/app/entity/businessAttribute/BusinessAttributeEntity.tsx
deleted file mode 100644
index d2cad8f094c425..00000000000000
--- a/datahub-web-react/src/app/entity/businessAttribute/BusinessAttributeEntity.tsx
+++ /dev/null
@@ -1,160 +0,0 @@
-import { GlobalOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { Preview } from '@app/entity/businessAttribute/preview/Preview';
-import { BusinessAttributeDataTypeSection } from '@app/entity/businessAttribute/profile/BusinessAttributeDataTypeSection';
-import BusinessAttributeRelatedEntity from '@app/entity/businessAttribute/profile/BusinessAttributeRelatedEntity';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { PageRoutes } from '@conf/Global';
-
-import { useGetBusinessAttributeQuery } from '@graphql/businessAttribute.generated';
-import { BusinessAttribute, EntityType, SearchResult } from '@types';
-
-/**
- *  Definition of datahub Business Attribute Entity
- */
-/* eslint-disable @typescript-eslint/no-unused-vars */
-export class BusinessAttributeEntity implements Entity<BusinessAttribute> {
-    type: EntityType = EntityType.BusinessAttribute;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <GlobalOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <GlobalOutlined style={{ fontSize, color: color || '#B37FEB' }} />;
-        }
-
-        if (styleType === IconStyleType.SVG) {
-            // TODO: Update the returned path value to the correct svg icon path
-            return (
-                <path d="M832 64H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V96c0-17.7-14.3-32-32-32zm-600 72h560v208H232V136zm560 480H232V408h560v208zm0 272H232V680h560v208zM304 240a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0z" />
-            );
-        }
-
-        return (
-            <GlobalOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    displayName = (data: BusinessAttribute) => {
-        return data?.properties?.name || data?.urn;
-    };
-
-    getPathName = () => 'business-attribute';
-
-    getEntityName = () => 'Business Attribute';
-
-    getCollectionName = () => 'Business Attributes';
-
-    getGraphName = () => 'businessAttribute';
-
-    getCustomCardUrlPath = () => PageRoutes.BUSINESS_ATTRIBUTE;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => false;
-
-    isSearchEnabled = () => true;
-
-    getOverridePropertiesFromEntity = (data: BusinessAttribute) => {
-        return {
-            name: data.properties?.name,
-        };
-    };
-
-    getGenericEntityProperties = (data: BusinessAttribute) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    renderPreview = (previewType: PreviewType, data: BusinessAttribute) => {
-        return (
-            <Preview
-                previewType={previewType}
-                urn={data.urn}
-                name={this.displayName(data)}
-                description={data.properties?.description || ''}
-                owners={data.ownership?.owners}
-            />
-        );
-    };
-
-    renderProfile = (urn: string) => {
-        return (
-            <EntityProfile
-                urn={urn}
-                entityType={EntityType.BusinessAttribute}
-                useEntityQuery={useGetBusinessAttributeQuery as any}
-                headerDropdownItems={new Set([EntityMenuItems.DELETE])}
-                isNameEditable
-                hideBrowseBar
-                tabs={[
-                    {
-                        name: 'Documentation',
-                        component: DocumentationTab,
-                    },
-                    {
-                        name: 'Related Entities',
-                        component: BusinessAttributeRelatedEntity,
-                    },
-                    {
-                        name: 'Properties',
-                        component: PropertiesTab,
-                    },
-                ]}
-                sidebarSections={[
-                    {
-                        component: SidebarAboutSection,
-                    },
-                    {
-                        component: BusinessAttributeDataTypeSection,
-                    },
-                    {
-                        component: SidebarOwnerSection,
-                    },
-                    {
-                        component: SidebarTagsSection,
-                        properties: {
-                            hasTags: true,
-                            hasTerms: true,
-                            customTagPath: 'properties.tags',
-                            customTermPath: 'properties.glossaryTerms',
-                        },
-                    },
-                ]}
-                getOverrideProperties={this.getOverridePropertiesFromEntity}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        return this.renderPreview(PreviewType.SEARCH, result.entity as BusinessAttribute);
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.BUSINESS_ATTRIBUTES,
-        ]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/businessAttribute/preview/Preview.tsx b/datahub-web-react/src/app/entity/businessAttribute/preview/Preview.tsx
deleted file mode 100644
index 5fad4ea1bf4cf5..00000000000000
--- a/datahub-web-react/src/app/entity/businessAttribute/preview/Preview.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { GlobalOutlined } from '@ant-design/icons';
-import React from 'react';
-
-import { getRelatedEntitiesUrl } from '@app/businessAttribute/businessAttributeUtils';
-import { IconStyleType, PreviewType } from '@app/entity/Entity';
-import UrlButton from '@app/entity/shared/UrlButton';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType, Owner } from '@types';
-
-export const Preview = ({
-    urn,
-    name,
-    description,
-    owners,
-    previewType,
-}: {
-    urn: string;
-    name: string;
-    description?: string | null;
-    owners?: Array<Owner> | null;
-    previewType: PreviewType;
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <DefaultPreviewCard
-            previewType={previewType}
-            url={entityRegistry.getEntityUrl(EntityType.BusinessAttribute, urn)}
-            name={name || ''}
-            urn={urn}
-            description={description || ''}
-            owners={owners}
-            logoComponent={<GlobalOutlined style={{ fontSize: '20px' }} />}
-            type="Business Attribute"
-            typeIcon={entityRegistry.getIcon(EntityType.BusinessAttribute, 14, IconStyleType.ACCENT)}
-            entityTitleSuffix={
-                <UrlButton href={getRelatedEntitiesUrl(entityRegistry, urn)}>View Related Entities</UrlButton>
-            }
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/businessAttribute/preview/_tests_/Preview.test.tsx b/datahub-web-react/src/app/entity/businessAttribute/preview/_tests_/Preview.test.tsx
deleted file mode 100644
index a9875df3255b58..00000000000000
--- a/datahub-web-react/src/app/entity/businessAttribute/preview/_tests_/Preview.test.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { render } from '@testing-library/react';
-import React from 'react';
-
-import { PreviewType } from '@app/entity/Entity';
-import { Preview } from '@app/entity/businessAttribute/preview/Preview';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-describe('Preview', () => {
-    it('renders', () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <Preview
-                        urn="urn:li:businessAttribute:ba1"
-                        name="name"
-                        description="definition"
-                        owners={null}
-                        previewType={PreviewType.PREVIEW}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('definition')).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx b/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx
deleted file mode 100644
index badfb718833b63..00000000000000
--- a/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import { EditOutlined } from '@ant-design/icons';
-import { Button, Select, message } from 'antd';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import { SchemaFieldDataType } from '@app/businessAttribute/businessAttributeUtils';
-import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext';
-import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader';
-
-import { useUpdateBusinessAttributeMutation } from '@graphql/businessAttribute.generated';
-
-interface Props {
-    readOnly?: boolean;
-}
-
-const DataTypeSelect = styled(Select)`
-    && {
-        width: 100%;
-        margin-top: 1em;
-        margin-bottom: 1em;
-    }
-`;
-// Ensures that any newly added datatype is automatically included in the user dropdown.
-const DATA_TYPES = Object.values(SchemaFieldDataType);
-export const BusinessAttributeDataTypeSection = ({ readOnly }: Props) => {
-    const { urn, entityData } = useEntityData();
-    const [originalDescription, setOriginalDescription] = useState<string | null>(null);
-    const [isEditing, setEditing] = useState(false);
-    const refetch = useRefetch();
-
-    useEffect(() => {
-        if (entityData?.properties?.businessAttributeDataType) {
-            setOriginalDescription(entityData?.properties?.businessAttributeDataType);
-        }
-    }, [entityData]);
-
-    const [updateBusinessAttribute] = useUpdateBusinessAttributeMutation();
-
-    const handleChange = (value) => {
-        if (value === originalDescription) {
-            setEditing(false);
-            return;
-        }
-
-        updateBusinessAttribute({ variables: { urn, input: { type: value } } })
-            .then(() => {
-                setEditing(false);
-                setOriginalDescription(value);
-                message.success({ content: 'Data Type Updated', duration: 2 });
-                refetch();
-            })
-            .catch((e: unknown) => {
-                message.destroy();
-                if (e instanceof Error) {
-                    message.error({ content: `Failed to update Data Type: \n ${e.message || ''}`, duration: 3 });
-                }
-            });
-    };
-
-    // Toggle editing mode
-    const handleEditClick = () => {
-        setEditing(!isEditing);
-    };
-
-    return (
-        <div>
-            <SidebarHeader
-                title="Data Type"
-                actions={
-                    !readOnly && (
-                        <Button
-                            data-testid="edit-data-type-button"
-                            onClick={handleEditClick}
-                            type="text"
-                            shape="circle"
-                        >
-                            <EditOutlined />
-                        </Button>
-                    )
-                }
-            />
-            {originalDescription}
-            {isEditing && (
-                <DataTypeSelect
-                    data-testid="add-data-type-option"
-                    placeholder="A data type for business attribute"
-                    onChange={handleChange}
-                >
-                    {DATA_TYPES.map((dataType: SchemaFieldDataType) => (
-                        <Select.Option key={dataType} value={dataType}>
-                            {dataType}
-                        </Select.Option>
-                    ))}
-                </DataTypeSelect>
-            )}
-        </div>
-    );
-};
-
-export default BusinessAttributeDataTypeSection;
diff --git a/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx b/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx
deleted file mode 100644
index 7cce43befb9c8e..00000000000000
--- a/datahub-web-react/src/app/entity/businessAttribute/profile/BusinessAttributeRelatedEntity.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import * as React from 'react';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection';
-import { UnionType } from '@app/search/utils/constants';
-
-export default function BusinessAttributeRelatedEntity() {
-    const { entityData } = useEntityData();
-
-    const entityUrn = entityData?.urn;
-
-    const fixedOrFilters =
-        (entityUrn && [
-            {
-                field: 'businessAttribute',
-                values: [entityUrn],
-            },
-        ]) ||
-        [];
-
-    entityData?.isAChildren?.relationships?.forEach((businessAttribute) => {
-        const childUrn = businessAttribute.entity?.urn;
-
-        if (childUrn) {
-            fixedOrFilters.push({
-                field: 'businessAttributes',
-                values: [childUrn],
-            });
-        }
-    });
-
-    return (
-        <EmbeddedListSearchSection
-            fixedFilters={{
-                unionType: UnionType.OR,
-                filters: fixedOrFilters,
-            }}
-            emptySearchQuery="*"
-            placeholderText="Filter entities..."
-            skipCache
-            applyView
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/entity/chart/ChartEntity.tsx b/datahub-web-react/src/app/entity/chart/ChartEntity.tsx
deleted file mode 100644
index 1e6a3427ee5291..00000000000000
--- a/datahub-web-react/src/app/entity/chart/ChartEntity.tsx
+++ /dev/null
@@ -1,297 +0,0 @@
-import { LineChartOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { ChartQueryTab } from '@app/entity/chart/ChartQueryTab';
-import { ChartPreview } from '@app/entity/chart/preview/ChartPreview';
-import { ChartStatsSummarySubHeader } from '@app/entity/chart/profile/stats/ChartStatsSummarySubHeader';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import EmbeddedProfile from '@app/entity/shared/embed/EmbeddedProfile';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { EmbedTab } from '@app/entity/shared/tabs/Embed/EmbedTab';
-import { ChartDashboardsTab } from '@app/entity/shared/tabs/Entity/ChartDashboardsTab';
-import { InputFieldsTab } from '@app/entity/shared/tabs/Entity/InputFieldsTab';
-import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab';
-import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { getDataProduct } from '@app/entity/shared/utils';
-import { LOOKER_URN } from '@app/ingest/source/builder/constants';
-import { MatchedFieldList } from '@app/search/matches/MatchedFieldList';
-import { matchedInputFieldRenderer } from '@app/search/matches/matchedInputFieldRenderer';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-
-import { GetChartQuery, useGetChartQuery, useUpdateChartMutation } from '@graphql/chart.generated';
-import { Chart, EntityType, LineageDirection, SearchResult } from '@types';
-
-/**
- * Definition of the DataHub Chart entity.
- */
-export class ChartEntity implements Entity<Chart> {
-    type: EntityType = EntityType.Chart;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <LineChartOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <LineChartOutlined style={{ fontSize, color: color || 'rgb(144 163 236)' }} />;
-        }
-
-        if (styleType === IconStyleType.SVG) {
-            return (
-                <path d="M888 792H200V168c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v688c0 4.4 3.6 8 8 8h752c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM305.8 637.7c3.1 3.1 8.1 3.1 11.3 0l138.3-137.6L583 628.5c3.1 3.1 8.2 3.1 11.3 0l275.4-275.3c3.1-3.1 3.1-8.2 0-11.3l-39.6-39.6a8.03 8.03 0 00-11.3 0l-230 229.9L461.4 404a8.03 8.03 0 00-11.3 0L266.3 586.7a8.03 8.03 0 000 11.3l39.5 39.7z" />
-            );
-        }
-
-        return (
-            <LineChartOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => true;
-
-    isLineageEnabled = () => true;
-
-    getAutoCompleteFieldName = () => 'title';
-
-    getGraphName = () => 'chart';
-
-    getPathName = () => 'chart';
-
-    getEntityName = () => 'Chart';
-
-    getCollectionName = () => 'Charts';
-
-    useEntityQuery = useGetChartQuery;
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-        },
-        {
-            component: SidebarTagsSection,
-            properties: {
-                hasTags: true,
-                hasTerms: true,
-            },
-        },
-        {
-            component: SidebarDomainSection,
-        },
-        {
-            component: DataProductSection,
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-    ];
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            entityType={EntityType.Chart}
-            useEntityQuery={this.useEntityQuery}
-            useUpdateQuery={useUpdateChartMutation}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            headerDropdownItems={new Set([EntityMenuItems.UPDATE_DEPRECATION, EntityMenuItems.RAISE_INCIDENT])}
-            subHeader={{
-                component: ChartStatsSummarySubHeader,
-            }}
-            tabs={[
-                {
-                    name: 'Query',
-                    component: ChartQueryTab,
-                    display: {
-                        visible: (_, chart: GetChartQuery) => (chart?.chart?.query?.rawQuery && true) || false,
-                        enabled: (_, chart: GetChartQuery) => (chart?.chart?.query?.rawQuery && true) || false,
-                    },
-                },
-                {
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                },
-                {
-                    name: 'Fields',
-                    component: InputFieldsTab,
-                    display: {
-                        visible: (_, chart: GetChartQuery) => (chart?.chart?.inputFields?.fields?.length || 0) > 0,
-                        enabled: (_, chart: GetChartQuery) => (chart?.chart?.inputFields?.fields?.length || 0) > 0,
-                    },
-                },
-                {
-                    name: 'Preview',
-                    component: EmbedTab,
-                    display: {
-                        visible: (_, chart: GetChartQuery) =>
-                            !!chart?.chart?.embed?.renderUrl && chart?.chart?.platform?.urn === LOOKER_URN,
-                        enabled: (_, chart: GetChartQuery) =>
-                            !!chart?.chart?.embed?.renderUrl && chart?.chart?.platform?.urn === LOOKER_URN,
-                    },
-                },
-                {
-                    name: 'Lineage',
-                    component: LineageTab,
-                    properties: {
-                        defaultDirection: LineageDirection.Upstream,
-                    },
-                },
-                {
-                    name: 'Dashboards',
-                    component: ChartDashboardsTab,
-                    display: {
-                        visible: (_, _1) => true,
-                        enabled: (_, chart: GetChartQuery) => (chart?.chart?.dashboards?.total || 0) > 0,
-                    },
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-                {
-                    name: 'Incidents',
-                    component: IncidentTab,
-                    getDynamicName: (_, chart) => {
-                        const activeIncidentCount = chart?.chart?.activeIncidents?.total;
-                        return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
-                    },
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-        />
-    );
-
-    getOverridePropertiesFromEntity = (chart?: Chart | null): GenericEntityProperties => {
-        // TODO: Get rid of this once we have correctly formed platform coming back.
-        const name = chart?.properties?.name;
-        const subTypes = chart?.subTypes;
-        const externalUrl = chart?.properties?.externalUrl;
-        return {
-            name,
-            externalUrl,
-            entityTypeOverride: subTypes ? capitalizeFirstLetterOnly(subTypes.typeNames?.[0]) : '',
-        };
-    };
-
-    renderPreview = (_: PreviewType, data: Chart) => {
-        const genericProperties = this.getGenericEntityProperties(data);
-        return (
-            <ChartPreview
-                urn={data.urn}
-                subType={data.subTypes?.typeNames?.[0]}
-                platform={data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)}
-                name={data.properties?.name}
-                description={data.editableProperties?.description || data.properties?.description}
-                access={data.properties?.access}
-                owners={data.ownership?.owners}
-                tags={data?.globalTags || undefined}
-                glossaryTerms={data?.glossaryTerms}
-                logoUrl={data?.platform?.properties?.logoUrl}
-                domain={data.domain?.domain}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                parentContainers={data.parentContainers}
-                health={data.health}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as Chart;
-        const genericProperties = this.getGenericEntityProperties(data);
-        return (
-            <ChartPreview
-                urn={data.urn}
-                subType={data.subTypes?.typeNames?.[0]}
-                platform={data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)}
-                platformInstanceId={data.dataPlatformInstance?.instanceId}
-                name={data.properties?.name}
-                description={data.editableProperties?.description || data.properties?.description}
-                access={data.properties?.access}
-                owners={data.ownership?.owners}
-                tags={data?.globalTags || undefined}
-                glossaryTerms={data?.glossaryTerms}
-                insights={result.insights}
-                logoUrl={data?.platform?.properties?.logoUrl || ''}
-                domain={data.domain?.domain}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                deprecation={data.deprecation}
-                statsSummary={data.statsSummary}
-                lastUpdatedMs={data.properties?.lastModified?.time}
-                createdMs={data.properties?.created?.time}
-                externalUrl={data.properties?.externalUrl}
-                snippet={
-                    <MatchedFieldList
-                        customFieldRenderer={(matchedField) => matchedInputFieldRenderer(matchedField, data)}
-                    />
-                }
-                degree={(result as any).degree}
-                paths={(result as any).paths}
-                health={data.health}
-            />
-        );
-    };
-
-    getLineageVizConfig = (entity: Chart) => {
-        return {
-            urn: entity.urn,
-            name: entity.properties?.name || entity.urn,
-            type: EntityType.Chart,
-            icon: entity?.platform?.properties?.logoUrl || undefined,
-            platform: entity?.platform,
-            subtype: entity?.subTypes?.typeNames?.[0] || undefined,
-            health: entity?.health || undefined,
-        };
-    };
-
-    displayName = (data: Chart) => {
-        return data.properties?.name || data.urn;
-    };
-
-    getGenericEntityProperties = (data: Chart) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.DOMAINS,
-            EntityCapabilityType.DEPRECATION,
-            EntityCapabilityType.SOFT_DELETE,
-            EntityCapabilityType.DATA_PRODUCTS,
-        ]);
-    };
-
-    renderEmbeddedProfile = (urn: string) => (
-        <EmbeddedProfile
-            urn={urn}
-            entityType={EntityType.Chart}
-            useEntityQuery={this.useEntityQuery}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/entity/chart/ChartQueryTab.tsx b/datahub-web-react/src/app/entity/chart/ChartQueryTab.tsx
deleted file mode 100644
index 02bd34aa1d2ffc..00000000000000
--- a/datahub-web-react/src/app/entity/chart/ChartQueryTab.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
-import styled from 'styled-components';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { InfoItem } from '@app/entity/shared/components/styled/InfoItem';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-import { GetChartQuery } from '@graphql/chart.generated';
-
-const InfoSection = styled.div`
-    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
-    padding: 16px 20px;
-`;
-
-const InfoItemContainer = styled.div<{ justifyContent }>`
-    display: flex;
-    position: relative;
-    justify-content: ${(props) => props.justifyContent};
-    padding: 12px 2px;
-`;
-
-const InfoItemContent = styled.div`
-    padding-top: 8px;
-`;
-
-const QueryText = styled(Typography.Paragraph)`
-    margin-top: 20px;
-    background-color: ${ANTD_GRAY[2]};
-`;
-
-// NOTE: Yes, using `!important` is a shame. However, the SyntaxHighlighter is applying styles directly
-// to the component, so there's no way around this
-const NestedSyntax = styled(SyntaxHighlighter)`
-    background-color: transparent !important;
-    border: none !important;
-`;
-
-export function ChartQueryTab() {
-    const baseEntity = useBaseEntity<GetChartQuery>();
-    const query = baseEntity?.chart?.query?.rawQuery || 'UNKNOWN';
-    const type = baseEntity?.chart?.query?.type || 'UNKNOWN';
-
-    return (
-        <>
-            <InfoSection>
-                <Typography.Title level={5}>Details</Typography.Title>
-                <InfoItemContainer justifyContent="left">
-                    <InfoItem title="Type">
-                        <InfoItemContent>{type.toUpperCase()}</InfoItemContent>
-                    </InfoItem>
-                </InfoItemContainer>
-            </InfoSection>
-            <InfoSection>
-                <Typography.Title level={5}>Query</Typography.Title>
-                <QueryText>
-                    <NestedSyntax language="sql">{query}</NestedSyntax>
-                </QueryText>
-            </InfoSection>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/chart/preview/ChartPreview.tsx b/datahub-web-react/src/app/entity/chart/preview/ChartPreview.tsx
deleted file mode 100644
index a8a13a6b7ef48c..00000000000000
--- a/datahub-web-react/src/app/entity/chart/preview/ChartPreview.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import React from 'react';
-
-import { IconStyleType, PreviewType } from '@app/entity/Entity';
-import { ChartStatsSummary as ChartStatsSummaryView } from '@app/entity/chart/shared/ChartStatsSummary';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import {
-    AccessLevel,
-    ChartStatsSummary,
-    Container,
-    DataProduct,
-    Deprecation,
-    Domain,
-    EntityPath,
-    EntityType,
-    GlobalTags,
-    GlossaryTerms,
-    Health,
-    Owner,
-    ParentContainersResult,
-    SearchInsight,
-} from '@types';
-
-export const ChartPreview = ({
-    urn,
-    name,
-    description,
-    platform,
-    platformInstanceId,
-    access,
-    owners,
-    tags,
-    glossaryTerms,
-    domain,
-    dataProduct,
-    container,
-    insights,
-    logoUrl,
-    deprecation,
-    statsSummary,
-    lastUpdatedMs,
-    createdMs,
-    externalUrl,
-    parentContainers,
-    snippet,
-    degree,
-    paths,
-    subType,
-    health,
-    previewType,
-}: {
-    urn: string;
-    platform?: string;
-    platformInstanceId?: string;
-    name?: string;
-    description?: string | null;
-    access?: AccessLevel | null;
-    owners?: Array<Owner> | null;
-    tags?: GlobalTags;
-    glossaryTerms?: GlossaryTerms | null;
-    domain?: Domain | null;
-    dataProduct?: DataProduct | null;
-    container?: Container | null;
-    insights?: Array<SearchInsight> | null;
-    logoUrl?: string | null;
-    deprecation?: Deprecation | null;
-    statsSummary?: ChartStatsSummary | null;
-    lastUpdatedMs?: number | null;
-    createdMs?: number | null;
-    externalUrl?: string | null;
-    parentContainers?: ParentContainersResult | null;
-    snippet?: React.ReactNode | null;
-    degree?: number;
-    paths?: EntityPath[];
-    subType?: string | null;
-    health?: Health[] | null;
-    previewType?: PreviewType;
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.Chart, urn)}
-            name={name || ''}
-            urn={urn}
-            description={description || ''}
-            type={capitalizeFirstLetterOnly(subType) || 'Chart'}
-            typeIcon={entityRegistry.getIcon(EntityType.Chart, 14, IconStyleType.ACCENT)}
-            logoUrl={logoUrl || ''}
-            platform={platform}
-            platformInstanceId={platformInstanceId}
-            qualifier={access}
-            tags={tags}
-            owners={owners}
-            glossaryTerms={glossaryTerms || undefined}
-            domain={domain}
-            dataProduct={dataProduct}
-            container={container || undefined}
-            insights={insights}
-            parentContainers={parentContainers}
-            deprecation={deprecation}
-            externalUrl={externalUrl}
-            snippet={snippet}
-            subHeader={
-                <ChartStatsSummaryView
-                    viewCount={statsSummary?.viewCount}
-                    uniqueUserCountLast30Days={statsSummary?.uniqueUserCountLast30Days}
-                    lastUpdatedMs={lastUpdatedMs}
-                    createdMs={createdMs}
-                />
-            }
-            degree={degree}
-            paths={paths}
-            health={health || undefined}
-            previewType={previewType}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/chart/profile/stats/ChartStatsSummarySubHeader.tsx b/datahub-web-react/src/app/entity/chart/profile/stats/ChartStatsSummarySubHeader.tsx
deleted file mode 100644
index 336fb1f1d0ec4b..00000000000000
--- a/datahub-web-react/src/app/entity/chart/profile/stats/ChartStatsSummarySubHeader.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-
-import { ChartStatsSummary } from '@app/entity/chart/shared/ChartStatsSummary';
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-
-import { GetChartQuery } from '@graphql/chart.generated';
-import { ChartStatsSummary as ChartStatsSummaryObj } from '@types';
-
-export const ChartStatsSummarySubHeader = () => {
-    const result = useBaseEntity<GetChartQuery>();
-    const chart = result?.chart;
-    const maybeStatsSummary = chart?.statsSummary as ChartStatsSummaryObj;
-    const viewCount = maybeStatsSummary?.viewCount;
-    const uniqueUserCountLast30Days = maybeStatsSummary?.uniqueUserCountLast30Days;
-    const lastUpdatedMs = chart?.properties?.lastModified?.time;
-    const createdMs = chart?.properties?.created?.time;
-
-    return (
-        <ChartStatsSummary
-            viewCount={viewCount}
-            uniqueUserCountLast30Days={uniqueUserCountLast30Days}
-            lastUpdatedMs={lastUpdatedMs}
-            createdMs={createdMs}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/chart/shared/ChartStatsSummary.tsx b/datahub-web-react/src/app/entity/chart/shared/ChartStatsSummary.tsx
deleted file mode 100644
index d5cf88b4a848d9..00000000000000
--- a/datahub-web-react/src/app/entity/chart/shared/ChartStatsSummary.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import { ClockCircleOutlined, EyeOutlined, QuestionCircleOutlined, TeamOutlined } from '@ant-design/icons';
-import { Popover, Tooltip } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import ExpandingStat from '@app/entity/dataset/shared/ExpandingStat';
-import { StatsSummary } from '@app/entity/shared/components/styled/StatsSummary';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber';
-import { toLocalDateTimeString, toRelativeTimeString } from '@app/shared/time/timeUtils';
-import { countFormatter, needsFormatting } from '@utils/formatter';
-
-const StatText = styled.span`
-    color: ${ANTD_GRAY[8]};
-`;
-
-const HelpIcon = styled(QuestionCircleOutlined)`
-    color: ${ANTD_GRAY[7]};
-    padding-left: 4px;
-`;
-
-type Props = {
-    chartCount?: number | null;
-    viewCount?: number | null;
-    uniqueUserCountLast30Days?: number | null;
-    lastUpdatedMs?: number | null;
-    createdMs?: number | null;
-};
-
-export const ChartStatsSummary = ({
-    chartCount,
-    viewCount,
-    uniqueUserCountLast30Days,
-    lastUpdatedMs,
-    createdMs,
-}: Props) => {
-    const statsViews = [
-        (!!chartCount && (
-            <ExpandingStat
-                disabled={!needsFormatting(chartCount)}
-                render={(isExpanded) => (
-                    <StatText color={ANTD_GRAY[8]}>
-                        <b>{isExpanded ? formatNumberWithoutAbbreviation(chartCount) : countFormatter(chartCount)}</b>{' '}
-                        charts
-                    </StatText>
-                )}
-            />
-        )) ||
-            undefined,
-        (!!viewCount && (
-            <StatText>
-                <EyeOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} />
-                <b>{formatNumberWithoutAbbreviation(viewCount)}</b> views
-            </StatText>
-        )) ||
-            undefined,
-        (!!uniqueUserCountLast30Days && (
-            <StatText>
-                <TeamOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} />
-                <b>{formatNumberWithoutAbbreviation(uniqueUserCountLast30Days)}</b> unique users
-            </StatText>
-        )) ||
-            undefined,
-        (!!lastUpdatedMs && (
-            <Popover
-                content={
-                    <>
-                        {createdMs && <div>Created on {toLocalDateTimeString(createdMs)}.</div>}
-                        <div>
-                            Changed on {toLocalDateTimeString(lastUpdatedMs)}.{' '}
-                            <Tooltip title="The time at which the chart was last changed in the source platform">
-                                <HelpIcon />
-                            </Tooltip>
-                        </div>
-                    </>
-                }
-            >
-                <StatText>
-                    <ClockCircleOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} />
-                    Changed {toRelativeTimeString(lastUpdatedMs)}
-                </StatText>
-            </Popover>
-        )) ||
-            undefined,
-    ].filter((stat) => stat !== undefined);
-
-    return <>{statsViews.length > 0 && <StatsSummary stats={statsViews} />}</>;
-};
diff --git a/datahub-web-react/src/app/entity/container/ContainerEntitiesTab.tsx b/datahub-web-react/src/app/entity/container/ContainerEntitiesTab.tsx
deleted file mode 100644
index ac3864fc0caf3a..00000000000000
--- a/datahub-web-react/src/app/entity/container/ContainerEntitiesTab.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection';
-import { UnionType } from '@app/search/utils/constants';
-
-export const ContainerEntitiesTab = () => {
-    const { urn } = useEntityData();
-
-    const fixedFilter = {
-        field: 'container',
-        values: [urn],
-    };
-
-    return (
-        <EmbeddedListSearchSection
-            fixedFilters={{
-                unionType: UnionType.AND,
-                filters: [fixedFilter],
-            }}
-            emptySearchQuery="*"
-            placeholderText="Filter container entities..."
-            applyView
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/container/ContainerEntity.tsx b/datahub-web-react/src/app/entity/container/ContainerEntity.tsx
deleted file mode 100644
index d851d27c6c2a86..00000000000000
--- a/datahub-web-react/src/app/entity/container/ContainerEntity.tsx
+++ /dev/null
@@ -1,235 +0,0 @@
-import { FolderOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { ContainerEntitiesTab } from '@app/entity/container/ContainerEntitiesTab';
-import { Preview } from '@app/entity/container/preview/Preview';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import EmbeddedProfile from '@app/entity/shared/embed/EmbeddedProfile';
-import AccessManagement from '@app/entity/shared/tabs/Dataset/AccessManagement/AccessManagement';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { getDataProduct } from '@app/entity/shared/utils';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useAppConfig } from '@app/useAppConfig';
-
-import { GetContainerQuery, useGetContainerQuery } from '@graphql/container.generated';
-import { Container, EntityType, SearchResult } from '@types';
-
-/**
- * Definition of the DataHub Container entity.
- */
-export class ContainerEntity implements Entity<Container> {
-    type: EntityType = EntityType.Container;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <FolderOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <FolderOutlined style={{ fontSize, color: color || '#B37FEB' }} />;
-        }
-
-        if (styleType === IconStyleType.SVG) {
-            return (
-                <path d="M832 64H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V96c0-17.7-14.3-32-32-32zm-600 72h560v208H232V136zm560 480H232V408h560v208zm0 272H232V680h560v208zM304 240a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0z" />
-            );
-        }
-
-        return (
-            <FolderOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getGraphName = () => 'container';
-
-    getPathName = () => 'container';
-
-    getEntityName = () => 'Container';
-
-    getCollectionName = () => 'Containers';
-
-    useEntityQuery = useGetContainerQuery;
-
-    appconfig = useAppConfig;
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            entityType={EntityType.Container}
-            useEntityQuery={this.useEntityQuery}
-            useUpdateQuery={undefined}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            tabs={[
-                {
-                    name: 'Entities',
-                    component: ContainerEntitiesTab,
-                },
-                {
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                },
-                {
-                    name: 'Access',
-                    component: AccessManagement,
-                    display: {
-                        visible: (_, container: GetContainerQuery) => {
-                            return (
-                                this.appconfig().config.featureFlags.showAccessManagement &&
-                                !!container?.container?.access
-                            );
-                        },
-                        enabled: (_, container: GetContainerQuery) => {
-                            const accessAspect = container?.container?.access;
-                            const rolesList = accessAspect?.roles;
-                            return !!accessAspect && !!rolesList && rolesList.length > 0;
-                        },
-                    },
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-        />
-    );
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-        },
-        {
-            component: SidebarTagsSection,
-            properties: {
-                hasTags: true,
-                hasTerms: true,
-            },
-        },
-        {
-            component: SidebarDomainSection,
-        },
-        {
-            component: DataProductSection,
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-        // TODO: Add back once entity-level recommendations are complete.
-        // {
-        //    component: SidebarRecommendationsSection,
-        // },
-    ];
-
-    renderPreview = (_: PreviewType, data: Container) => {
-        const genericProperties = this.getGenericEntityProperties(data);
-        return (
-            <Preview
-                urn={data.urn}
-                name={this.displayName(data)}
-                platformName={data.platform.properties?.displayName || capitalizeFirstLetterOnly(data.platform.name)}
-                platformLogo={data.platform.properties?.logoUrl}
-                description={data.properties?.description}
-                owners={data.ownership?.owners}
-                subTypes={data.subTypes}
-                container={data.container}
-                entityCount={data.entities?.total}
-                domain={data.domain?.domain}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                tags={data.tags}
-                externalUrl={data.properties?.externalUrl}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as Container;
-        const genericProperties = this.getGenericEntityProperties(data);
-        return (
-            <Preview
-                urn={data.urn}
-                name={this.displayName(data)}
-                platformName={data.platform.properties?.displayName || capitalizeFirstLetterOnly(data.platform.name)}
-                platformLogo={data.platform.properties?.logoUrl}
-                platformInstanceId={data.dataPlatformInstance?.instanceId}
-                description={data.editableProperties?.description || data.properties?.description}
-                owners={data.ownership?.owners}
-                subTypes={data.subTypes}
-                container={data.container}
-                entityCount={data.entities?.total}
-                domain={data.domain?.domain}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                parentContainers={data.parentContainers}
-                externalUrl={data.properties?.externalUrl}
-                tags={data.tags}
-                glossaryTerms={data.glossaryTerms}
-                degree={(result as any).degree}
-                paths={(result as any).paths}
-            />
-        );
-    };
-
-    displayName = (data: Container) => {
-        return data?.properties?.name || data?.properties?.qualifiedName || data?.urn;
-    };
-
-    getOverridePropertiesFromEntity = (data: Container) => {
-        return {
-            name: this.displayName(data),
-            externalUrl: data.properties?.externalUrl,
-            entityCount: data.entities?.total,
-        };
-    };
-
-    getGenericEntityProperties = (data: Container) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.DOMAINS,
-            EntityCapabilityType.SOFT_DELETE,
-            EntityCapabilityType.DATA_PRODUCTS,
-        ]);
-    };
-
-    renderEmbeddedProfile = (urn: string) => (
-        <EmbeddedProfile
-            urn={urn}
-            entityType={EntityType.Container}
-            useEntityQuery={this.useEntityQuery}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/entity/container/preview/Preview.tsx b/datahub-web-react/src/app/entity/container/preview/Preview.tsx
deleted file mode 100644
index 746171354f5d59..00000000000000
--- a/datahub-web-react/src/app/entity/container/preview/Preview.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { IconStyleType } from '@app/entity/Entity';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import {
-    Container,
-    DataProduct,
-    Deprecation,
-    Domain,
-    EntityPath,
-    EntityType,
-    GlobalTags,
-    GlossaryTerms,
-    Owner,
-    ParentContainersResult,
-    SearchInsight,
-    SubTypes,
-} from '@types';
-
-const StatText = styled(Typography.Text)`
-    color: ${ANTD_GRAY[8]};
-`;
-
-export const Preview = ({
-    urn,
-    name,
-    platformName,
-    platformLogo,
-    platformInstanceId,
-    description,
-    owners,
-    tags,
-    glossaryTerms,
-    insights,
-    subTypes,
-    logoComponent,
-    container,
-    entityCount,
-    domain,
-    dataProduct,
-    parentContainers,
-    externalUrl,
-    deprecation,
-    degree,
-    paths,
-}: {
-    urn: string;
-    name: string;
-    platformName?: string;
-    platformLogo?: string | null;
-    platformInstanceId?: string;
-    description?: string | null;
-    owners?: Array<Owner> | null;
-    tags?: GlobalTags | null;
-    glossaryTerms?: GlossaryTerms | null;
-    insights?: Array<SearchInsight> | null;
-    subTypes?: SubTypes | null;
-    logoComponent?: JSX.Element;
-    container?: Container | null;
-    entityCount?: number;
-    domain?: Domain | null;
-    dataProduct?: DataProduct | null;
-    deprecation?: Deprecation | null;
-    parentContainers?: ParentContainersResult | null;
-    externalUrl?: string | null;
-    degree?: number;
-    paths?: EntityPath[];
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    const typeName = capitalizeFirstLetterOnly(subTypes?.typeNames?.[0]) || 'Container';
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.Container, urn)}
-            name={name || ''}
-            urn={urn}
-            platform={platformName}
-            platformInstanceId={platformInstanceId}
-            description={description || ''}
-            type={typeName}
-            owners={owners}
-            deprecation={deprecation}
-            insights={insights}
-            logoUrl={platformLogo || undefined}
-            logoComponent={logoComponent}
-            container={container || undefined}
-            typeIcon={entityRegistry.getIcon(EntityType.Container, 12, IconStyleType.ACCENT)}
-            domain={domain || undefined}
-            dataProduct={dataProduct}
-            parentContainers={parentContainers}
-            tags={tags || undefined}
-            glossaryTerms={glossaryTerms || undefined}
-            externalUrl={externalUrl}
-            subHeader={
-                (entityCount && [
-                    <StatText>
-                        <b>{entityCount}</b> {entityCount === 1 ? 'entity' : 'entities'}
-                    </StatText>,
-                ]) ||
-                undefined
-            }
-            degree={degree}
-            paths={paths}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/dashboard/DashboardEntity.tsx b/datahub-web-react/src/app/entity/dashboard/DashboardEntity.tsx
deleted file mode 100644
index 64409b5bfb854e..00000000000000
--- a/datahub-web-react/src/app/entity/dashboard/DashboardEntity.tsx
+++ /dev/null
@@ -1,305 +0,0 @@
-import { DashboardFilled, DashboardOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { DashboardPreview } from '@app/entity/dashboard/preview/DashboardPreview';
-import { DashboardStatsSummarySubHeader } from '@app/entity/dashboard/profile/DashboardStatsSummarySubHeader';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import EmbeddedProfile from '@app/entity/shared/embed/EmbeddedProfile';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { EmbedTab } from '@app/entity/shared/tabs/Embed/EmbedTab';
-import { DashboardChartsTab } from '@app/entity/shared/tabs/Entity/DashboardChartsTab';
-import { DashboardDatasetsTab } from '@app/entity/shared/tabs/Entity/DashboardDatasetsTab';
-import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab';
-import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { getDataProduct } from '@app/entity/shared/utils';
-import { LOOKER_URN } from '@app/ingest/source/builder/constants';
-import { MatchedFieldList } from '@app/search/matches/MatchedFieldList';
-import { matchedInputFieldRenderer } from '@app/search/matches/matchedInputFieldRenderer';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-
-import { GetDashboardQuery, useGetDashboardQuery, useUpdateDashboardMutation } from '@graphql/dashboard.generated';
-import { Dashboard, EntityType, LineageDirection, OwnershipType, SearchResult } from '@types';
-
-/**
- * Definition of the DataHub Dashboard entity.
- */
-export class DashboardEntity implements Entity<Dashboard> {
-    type: EntityType = EntityType.Dashboard;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <DashboardOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <DashboardFilled style={{ fontSize, color: color || 'rgb(144 163 236)' }} />;
-        }
-
-        if (styleType === IconStyleType.SVG) {
-            return (
-                <path d="M924.8 385.6a446.7 446.7 0 00-96-142.4 446.7 446.7 0 00-142.4-96C631.1 123.8 572.5 112 512 112s-119.1 11.8-174.4 35.2a446.7 446.7 0 00-142.4 96 446.7 446.7 0 00-96 142.4C75.8 440.9 64 499.5 64 560c0 132.7 58.3 257.7 159.9 343.1l1.7 1.4c5.8 4.8 13.1 7.5 20.6 7.5h531.7c7.5 0 14.8-2.7 20.6-7.5l1.7-1.4C901.7 817.7 960 692.7 960 560c0-60.5-11.9-119.1-35.2-174.4zM761.4 836H262.6A371.12 371.12 0 01140 560c0-99.4 38.7-192.8 109-263 70.3-70.3 163.7-109 263-109 99.4 0 192.8 38.7 263 109 70.3 70.3 109 163.7 109 263 0 105.6-44.5 205.5-122.6 276zM623.5 421.5a8.03 8.03 0 00-11.3 0L527.7 506c-18.7-5-39.4-.2-54.1 14.5a55.95 55.95 0 000 79.2 55.95 55.95 0 0079.2 0 55.87 55.87 0 0014.5-54.1l84.5-84.5c3.1-3.1 3.1-8.2 0-11.3l-28.3-28.3zM490 320h44c4.4 0 8-3.6 8-8v-80c0-4.4-3.6-8-8-8h-44c-4.4 0-8 3.6-8 8v80c0 4.4 3.6 8 8 8zm260 218v44c0 4.4 3.6 8 8 8h80c4.4 0 8-3.6 8-8v-44c0-4.4-3.6-8-8-8h-80c-4.4 0-8 3.6-8 8zm12.7-197.2l-31.1-31.1a8.03 8.03 0 00-11.3 0l-56.6 56.6a8.03 8.03 0 000 11.3l31.1 31.1c3.1 3.1 8.2 3.1 11.3 0l56.6-56.6c3.1-3.1 3.1-8.2 0-11.3zm-458.6-31.1a8.03 8.03 0 00-11.3 0l-31.1 31.1a8.03 8.03 0 000 11.3l56.6 56.6c3.1 3.1 8.2 3.1 11.3 0l31.1-31.1c3.1-3.1 3.1-8.2 0-11.3l-56.6-56.6zM262 530h-80c-4.4 0-8 3.6-8 8v44c0 4.4 3.6 8 8 8h80c4.4 0 8-3.6 8-8v-44c0-4.4-3.6-8-8-8z" />
-            );
-        }
-
-        return (
-            <DashboardOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => true;
-
-    isLineageEnabled = () => true;
-
-    getAutoCompleteFieldName = () => 'title';
-
-    getPathName = () => 'dashboard';
-
-    getEntityName = () => 'Dashboard';
-
-    getCollectionName = () => 'Dashboards';
-
-    useEntityQuery = useGetDashboardQuery;
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-            properties: {
-                defaultOwnerType: OwnershipType.TechnicalOwner,
-            },
-        },
-        {
-            component: SidebarTagsSection,
-            properties: {
-                hasTags: true,
-                hasTerms: true,
-            },
-        },
-        {
-            component: SidebarDomainSection,
-        },
-        {
-            component: DataProductSection,
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-    ];
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            entityType={EntityType.Dashboard}
-            useEntityQuery={this.useEntityQuery}
-            useUpdateQuery={useUpdateDashboardMutation}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            headerDropdownItems={new Set([EntityMenuItems.UPDATE_DEPRECATION, EntityMenuItems.RAISE_INCIDENT])}
-            subHeader={{
-                component: DashboardStatsSummarySubHeader,
-            }}
-            tabs={[
-                {
-                    name: 'Charts',
-                    component: DashboardChartsTab,
-                    display: {
-                        visible: (_, dashboard: GetDashboardQuery) =>
-                            (dashboard?.dashboard?.charts?.total || 0) > 0 ||
-                            (dashboard?.dashboard?.datasets?.total || 0) === 0,
-                        enabled: (_, dashboard: GetDashboardQuery) => (dashboard?.dashboard?.charts?.total || 0) > 0,
-                    },
-                },
-                {
-                    name: 'Datasets',
-                    component: DashboardDatasetsTab,
-                    display: {
-                        visible: (_, dashboard: GetDashboardQuery) => (dashboard?.dashboard?.datasets?.total || 0) > 0,
-                        enabled: (_, dashboard: GetDashboardQuery) => (dashboard?.dashboard?.datasets?.total || 0) > 0,
-                    },
-                },
-                {
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                },
-                {
-                    name: 'Preview',
-                    component: EmbedTab,
-                    display: {
-                        visible: (_, dashboard: GetDashboardQuery) =>
-                            !!dashboard?.dashboard?.embed?.renderUrl &&
-                            dashboard?.dashboard?.platform?.urn === LOOKER_URN,
-                        enabled: (_, dashboard: GetDashboardQuery) =>
-                            !!dashboard?.dashboard?.embed?.renderUrl &&
-                            dashboard?.dashboard?.platform?.urn === LOOKER_URN,
-                    },
-                },
-                {
-                    name: 'Lineage',
-                    component: LineageTab,
-                    properties: {
-                        defaultDirection: LineageDirection.Upstream,
-                    },
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-                {
-                    name: 'Incidents',
-                    component: IncidentTab,
-                    getDynamicName: (_, dashboard) => {
-                        const activeIncidentCount = dashboard?.dashboard?.activeIncidents?.total;
-                        return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
-                    },
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-        />
-    );
-
-    getOverridePropertiesFromEntity = (dashboard?: Dashboard | null): GenericEntityProperties => {
-        // TODO: Get rid of this once we have correctly formed platform coming back.
-        const name = dashboard?.properties?.name;
-        const externalUrl = dashboard?.properties?.externalUrl;
-        const subTypes = dashboard?.subTypes;
-        return {
-            name,
-            externalUrl,
-            entityTypeOverride: subTypes ? capitalizeFirstLetterOnly(subTypes.typeNames?.[0]) : '',
-        };
-    };
-
-    renderPreview = (_: PreviewType, data: Dashboard) => {
-        const genericProperties = this.getGenericEntityProperties(data);
-        return (
-            <DashboardPreview
-                urn={data.urn}
-                platform={data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)}
-                name={data.properties?.name}
-                description={data.editableProperties?.description || data.properties?.description}
-                access={data.properties?.access}
-                tags={data.globalTags || undefined}
-                owners={data.ownership?.owners}
-                glossaryTerms={data?.glossaryTerms}
-                logoUrl={data?.platform?.properties?.logoUrl}
-                domain={data.domain?.domain}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                container={data.container}
-                parentContainers={data.parentContainers}
-                deprecation={data.deprecation}
-                externalUrl={data.properties?.externalUrl}
-                statsSummary={data.statsSummary}
-                lastUpdatedMs={data.properties?.lastModified?.time}
-                createdMs={data.properties?.created?.time}
-                subtype={data.subTypes?.typeNames?.[0]}
-                health={data.health}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as Dashboard;
-        const genericProperties = this.getGenericEntityProperties(data);
-
-        return (
-            <DashboardPreview
-                urn={data.urn}
-                platform={data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)}
-                name={data.properties?.name}
-                platformInstanceId={data.dataPlatformInstance?.instanceId}
-                description={data.editableProperties?.description || data.properties?.description}
-                access={data.properties?.access}
-                tags={data.globalTags || undefined}
-                owners={data.ownership?.owners}
-                glossaryTerms={data?.glossaryTerms}
-                insights={result.insights}
-                logoUrl={data?.platform?.properties?.logoUrl || ''}
-                domain={data.domain?.domain}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                container={data.container}
-                parentContainers={data.parentContainers}
-                deprecation={data.deprecation}
-                externalUrl={data.properties?.externalUrl}
-                statsSummary={data.statsSummary}
-                lastUpdatedMs={data.properties?.lastModified?.time}
-                createdMs={data.properties?.created?.time}
-                snippet={
-                    <MatchedFieldList
-                        customFieldRenderer={(matchedField) => matchedInputFieldRenderer(matchedField, data)}
-                        matchSuffix="on a contained chart"
-                    />
-                }
-                subtype={data.subTypes?.typeNames?.[0]}
-                degree={(result as any).degree}
-                paths={(result as any).paths}
-                health={data.health}
-            />
-        );
-    };
-
-    getLineageVizConfig = (entity: Dashboard) => {
-        return {
-            urn: entity.urn,
-            name: entity.properties?.name || entity.urn,
-            type: EntityType.Dashboard,
-            subtype: entity?.subTypes?.typeNames?.[0] || undefined,
-            icon: entity?.platform?.properties?.logoUrl || undefined,
-            platform: entity?.platform,
-            health: entity?.health || undefined,
-        };
-    };
-
-    displayName = (data: Dashboard) => {
-        return data.properties?.name || data.urn;
-    };
-
-    getGenericEntityProperties = (data: Dashboard) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.DOMAINS,
-            EntityCapabilityType.DEPRECATION,
-            EntityCapabilityType.SOFT_DELETE,
-            EntityCapabilityType.DATA_PRODUCTS,
-        ]);
-    };
-
-    getGraphName = () => this.getPathName();
-
-    renderEmbeddedProfile = (urn: string) => (
-        <EmbeddedProfile
-            urn={urn}
-            entityType={EntityType.Dashboard}
-            useEntityQuery={this.useEntityQuery}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dashboard/preview/DashboardPreview.tsx b/datahub-web-react/src/app/entity/dashboard/preview/DashboardPreview.tsx
deleted file mode 100644
index d4dbe48d6e5ba9..00000000000000
--- a/datahub-web-react/src/app/entity/dashboard/preview/DashboardPreview.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import React from 'react';
-
-import { IconStyleType, PreviewType } from '@app/entity/Entity';
-import { DashboardStatsSummary as DashboardStatsSummaryView } from '@app/entity/dashboard/shared/DashboardStatsSummary';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import {
-    AccessLevel,
-    Container,
-    DashboardStatsSummary,
-    DataProduct,
-    Deprecation,
-    Domain,
-    EntityPath,
-    EntityType,
-    GlobalTags,
-    GlossaryTerms,
-    Health,
-    Owner,
-    ParentContainersResult,
-    SearchInsight,
-} from '@types';
-
-export const DashboardPreview = ({
-    urn,
-    platform,
-    platformInstanceId,
-    name,
-    subtype,
-    description,
-    access,
-    owners,
-    tags,
-    glossaryTerms,
-    domain,
-    dataProduct,
-    container,
-    insights,
-    logoUrl,
-    chartCount,
-    statsSummary,
-    lastUpdatedMs,
-    createdMs,
-    externalUrl,
-    parentContainers,
-    deprecation,
-    snippet,
-    degree,
-    paths,
-    health,
-    previewType,
-}: {
-    urn: string;
-    platform?: string;
-    platformInstanceId?: string;
-    name?: string;
-    subtype?: string | null;
-    description?: string | null;
-    access?: AccessLevel | null;
-    owners?: Array<Owner> | null;
-    tags?: GlobalTags;
-    glossaryTerms?: GlossaryTerms | null;
-    domain?: Domain | null;
-    dataProduct?: DataProduct | null;
-    container?: Container | null;
-    deprecation?: Deprecation | null;
-    insights?: Array<SearchInsight> | null;
-    logoUrl?: string | null;
-    chartCount?: number | null;
-    statsSummary?: DashboardStatsSummary | null;
-    lastUpdatedMs?: number | null;
-    createdMs?: number | null;
-    externalUrl?: string | null;
-    parentContainers?: ParentContainersResult | null;
-    snippet?: React.ReactNode | null;
-    degree?: number;
-    paths?: EntityPath[];
-    health?: Health[] | null;
-    previewType?: PreviewType;
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.Dashboard, urn)}
-            name={name || ''}
-            urn={urn}
-            description={description || ''}
-            type={capitalizeFirstLetterOnly(subtype) || 'Dashboard'}
-            typeIcon={entityRegistry.getIcon(EntityType.Dashboard, 14, IconStyleType.ACCENT)}
-            logoUrl={logoUrl || ''}
-            platformInstanceId={platformInstanceId}
-            platform={platform}
-            qualifier={access}
-            owners={owners}
-            tags={tags}
-            container={container || undefined}
-            glossaryTerms={glossaryTerms || undefined}
-            domain={domain}
-            dataProduct={dataProduct}
-            deprecation={deprecation}
-            insights={insights}
-            parentContainers={parentContainers}
-            externalUrl={externalUrl}
-            topUsers={statsSummary?.topUsersLast30Days}
-            snippet={snippet}
-            subHeader={
-                <DashboardStatsSummaryView
-                    chartCount={chartCount}
-                    viewCount={statsSummary?.viewCount}
-                    uniqueUserCountLast30Days={statsSummary?.uniqueUserCountLast30Days}
-                    lastUpdatedMs={lastUpdatedMs}
-                    createdMs={createdMs}
-                />
-            }
-            degree={degree}
-            paths={paths}
-            health={health || undefined}
-            previewType={previewType}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/dashboard/profile/DashboardStatsSummarySubHeader.tsx b/datahub-web-react/src/app/entity/dashboard/profile/DashboardStatsSummarySubHeader.tsx
deleted file mode 100644
index 9bd5771c0b567b..00000000000000
--- a/datahub-web-react/src/app/entity/dashboard/profile/DashboardStatsSummarySubHeader.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-
-import { DashboardStatsSummary } from '@app/entity/dashboard/shared/DashboardStatsSummary';
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-
-import { GetDashboardQuery } from '@graphql/dashboard.generated';
-import { DashboardStatsSummary as DashboardStatsSummaryObj } from '@types';
-
-export const DashboardStatsSummarySubHeader = () => {
-    const result = useBaseEntity<GetDashboardQuery>();
-    const dashboard = result?.dashboard;
-    const maybeStatsSummary = dashboard?.statsSummary as DashboardStatsSummaryObj;
-    const chartCount = dashboard?.charts?.total;
-    const viewCount = maybeStatsSummary?.viewCount;
-    const uniqueUserCountLast30Days = maybeStatsSummary?.uniqueUserCountLast30Days;
-    const lastUpdatedMs = dashboard?.properties?.lastModified?.time;
-    const createdMs = dashboard?.properties?.created?.time;
-
-    return (
-        <DashboardStatsSummary
-            chartCount={chartCount}
-            viewCount={viewCount}
-            uniqueUserCountLast30Days={uniqueUserCountLast30Days}
-            lastUpdatedMs={lastUpdatedMs}
-            createdMs={createdMs}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/dashboard/shared/DashboardStatsSummary.tsx b/datahub-web-react/src/app/entity/dashboard/shared/DashboardStatsSummary.tsx
deleted file mode 100644
index 48f6488cb1c418..00000000000000
--- a/datahub-web-react/src/app/entity/dashboard/shared/DashboardStatsSummary.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { ClockCircleOutlined, EyeOutlined, QuestionCircleOutlined, TeamOutlined } from '@ant-design/icons';
-import { Popover, Tooltip } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import ExpandingStat from '@app/entity/dataset/shared/ExpandingStat';
-import { StatsSummary } from '@app/entity/shared/components/styled/StatsSummary';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber';
-import { toLocalDateTimeString, toRelativeTimeString } from '@app/shared/time/timeUtils';
-import { countFormatter, needsFormatting } from '@utils/formatter';
-
-const StatText = styled.span`
-    color: ${ANTD_GRAY[8]};
-    @media (min-width: 1024px) {
-        white-space: nowrap;
-`;
-
-const HelpIcon = styled(QuestionCircleOutlined)`
-    color: ${ANTD_GRAY[7]};
-    padding-left: 4px;
-`;
-
-type Props = {
-    chartCount?: number | null;
-    viewCount?: number | null;
-    uniqueUserCountLast30Days?: number | null;
-    lastUpdatedMs?: number | null;
-    createdMs?: number | null;
-};
-
-export const DashboardStatsSummary = ({
-    chartCount,
-    viewCount,
-    uniqueUserCountLast30Days,
-    lastUpdatedMs,
-    createdMs,
-}: Props) => {
-    const statsViews = [
-        (!!chartCount && (
-            <ExpandingStat
-                disabled={!needsFormatting(chartCount)}
-                render={(isExpanded) => (
-                    <StatText color={ANTD_GRAY[8]}>
-                        <b>{isExpanded ? formatNumberWithoutAbbreviation(chartCount) : countFormatter(chartCount)}</b>{' '}
-                        charts
-                    </StatText>
-                )}
-            />
-        )) ||
-            undefined,
-        (!!viewCount && (
-            <StatText>
-                <EyeOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} />
-                <b>{formatNumberWithoutAbbreviation(viewCount)}</b> views
-            </StatText>
-        )) ||
-            undefined,
-        (!!uniqueUserCountLast30Days && (
-            <StatText>
-                <TeamOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} />
-                <b>{formatNumberWithoutAbbreviation(uniqueUserCountLast30Days)}</b> unique users
-            </StatText>
-        )) ||
-            undefined,
-        (!!lastUpdatedMs && (
-            <Popover
-                content={
-                    <>
-                        {createdMs && <div>Created on {toLocalDateTimeString(createdMs)}.</div>}
-                        <div>
-                            Changed on {toLocalDateTimeString(lastUpdatedMs)}.{' '}
-                            <Tooltip title="The time at which the dashboard was last changed in the source platform">
-                                <HelpIcon />
-                            </Tooltip>
-                        </div>
-                    </>
-                }
-            >
-                <StatText>
-                    <ClockCircleOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} />
-                    Changed {toRelativeTimeString(lastUpdatedMs)}
-                </StatText>
-            </Popover>
-        )) ||
-            undefined,
-    ].filter((stat) => stat !== undefined);
-
-    return <>{statsViews.length > 0 && <StatsSummary stats={statsViews} />}</>;
-};
diff --git a/datahub-web-react/src/app/entity/dataContract/DataContractEntity.tsx b/datahub-web-react/src/app/entity/dataContract/DataContractEntity.tsx
deleted file mode 100644
index afe7efe7e3251f..00000000000000
--- a/datahub-web-react/src/app/entity/dataContract/DataContractEntity.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { FileOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, IconStyleType } from '@app/entity/Entity';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { TYPE_ICON_CLASS_NAME } from '@src/app/shared/constants';
-import { DataContract, EntityType } from '@src/types.generated';
-
-/**
- * Definition of the DataHub DataContract entity.
- */
-export class DataContractEntity implements Entity<DataContract> {
-    type: EntityType = EntityType.DataContract;
-
-    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <FileOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <FileOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#d6246c' }} />;
-        }
-
-        return (
-            <FileOutlined
-                className={TYPE_ICON_CLASS_NAME}
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getGraphName = () => 'dataContract';
-
-    getPathName = () => 'dataContracts';
-
-    getEntityName = () => 'Data Contract';
-
-    getCollectionName = () => 'Data Contracts';
-
-    renderProfile = () => <span>Not Implemented</span>;
-
-    getSidebarSections = () => [];
-
-    getSidebarTabs = () => [];
-
-    getOverridePropertiesFromEntity = () => {};
-
-    renderPreview = () => {
-        return <span>Not Implemented</span>;
-    };
-
-    renderSearch = () => {
-        return <span>Not Implemented</span>;
-    };
-
-    displayName = () => {
-        return 'Data Contract';
-    };
-
-    getGenericEntityProperties = (data: DataContract) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: (newData) => newData,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx b/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx
deleted file mode 100644
index 5ab90424f7a9b8..00000000000000
--- a/datahub-web-react/src/app/entity/dataFlow/DataFlowEntity.tsx
+++ /dev/null
@@ -1,217 +0,0 @@
-import { ShareAltOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { Preview } from '@app/entity/dataFlow/preview/Preview';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { DataFlowJobsTab } from '@app/entity/shared/tabs/Entity/DataFlowJobsTab';
-import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { getDataProduct } from '@app/entity/shared/utils';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-
-import { useGetDataFlowQuery, useUpdateDataFlowMutation } from '@graphql/dataFlow.generated';
-import { DataFlow, EntityType, OwnershipType, SearchResult } from '@types';
-
-/**
- * Definition of the DataHub DataFlow entity.
- */
-export class DataFlowEntity implements Entity<DataFlow> {
-    type: EntityType = EntityType.DataFlow;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <ShareAltOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <ShareAltOutlined style={{ fontSize, color: color || '#d6246c' }} />;
-        }
-
-        return (
-            <ShareAltOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => true;
-
-    isLineageEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getGraphName = () => 'dataFlow';
-
-    getPathName = () => 'pipelines';
-
-    getEntityName = () => 'Pipeline';
-
-    getCollectionName = () => 'Pipelines';
-
-    useEntityQuery = useGetDataFlowQuery;
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            entityType={EntityType.DataFlow}
-            useEntityQuery={this.useEntityQuery}
-            useUpdateQuery={useUpdateDataFlowMutation}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            headerDropdownItems={new Set([EntityMenuItems.UPDATE_DEPRECATION, EntityMenuItems.RAISE_INCIDENT])}
-            tabs={[
-                {
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-                {
-                    name: 'Tasks',
-                    component: DataFlowJobsTab,
-                    properties: {
-                        urn,
-                    },
-                },
-                {
-                    name: 'Incidents',
-                    component: IncidentTab,
-                    getDynamicName: (_, dataFlow) => {
-                        const activeIncidentCount = dataFlow?.dataFlow?.activeIncidents?.total;
-                        return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
-                    },
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-        />
-    );
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-            properties: {
-                defaultOwnerType: OwnershipType.TechnicalOwner,
-            },
-        },
-        {
-            component: SidebarTagsSection,
-            properties: {
-                hasTags: true,
-                hasTerms: true,
-            },
-        },
-        {
-            component: SidebarDomainSection,
-        },
-        {
-            component: DataProductSection,
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-    ];
-
-    getOverridePropertiesFromEntity = (dataFlow?: DataFlow | null): GenericEntityProperties => {
-        // TODO: Get rid of this once we have correctly formed platform coming back.
-        const name = dataFlow?.properties?.name;
-        const externalUrl = dataFlow?.properties?.externalUrl;
-        return {
-            name,
-            externalUrl,
-        };
-    };
-
-    renderPreview = (_: PreviewType, data: DataFlow) => {
-        const genericProperties = this.getGenericEntityProperties(data);
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.properties?.name || ''}
-                description={data.editableProperties?.description || data.properties?.description}
-                platformName={
-                    data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)
-                }
-                platformLogo={data?.platform?.properties?.logoUrl || ''}
-                owners={data.ownership?.owners}
-                globalTags={data.globalTags}
-                domain={data.domain?.domain}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                externalUrl={data.properties?.externalUrl}
-                health={data.health}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as DataFlow;
-        const genericProperties = this.getGenericEntityProperties(data);
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.properties?.name || ''}
-                platformInstanceId={data.dataPlatformInstance?.instanceId}
-                description={data.editableProperties?.description || data.properties?.description || ''}
-                platformName={
-                    data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)
-                }
-                platformLogo={data?.platform?.properties?.logoUrl || ''}
-                owners={data.ownership?.owners}
-                globalTags={data.globalTags}
-                insights={result.insights}
-                domain={data.domain?.domain}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                externalUrl={data.properties?.externalUrl}
-                jobCount={(data as any).childJobs?.total}
-                deprecation={data.deprecation}
-                degree={(result as any).degree}
-                paths={(result as any).paths}
-                health={data.health}
-                parentContainers={data.parentContainers}
-            />
-        );
-    };
-
-    displayName = (data: DataFlow) => {
-        return data.properties?.name || data.urn;
-    };
-
-    getGenericEntityProperties = (data: DataFlow) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.DOMAINS,
-            EntityCapabilityType.DEPRECATION,
-            EntityCapabilityType.SOFT_DELETE,
-            EntityCapabilityType.DATA_PRODUCTS,
-        ]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/dataFlow/preview/Preview.tsx b/datahub-web-react/src/app/entity/dataFlow/preview/Preview.tsx
deleted file mode 100644
index 850b0d5cadb4bc..00000000000000
--- a/datahub-web-react/src/app/entity/dataFlow/preview/Preview.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { IconStyleType } from '@app/entity/Entity';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import {
-    DataProduct,
-    Deprecation,
-    Domain,
-    EntityPath,
-    EntityType,
-    GlobalTags,
-    Health,
-    Owner,
-    ParentContainersResult,
-    SearchInsight,
-} from '@types';
-
-const StatText = styled(Typography.Text)`
-    color: ${ANTD_GRAY[8]};
-`;
-
-export const Preview = ({
-    urn,
-    name,
-    platformInstanceId,
-    description,
-    platformName,
-    platformLogo,
-    owners,
-    globalTags,
-    domain,
-    dataProduct,
-    externalUrl,
-    snippet,
-    insights,
-    jobCount,
-    deprecation,
-    degree,
-    paths,
-    health,
-    parentContainers,
-}: {
-    urn: string;
-    name: string;
-    platformInstanceId?: string;
-    description?: string | null;
-    platformName?: string;
-    platformLogo?: string | null;
-    owners?: Array<Owner> | null;
-    domain?: Domain | null;
-    dataProduct?: DataProduct | null;
-    globalTags?: GlobalTags | null;
-    deprecation?: Deprecation | null;
-    externalUrl?: string | null;
-    snippet?: React.ReactNode | null;
-    insights?: Array<SearchInsight> | null;
-    jobCount?: number | null;
-    degree?: number;
-    paths?: EntityPath[];
-    health?: Health[] | null;
-    parentContainers?: ParentContainersResult | null;
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.DataFlow, urn)}
-            name={name}
-            urn={urn}
-            description={description || ''}
-            platformInstanceId={platformInstanceId}
-            type="Data Pipeline"
-            typeIcon={entityRegistry.getIcon(EntityType.DataFlow, 14, IconStyleType.ACCENT)}
-            platform={platformName}
-            logoUrl={platformLogo || ''}
-            owners={owners}
-            tags={globalTags || undefined}
-            domain={domain}
-            dataProduct={dataProduct}
-            snippet={snippet}
-            insights={insights}
-            externalUrl={externalUrl}
-            deprecation={deprecation}
-            subHeader={
-                (jobCount && [
-                    <StatText>
-                        <b>{jobCount}</b> {entityRegistry.getCollectionName(EntityType.DataJob)}
-                    </StatText>,
-                ]) ||
-                undefined
-            }
-            degree={degree}
-            paths={paths}
-            health={health || undefined}
-            parentContainers={parentContainers}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx b/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx
deleted file mode 100644
index c86ff0761fca5c..00000000000000
--- a/datahub-web-react/src/app/entity/dataJob/DataJobEntity.tsx
+++ /dev/null
@@ -1,268 +0,0 @@
-import { ConsoleSqlOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { DataFlowEntity } from '@app/entity/dataFlow/DataFlowEntity';
-import { Preview } from '@app/entity/dataJob/preview/Preview';
-import { RunsTab } from '@app/entity/dataJob/tabs/RunsTab';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { DataJobFlowTab } from '@app/entity/shared/tabs/Entity/DataJobFlowTab';
-import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab';
-import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { getDataProduct } from '@app/entity/shared/utils';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-
-import { GetDataJobQuery, useGetDataJobQuery, useUpdateDataJobMutation } from '@graphql/dataJob.generated';
-import { DataJob, EntityType, OwnershipType, SearchResult } from '@types';
-
-const getDataJobPlatformName = (data?: DataJob): string => {
-    return (
-        data?.dataFlow?.platform?.properties?.displayName ||
-        capitalizeFirstLetterOnly(data?.dataFlow?.platform?.name) ||
-        ''
-    );
-};
-
-/**
- * Definition of the DataHub DataJob entity.
- */
-export class DataJobEntity implements Entity<DataJob> {
-    type: EntityType = EntityType.DataJob;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <ConsoleSqlOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <ConsoleSqlOutlined style={{ fontSize, color: color || '#B37FEB' }} />;
-        }
-
-        return (
-            <ConsoleSqlOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => true;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getGraphName = () => 'dataJob';
-
-    getPathName = () => 'tasks';
-
-    getEntityName = () => 'Task';
-
-    getCollectionName = () => 'Tasks';
-
-    useEntityQuery = useGetDataJobQuery;
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            entityType={EntityType.DataJob}
-            useEntityQuery={this.useEntityQuery}
-            useUpdateQuery={useUpdateDataJobMutation}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            headerDropdownItems={new Set([EntityMenuItems.UPDATE_DEPRECATION, EntityMenuItems.RAISE_INCIDENT])}
-            tabs={[
-                {
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-                {
-                    name: 'Pipeline',
-                    component: DataJobFlowTab,
-                },
-                {
-                    name: 'Lineage',
-                    component: LineageTab,
-                },
-                {
-                    name: 'Runs',
-                    component: RunsTab,
-                    display: {
-                        visible: (_, _1) => true,
-                        enabled: (_, dataJob: GetDataJobQuery) => (dataJob?.dataJob?.runs?.total || 0) !== 0,
-                    },
-                },
-                {
-                    name: 'Incidents',
-                    component: IncidentTab,
-                    getDynamicName: (_, dataJob) => {
-                        const activeIncidentCount = dataJob?.dataJob?.activeIncidents?.total;
-                        return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
-                    },
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-        />
-    );
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-            properties: {
-                defaultOwnerType: OwnershipType.TechnicalOwner,
-            },
-        },
-        {
-            component: SidebarTagsSection,
-            properties: {
-                hasTags: true,
-                hasTerms: true,
-            },
-        },
-        {
-            component: SidebarDomainSection,
-        },
-        {
-            component: DataProductSection,
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-    ];
-
-    getOverridePropertiesFromEntity = (dataJob?: DataJob | null): GenericEntityProperties => {
-        // TODO: Get rid of this once we have correctly formed platform coming back.
-        const name = dataJob?.properties?.name;
-        const externalUrl = dataJob?.properties?.externalUrl;
-        return {
-            name,
-            externalUrl,
-            platform: dataJob?.dataFlow?.platform,
-        };
-    };
-
-    renderPreview = (_: PreviewType, data: DataJob) => {
-        const genericProperties = this.getGenericEntityProperties(data);
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.properties?.name || ''}
-                subType={data.subTypes?.typeNames?.[0]}
-                description={data.editableProperties?.description || data.properties?.description}
-                platformName={getDataJobPlatformName(data)}
-                platformLogo={data?.dataFlow?.platform?.properties?.logoUrl || ''}
-                owners={data.ownership?.owners}
-                globalTags={data.globalTags || null}
-                domain={data.domain?.domain}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                externalUrl={data.properties?.externalUrl}
-                health={data.health}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as DataJob;
-        const genericProperties = this.getGenericEntityProperties(data);
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.properties?.name || ''}
-                subType={data.subTypes?.typeNames?.[0]}
-                description={data.editableProperties?.description || data.properties?.description}
-                platformName={getDataJobPlatformName(data)}
-                platformLogo={data?.dataFlow?.platform?.properties?.logoUrl || ''}
-                platformInstanceId={data.dataPlatformInstance?.instanceId}
-                owners={data.ownership?.owners}
-                globalTags={data.globalTags}
-                domain={data.domain?.domain}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                deprecation={data.deprecation}
-                insights={result.insights}
-                externalUrl={data.properties?.externalUrl}
-                lastRunTimeMs={
-                    ((data as any).lastRun?.runs?.length && (data as any).lastRun?.runs[0]?.created?.time) || undefined
-                }
-                degree={(result as any).degree}
-                paths={(result as any).paths}
-                health={data.health}
-                parentContainers={data.parentContainers}
-            />
-        );
-    };
-
-    getExpandedNameForDataJob = (entity: DataJob): string => {
-        const name = this.displayName(entity);
-        const flowName = entity?.dataFlow ? new DataFlowEntity().displayName(entity?.dataFlow) : undefined;
-
-        // if we have no name, just return blank. this should not happen, so dont try & construct a name
-        if (!name) {
-            return '';
-        }
-
-        // if we have a flow name, return the full name of flow.task
-        if (flowName) {
-            return `${flowName}.${name}`;
-        }
-
-        // otherwise, just return the task name (same as non-expanded)
-        return name;
-    };
-
-    getLineageVizConfig = (entity: DataJob) => {
-        return {
-            urn: entity?.urn,
-            name: this.displayName(entity),
-            expandedName: this.getExpandedNameForDataJob(entity),
-            type: EntityType.DataJob,
-            icon: entity?.dataFlow?.platform?.properties?.logoUrl || undefined,
-            platform: entity?.dataFlow?.platform,
-            health: entity?.health || undefined,
-        };
-    };
-
-    displayName = (data: DataJob) => {
-        return data.properties?.name || data.urn;
-    };
-
-    getGenericEntityProperties = (data: DataJob) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.DOMAINS,
-            EntityCapabilityType.DEPRECATION,
-            EntityCapabilityType.SOFT_DELETE,
-            EntityCapabilityType.DATA_PRODUCTS,
-        ]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/dataJob/preview/Preview.tsx b/datahub-web-react/src/app/entity/dataJob/preview/Preview.tsx
deleted file mode 100644
index 686b6040cce86f..00000000000000
--- a/datahub-web-react/src/app/entity/dataJob/preview/Preview.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import { ClockCircleOutlined } from '@ant-design/icons';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { IconStyleType } from '@app/entity/Entity';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { toRelativeTimeString } from '@app/shared/time/timeUtils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import {
-    DataProduct,
-    Deprecation,
-    Domain,
-    EntityPath,
-    EntityType,
-    GlobalTags,
-    Health,
-    Owner,
-    ParentContainersResult,
-    SearchInsight,
-} from '@types';
-
-const StatText = styled(Typography.Text)`
-    color: ${ANTD_GRAY[8]};
-`;
-
-export const Preview = ({
-    urn,
-    name,
-    subType,
-    description,
-    platformName,
-    platformLogo,
-    platformInstanceId,
-    owners,
-    domain,
-    dataProduct,
-    deprecation,
-    globalTags,
-    snippet,
-    insights,
-    lastRunTimeMs,
-    externalUrl,
-    degree,
-    paths,
-    health,
-    parentContainers,
-}: {
-    urn: string;
-    name: string;
-    subType?: string | null;
-    description?: string | null;
-    platformName: string;
-    platformLogo?: string | null;
-    platformInstanceId?: string;
-    owners?: Array<Owner> | null;
-    domain?: Domain | null;
-    dataProduct?: DataProduct | null;
-    deprecation?: Deprecation | null;
-    globalTags?: GlobalTags | null;
-    snippet?: React.ReactNode | null;
-    insights?: Array<SearchInsight> | null;
-    lastRunTimeMs?: number | null;
-    externalUrl?: string | null;
-    degree?: number;
-    paths?: EntityPath[];
-    health?: Health[] | null;
-    parentContainers?: ParentContainersResult | null;
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.DataJob, urn)}
-            name={name}
-            urn={urn}
-            description={description || ''}
-            type={subType || 'Data Task'}
-            typeIcon={entityRegistry.getIcon(EntityType.DataJob, 14, IconStyleType.ACCENT)}
-            platform={platformName}
-            logoUrl={platformLogo || ''}
-            platformInstanceId={platformInstanceId}
-            owners={owners}
-            tags={globalTags || undefined}
-            domain={domain}
-            dataProduct={dataProduct}
-            snippet={snippet}
-            deprecation={deprecation}
-            dataTestID="datajob-item-preview"
-            insights={insights}
-            externalUrl={externalUrl}
-            subHeader={
-                (lastRunTimeMs && [
-                    <StatText>
-                        <ClockCircleOutlined style={{ paddingRight: 8 }} />
-                        Last run {toRelativeTimeString(lastRunTimeMs)}
-                    </StatText>,
-                ]) ||
-                undefined
-            }
-            degree={degree}
-            paths={paths}
-            health={health || undefined}
-            parentContainers={parentContainers}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/dataJob/tabs/RunsTab.tsx b/datahub-web-react/src/app/entity/dataJob/tabs/RunsTab.tsx
deleted file mode 100644
index 7ac08b1176df38..00000000000000
--- a/datahub-web-react/src/app/entity/dataJob/tabs/RunsTab.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-import { DeliveredProcedureOutlined } from '@ant-design/icons';
-import { Pagination, Table, Tooltip, Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import {
-    getExecutionRequestStatusDisplayColor,
-    getExecutionRequestStatusDisplayText,
-    getExecutionRequestStatusIcon,
-} from '@app/ingest/source/utils';
-import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList';
-import { scrollToTop } from '@app/shared/searchUtils';
-
-import { useGetDataJobRunsQuery } from '@graphql/dataJob.generated';
-import { DataProcessInstanceRunResultType, DataProcessRunStatus } from '@types';
-
-import LoadingSvg from '@images/datahub-logo-color-loading_pendulum.svg?react';
-
-const ExternalUrlLink = styled.a`
-    font-size: 16px;
-    color: ${ANTD_GRAY[8]};
-`;
-
-const PaginationControlContainer = styled.div`
-    padding-top: 16px;
-    padding-bottom: 16px;
-    text-align: center;
-`;
-
-const LoadingText = styled.div`
-    margin-top: 18px;
-    font-size: 12px;
-`;
-
-const LoadingContainer = styled.div`
-    padding-top: 40px;
-    padding-bottom: 40px;
-    width: 100%;
-    text-align: center;
-`;
-
-function getStatusForStyling(status: DataProcessRunStatus, resultType: DataProcessInstanceRunResultType) {
-    if (status === 'COMPLETE') {
-        if (resultType === 'SKIPPED') {
-            return 'CANCELLED';
-        }
-        return resultType;
-    }
-    return 'RUNNING';
-}
-
-const columns = [
-    {
-        title: 'Time',
-        dataIndex: 'time',
-        key: 'time',
-        render: (value) => (
-            <Tooltip title={new Date(Number(value)).toUTCString()}>{new Date(Number(value)).toLocaleString()}</Tooltip>
-        ),
-    },
-    {
-        title: 'Run ID',
-        dataIndex: 'name',
-        key: 'name',
-    },
-    {
-        title: 'Status',
-        dataIndex: 'status',
-        key: 'status',
-        render: (status: any, row) => {
-            const statusForStyling = getStatusForStyling(status, row?.resultType);
-            const Icon = getExecutionRequestStatusIcon(statusForStyling);
-            const text = getExecutionRequestStatusDisplayText(statusForStyling);
-            const color = getExecutionRequestStatusDisplayColor(statusForStyling);
-            return (
-                <>
-                    <div style={{ display: 'flex', justifyContent: 'left', alignItems: 'center' }}>
-                        {Icon && <Icon style={{ color }} />}
-                        <Typography.Text strong style={{ color, marginLeft: 8 }}>
-                            {text || 'N/A'}
-                        </Typography.Text>
-                    </div>
-                </>
-            );
-        },
-    },
-    {
-        title: 'Inputs',
-        dataIndex: 'inputs',
-        key: 'inputs',
-        render: (inputs) => <CompactEntityNameList entities={inputs} />,
-    },
-    {
-        title: 'Outputs',
-        dataIndex: 'outputs',
-        key: 'outputs',
-        render: (outputs) => <CompactEntityNameList entities={outputs} />,
-    },
-    {
-        title: '',
-        dataIndex: 'externalUrl',
-        key: 'externalUrl',
-        render: (externalUrl) =>
-            externalUrl && (
-                <Tooltip title="View task run details">
-                    <ExternalUrlLink href={externalUrl}>
-                        <DeliveredProcedureOutlined />
-                    </ExternalUrlLink>
-                </Tooltip>
-            ),
-    },
-];
-
-const PAGE_SIZE = 20;
-
-export const RunsTab = () => {
-    const { urn } = useEntityData();
-    const [page, setPage] = useState(1);
-
-    const { loading, data } = useGetDataJobRunsQuery({
-        variables: { urn, start: (page - 1) * PAGE_SIZE, count: PAGE_SIZE },
-    });
-    const runs = data && data?.dataJob?.runs?.runs;
-
-    const tableData = runs
-        ?.filter((run) => run)
-        .map((run) => ({
-            time: run?.created?.time,
-            name: run?.name,
-            status: run?.state?.[0]?.status,
-            resultType: run?.state?.[0]?.result?.resultType,
-            inputs: run?.inputs?.relationships?.map((relationship) => relationship.entity),
-            outputs: run?.outputs?.relationships?.map((relationship) => relationship.entity),
-            externalUrl: run?.externalUrl,
-        }));
-    if (loading) {
-        return (
-            <LoadingContainer>
-                <LoadingSvg height={80} width={80} />
-                <LoadingText>Fetching runs...</LoadingText>
-            </LoadingContainer>
-        );
-    }
-
-    const onChangePage = (newPage: number) => {
-        scrollToTop();
-        setPage(newPage);
-    };
-
-    return (
-        <>
-            <Table dataSource={tableData} columns={columns} pagination={false} />
-            <PaginationControlContainer>
-                <Pagination
-                    current={page}
-                    pageSize={PAGE_SIZE}
-                    total={data?.dataJob?.runs?.total || 0}
-                    showLessItems
-                    onChange={onChangePage}
-                    showSizeChanger={false}
-                />
-            </PaginationControlContainer>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/dataPlatform/DataPlatformEntity.tsx b/datahub-web-react/src/app/entity/dataPlatform/DataPlatformEntity.tsx
deleted file mode 100644
index 8b3dbb864d6a5c..00000000000000
--- a/datahub-web-react/src/app/entity/dataPlatform/DataPlatformEntity.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import { DatabaseOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-
-import { useGetDataPlatformQuery } from '@graphql/dataPlatform.generated';
-import { DataPlatform, EntityType, SearchResult } from '@types';
-
-const getDisplayName = (data?: DataPlatform): string => {
-    return data?.properties?.displayName || data?.name || '';
-};
-
-/**
- * Definition of the DataHub DataJob entity.
- */
-export class DataPlatformEntity implements Entity<DataPlatform> {
-    type: EntityType = EntityType.DataPlatform;
-
-    icon = (fontSize: number, _styleType: IconStyleType, color?: string) => {
-        return (
-            <DatabaseOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => false;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => false;
-
-    // Currently unused.
-    getAutoCompleteFieldName = () => 'name';
-
-    // Currently unused.
-    getPathName = () => 'platform';
-
-    // Currently unused.
-    getEntityName = () => 'Data Platform';
-
-    // Currently unused.
-    getCollectionName = () => 'Data Platforms';
-
-    useEntityQuery = useGetDataPlatformQuery;
-
-    // Currently unused.
-    renderProfile = (_: string) => <></>;
-
-    // Currently unused.
-    renderPreview = (_: PreviewType, _1: DataPlatform) => <></>;
-
-    // Currently unused.
-    renderSearch = (_: SearchResult) => <></>;
-
-    displayName = (data: DataPlatform) => {
-        return getDisplayName(data);
-    };
-
-    getGenericEntityProperties = (data: DataPlatform) => {
-        return {
-            ...data,
-            entityType: this.type,
-            name: getDisplayName(data),
-            platform: data,
-        } as GenericEntityProperties;
-    };
-
-    supportedCapabilities = () => {
-        return new Set([]);
-    };
-
-    getGraphName = () => {
-        return 'dataPlatform';
-    };
-}
diff --git a/datahub-web-react/src/app/entity/dataPlatformInstance/DataPlatformInstanceEntity.tsx b/datahub-web-react/src/app/entity/dataPlatformInstance/DataPlatformInstanceEntity.tsx
deleted file mode 100644
index 684fb2cea0c541..00000000000000
--- a/datahub-web-react/src/app/entity/dataPlatformInstance/DataPlatformInstanceEntity.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import * as React from 'react';
-
-import { Entity } from '@app/entity/Entity';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-
-import { DataPlatformInstance, EntityType } from '@types';
-
-/**
- * Definition of the DataHub DataPlatformInstance entity.
- * Most of this still needs to be filled out.
- */
-export class DataPlatformInstanceEntity implements Entity<DataPlatformInstance> {
-    type: EntityType = EntityType.DataPlatformInstance;
-
-    icon = () => {
-        return <></>;
-    };
-
-    isSearchEnabled = () => false;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getPathName = () => 'dataPlatformInstance';
-
-    getEntityName = () => 'Data Platform Instance';
-
-    getCollectionName = () => 'Data Platform Instances';
-
-    renderProfile = () => <></>;
-
-    getOverridePropertiesFromEntity = (): GenericEntityProperties => {
-        return {};
-    };
-
-    renderPreview = () => {
-        return <></>;
-    };
-
-    renderSearch = () => {
-        return <></>;
-    };
-
-    displayName = (data: DataPlatformInstance) => {
-        return data?.instanceId || data.urn;
-    };
-
-    getGenericEntityProperties = (data: DataPlatformInstance) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([]);
-    };
-
-    getGraphName = () => {
-        return 'dataPlatformInstance';
-    };
-}
diff --git a/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx b/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
deleted file mode 100644
index 2b038801dc62f2..00000000000000
--- a/datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx
+++ /dev/null
@@ -1,223 +0,0 @@
-import { ApiOutlined } from '@ant-design/icons';
-import React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { Preview } from '@app/entity/dataProcessInstance/preview/Preview';
-import SummaryTab from '@app/entity/dataProcessInstance/profile/DataProcessInstanceSummary';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { getDataProduct } from '@app/entity/shared/utils';
-
-import { GetDataProcessInstanceQuery, useGetDataProcessInstanceQuery } from '@graphql/dataProcessInstance.generated';
-import { DataProcessInstance, EntityType, Entity as GraphQLEntity, OwnershipType, SearchResult } from '@types';
-
-const getParentEntities = (data: DataProcessInstance): GraphQLEntity[] => {
-    const parentEntity = data?.relationships?.relationships?.find(
-        (rel) => rel.type === 'InstanceOf' && rel.entity?.type === EntityType.DataJob,
-    );
-
-    if (!parentEntity || !parentEntity.entity) {
-        return [];
-    }
-
-    // First cast to unknown, then to Entity with proper type
-    return [parentEntity.entity];
-};
-
-/**
- * Definition of the DataHub DataProcessInstance entity.
- */
-export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
-    type: EntityType = EntityType.DataProcessInstance;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <ApiOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <ApiOutlined style={{ fontSize, color: color || '#B37FEB' }} />;
-        }
-
-        return (
-            <ApiOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => false;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => true;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getPathName = () => 'dataProcessInstance';
-
-    getEntityName = () => 'Process Instance';
-
-    getGraphName = () => 'dataProcessInstance';
-
-    getCollectionName = () => 'Process Instances';
-
-    useEntityQuery = useGetDataProcessInstanceQuery;
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            entityType={EntityType.DataProcessInstance}
-            useEntityQuery={this.useEntityQuery}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            headerDropdownItems={new Set([EntityMenuItems.UPDATE_DEPRECATION, EntityMenuItems.RAISE_INCIDENT])}
-            tabs={[
-                {
-                    name: 'Summary',
-                    component: SummaryTab,
-                },
-                {
-                    name: 'Lineage',
-                    component: LineageTab,
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-        />
-    );
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-            properties: {
-                defaultOwnerType: OwnershipType.TechnicalOwner,
-            },
-        },
-        {
-            component: SidebarTagsSection,
-            properties: {
-                hasTags: true,
-                hasTerms: true,
-            },
-        },
-        {
-            component: SidebarDomainSection,
-        },
-        {
-            component: DataProductSection,
-        },
-    ];
-
-    getOverridePropertiesFromEntity = (processInstance?: DataProcessInstance | null): GenericEntityProperties => {
-        return {
-            name: processInstance && this.displayName(processInstance),
-            platform: (processInstance as GetDataProcessInstanceQuery['dataProcessInstance'])?.optionalPlatform,
-        };
-    };
-
-    renderPreview = (_: PreviewType, data: DataProcessInstance) => {
-        const genericProperties = this.getGenericEntityProperties(data);
-        const parentEntities = getParentEntities(data);
-        return (
-            <Preview
-                urn={data.urn}
-                name={this.displayName(data)}
-                subType={data.subTypes?.typeNames?.[0]}
-                description=""
-                platformName={genericProperties?.platform?.properties?.displayName ?? undefined}
-                platformLogo={genericProperties?.platform?.properties?.logoUrl}
-                owners={null}
-                globalTags={null}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                externalUrl={data.properties?.externalUrl}
-                parentContainers={data.parentContainers}
-                parentEntities={parentEntities}
-                container={data.container || undefined}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as DataProcessInstance;
-        const genericProperties = this.getGenericEntityProperties(data);
-        const parentEntities = getParentEntities(data);
-
-        return (
-            <Preview
-                urn={data.urn}
-                name={this.displayName(data)}
-                subType={data.subTypes?.typeNames?.[0]}
-                description=""
-                platformName={genericProperties?.platform?.properties?.displayName ?? undefined}
-                platformLogo={genericProperties?.platform?.properties?.logoUrl}
-                platformInstanceId={genericProperties?.dataPlatformInstance?.instanceId}
-                owners={null}
-                globalTags={null}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                insights={result.insights}
-                externalUrl={data.properties?.externalUrl}
-                degree={(result as any).degree}
-                paths={(result as any).paths}
-                parentContainers={data.parentContainers}
-                parentEntities={parentEntities}
-                container={data.container || undefined}
-                lastRunEvent={data.state?.[0]}
-            />
-        );
-    };
-
-    getLineageVizConfig = (entity: DataProcessInstance) => {
-        const properties = this.getGenericEntityProperties(entity);
-        return {
-            urn: entity?.urn,
-            name: this.displayName(entity),
-            type: EntityType.DataProcessInstance,
-            subtype: entity?.subTypes?.typeNames?.[0],
-            icon: properties?.platform?.properties?.logoUrl ?? undefined,
-            platform: properties?.platform ?? undefined,
-            container: entity?.container,
-        };
-    };
-
-    displayName = (data: DataProcessInstance) => {
-        return data.properties?.name || data.urn;
-    };
-
-    getGenericEntityProperties = (data: DataProcessInstance) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.DOMAINS,
-            EntityCapabilityType.DEPRECATION,
-            EntityCapabilityType.SOFT_DELETE,
-            EntityCapabilityType.DATA_PRODUCTS,
-        ]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx b/datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx
deleted file mode 100644
index 42e8e71f2f9a96..00000000000000
--- a/datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import React from 'react';
-
-import { IconStyleType } from '@app/entity/Entity';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import {
-    Container,
-    DataProcessRunEvent,
-    DataProduct,
-    Deprecation,
-    Domain,
-    EntityPath,
-    EntityType,
-    Entity as GeneratedEntity,
-    GlobalTags,
-    Health,
-    Owner,
-    ParentContainersResult,
-    SearchInsight,
-} from '@types';
-
-export const Preview = ({
-    urn,
-    name,
-    subType,
-    description,
-    platformName,
-    platformLogo,
-    platformInstanceId,
-    container,
-    owners,
-    domain,
-    dataProduct,
-    deprecation,
-    globalTags,
-    snippet,
-    insights,
-    externalUrl,
-    degree,
-    paths,
-    health,
-    parentEntities,
-    parentContainers,
-    lastRunEvent,
-}: {
-    urn: string;
-    name: string;
-    subType?: string | null;
-    description?: string | null;
-    platformName?: string;
-    platformLogo?: string | null;
-    platformInstanceId?: string;
-    container?: Container;
-    owners?: Array<Owner> | null;
-    domain?: Domain | null;
-    dataProduct?: DataProduct | null;
-    deprecation?: Deprecation | null;
-    globalTags?: GlobalTags | null;
-    snippet?: React.ReactNode | null;
-    insights?: Array<SearchInsight> | null;
-    externalUrl?: string | null;
-    degree?: number;
-    paths?: EntityPath[];
-    health?: Health[] | null;
-    parentEntities?: Array<GeneratedEntity> | null;
-    parentContainers?: ParentContainersResult | null;
-    lastRunEvent?: DataProcessRunEvent | null;
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.DataProcessInstance, urn)}
-            name={name}
-            urn={urn}
-            description={description || ''}
-            type={subType || 'Process Instance'}
-            typeIcon={entityRegistry.getIcon(EntityType.DataProcessInstance, 14, IconStyleType.ACCENT)}
-            platform={platformName || undefined}
-            logoUrl={platformLogo || undefined}
-            platformInstanceId={platformInstanceId}
-            container={container}
-            parentContainers={parentContainers}
-            owners={owners}
-            tags={globalTags || undefined}
-            domain={domain}
-            dataProduct={dataProduct}
-            snippet={snippet}
-            deprecation={deprecation}
-            dataTestID="process-instance-item-preview"
-            insights={insights}
-            externalUrl={externalUrl}
-            degree={degree}
-            paths={paths}
-            health={health || undefined}
-            parentEntities={parentEntities}
-            lastRunEvent={lastRunEvent}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/dataProduct/DataProductEntitiesTab.tsx b/datahub-web-react/src/app/entity/dataProduct/DataProductEntitiesTab.tsx
deleted file mode 100644
index 6f5cdc369e2b96..00000000000000
--- a/datahub-web-react/src/app/entity/dataProduct/DataProductEntitiesTab.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-
-import generateUseListDataProductAssets from '@app/entity/dataProduct/generateUseListDataProductAssets';
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection';
-
-export function DataProductEntitiesTab() {
-    const { urn } = useEntityData();
-
-    return (
-        <EmbeddedListSearchSection
-            useGetSearchResults={generateUseListDataProductAssets({ urn })}
-            emptySearchQuery="*"
-            placeholderText="Filter assets..."
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataProduct/DataProductEntity.tsx b/datahub-web-react/src/app/entity/dataProduct/DataProductEntity.tsx
deleted file mode 100644
index 14d7f332571e9e..00000000000000
--- a/datahub-web-react/src/app/entity/dataProduct/DataProductEntity.tsx
+++ /dev/null
@@ -1,204 +0,0 @@
-import { FileDoneOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { DataProductEntitiesTab } from '@app/entity/dataProduct/DataProductEntitiesTab';
-import { Preview } from '@app/entity/dataProduct/preview/Preview';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import { SidebarViewDefinitionSection } from '@app/entity/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { EntityActionItem } from '@app/entity/shared/entity/EntityActions';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-
-import { useGetDataProductQuery } from '@graphql/dataProduct.generated';
-import { GetDatasetQuery } from '@graphql/dataset.generated';
-import { DataProduct, EntityType, OwnershipType, SearchResult } from '@types';
-
-/**
- * Definition of the DataHub Data Product entity.
- */
-export class DataProductEntity implements Entity<DataProduct> {
-    type: EntityType = EntityType.DataProduct;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <FileDoneOutlined />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <FileDoneOutlined style={{ fontSize, color: color || '#B37FEB' }} />;
-        }
-
-        if (styleType === IconStyleType.SVG) {
-            return (
-                <path d="M832 64H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V96c0-17.7-14.3-32-32-32zm-600 72h560v208H232V136zm560 480H232V408h560v208zm0 272H232V680h560v208zM304 240a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0z" />
-            );
-        }
-
-        return (
-            <FileDoneOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => true;
-
-    isLineageEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getPathName = () => 'dataProduct';
-
-    getEntityName = () => 'Data Product';
-
-    getCollectionName = () => 'Data Products';
-
-    useEntityQuery = useGetDataProductQuery;
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            entityType={EntityType.DataProduct}
-            useEntityQuery={useGetDataProductQuery}
-            useUpdateQuery={undefined}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            headerActionItems={new Set([EntityActionItem.BATCH_ADD_DATA_PRODUCT])}
-            headerDropdownItems={new Set([EntityMenuItems.DELETE])}
-            isNameEditable
-            tabs={[
-                {
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                },
-                {
-                    name: 'Assets',
-                    component: DataProductEntitiesTab,
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-        />
-    );
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-            properties: {
-                defaultOwnerType: OwnershipType.TechnicalOwner,
-            },
-        },
-        {
-            component: SidebarViewDefinitionSection,
-            display: {
-                // to do - change when we have a GetDataProductQuery
-                visible: (_, dataset: GetDatasetQuery) => (dataset?.dataset?.viewProperties?.logic && true) || false,
-            },
-        },
-        {
-            component: SidebarTagsSection,
-            properties: {
-                hasTags: true,
-                hasTerms: true,
-            },
-        },
-        {
-            component: SidebarDomainSection,
-            properties: {
-                updateOnly: true,
-            },
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-    ];
-
-    renderPreview = (_: PreviewType, data: DataProduct) => {
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.properties?.name || ''}
-                description={data.properties?.description}
-                owners={data.ownership?.owners}
-                globalTags={data.tags}
-                glossaryTerms={data.glossaryTerms}
-                domain={data.domain?.domain}
-                entityCount={data?.entities?.total || undefined}
-                externalUrl={data.properties?.externalUrl}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as DataProduct;
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.properties?.name || ''}
-                description={data.properties?.description}
-                owners={data.ownership?.owners}
-                globalTags={data.tags}
-                glossaryTerms={data.glossaryTerms}
-                domain={data.domain?.domain}
-                entityCount={data?.entities?.total || undefined}
-                externalUrl={data.properties?.externalUrl}
-                degree={(result as any).degree}
-                paths={(result as any).paths}
-            />
-        );
-    };
-
-    displayName = (data: DataProduct) => {
-        return data?.properties?.name || data.urn;
-    };
-
-    getOverridePropertiesFromEntity = (data: DataProduct) => {
-        const name = data?.properties?.name;
-        const externalUrl = data?.properties?.externalUrl;
-        const entityCount = data?.entities?.total || undefined;
-        return {
-            name,
-            externalUrl,
-            entityCount,
-        };
-    };
-
-    getGenericEntityProperties = (data: DataProduct) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.DOMAINS,
-        ]);
-    };
-
-    getGraphName = () => {
-        return 'dataProduct';
-    };
-}
diff --git a/datahub-web-react/src/app/entity/dataProduct/generateUseListDataProductAssets.ts b/datahub-web-react/src/app/entity/dataProduct/generateUseListDataProductAssets.ts
deleted file mode 100644
index 931f2fcc87fdb4..00000000000000
--- a/datahub-web-react/src/app/entity/dataProduct/generateUseListDataProductAssets.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { GetSearchResultsParams } from '@app/entity/shared/components/styled/search/types';
-
-import { useListDataProductAssetsQuery } from '@graphql/search.generated';
-
-export default function generateUseListDataProductAssets({ urn }: { urn: string }) {
-    return (params: GetSearchResultsParams) => {
-        const {
-            variables: { input },
-        } = params;
-
-        const { data, loading, error, refetch } = useListDataProductAssetsQuery({
-            variables: { urn, input },
-        });
-
-        return {
-            data: data?.listDataProductAssets,
-            loading,
-            error,
-            refetch: (refetchParams: GetSearchResultsParams['variables']) => {
-                return refetch({ urn, input: refetchParams.input }).then((res) => res.data.listDataProductAssets);
-            },
-        };
-    };
-}
diff --git a/datahub-web-react/src/app/entity/dataProduct/preview/Preview.tsx b/datahub-web-react/src/app/entity/dataProduct/preview/Preview.tsx
deleted file mode 100644
index 29e07bd0430b94..00000000000000
--- a/datahub-web-react/src/app/entity/dataProduct/preview/Preview.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-
-import { IconStyleType } from '@app/entity/Entity';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Domain, EntityPath, EntityType, GlobalTags, GlossaryTerms, Owner } from '@types';
-
-interface Props {
-    urn: string;
-    name: string;
-    description?: string | null;
-    owners?: Array<Owner> | null;
-    domain?: Domain | null;
-    globalTags?: GlobalTags | null;
-    glossaryTerms?: GlossaryTerms | null;
-    entityCount?: number;
-    externalUrl?: string | null;
-    degree?: number;
-    paths?: EntityPath[];
-}
-
-export const Preview = ({
-    urn,
-    name,
-    description,
-    owners,
-    globalTags,
-    domain,
-    glossaryTerms,
-    entityCount,
-    externalUrl,
-    degree,
-    paths,
-}: Props): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.DataProduct, urn)}
-            name={name || ''}
-            urn={urn}
-            description={description || ''}
-            type={entityRegistry.getEntityName(EntityType.DataProduct)}
-            typeIcon={entityRegistry.getIcon(EntityType.DataProduct, 12, IconStyleType.ACCENT)}
-            qualifier={origin}
-            tags={globalTags || undefined}
-            owners={owners}
-            domain={domain}
-            glossaryTerms={glossaryTerms || undefined}
-            entityCount={entityCount}
-            externalUrl={externalUrl}
-            displayAssetCount
-            degree={degree}
-            paths={paths}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx b/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx
deleted file mode 100644
index 2a473ae405ca28..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx
+++ /dev/null
@@ -1,409 +0,0 @@
-import { DatabaseFilled, DatabaseOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { Preview } from '@app/entity/dataset/preview/Preview';
-import { OperationsTab } from '@app/entity/dataset/profile/OperationsTab';
-import { DatasetStatsSummarySubHeader } from '@app/entity/dataset/profile/stats/stats/DatasetStatsSummarySubHeader';
-import { getLastUpdatedMs } from '@app/entity/dataset/shared/utils';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection';
-import { SidebarViewDefinitionSection } from '@app/entity/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarSiblingsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarSiblingsSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import EmbeddedProfile from '@app/entity/shared/embed/EmbeddedProfile';
-import AccessManagement from '@app/entity/shared/tabs/Dataset/AccessManagement/AccessManagement';
-import { GovernanceTab } from '@app/entity/shared/tabs/Dataset/Governance/GovernanceTab';
-import QueriesTab from '@app/entity/shared/tabs/Dataset/Queries/QueriesTab';
-import { RelationshipsTab } from '@app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab';
-import { SchemaTab } from '@app/entity/shared/tabs/Dataset/Schema/SchemaTab';
-import StatsTab from '@app/entity/shared/tabs/Dataset/Stats/StatsTab';
-import { ValidationsTab } from '@app/entity/shared/tabs/Dataset/Validations/ValidationsTab';
-import ViewDefinitionTab from '@app/entity/shared/tabs/Dataset/View/ViewDefinitionTab';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { EmbedTab } from '@app/entity/shared/tabs/Embed/EmbedTab';
-import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab';
-import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { getDataProduct } from '@app/entity/shared/utils';
-import { MatchedFieldList } from '@app/search/matches/MatchedFieldList';
-import { matchedFieldPathsRenderer } from '@app/search/matches/matchedFieldPathsRenderer';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useAppConfig } from '@app/useAppConfig';
-
-import { GetDatasetQuery, useGetDatasetQuery, useUpdateDatasetMutation } from '@graphql/dataset.generated';
-import { Dataset, DatasetProperties, EntityType, OwnershipType, SearchResult } from '@types';
-
-const SUBTYPES = {
-    VIEW: 'view',
-};
-
-/**
- * Definition of the DataHub Dataset entity.
- */
-export class DatasetEntity implements Entity<Dataset> {
-    type: EntityType = EntityType.Dataset;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <DatabaseOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <DatabaseFilled style={{ fontSize, color: color || '#B37FEB' }} />;
-        }
-
-        if (styleType === IconStyleType.SVG) {
-            return (
-                <path d="M832 64H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V96c0-17.7-14.3-32-32-32zm-600 72h560v208H232V136zm560 480H232V408h560v208zm0 272H232V680h560v208zM304 240a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0z" />
-            );
-        }
-
-        return (
-            <DatabaseOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    appconfig = useAppConfig;
-
-    isBrowseEnabled = () => true;
-
-    isLineageEnabled = () => true;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getPathName = () => 'dataset';
-
-    getGraphName = () => 'dataset';
-
-    getEntityName = () => 'Dataset';
-
-    getCollectionName = () => 'Datasets';
-
-    useEntityQuery = useGetDatasetQuery;
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            entityType={EntityType.Dataset}
-            useEntityQuery={this.useEntityQuery}
-            useUpdateQuery={useUpdateDatasetMutation}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            headerDropdownItems={new Set([EntityMenuItems.UPDATE_DEPRECATION, EntityMenuItems.RAISE_INCIDENT])}
-            subHeader={{
-                component: DatasetStatsSummarySubHeader,
-            }}
-            tabs={[
-                {
-                    name: 'Schema',
-                    component: SchemaTab,
-                },
-                {
-                    name: 'Relationships',
-                    component: RelationshipsTab,
-                    display: {
-                        visible: (_, _1) => false,
-                        enabled: (_, _2) => false,
-                    },
-                },
-                {
-                    name: 'View Definition',
-                    component: ViewDefinitionTab,
-                    display: {
-                        visible: (_, dataset: GetDatasetQuery) =>
-                            !!dataset?.dataset?.viewProperties?.logic ||
-                            !!dataset?.dataset?.subTypes?.typeNames
-                                ?.map((t) => t.toLocaleLowerCase())
-                                .includes(SUBTYPES.VIEW.toLocaleLowerCase()),
-                        enabled: (_, dataset: GetDatasetQuery) => !!dataset?.dataset?.viewProperties?.logic,
-                    },
-                },
-                {
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                },
-                {
-                    name: 'Preview',
-                    component: EmbedTab,
-                    display: {
-                        visible: (_, dataset: GetDatasetQuery) => !!dataset?.dataset?.embed?.renderUrl,
-                        enabled: (_, dataset: GetDatasetQuery) => !!dataset?.dataset?.embed?.renderUrl,
-                    },
-                },
-                {
-                    name: 'Lineage',
-                    component: LineageTab,
-                },
-                {
-                    name: 'Access',
-                    component: AccessManagement,
-                    display: {
-                        visible: (_, _1) => this.appconfig().config.featureFlags.showAccessManagement,
-                        enabled: (_, dataset: GetDatasetQuery) => {
-                            const accessAspect = dataset?.dataset?.access;
-                            const rolesList = accessAspect?.roles;
-                            return !!accessAspect && !!rolesList && rolesList.length > 0;
-                        },
-                    },
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-                {
-                    name: 'Queries',
-                    component: QueriesTab,
-                    display: {
-                        visible: (_, _1) => true,
-                        enabled: (_, _2) => true,
-                    },
-                },
-                {
-                    name: 'Stats',
-                    component: StatsTab,
-                    display: {
-                        visible: (_, _1) => true,
-                        enabled: (_, dataset: GetDatasetQuery) =>
-                            (dataset?.dataset?.datasetProfiles?.length || 0) > 0 ||
-                            (dataset?.dataset?.usageStats?.buckets?.length || 0) > 0 ||
-                            (dataset?.dataset?.operations?.length || 0) > 0,
-                    },
-                },
-                {
-                    name: 'Quality',
-                    component: ValidationsTab,
-                    display: {
-                        visible: (_, _1) => true,
-                        enabled: (_, dataset: GetDatasetQuery) => {
-                            return (dataset?.dataset?.assertions?.total || 0) > 0;
-                        },
-                    },
-                },
-                {
-                    name: 'Governance',
-                    component: GovernanceTab,
-                    display: {
-                        visible: (_, _1) => true,
-                        enabled: (_, dataset: GetDatasetQuery) => {
-                            return dataset?.dataset?.testResults !== null;
-                        },
-                    },
-                },
-                {
-                    name: 'Runs', // TODO: Rename this to DatasetRunsTab.
-                    component: OperationsTab,
-                    display: {
-                        visible: (_, dataset: GetDatasetQuery) => {
-                            return (dataset?.dataset?.runs?.total || 0) > 0;
-                        },
-                        enabled: (_, dataset: GetDatasetQuery) => {
-                            return (dataset?.dataset?.runs?.total || 0) > 0;
-                        },
-                    },
-                },
-                {
-                    name: 'Incidents',
-                    component: IncidentTab,
-                    getDynamicName: (_, dataset) => {
-                        const activeIncidentCount = dataset?.dataset?.activeIncidents?.total;
-                        return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
-                    },
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-            isNameEditable
-        />
-    );
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-            properties: {
-                defaultOwnerType: OwnershipType.TechnicalOwner,
-            },
-        },
-        {
-            component: SidebarSiblingsSection,
-            display: {
-                visible: (_, dataset: GetDatasetQuery) => (dataset?.dataset?.siblingsSearch?.total || 0) > 0,
-            },
-        },
-        {
-            component: SidebarViewDefinitionSection,
-            display: {
-                visible: (_, dataset: GetDatasetQuery) => !!dataset?.dataset?.viewProperties?.logic,
-            },
-        },
-        {
-            component: SidebarTagsSection,
-            properties: {
-                hasTags: true,
-                hasTerms: true,
-            },
-        },
-        {
-            component: SidebarDomainSection,
-        },
-        {
-            component: DataProductSection,
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-        // TODO: Add back once entity-level recommendations are complete.
-        // {
-        //    component: SidebarRecommendationsSection,
-        // },
-    ];
-
-    getOverridePropertiesFromEntity = (dataset?: Dataset | null): GenericEntityProperties => {
-        // if dataset has subTypes filled out, pick the most specific subtype and return it
-        const subTypes = dataset?.subTypes;
-        const extendedProperties: DatasetProperties | undefined | null = dataset?.properties && {
-            ...dataset?.properties,
-            qualifiedName: dataset?.properties?.qualifiedName || this.displayName(dataset),
-        };
-        return {
-            name: dataset && this.displayName(dataset),
-            externalUrl: dataset?.properties?.externalUrl,
-            entityTypeOverride: subTypes ? capitalizeFirstLetterOnly(subTypes.typeNames?.[0]) : '',
-            properties: extendedProperties,
-        };
-    };
-
-    renderPreview = (_: PreviewType, data: Dataset) => {
-        const genericProperties = this.getGenericEntityProperties(data);
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.editableProperties?.name || data.properties?.name || data.name}
-                origin={data.origin}
-                subtype={data.subTypes?.typeNames?.[0]}
-                description={data.editableProperties?.description || data.properties?.description}
-                platformName={
-                    data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)
-                }
-                platformLogo={data.platform.properties?.logoUrl}
-                platformInstanceId={data.dataPlatformInstance?.instanceId}
-                owners={data.ownership?.owners}
-                globalTags={data.globalTags}
-                glossaryTerms={data.glossaryTerms}
-                domain={data.domain?.domain}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                container={data.container}
-                externalUrl={data.properties?.externalUrl}
-                health={data.health}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as Dataset;
-        const genericProperties = this.getGenericEntityProperties(data);
-
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.editableProperties?.name || data.properties?.name || data.name}
-                origin={data.origin}
-                description={data.editableProperties?.description || data.properties?.description}
-                platformName={
-                    data?.platform?.properties?.displayName || capitalizeFirstLetterOnly(data?.platform?.name)
-                }
-                platformLogo={data.platform.properties?.logoUrl}
-                platformInstanceId={data.dataPlatformInstance?.instanceId}
-                platformNames={genericProperties?.siblingPlatforms?.map(
-                    (platform) => platform.properties?.displayName || capitalizeFirstLetterOnly(platform.name),
-                )}
-                platformLogos={genericProperties?.siblingPlatforms?.map((platform) => platform.properties?.logoUrl)}
-                owners={data.ownership?.owners}
-                globalTags={data.globalTags}
-                domain={data.domain?.domain}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                deprecation={data.deprecation}
-                glossaryTerms={data.glossaryTerms}
-                subtype={data.subTypes?.typeNames?.[0]}
-                container={data.container}
-                parentContainers={data.parentContainers}
-                snippet={<MatchedFieldList customFieldRenderer={matchedFieldPathsRenderer} />}
-                insights={result.insights}
-                externalUrl={data.properties?.externalUrl}
-                statsSummary={data.statsSummary}
-                rowCount={(data as any).lastProfile?.length && (data as any).lastProfile[0].rowCount}
-                columnCount={(data as any).lastProfile?.length && (data as any).lastProfile[0].columnCount}
-                sizeInBytes={(data as any).lastProfile?.length && (data as any).lastProfile[0].sizeInBytes}
-                lastUpdatedMs={getLastUpdatedMs(data.properties, (data as any)?.lastOperation)}
-                health={data.health}
-                degree={(result as any).degree}
-                paths={(result as any).paths}
-            />
-        );
-    };
-
-    getLineageVizConfig = (entity: Dataset) => {
-        return {
-            urn: entity?.urn,
-            name: entity?.properties?.name || entity.name,
-            expandedName: entity?.properties?.qualifiedName || entity?.properties?.name || entity.name,
-            type: EntityType.Dataset,
-            subtype: entity?.subTypes?.typeNames?.[0] || undefined,
-            icon: entity?.platform?.properties?.logoUrl || undefined,
-            platform: entity?.platform,
-            health: entity?.health || undefined,
-        };
-    };
-
-    displayName = (data: Dataset) => {
-        return data?.editableProperties?.name || data?.properties?.name || data.name || data.urn;
-    };
-
-    platformLogoUrl = (data: Dataset) => {
-        return data.platform.properties?.logoUrl || undefined;
-    };
-
-    getGenericEntityProperties = (data: Dataset) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.DOMAINS,
-            EntityCapabilityType.DEPRECATION,
-            EntityCapabilityType.SOFT_DELETE,
-            EntityCapabilityType.DATA_PRODUCTS,
-        ]);
-    };
-
-    renderEmbeddedProfile = (urn: string) => (
-        <EmbeddedProfile
-            urn={urn}
-            entityType={EntityType.Dataset}
-            useEntityQuery={this.useEntityQuery}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/preview/Preview.tsx b/datahub-web-react/src/app/entity/dataset/preview/Preview.tsx
deleted file mode 100644
index cf489ada040877..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/preview/Preview.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import React from 'react';
-
-import { IconStyleType } from '@app/entity/Entity';
-import { DatasetStatsSummary as DatasetStatsSummaryView } from '@app/entity/dataset/shared/DatasetStatsSummary';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import {
-    Container,
-    DataProduct,
-    DatasetStatsSummary,
-    Deprecation,
-    Domain,
-    EntityPath,
-    EntityType,
-    FabricType,
-    GlobalTags,
-    GlossaryTerms,
-    Health,
-    Maybe,
-    Owner,
-    ParentContainersResult,
-    SearchInsight,
-} from '@types';
-
-export const Preview = ({
-    urn,
-    name,
-    origin,
-    description,
-    platformName,
-    platformLogo,
-    platformNames,
-    platformLogos,
-    platformInstanceId,
-    owners,
-    globalTags,
-    domain,
-    dataProduct,
-    deprecation,
-    snippet,
-    insights,
-    glossaryTerms,
-    subtype,
-    externalUrl,
-    container,
-    parentContainers,
-    rowCount,
-    columnCount,
-    sizeInBytes,
-    statsSummary,
-    lastUpdatedMs,
-    health,
-    degree,
-    paths,
-}: {
-    urn: string;
-    name: string;
-    origin: FabricType;
-    description?: string | null;
-    platformName?: string;
-    platformLogo?: string | null;
-    platformNames?: (Maybe<string> | undefined)[];
-    platformLogos?: (Maybe<string> | undefined)[];
-    platformInstanceId?: string;
-    owners?: Array<Owner> | null;
-    domain?: Domain | null;
-    dataProduct?: DataProduct | null;
-    deprecation?: Deprecation | null;
-    globalTags?: GlobalTags | null;
-    snippet?: React.ReactNode | null;
-    insights?: Array<SearchInsight> | null;
-    glossaryTerms?: GlossaryTerms | null;
-    subtype?: string | null;
-    externalUrl?: string | null;
-    container?: Container | null;
-    parentContainers?: ParentContainersResult | null;
-    rowCount?: number | null;
-    columnCount?: number | null;
-    sizeInBytes?: number | null;
-    statsSummary?: DatasetStatsSummary | null;
-    lastUpdatedMs?: number | null;
-    health?: Health[] | null;
-    degree?: number;
-    paths?: EntityPath[];
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.Dataset, urn)}
-            name={name || ''}
-            urn={urn}
-            description={description || ''}
-            type={capitalizeFirstLetterOnly(subtype) || 'Dataset'}
-            logoUrl={platformLogo || ''}
-            typeIcon={entityRegistry.getIcon(EntityType.Dataset, 12, IconStyleType.ACCENT)}
-            platform={platformName}
-            platforms={platformNames}
-            logoUrls={platformLogos}
-            platformInstanceId={platformInstanceId}
-            qualifier={origin}
-            tags={globalTags || undefined}
-            owners={owners}
-            domain={domain}
-            dataProduct={dataProduct}
-            container={container || undefined}
-            deprecation={deprecation}
-            snippet={snippet}
-            glossaryTerms={glossaryTerms || undefined}
-            insights={insights}
-            parentContainers={parentContainers}
-            externalUrl={externalUrl}
-            topUsers={statsSummary?.topUsersLast30Days}
-            subHeader={
-                <DatasetStatsSummaryView
-                    rowCount={rowCount}
-                    columnCount={columnCount}
-                    sizeInBytes={sizeInBytes}
-                    lastUpdatedMs={lastUpdatedMs}
-                />
-            }
-            health={health || undefined}
-            degree={degree}
-            paths={paths}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/dataset/profile/Lineage.tsx b/datahub-web-react/src/app/entity/dataset/profile/Lineage.tsx
deleted file mode 100644
index cc6f245dcbf105..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/Lineage.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Button, List, Space, Typography } from 'antd';
-import React from 'react';
-import { useHistory, useLocation } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { PreviewType } from '@app/entity/Entity';
-import { navigateToLineageUrl } from '@app/lineage/utils/navigateToLineageUrl';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { DownstreamEntityRelationships, EntityType, UpstreamEntityRelationships } from '@types';
-
-export type Props = {
-    upstreamLineage?: UpstreamEntityRelationships | null;
-    downstreamLineage?: DownstreamEntityRelationships | null;
-};
-
-const ViewRawButtonContainer = styled.div`
-    display: flex;
-    justify-content: flex-end;
-`;
-
-export default function Lineage({ upstreamLineage, downstreamLineage }: Props) {
-    const entityRegistry = useEntityRegistry();
-    const history = useHistory();
-    const location = useLocation();
-    const upstreamEntities = upstreamLineage?.entities?.map((entityRelationship) => entityRelationship?.entity);
-    const downstreamEntities = downstreamLineage?.entities?.map((entityRelationship) => entityRelationship?.entity);
-
-    return (
-        <>
-            <div>
-                <ViewRawButtonContainer>
-                    <Button onClick={() => navigateToLineageUrl({ location, history, isLineageMode: true })}>
-                        View Graph
-                    </Button>
-                </ViewRawButtonContainer>
-            </div>
-            <Space direction="vertical" style={{ width: '100%' }} size="large">
-                <List
-                    style={{ marginTop: '24px', padding: '16px 32px' }}
-                    bordered
-                    dataSource={upstreamEntities}
-                    header={<Typography.Title level={3}>Upstream</Typography.Title>}
-                    renderItem={(item) => (
-                        <List.Item style={{ paddingTop: '20px' }}>
-                            {entityRegistry.renderPreview(item?.type || EntityType.Dataset, PreviewType.PREVIEW, item)}
-                        </List.Item>
-                    )}
-                />
-                <List
-                    style={{ marginTop: '12px', padding: '16px 32px' }}
-                    bordered
-                    dataSource={downstreamEntities}
-                    header={<Typography.Title level={3}>Downstream</Typography.Title>}
-                    renderItem={(item) => (
-                        <List.Item style={{ paddingTop: '20px' }}>
-                            {entityRegistry.renderPreview(item?.type || EntityType.Dataset, PreviewType.PREVIEW, item)}
-                        </List.Item>
-                    )}
-                />
-            </Space>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/OperationsTab.tsx b/datahub-web-react/src/app/entity/dataset/profile/OperationsTab.tsx
deleted file mode 100644
index c443efb704486b..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/OperationsTab.tsx
+++ /dev/null
@@ -1,243 +0,0 @@
-import { DeliveredProcedureOutlined } from '@ant-design/icons';
-import { Pagination, Table, Tooltip, Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { notEmpty } from '@app/entity/shared/utils';
-import {
-    getExecutionRequestStatusDisplayColor,
-    getExecutionRequestStatusDisplayText,
-    getExecutionRequestStatusIcon,
-} from '@app/ingest/source/utils';
-import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList';
-import { formatDuration } from '@app/shared/formatDuration';
-import { scrollToTop } from '@app/shared/searchUtils';
-
-import { GetDatasetRunsQuery, useGetDatasetRunsQuery } from '@graphql/dataset.generated';
-import { DataProcessInstanceRunResultType, DataProcessRunStatus, EntityType, RelationshipDirection } from '@types';
-
-import LoadingSvg from '@images/datahub-logo-color-loading_pendulum.svg?react';
-
-const ExternalUrlLink = styled.a`
-    font-size: 16px;
-    color: ${ANTD_GRAY[8]};
-`;
-
-const PaginationControlContainer = styled.div`
-    padding-top: 16px;
-    padding-bottom: 16px;
-    text-align: center;
-`;
-
-const LoadingText = styled.div`
-    margin-top: 18px;
-    font-size: 12px;
-`;
-
-const LoadingContainer = styled.div`
-    padding-top: 40px;
-    padding-bottom: 40px;
-    width: 100%;
-    text-align: center;
-`;
-
-function getStatusForStyling(status: DataProcessRunStatus, resultType: DataProcessInstanceRunResultType) {
-    if (status === 'COMPLETE') {
-        if (resultType === 'SKIPPED') {
-            return 'CANCELLED';
-        }
-        return resultType;
-    }
-    return 'RUNNING';
-}
-
-const columns = [
-    {
-        title: 'Time',
-        dataIndex: 'time',
-        key: 'time',
-        render: (value) => (
-            <Tooltip title={new Date(Number(value)).toUTCString()}>{new Date(Number(value)).toLocaleString()}</Tooltip>
-        ),
-    },
-    {
-        title: 'Duration',
-        dataIndex: 'duration',
-        key: 'duration',
-        render: (durationMs: number) => formatDuration(durationMs),
-    },
-    {
-        title: 'Run ID',
-        dataIndex: 'name',
-        key: 'name',
-    },
-    {
-        title: 'Task',
-        dataIndex: 'parentTemplate',
-        key: 'parentTemplate',
-        render: (parentTemplate) => <CompactEntityNameList entities={[parentTemplate]} />,
-    },
-    {
-        title: 'Status',
-        dataIndex: 'status',
-        key: 'status',
-        render: (status: any, row) => {
-            const statusForStyling = getStatusForStyling(status, row?.resultType);
-            const Icon = getExecutionRequestStatusIcon(statusForStyling);
-            const text = getExecutionRequestStatusDisplayText(statusForStyling);
-            const color = getExecutionRequestStatusDisplayColor(statusForStyling);
-            return (
-                <>
-                    <div style={{ display: 'flex', justifyContent: 'left', alignItems: 'center' }}>
-                        {Icon && <Icon style={{ color }} />}
-                        <Typography.Text strong style={{ color, marginLeft: 8 }}>
-                            {text || 'N/A'}
-                        </Typography.Text>
-                    </div>
-                </>
-            );
-        },
-    },
-    {
-        title: 'Inputs',
-        dataIndex: 'inputs',
-        key: 'inputs',
-        render: (inputs) => <CompactEntityNameList entities={inputs} />,
-    },
-    {
-        title: 'Outputs',
-        dataIndex: 'outputs',
-        key: 'outputs',
-        render: (outputs) => <CompactEntityNameList entities={outputs} />,
-    },
-    {
-        title: '',
-        dataIndex: 'externalUrl',
-        key: 'externalUrl',
-        render: (externalUrl) =>
-            externalUrl && (
-                <Tooltip title="View task run details">
-                    <ExternalUrlLink href={externalUrl}>
-                        <DeliveredProcedureOutlined />
-                    </ExternalUrlLink>
-                </Tooltip>
-            ),
-    },
-];
-
-const PAGE_SIZE = 20;
-
-export const OperationsTab = () => {
-    const { urn, entityData } = useEntityData();
-    const [page, setPage] = useState(1);
-
-    // Fetch data across all siblings.
-    const allUrns = [
-        urn,
-        ...(entityData?.siblingsSearch?.searchResults || []).map((sibling) => sibling.entity.urn).filter(notEmpty),
-    ];
-    const loadings: boolean[] = [];
-    const datas: GetDatasetRunsQuery[] = [];
-    allUrns.forEach((entityUrn) => {
-        // Because there's a consistent number and order of the urns,
-        // this usage of a hook within a loop should be safe.
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        const { loading, data } = useGetDatasetRunsQuery({
-            variables: {
-                urn: entityUrn,
-                start: (page - 1) * PAGE_SIZE,
-                count: PAGE_SIZE,
-                direction: RelationshipDirection.Outgoing,
-            },
-        });
-        loadings.push(loading);
-        if (data) {
-            datas.push(data);
-        }
-    });
-
-    const loading = loadings.some((loadingEntry) => loadingEntry);
-
-    // Merge the runs data from all entities.
-    // If there's more than one entity contributing to the data, then we can't do pagination.
-    let canPaginate = true;
-    let dataRuns: NonNullable<GetDatasetRunsQuery['dataset']>['runs'] | undefined;
-    if (datas.length > 0) {
-        let numWithRuns = 0;
-        for (let i = 0; i < datas.length; i++) {
-            if (datas[i]?.dataset?.runs?.total) {
-                numWithRuns++;
-            }
-
-            if (dataRuns && dataRuns.runs) {
-                dataRuns.runs.push(...(datas[i]?.dataset?.runs?.runs || []));
-                dataRuns.total = (dataRuns.total ?? 0) + (datas[i]?.dataset?.runs?.total ?? 0);
-            } else {
-                dataRuns = JSON.parse(JSON.stringify(datas[i]?.dataset?.runs));
-            }
-        }
-
-        if (numWithRuns > 1) {
-            canPaginate = false;
-        }
-    }
-
-    // This also sorts the runs data across all entities.
-    const runs = dataRuns?.runs?.sort((a, b) => (b?.created?.time ?? 0) - (a?.created?.time ?? 0));
-
-    const tableData = runs
-        ?.filter((run) => run)
-        .map((run) => ({
-            time: run?.created?.time,
-            name: run?.name,
-            status: run?.state?.[0]?.status,
-            resultType: run?.state?.[0]?.result?.resultType,
-            duration: run?.state?.[0]?.durationMillis,
-            inputs: run?.inputs?.relationships?.map((relationship) => relationship.entity),
-            outputs: run?.outputs?.relationships?.map((relationship) => relationship.entity),
-            externalUrl: run?.externalUrl,
-            parentTemplate: run?.parentTemplate?.relationships?.[0]?.entity,
-        }));
-
-    // If the table contains jobs, we need to show the job-related columns. Otherwise we can simplify the table.
-    const containsJobs = tableData?.some((run) => run.parentTemplate?.type !== EntityType.Dataset);
-    const simplifiedColumns = containsJobs
-        ? columns
-        : columns.filter((column) => !['name', 'inputs', 'outputs'].includes(column.key));
-
-    const onChangePage = (newPage: number) => {
-        scrollToTop();
-        setPage(newPage);
-    };
-
-    // TODO: Much of this file is duplicated from RunsTab.tsx. We should refactor this to share code.
-    return (
-        <>
-            {loading && (
-                <LoadingContainer>
-                    <LoadingSvg height={80} width={80} />
-                    <LoadingText>Fetching runs...</LoadingText>
-                </LoadingContainer>
-            )}
-            {!loading && (
-                <>
-                    <Table dataSource={tableData} columns={simplifiedColumns} pagination={false} />
-                    {canPaginate && (
-                        <PaginationControlContainer>
-                            <Pagination
-                                current={page}
-                                pageSize={PAGE_SIZE}
-                                total={dataRuns?.total || 0}
-                                showLessItems
-                                onChange={onChangePage}
-                                showSizeChanger={false}
-                            />
-                        </PaginationControlContainer>
-                    )}
-                </>
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/dataset/profile/UsageFacepile.tsx b/datahub-web-react/src/app/entity/dataset/profile/UsageFacepile.tsx
deleted file mode 100644
index 7cd58d287eac67..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/UsageFacepile.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Avatar, Tooltip } from 'antd';
-import React, { useMemo } from 'react';
-import styled from 'styled-components';
-
-import { SpacedAvatarGroup } from '@app/shared/avatar/SpaceAvatarGroup';
-import getAvatarColor from '@app/shared/avatar/getAvatarColor';
-
-import { UserUsageCounts } from '@types';
-
-export type Props = {
-    users?: (UserUsageCounts | null)[] | null;
-    maxNumberDisplayed?: number;
-};
-
-const AvatarStyled = styled(Avatar)<{ backgroundColor: string }>`
-    color: #fff;
-    background-color: ${(props) => props.backgroundColor};
-`;
-
-export default function UsageFacepile({ users, maxNumberDisplayed }: Props) {
-    const sortedUsers = useMemo(() => users?.slice().sort((a, b) => (b?.count || 0) - (a?.count || 0)), [users]);
-    let displayedUsers = sortedUsers;
-    if (maxNumberDisplayed) {
-        displayedUsers = displayedUsers?.slice(0, maxNumberDisplayed);
-    }
-
-    return (
-        <SpacedAvatarGroup maxCount={2}>
-            {displayedUsers?.map((user) => (
-                <Tooltip title={user?.userEmail}>
-                    <AvatarStyled backgroundColor={getAvatarColor(user?.userEmail || undefined)}>
-                        {user?.userEmail?.charAt(0).toUpperCase()}
-                    </AvatarStyled>
-                </Tooltip>
-            ))}
-        </SpacedAvatarGroup>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Lineage.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Lineage.test.tsx
deleted file mode 100644
index 2ac0f90864b417..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Lineage.test.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { render } from '@testing-library/react';
-import React from 'react';
-
-import Lineage from '@app/entity/dataset/profile/Lineage';
-import { sampleDownstreamRelationship, sampleRelationship } from '@app/entity/dataset/profile/stories/lineageEntities';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-describe('Lineage', () => {
-    it('renders', () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <Lineage upstreamLineage={sampleRelationship} downstreamLineage={sampleDownstreamRelationship} />,
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('Upstream HiveDataset')).toBeInTheDocument();
-        expect(getByText('Downstream HiveDataset')).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Properties.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Properties.test.tsx
deleted file mode 100644
index 3936e97f1f2cb8..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Properties.test.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { render } from '@testing-library/react';
-import React from 'react';
-
-import { sampleProperties } from '@app/entity/dataset/profile/stories/properties';
-import { Properties } from '@app/entity/shared/components/legacy/Properties';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-describe('Properties', () => {
-    it('renders', () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <Properties properties={sampleProperties} />,
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('Properties')).toBeInTheDocument();
-        expect(getByText('Number of Partitions')).toBeInTheDocument();
-        expect(getByText('18')).toBeInTheDocument();
-        expect(getByText('Cluster Name')).toBeInTheDocument();
-        expect(getByText('Testing')).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx
deleted file mode 100644
index bdf04fead920eb..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx
+++ /dev/null
@@ -1,399 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { fireEvent, render } from '@testing-library/react';
-import React from 'react';
-
-import {
-    sampleSchema,
-    sampleSchemaWithKeyValueFields,
-    sampleSchemaWithPkFk,
-    sampleSchemaWithTags,
-    sampleSchemaWithoutFields,
-} from '@app/entity/dataset/profile/stories/sampleSchema';
-import { EntityContext } from '@app/entity/shared/EntityContext';
-import { SchemaTab } from '@app/entity/shared/tabs/Dataset/Schema/SchemaTab';
-import { SchemaRow } from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaRow';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-import { EntityType, SchemaMetadata } from '@types';
-
-vi.mock('virtualizedtableforantd4', async () => {
-    return {
-        ...(await vi.importActual<object>('virtualizedtableforantd4')),
-        useVT: () => [{ body: { row: SchemaRow } }, vi.fn()],
-    };
-});
-
-describe('Schema', () => {
-    it('renders', () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <EntityContext.Provider
-                        value={{
-                            urn: 'urn:li:dataset:123',
-                            entityType: EntityType.Dataset,
-                            entityData: {
-                                schemaMetadata: sampleSchema as SchemaMetadata,
-                            },
-                            baseEntity: {},
-                            updateEntity: vi.fn(),
-                            routeToTab: vi.fn(),
-                            refetch: vi.fn(),
-                            loading: true,
-                            lineage: undefined,
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <SchemaTab />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('name')).toBeInTheDocument();
-        expect(getByText('the name of the order')).toBeInTheDocument();
-        expect(getByText('shipping_address')).toBeInTheDocument();
-        expect(getByText('the address the order ships to')).toBeInTheDocument();
-    });
-
-    it('renders raw', () => {
-        const { getByText, queryAllByTestId } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <EntityContext.Provider
-                        value={{
-                            urn: 'urn:li:dataset:123',
-                            entityType: EntityType.Dataset,
-                            entityData: {
-                                properties: {
-                                    description: 'This is a description',
-                                },
-                                schemaMetadata: sampleSchema as SchemaMetadata,
-                            },
-                            baseEntity: {},
-                            updateEntity: vi.fn(),
-                            routeToTab: vi.fn(),
-                            refetch: vi.fn(),
-                            loading: true,
-                            lineage: undefined,
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <SchemaTab />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        expect(queryAllByTestId('schema-raw-view')).toHaveLength(0);
-
-        const rawButton = getByText('Raw');
-        fireEvent.click(rawButton);
-
-        expect(queryAllByTestId('schema-raw-view')).toHaveLength(1);
-
-        const schemaButton = getByText('Tabular');
-        fireEvent.click(schemaButton);
-
-        expect(queryAllByTestId('schema-raw-view')).toHaveLength(0);
-    });
-
-    it('renders tags and terms', () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <EntityContext.Provider
-                        value={{
-                            urn: 'urn:li:dataset:123',
-                            entityType: EntityType.Dataset,
-                            entityData: {
-                                properties: {
-                                    description: 'This is a description',
-                                },
-                                schemaMetadata: sampleSchemaWithTags as SchemaMetadata,
-                            },
-                            baseEntity: {},
-                            updateEntity: vi.fn(),
-                            routeToTab: vi.fn(),
-                            refetch: vi.fn(),
-                            loading: true,
-                            lineage: undefined,
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <SchemaTab />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('Legacy')).toBeInTheDocument();
-        expect(getByText('sample-glossary-term')).toBeInTheDocument();
-    });
-
-    it('renders description', () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <EntityContext.Provider
-                        value={{
-                            urn: 'urn:li:dataset:123',
-                            entityType: EntityType.Dataset,
-                            entityData: {
-                                properties: {
-                                    description: 'This is a description',
-                                },
-                                schemaMetadata: sampleSchemaWithTags as SchemaMetadata,
-                            },
-                            baseEntity: {},
-                            updateEntity: vi.fn(),
-                            routeToTab: vi.fn(),
-                            refetch: vi.fn(),
-                            loading: true,
-                            lineage: undefined,
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <SchemaTab />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('order id')).toBeInTheDocument();
-    });
-
-    it('renders field', () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <EntityContext.Provider
-                        value={{
-                            urn: 'urn:li:dataset:123',
-                            entityType: EntityType.Dataset,
-                            entityData: {
-                                properties: {
-                                    description: 'This is a description',
-                                },
-                                schemaMetadata: sampleSchemaWithTags as SchemaMetadata,
-                            },
-                            baseEntity: {},
-                            updateEntity: vi.fn(),
-                            routeToTab: vi.fn(),
-                            refetch: vi.fn(),
-                            loading: true,
-                            lineage: undefined,
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <SchemaTab />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('shipping_address')).toBeInTheDocument();
-    });
-
-    it('renders primary keys', () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <EntityContext.Provider
-                        value={{
-                            urn: 'urn:li:dataset:123',
-                            entityType: EntityType.Dataset,
-                            entityData: {
-                                properties: {
-                                    description: 'This is a description',
-                                },
-                                schemaMetadata: sampleSchemaWithPkFk as SchemaMetadata,
-                            },
-                            baseEntity: {},
-                            updateEntity: vi.fn(),
-                            routeToTab: vi.fn(),
-                            refetch: vi.fn(),
-                            loading: true,
-                            lineage: undefined,
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <SchemaTab />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('Primary Key')).toBeInTheDocument();
-    });
-
-    it('renders foreign keys', () => {
-        const { getByText, getAllByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <EntityContext.Provider
-                        value={{
-                            urn: 'urn:li:dataset:123',
-                            entityType: EntityType.Dataset,
-                            entityData: {
-                                properties: {
-                                    description: 'This is a description',
-                                },
-                                schemaMetadata: sampleSchemaWithPkFk as SchemaMetadata,
-                            },
-                            baseEntity: {},
-                            updateEntity: vi.fn(),
-                            routeToTab: vi.fn(),
-                            refetch: vi.fn(),
-                            loading: true,
-                            lineage: undefined,
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <SchemaTab />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('Foreign Key')).toBeInTheDocument();
-
-        const fkButton = getByText('Foreign Key');
-        fireEvent.click(fkButton);
-
-        expect(getByText('Foreign Key to')).toBeInTheDocument();
-        expect(getAllByText('Yet Another Dataset')).toHaveLength(2);
-    });
-
-    it('renders key/value toggle', () => {
-        const { getByText, queryByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <EntityContext.Provider
-                        value={{
-                            urn: 'urn:li:dataset:123',
-                            entityType: EntityType.Dataset,
-                            entityData: {
-                                properties: {
-                                    description: 'This is a description',
-                                },
-                                schemaMetadata: sampleSchemaWithKeyValueFields as SchemaMetadata,
-                            },
-                            baseEntity: {},
-                            updateEntity: vi.fn(),
-                            routeToTab: vi.fn(),
-                            refetch: vi.fn(),
-                            loading: true,
-                            lineage: undefined,
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <SchemaTab />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('Key')).toBeInTheDocument();
-        expect(getByText('Value')).toBeInTheDocument();
-        expect(getByText('count')).toBeInTheDocument();
-        expect(getByText('cost')).toBeInTheDocument();
-        expect(queryByText('id')).not.toBeInTheDocument();
-
-        const keyButton = getByText('Key');
-        fireEvent.click(keyButton);
-
-        expect(getByText('Key')).toBeInTheDocument();
-        expect(getByText('Value')).toBeInTheDocument();
-        expect(getByText('id')).toBeInTheDocument();
-        expect(queryByText('count')).not.toBeInTheDocument();
-        expect(queryByText('cost')).not.toBeInTheDocument();
-    });
-
-    it('does not renders key/value toggle when no schema', () => {
-        const { queryByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <EntityContext.Provider
-                        value={{
-                            urn: 'urn:li:dataset:123',
-                            entityType: EntityType.Dataset,
-                            entityData: {
-                                properties: {
-                                    description: 'This is a description',
-                                },
-                                schemaMetadata: sampleSchemaWithoutFields as SchemaMetadata,
-                            },
-                            baseEntity: {},
-                            updateEntity: vi.fn(),
-                            routeToTab: vi.fn(),
-                            refetch: vi.fn(),
-                            loading: true,
-                            lineage: undefined,
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <SchemaTab />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(queryByText('Key')).not.toBeInTheDocument();
-        expect(queryByText('Value')).not.toBeInTheDocument();
-    });
-
-    it('renders usage column when usage is present', () => {
-        const usageStats = {
-            buckets: [
-                {
-                    bucket: Date.now(),
-                    metrics: {
-                        totalSqlQueries: 10,
-                    },
-                },
-            ],
-            aggregations: {
-                uniqueUserCount: 2,
-                totalSqlQueries: 10,
-                fields: [
-                    {
-                        fieldName: 'id',
-                        count: 10,
-                    },
-                    {
-                        fieldName: 'name',
-                        count: 24,
-                    },
-                ],
-            },
-        };
-
-        const { queryByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <EntityContext.Provider
-                        value={{
-                            urn: 'urn:li:dataset:123',
-                            entityType: EntityType.Dataset,
-                            entityData: {
-                                properties: {
-                                    description: 'This is a description',
-                                },
-                                schemaMetadata: sampleSchema as SchemaMetadata,
-                            },
-                            baseEntity: {
-                                dataset: {
-                                    urn: 'urn:li:dataset:123',
-                                    usageStats,
-                                },
-                            },
-                            updateEntity: vi.fn(),
-                            routeToTab: vi.fn(),
-                            refetch: vi.fn(),
-                            loading: true,
-                            lineage: undefined,
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <SchemaTab />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(queryByText('Usage')).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/SchemaDescriptionField.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/SchemaDescriptionField.test.tsx
deleted file mode 100644
index f6e0e32a2e4818..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/SchemaDescriptionField.test.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { fireEvent, render, waitFor } from '@testing-library/react';
-import React from 'react';
-
-import SchemaDescriptionField from '@app/entity/dataset/profile/schema/components/SchemaDescriptionField';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-describe('SchemaDescriptionField', () => {
-    it('renders editable description', async () => {
-        const { getByText, getByRole, queryByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <SchemaDescriptionField
-                        expanded
-                        onExpanded={() => {}}
-                        description="test description updated"
-                        isEdited
-                        onUpdate={async () => {}}
-                    />{' '}
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByRole('img')).toBeInTheDocument();
-        expect(getByText('test description updated')).toBeInTheDocument();
-        expect(queryByText('Update description')).not.toBeInTheDocument();
-    });
-
-    it('renders update description modal', async () => {
-        const { getByText, getByRole, queryByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <SchemaDescriptionField
-                        expanded
-                        onExpanded={() => {}}
-                        description="test description"
-                        original="test description"
-                        isEdited
-                        onUpdate={async () => {}}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(queryByText('Update description')).not.toBeInTheDocument();
-        fireEvent.click(getByRole('img'));
-        await waitFor(() => expect(getByText('Update description')).toBeInTheDocument());
-        expect(getByText('Cancel')).toBeInTheDocument();
-        expect(getByText('Update')).toBeInTheDocument();
-        expect(getByText('Original:')).toBeInTheDocument();
-        fireEvent.click(getByText('Cancel'));
-        await waitFor(() => expect(queryByText('Update description')).not.toBeInTheDocument());
-    });
-
-    it('renders short messages without show more / show less', () => {
-        const { getByText, queryByText } = render(
-            <SchemaDescriptionField
-                expanded
-                onExpanded={() => {}}
-                description="short description"
-                onUpdate={() => Promise.resolve()}
-            />,
-        );
-        expect(getByText('short description')).toBeInTheDocument();
-        expect(queryByText('Read Less')).not.toBeInTheDocument();
-        expect(queryByText('Read More')).not.toBeInTheDocument();
-    });
-
-    describe('renders longer messages with show more / show less', () => {
-        const longDescription =
-            'really long description over 80 characters, really long description over 80 characters, really long description over 80 characters, really long description over 80 characters, really long description over 80 characters';
-        it('renders longer messages with show more when not expanded', () => {
-            const onClick = vi.fn();
-            const { getByText, queryByText } = render(
-                <SchemaDescriptionField
-                    expanded={false}
-                    onExpanded={onClick}
-                    description={longDescription}
-                    onUpdate={() => Promise.resolve()}
-                />,
-            );
-            expect(getByText('Read More')).toBeInTheDocument();
-            expect(queryByText(longDescription)).not.toBeInTheDocument();
-            fireEvent.click(getByText('Read More'));
-            expect(onClick).toHaveBeenCalled();
-        });
-
-        it('renders longer messages with show less when expanded', () => {
-            const onClick = vi.fn();
-            const { getByText } = render(
-                <SchemaDescriptionField
-                    expanded
-                    onExpanded={onClick}
-                    description={longDescription}
-                    onUpdate={() => Promise.resolve()}
-                />,
-            );
-            expect(getByText(longDescription)).toBeInTheDocument();
-            expect(getByText('Read Less')).toBeInTheDocument();
-            fireEvent.click(getByText('Read Less'));
-            expect(onClick).toHaveBeenCalled();
-        });
-    });
-});
diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Stats.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Stats.test.tsx
deleted file mode 100644
index f299a362d392f1..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Stats.test.tsx
+++ /dev/null
@@ -1,160 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { render } from '@testing-library/react';
-import React from 'react';
-
-import SnapshotStatsView from '@app/entity/dataset/profile/stats/snapshot/SnapshotStatsView';
-import {
-    completeSampleProfile,
-    missingFieldStatsProfile,
-    missingTableStatsProfile,
-} from '@app/entity/dataset/profile/stories/stats';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-describe('SnapshotStatsView', () => {
-    it('renders complete profile', () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks}>
-                <TestPageContainer>
-                    <SnapshotStatsView profile={completeSampleProfile} />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        // Row Count
-        expect(getByText('1000')).toBeInTheDocument();
-        expect(getByText('Rows')).toBeInTheDocument();
-
-        // Column Count
-        expect(getByText('2000')).toBeInTheDocument();
-        expect(getByText('Columns')).toBeInTheDocument();
-
-        // Field Profiles
-        // First column
-        expect(getByText('testColumn')).toBeInTheDocument();
-        expect(getByText('1')).toBeInTheDocument();
-        expect(getByText('11.10%')).toBeInTheDocument();
-        expect(getByText('2')).toBeInTheDocument();
-        expect(getByText('22.20%')).toBeInTheDocument();
-        expect(getByText('3')).toBeInTheDocument();
-        expect(getByText('4')).toBeInTheDocument();
-        expect(getByText('5')).toBeInTheDocument();
-        expect(getByText('6')).toBeInTheDocument();
-        expect(getByText('value1')).toBeInTheDocument();
-        expect(getByText('value2')).toBeInTheDocument();
-        expect(getByText('value3')).toBeInTheDocument();
-
-        // Second column
-        expect(getByText('testColumn2')).toBeInTheDocument();
-        expect(getByText('8')).toBeInTheDocument();
-        expect(getByText('33.30%')).toBeInTheDocument();
-        expect(getByText('9')).toBeInTheDocument();
-        expect(getByText('44.40%')).toBeInTheDocument();
-        expect(getByText('10')).toBeInTheDocument();
-        expect(getByText('11')).toBeInTheDocument();
-        expect(getByText('12')).toBeInTheDocument();
-        expect(getByText('13')).toBeInTheDocument();
-        expect(getByText('14')).toBeInTheDocument();
-        expect(getByText('value4')).toBeInTheDocument();
-        expect(getByText('value5')).toBeInTheDocument();
-        expect(getByText('value6')).toBeInTheDocument();
-    });
-
-    it('renders profile without field stats', () => {
-        const { getByText, queryByText } = render(
-            <MockedProvider mocks={mocks}>
-                <TestPageContainer>
-                    <SnapshotStatsView profile={missingFieldStatsProfile} />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        // Row Count
-        expect(getByText('1000')).toBeInTheDocument();
-        expect(getByText('Rows')).toBeInTheDocument();
-
-        // Column Count
-        expect(getByText('2000')).toBeInTheDocument();
-        expect(getByText('Columns')).toBeInTheDocument();
-
-        // Field Profiles
-        // First column
-        expect(queryByText('testColumn')).toBeNull();
-        expect(queryByText('1')).toBeNull();
-        expect(queryByText('11.10%')).toBeNull();
-        expect(queryByText('2')).toBeNull();
-        expect(queryByText('22.20%')).toBeNull();
-        expect(queryByText('3')).toBeNull();
-        expect(queryByText('4')).toBeNull();
-        expect(queryByText('5')).toBeNull();
-        expect(queryByText('6')).toBeNull();
-        expect(queryByText('value1')).toBeNull();
-        expect(queryByText('value2')).toBeNull();
-        expect(queryByText('value3')).toBeNull();
-
-        // Second column
-        expect(queryByText('testColumn2')).toBeNull();
-        expect(queryByText('8')).toBeNull();
-        expect(queryByText('33.30%')).toBeNull();
-        expect(queryByText('9')).toBeNull();
-        expect(queryByText('44.40%')).toBeNull();
-        expect(queryByText('10')).toBeNull();
-        expect(queryByText('11')).toBeNull();
-        expect(queryByText('12')).toBeNull();
-        expect(queryByText('13')).toBeNull();
-        expect(queryByText('14')).toBeNull();
-        expect(queryByText('value4')).toBeNull();
-        expect(queryByText('value5')).toBeNull();
-        expect(queryByText('value6')).toBeNull();
-    });
-
-    it('renders profile without table stats', () => {
-        const { getByText, queryByText } = render(
-            <MockedProvider mocks={mocks}>
-                <TestPageContainer>
-                    <SnapshotStatsView profile={missingTableStatsProfile} />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        // Row Count
-        expect(queryByText('1000')).toBeNull();
-        expect(queryByText('Rows')).toBeNull();
-        expect(queryByText('Row Count Unknown')).toBeInTheDocument();
-
-        // Column Count
-        expect(queryByText('2000')).toBeNull();
-        expect(queryByText('Columns')).toBeNull();
-        expect(queryByText('Column Count Unknown')).toBeInTheDocument();
-
-        // Field Profiles
-        // First column
-        expect(getByText('testColumn')).toBeInTheDocument();
-        expect(getByText('1')).toBeInTheDocument();
-        expect(getByText('11.10%')).toBeInTheDocument();
-        expect(getByText('2')).toBeInTheDocument();
-        expect(getByText('22.20%')).toBeInTheDocument();
-        expect(getByText('3')).toBeInTheDocument();
-        expect(getByText('4')).toBeInTheDocument();
-        expect(getByText('5')).toBeInTheDocument();
-        expect(getByText('6')).toBeInTheDocument();
-        expect(getByText('value1')).toBeInTheDocument();
-        expect(getByText('value2')).toBeInTheDocument();
-        expect(getByText('value3')).toBeInTheDocument();
-
-        // Second column
-        expect(getByText('testColumn2')).toBeInTheDocument();
-        expect(getByText('8')).toBeInTheDocument();
-        expect(getByText('33.30%')).toBeInTheDocument();
-        expect(getByText('9')).toBeInTheDocument();
-        expect(getByText('44.40%')).toBeInTheDocument();
-        expect(getByText('10')).toBeInTheDocument();
-        expect(getByText('11')).toBeInTheDocument();
-        expect(getByText('12')).toBeInTheDocument();
-        expect(getByText('13')).toBeInTheDocument();
-        expect(getByText('14')).toBeInTheDocument();
-        expect(getByText('value4')).toBeInTheDocument();
-        expect(getByText('value5')).toBeInTheDocument();
-        expect(getByText('value6')).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/translateFieldPath.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/translateFieldPath.test.tsx
deleted file mode 100644
index 3e03f28fb605d4..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/translateFieldPath.test.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import translateFieldPath from '@app/entity/dataset/profile/schema/utils/translateFieldPath';
-
-describe('translateFieldPath', () => {
-    it('translates qualified unions', () => {
-        expect(translateFieldPath('[type=union].[type=QualifyingStruct].struct.[type=long].field')).toEqual(
-            '(QualifyingStruct) struct.field',
-        );
-    });
-
-    it('translates nested arrays', () => {
-        expect(translateFieldPath('[type=array].[type=array].my_array.[type=long].field')).toEqual(
-            'my_array[][].field',
-        );
-    });
-
-    it('removes non-qualifying structs', () => {
-        expect(
-            translateFieldPath('[type=array].[type=array].MyArray.[type=Struct].field.[type=long].nested_field'),
-        ).toEqual('MyArray[][].field.nested_field');
-    });
-
-    it('cleans the [key=true] prefix', () => {
-        expect(
-            translateFieldPath(
-                '[key=True].[type=array].[type=array].MyArray.[type=Struct].field.[type=long].nested_field',
-            ),
-        ).toEqual('MyArray[][].field.nested_field');
-    });
-
-    it('leaves old fieldpaths as is', () => {
-        expect(translateFieldPath('a.b.c')).toEqual('a.b.c');
-    });
-});
diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx
deleted file mode 100644
index b6291ae1c01e06..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/translateFieldPathSegment.test.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import translateFieldPathSegment from '@app/entity/dataset/profile/schema/utils/translateFieldPathSegment';
-
-describe('translateFieldPathSegment', () => {
-    it('translates unions', () => {
-        expect(translateFieldPathSegment('MyUnion', 1, ['[type=union]', 'MyUnion'])).toEqual('MyUnion.');
-    });
-
-    it('translates arrays', () => {
-        expect(translateFieldPathSegment('MyArray', 1, ['[type=array]', 'MyArray'])).toEqual('MyArray[].');
-    });
-
-    it('translates qualifying structs in the middle', () => {
-        expect(
-            translateFieldPathSegment('[type=QualifyingStruct]', 1, [
-                '[type=union]',
-                '[type=QualifyingStruct]',
-                'MyUnion',
-            ]),
-        ).toEqual('(QualifyingStruct) ');
-    });
-
-    it('translates qualifying structs in the end', () => {
-        expect(
-            translateFieldPathSegment('[type=QualifyingStruct]', 1, ['[type=union]', '[type=QualifyingStruct]']),
-        ).toEqual(' QualifyingStruct');
-    });
-
-    it('translates primitives', () => {
-        expect(
-            translateFieldPathSegment('field', 4, [
-                '[type=union]',
-                'MyUnion',
-                '[type=QualifyingStruct]',
-                '[type=long]',
-                'field',
-            ]),
-        ).toEqual('field.');
-    });
-});
diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/utils.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/utils.test.tsx
deleted file mode 100644
index c3a32a67cb497a..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/schema/utils.test.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { filterKeyFieldPath } from '@app/entity/dataset/profile/schema/utils/utils';
-
-import { SchemaFieldDataType } from '@types';
-
-describe('utils', () => {
-    describe('filterKeyFieldPath', () => {
-        it('allows keys when looking for keys', () => {
-            expect(
-                filterKeyFieldPath(true, {
-                    fieldPath: '[version=2.0].[key=True].[type=long].field',
-                    nullable: false,
-                    type: SchemaFieldDataType.Number,
-                    recursive: false,
-                }),
-            ).toEqual(true);
-        });
-        it('blocks non-keys when looking for keys', () => {
-            expect(
-                filterKeyFieldPath(true, {
-                    fieldPath: '[version=2.0].[type=long].field',
-                    nullable: false,
-                    type: SchemaFieldDataType.Number,
-                    recursive: false,
-                }),
-            ).toEqual(false);
-        });
-
-        it('allows non-keys when looking for non-keys', () => {
-            expect(
-                filterKeyFieldPath(false, {
-                    fieldPath: '[version=2.0].[type=long].field',
-                    nullable: false,
-                    type: SchemaFieldDataType.Number,
-                    recursive: false,
-                }),
-            ).toEqual(true);
-        });
-
-        it('blocks keys when looking for non-keys', () => {
-            expect(
-                filterKeyFieldPath(false, {
-                    fieldPath: '[version=2.0].[key=True].[type=long].field',
-                    nullable: false,
-                    type: SchemaFieldDataType.Number,
-                    recursive: false,
-                }),
-            ).toEqual(false);
-        });
-    });
-});
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/CustomPagination.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/CustomPagination.tsx
deleted file mode 100644
index 68fcefbb79c6d6..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/CustomPagination.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import { LeftOutlined, RightOutlined } from '@ant-design/icons';
-import { Button, Dropdown, Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent';
-
-const CustomPaginationContainer = styled.div`
-    display: flex;
-    flex-direction: row;
-    height: 32px;
-`;
-const NavButton = styled(Button)`
-    margin: 4px 6px;
-    cursor: pointer;
-`;
-const DescriptionText = styled(Typography.Text)`
-    line-height: 32px;
-`;
-const VersionText = styled(Typography.Text)`
-    padding: 0 4px;
-    line-height: 32px;
-    cursor: pointer;
-`;
-const VersionRightText = styled(Typography.Text)`
-    padding-left: 4px;
-    line-height: 32px;
-    cursor: pointer;
-`;
-
-type Props = {
-    onChange: (version1: number, version2: number) => void;
-    maxVersion: number;
-};
-
-export default function CustomPagination({ onChange, maxVersion }: Props) {
-    const [version1, setVersion1] = useState(maxVersion || 1); // current version - first dropdown selected
-    const [version2, setVersion2] = useState(maxVersion ? maxVersion - 1 : 0); // past version comparing with current - second dropdown
-
-    const onNextClick = () => {
-        setVersion1((v) => v - 1);
-        setVersion2(version1 - 2);
-        onChange(version1 - 1, version1 - 2);
-    };
-    const onPrevClick = () => {
-        setVersion1((v) => v + 1);
-        setVersion2(version1);
-        onChange(version1 + 1, version1);
-    };
-    const onVersion1Click = ({ key }) => {
-        const newVersion1 = parseInt(key, 10);
-        setVersion1(newVersion1);
-        if (version2 >= newVersion1) {
-            setVersion2(newVersion1 - 1);
-            onChange(newVersion1, newVersion1 - 1);
-            return;
-        }
-        onChange(newVersion1, version2);
-    };
-    const onVersion2Click = ({ key }) => {
-        setVersion2(parseInt(key, 10));
-        onChange(version1, parseInt(key, 10));
-    };
-
-    const items1 = [...Array(maxVersion)].map((_, i) => {
-        // eslint-disable-next-line react/no-array-index-key
-        return {
-            key: maxVersion - i,
-            label: (
-                <MenuItemStyle onClick={() => onVersion1Click({ key: maxVersion - i })}>
-                    <Typography.Text>{i === 0 ? 'latest' : `version ${maxVersion + 1 - i}`}</Typography.Text>
-                </MenuItemStyle>
-            ),
-        };
-    });
-
-    const items2 = [...Array(version1)].map((_, i) => {
-        // eslint-disable-next-line react/no-array-index-key
-        return {
-            key: version1 - i - 1,
-            label: (
-                <MenuItemStyle onClick={() => onVersion2Click({ key: version1 - i - 1 })}>
-                    <Typography.Text>{`version ${version1 - i}`}</Typography.Text>
-                </MenuItemStyle>
-            ),
-        };
-    });
-
-    return (
-        <CustomPaginationContainer>
-            <NavButton
-                size="small"
-                type="text"
-                icon={<LeftOutlined />}
-                onClick={onPrevClick}
-                disabled={version1 >= maxVersion}
-            />
-            <DescriptionText>Comparing</DescriptionText>
-            <Dropdown menu={{ items: items1 }} trigger={['click']}>
-                <VersionText strong type="success">
-                    {version1 === maxVersion ? 'latest' : `version ${version1 + 1}`}
-                </VersionText>
-            </Dropdown>
-            <DescriptionText>to</DescriptionText>
-            <Dropdown menu={{ items: items2 }} trigger={['click']}>
-                <VersionRightText strong type="success">{`version ${version2 + 1}`}</VersionRightText>
-            </Dropdown>
-            <NavButton
-                size="small"
-                type="text"
-                icon={<RightOutlined />}
-                onClick={onNextClick}
-                disabled={version1 <= 1}
-            />
-        </CustomPaginationContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaHeader.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaHeader.tsx
deleted file mode 100644
index 33fa35787fe26c..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaHeader.tsx
+++ /dev/null
@@ -1,304 +0,0 @@
-import {
-    AuditOutlined,
-    CaretDownOutlined,
-    FileTextOutlined,
-    QuestionCircleOutlined,
-    TableOutlined,
-} from '@ant-design/icons';
-import { Icon } from '@components';
-import { Button, Input, Popover, Select, Tooltip, Typography } from 'antd';
-import { debounce } from 'lodash';
-import React from 'react';
-import { useHistory, useLocation } from 'react-router-dom';
-import styled from 'styled-components/macro';
-
-import CustomPagination from '@app/entity/dataset/profile/schema/components/CustomPagination';
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entity/shared/constants';
-import getSchemaFilterFromQueryString from '@app/entity/shared/tabs/Dataset/Schema/utils/getSchemaFilterFromQueryString';
-import { navigateToVersionedDatasetUrl } from '@app/entity/shared/tabs/Dataset/Schema/utils/navigateToVersionedDatasetUrl';
-import { toRelativeTimeString } from '@app/shared/time/timeUtils';
-
-import { SemanticVersionStruct } from '@types';
-
-const SchemaHeaderContainer = styled.div`
-    display: flex;
-    justify-content: space-between;
-    width: 100%;
-`;
-
-// TODO(Gabe): undo display: none when dbt/bigquery flickering has been resolved
-const ShowVersionButton = styled(Button)`
-    display: inline-block;
-    margin-right: 10px;
-    display: none;
-`;
-
-// Below styles are for buttons on the left side of the Schema Header
-const LeftButtonsGroup = styled.div`
-    &&& {
-        display: flex;
-        justify-content: left;
-        width: 100%;
-    }
-`;
-
-const RawButton = styled(Button)`
-    &&& {
-        display: flex;
-        margin-right: 10px;
-        justify-content: left;
-        align-items: center;
-    }
-`;
-
-const RawButtonTitleContainer = styled.span`
-    display: flex;
-    align-items: center;
-`;
-
-const RawButtonTitle = styled(Typography.Text)`
-    margin-left: 6px;
-`;
-
-const KeyButton = styled(Button)<{ $highlighted: boolean }>`
-    border-radius: 8px 0px 0px 8px;
-    font-weight: ${(props) => (props.$highlighted ? '600' : '400')};
-`;
-
-const ValueButton = styled(Button)<{ $highlighted: boolean }>`
-    border-radius: 0px 8px 8px 0px;
-    font-weight: ${(props) => (props.$highlighted ? '600' : '400')};
-`;
-
-const KeyValueButtonGroup = styled.div`
-    margin-right: 10px;
-    display: flex;
-`;
-
-// Below styles are for buttons on the right side of the Schema Header
-const RightButtonsGroup = styled.div`
-    padding-left: 5px;
-    &&& {
-        display: flex;
-        justify-content: right;
-        margin-top: -6px;
-        width: 100%;
-        row-gap: 12px;
-    }
-`;
-
-const SchemaBlameSelector = styled(Select)`
-    &&& {
-        font-weight: 400;
-        margin-top: 6px;
-        min-width: 30px;
-        margin-right: 10px;
-        border-radius: 0px 8px 8px 0px;
-    }
-`;
-
-const SchemaBlameSelectorOption = styled(Select.Option)`
-    &&& {
-        overflow: visible;
-        margin-top: 6px;
-    }
-`;
-
-const SchemaAuditButton = styled(Button)`
-    &&& {
-        margin-top: 6px;
-    }
-`;
-
-const StyledQuestionCircleOutlined = styled(QuestionCircleOutlined)`
-    &&& {
-        margin-top: 14px;
-        font-size: 16px;
-        color: ${ANTD_GRAY[6]};
-    }
-`;
-
-const StyledInput = styled(Input)`
-    border-radius: 70px;
-    max-width: 300px;
-`;
-
-const MAX_ROWS_BEFORE_DEBOUNCE = 50;
-const HALF_SECOND_IN_MS = 500;
-
-type Props = {
-    maxVersion?: number;
-    fetchVersions?: (version1: number, version2: number) => void;
-    editMode: boolean;
-    setEditMode?: (mode: boolean) => void;
-    hasRaw: boolean;
-    showRaw: boolean;
-    setShowRaw: (show: boolean) => void;
-    hasKeySchema: boolean;
-    showKeySchema: boolean;
-    setShowKeySchema: (show: boolean) => void;
-    selectedVersion: string;
-    versionList: Array<SemanticVersionStruct>;
-    showSchemaAuditView: boolean;
-    setShowSchemaAuditView: any;
-    setFilterText: (text: string) => void;
-    numRows: number;
-};
-
-export default function SchemaHeader({
-    maxVersion = 0,
-    fetchVersions,
-    editMode,
-    setEditMode,
-    hasRaw,
-    showRaw,
-    setShowRaw,
-    hasKeySchema,
-    showKeySchema,
-    setShowKeySchema,
-    selectedVersion,
-    versionList,
-    showSchemaAuditView,
-    setShowSchemaAuditView,
-    setFilterText,
-    numRows,
-}: Props) {
-    const history = useHistory();
-    const location = useLocation();
-    const onVersionChange = (version1, version2) => {
-        if (version1 === null || version2 === null) {
-            return;
-        }
-        fetchVersions?.(version1 - maxVersion, version2 - maxVersion);
-    };
-
-    const semanticVersionDisplayString = (semanticVersion: SemanticVersionStruct) => {
-        const semanticVersionTimestampString =
-            (semanticVersion?.semanticVersionTimestamp &&
-                toRelativeTimeString(semanticVersion?.semanticVersionTimestamp)) ||
-            'unknown';
-        return `${semanticVersion.semanticVersion} - ${semanticVersionTimestampString}`;
-    };
-    const numVersions = versionList.length;
-
-    const renderOptions = () => {
-        return versionList.map(
-            (semanticVersionStruct) =>
-                semanticVersionStruct?.semanticVersion &&
-                semanticVersionStruct?.semanticVersionTimestamp && (
-                    <SchemaBlameSelectorOption
-                        value={semanticVersionStruct?.semanticVersion}
-                        data-testid={`sem-ver-select-button-${semanticVersionStruct?.semanticVersion}`}
-                    >
-                        {semanticVersionDisplayString(semanticVersionStruct)}
-                    </SchemaBlameSelectorOption>
-                ),
-        );
-    };
-    const schemaAuditToggleText = showSchemaAuditView ? 'Close column history' : 'View column history';
-
-    const debouncedSetFilterText = debounce(
-        (e: React.ChangeEvent<HTMLInputElement>) => setFilterText(e.target.value),
-        numRows > MAX_ROWS_BEFORE_DEBOUNCE ? HALF_SECOND_IN_MS : 0,
-    );
-    const schemaFilter = getSchemaFilterFromQueryString(location);
-
-    const docLink = 'https://docs.datahub.com/docs/dev-guides/timeline/';
-    return (
-        <TabToolbar>
-            <SchemaHeaderContainer>
-                {maxVersion > 0 && !editMode && <CustomPagination onChange={onVersionChange} maxVersion={maxVersion} />}
-                <LeftButtonsGroup>
-                    {hasRaw && (
-                        <RawButton type="text" onClick={() => setShowRaw(!showRaw)}>
-                            {showRaw ? (
-                                <RawButtonTitleContainer>
-                                    <TableOutlined style={{ padding: 0, margin: 0 }} />
-                                    <RawButtonTitle>Tabular</RawButtonTitle>
-                                </RawButtonTitleContainer>
-                            ) : (
-                                <RawButtonTitleContainer>
-                                    <FileTextOutlined style={{ padding: 0, margin: 0 }} />
-                                    <RawButtonTitle>Raw</RawButtonTitle>
-                                </RawButtonTitleContainer>
-                            )}
-                        </RawButton>
-                    )}
-                    {hasKeySchema && (
-                        <KeyValueButtonGroup>
-                            <KeyButton $highlighted={showKeySchema} onClick={() => setShowKeySchema(true)}>
-                                Key
-                            </KeyButton>
-                            <ValueButton $highlighted={!showKeySchema} onClick={() => setShowKeySchema(false)}>
-                                Value
-                            </ValueButton>
-                        </KeyValueButtonGroup>
-                    )}
-                    {maxVersion > 0 &&
-                        (editMode ? (
-                            <ShowVersionButton onClick={() => setEditMode?.(false)}>Version Blame</ShowVersionButton>
-                        ) : (
-                            <ShowVersionButton onClick={() => setEditMode?.(true)}>Back</ShowVersionButton>
-                        ))}
-                    {!showRaw && (
-                        <StyledInput
-                            defaultValue={schemaFilter}
-                            placeholder="Search in schema..."
-                            onChange={debouncedSetFilterText}
-                            allowClear
-                            prefix={<Icon icon="MagnifyingGlass" source="phosphor" />}
-                        />
-                    )}
-                </LeftButtonsGroup>
-                <RightButtonsGroup>
-                    <Tooltip title={schemaAuditToggleText}>
-                        <SchemaAuditButton
-                            type="text"
-                            data-testid="schema-blame-button"
-                            onClick={() => setShowSchemaAuditView(!showSchemaAuditView)}
-                            style={{ color: showSchemaAuditView ? REDESIGN_COLORS.BLUE : ANTD_GRAY[7] }}
-                        >
-                            <AuditOutlined />
-                        </SchemaAuditButton>
-                    </Tooltip>
-                    {numVersions > 1 && (
-                        <>
-                            <SchemaBlameSelector
-                                value={selectedVersion}
-                                onChange={(e) => {
-                                    const datasetVersion: string = e as string;
-                                    navigateToVersionedDatasetUrl({
-                                        location,
-                                        history,
-                                        datasetVersion,
-                                    });
-                                }}
-                                data-testid="schema-version-selector-dropdown"
-                                suffixIcon={<CaretDownOutlined />}
-                            >
-                                {renderOptions()}
-                            </SchemaBlameSelector>
-                            <Popover
-                                overlayStyle={{ maxWidth: 240 }}
-                                placement="right"
-                                content={
-                                    <div>
-                                        Semantic versions for this view were computed using Technical Schema. You can
-                                        find more info about how DataHub computes versions
-                                        <a target="_blank" rel="noreferrer noopener" href={docLink}>
-                                            {' '}
-                                            here.{' '}
-                                        </a>
-                                    </div>
-                                }
-                            >
-                                <StyledQuestionCircleOutlined />
-                            </Popover>
-                        </>
-                    )}
-                </RightButtonsGroup>
-            </SchemaHeaderContainer>
-        </TabToolbar>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaRawView.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaRawView.tsx
deleted file mode 100644
index ac063d43fa9ee1..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaRawView.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { diffJson, formatRawSchema, getRawSchema } from '@app/entity/dataset/profile/schema/utils/utils';
-
-import { Schema, SchemaMetadata } from '@types';
-
-type Props = {
-    schemaDiff: {
-        current?: SchemaMetadata | Schema | null;
-        previous?: SchemaMetadata | null;
-    };
-    editMode: boolean;
-    showKeySchema: boolean;
-};
-
-const SchemaContainer = styled.div`
-    padding: 12px;
-`;
-
-export default function SchemaRawView({ schemaDiff, editMode, showKeySchema }: Props) {
-    const currentSchemaRaw = formatRawSchema(getRawSchema(schemaDiff.current?.platformSchema, showKeySchema));
-
-    const schemaRawDiff = editMode
-        ? currentSchemaRaw
-        : diffJson(formatRawSchema(getRawSchema(schemaDiff.previous?.platformSchema, showKeySchema)), currentSchemaRaw);
-
-    return (
-        <SchemaContainer>
-            <Typography.Text data-testid="schema-raw-view">
-                <pre>
-                    <code>{schemaRawDiff}</code>
-                </pre>
-            </Typography.Text>
-        </SchemaContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaVersionSummary.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaVersionSummary.tsx
deleted file mode 100644
index 2a27a41a8cf387..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaVersionSummary.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const SummaryContainer = styled.div`
-    margin-bottom: 16px;
-    padding-left: 10px;
-    & ul {
-        padding-inline-start: 30px;
-        margin-top: 5px;
-    }
-`;
-
-export interface SchemaDiffSummary {
-    added: number;
-    removed: number;
-    updated: number;
-}
-
-type Props = {
-    diffSummary: SchemaDiffSummary;
-};
-
-export default function SchemaVersionSummary({ diffSummary }: Props) {
-    return (
-        <SummaryContainer>
-            <ul>
-                {diffSummary.added ? (
-                    <li>
-                        <Typography.Text>{`${diffSummary.added} column${
-                            diffSummary.added > 1 ? 's were' : ' was'
-                        } added`}</Typography.Text>
-                    </li>
-                ) : null}
-                {diffSummary.removed ? (
-                    <li>
-                        <Typography.Text>{`${diffSummary.removed} column${
-                            diffSummary.removed > 1 ? 's were' : ' was'
-                        } removed`}</Typography.Text>
-                    </li>
-                ) : null}
-                {diffSummary.updated ? (
-                    <li>
-                        <Typography.Text>{`${diffSummary.updated} description${
-                            diffSummary.updated > 1 ? 's were' : ' was'
-                        } updated`}</Typography.Text>
-                    </li>
-                ) : null}
-            </ul>
-        </SummaryContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/StructuredPropValues.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/StructuredPropValues.tsx
deleted file mode 100644
index 727159eb17e93b..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/StructuredPropValues.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Tooltip } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import StructuredPropertyValue from '@src/app/entity/shared/tabs/Properties/StructuredPropertyValue';
-import { mapStructuredPropertyToPropertyRow } from '@src/app/entity/shared/tabs/Properties/useStructuredProperties';
-import { useEntityRegistry } from '@src/app/useEntityRegistry';
-import { SchemaFieldEntity, SearchResult, StdDataType } from '@src/types.generated';
-
-const ValuesContainer = styled.span`
-    max-width: 120px;
-    display: flex;
-`;
-
-const MoreIndicator = styled.span`
-    float: right;
-`;
-
-interface Props {
-    schemaFieldEntity: SchemaFieldEntity | undefined;
-    propColumn: SearchResult | undefined;
-}
-
-const StructuredPropValues = ({ schemaFieldEntity, propColumn }: Props) => {
-    const entityRegistry = useEntityRegistry();
-
-    const property = schemaFieldEntity?.structuredProperties?.properties?.find(
-        (prop) => prop.structuredProperty.urn === propColumn?.entity?.urn,
-    );
-    const propRow = property ? mapStructuredPropertyToPropertyRow(property) : undefined;
-    const values = propRow?.values;
-    const isRichText = propRow?.dataType?.info?.type === StdDataType.RichText;
-
-    const hasMoreValues = values && values.length > 2;
-    const displayedValues = hasMoreValues ? values.slice(0, 1) : values;
-    const tooltipContent = values?.map((value) => {
-        const title = value.entity
-            ? entityRegistry.getDisplayName(value.entity.type, value.entity)
-            : value.value?.toString();
-        return <div>{title}</div>;
-    });
-
-    return (
-        <>
-            {values && (
-                <>
-                    {displayedValues?.map((val) => {
-                        return (
-                            <ValuesContainer>
-                                <StructuredPropertyValue
-                                    value={val}
-                                    isRichText={isRichText}
-                                    truncateText
-                                    isFieldColumn
-                                />
-                            </ValuesContainer>
-                        );
-                    })}
-                    {hasMoreValues && (
-                        <Tooltip title={tooltipContent} showArrow={false}>
-                            <MoreIndicator>...</MoreIndicator>
-                        </Tooltip>
-                    )}
-                </>
-            )}
-        </>
-    );
-};
-
-export default StructuredPropValues;
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/TypeIcon.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/TypeIcon.tsx
deleted file mode 100644
index df54db34b8b5c8..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/components/TypeIcon.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import {
-    CalendarOutlined,
-    FieldBinaryOutlined,
-    FieldTimeOutlined,
-    NumberOutlined,
-    QuestionCircleOutlined,
-    UnderlineOutlined,
-    UnorderedListOutlined,
-} from '@ant-design/icons';
-import { Tooltip, Typography } from 'antd';
-import React, { FC } from 'react';
-import { VscFileBinary, VscSymbolString } from 'react-icons/vsc';
-import styled from 'styled-components';
-
-import { capitalizeFirstLetter } from '@app/shared/textUtil';
-
-import { SchemaFieldDataType } from '@types';
-
-const TypeIconContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    text-align: center;
-    margin-top: 2.5px;
-    width: 40px;
-`;
-
-const TypeSubtitle = styled(Typography.Text)<{ hasicon?: string }>`
-    font-size: 8px;
-    text-align: center;
-    ${(props) => (props.hasicon ? '' : 'margin-top: 4px;')}
-`;
-
-const IconSpan = styled.span`
-    font-size: 18px;
-`;
-
-const DATA_TYPE_ICON_MAP: Record<SchemaFieldDataType, { icon: FC<{ style: any }> | null; size: number; text: string }> =
-    {
-        [SchemaFieldDataType.Boolean]: {
-            icon: FieldBinaryOutlined,
-            size: 18,
-            text: 'Boolean',
-        },
-        [SchemaFieldDataType.Fixed]: { icon: FieldBinaryOutlined, size: 18, text: 'Fixed' },
-        [SchemaFieldDataType.String]: {
-            icon: () => (
-                <IconSpan role="img" aria-label="calendar" className="anticon anticon-calendar">
-                    <VscSymbolString />
-                </IconSpan>
-            ),
-            size: 20,
-            text: 'String',
-        },
-        [SchemaFieldDataType.Bytes]: {
-            icon: () => (
-                <IconSpan role="img" aria-label="calendar" className="anticon anticon-calendar">
-                    <VscFileBinary />
-                </IconSpan>
-            ),
-            size: 18,
-            text: 'Bytes',
-        },
-        [SchemaFieldDataType.Number]: { icon: NumberOutlined, size: 14, text: 'Number' },
-        [SchemaFieldDataType.Date]: { icon: CalendarOutlined, size: 18, text: 'Date' },
-        [SchemaFieldDataType.Time]: { icon: FieldTimeOutlined, size: 18, text: 'Time' },
-        [SchemaFieldDataType.Enum]: { icon: UnorderedListOutlined, size: 18, text: 'Enum' },
-        [SchemaFieldDataType.Null]: { icon: QuestionCircleOutlined, size: 16, text: '' },
-        [SchemaFieldDataType.Map]: { icon: null, size: 0, text: 'Map' },
-        [SchemaFieldDataType.Array]: { icon: UnorderedListOutlined, size: 14, text: 'Array' },
-        [SchemaFieldDataType.Union]: { icon: UnderlineOutlined, size: 14, text: 'Union' },
-        [SchemaFieldDataType.Struct]: { icon: null, size: 0, text: 'Struct' },
-    };
-
-const truncate = (length: number, input?: string | null) => {
-    if (!input) return '';
-    if (input.length > length) {
-        return `${input.substring(0, length)}...`;
-    }
-    return input;
-};
-
-type Props = {
-    type: SchemaFieldDataType;
-    nativeDataType: string | null | undefined;
-};
-
-export default function TypeIcon({ type, nativeDataType }: Props) {
-    const { icon: Icon, size, text } = DATA_TYPE_ICON_MAP[type];
-
-    // if unable to match type to DataHub, display native type info by default
-    const nativeFallback = type === SchemaFieldDataType.Null;
-
-    // eslint-disable-next-line react/prop-types
-    const NativeDataTypeTooltip = ({ children }) =>
-        nativeDataType ? (
-            <Tooltip placement="top" title={capitalizeFirstLetter(nativeDataType)}>
-                {children}
-            </Tooltip>
-        ) : (
-            <>{children}</>
-        );
-
-    return (
-        <NativeDataTypeTooltip>
-            <TypeIconContainer data-testid={`icon-${type}`}>
-                {Icon && <Icon style={{ fontSize: size }} />}
-                <TypeSubtitle type="secondary" hasicon={Icon ? 'yes' : undefined}>
-                    {nativeFallback ? truncate(250, nativeDataType) : text}
-                </TypeSubtitle>
-            </TypeIconContainer>
-        </NativeDataTypeTooltip>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx
deleted file mode 100644
index 93234a88bff79f..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import { Typography } from 'antd';
-import React, { useState } from 'react';
-import Highlight from 'react-highlighter';
-import styled from 'styled-components';
-
-import translateFieldPath from '@app/entity/dataset/profile/schema/utils/translateFieldPath';
-import { ExtendedSchemaFields } from '@app/entity/dataset/profile/schema/utils/types';
-import ForeignKeyLabel from '@app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel';
-import NullableLabel from '@app/entity/shared/tabs/Dataset/Schema/components/NullableLabel';
-import PartitioningKeyLabel from '@app/entity/shared/tabs/Dataset/Schema/components/PartitioningKeyLabel';
-import PrimaryKeyLabel from '@app/entity/shared/tabs/Dataset/Schema/components/PrimaryKeyLabel';
-import TypeLabel from '@app/entity/shared/tabs/Dataset/Schema/components/TypeLabel';
-
-import { ForeignKeyConstraint, SchemaMetadata } from '@types';
-
-const MAX_FIELD_PATH_LENGTH = 200;
-
-// const LighterText = styled(Typography.Text)`
-//     color: rgba(0, 0, 0, 0.45);
-// `;
-
-const FieldPathContainer = styled.div`
-    vertical-align: top;
-    display: inline-block;
-    width: 250px;
-    margin-top: 16px;
-    margin-bottom: 16px;
-`;
-const FieldPathText = styled(Typography.Text)`
-    font-size: 12px;
-    line-height: 22px;
-    font-family: 'Roboto Mono', monospace;
-    font-weight: 500;
-`;
-
-// ex: [type=MetadataAuditEvent].[type=union]oldSnapshot.[type=CorpUserSnapshot].[type=array]aspects.[type=union].[type=CorpUserInfo].[type=boolean]active
-export default function useSchemaTitleRenderer(
-    schemaMetadata: SchemaMetadata | undefined | null,
-    setSelectedFkFieldPath: (params: { fieldPath: string; constraint?: ForeignKeyConstraint | null } | null) => void,
-    filterText: string,
-) {
-    const [highlightedConstraint, setHighlightedConstraint] = useState<string | null>(null);
-
-    return (fieldPath: string, record: ExtendedSchemaFields): JSX.Element => {
-        const fieldPathWithoutAnnotations = translateFieldPath(fieldPath);
-        const parentPathWithoutAnnotations = translateFieldPath(record.parent?.fieldPath || '');
-        let pathToDisplay = fieldPathWithoutAnnotations;
-
-        // if the parent path is a prefix of the field path, remove it for display purposes
-        if (parentPathWithoutAnnotations && fieldPathWithoutAnnotations.indexOf(parentPathWithoutAnnotations) === 0) {
-            // parent length + 1 because of the trailing `.` of the parent
-            pathToDisplay = fieldPathWithoutAnnotations.slice(parentPathWithoutAnnotations.length + 1);
-        }
-
-        // if the field path is too long, truncate it
-        if (pathToDisplay.length > MAX_FIELD_PATH_LENGTH) {
-            pathToDisplay = `..${pathToDisplay.substring(pathToDisplay.length - MAX_FIELD_PATH_LENGTH)}`;
-        }
-
-        return (
-            <>
-                <FieldPathContainer>
-                    <FieldPathText>
-                        <Highlight search={filterText}>{pathToDisplay}</Highlight>
-                    </FieldPathText>
-                    <TypeLabel type={record.type} nativeDataType={record.nativeDataType} />
-                    {(schemaMetadata?.primaryKeys?.includes(fieldPath) || record.isPartOfKey) && <PrimaryKeyLabel />}
-                    {record.isPartitioningKey && <PartitioningKeyLabel />}
-                    {record.nullable && <NullableLabel />}
-                    {schemaMetadata?.foreignKeys
-                        ?.filter(
-                            (constraint) =>
-                                (constraint?.sourceFields?.filter(
-                                    (sourceField) => sourceField?.fieldPath?.trim() === fieldPath.trim(),
-                                ).length || 0) > 0,
-                        )
-                        .map((constraint) => (
-                            <ForeignKeyLabel
-                                key={constraint?.name}
-                                fieldPath={fieldPath}
-                                constraint={constraint}
-                                highlight={constraint?.name === highlightedConstraint}
-                                setHighlightedConstraint={setHighlightedConstraint}
-                                onClick={setSelectedFkFieldPath}
-                            />
-                        ))}
-                </FieldPathContainer>
-            </>
-        );
-    };
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/types.ts b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/types.ts
deleted file mode 100644
index 0b43ef2f113ea7..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/types.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { GlobalTags, SchemaField } from '@types';
-
-export interface ExtendedSchemaFields extends SchemaField {
-    children?: Array<ExtendedSchemaFields>;
-    depth?: number;
-    previousDescription?: string | null;
-    pastGlobalTags?: GlobalTags | null;
-    isNewRow?: boolean;
-    isDeletedRow?: boolean;
-    parent?: ExtendedSchemaFields;
-}
-
-export enum SchemaViewType {
-    NORMAL,
-    BLAME,
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/utils.ts b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/utils.ts
index 1d90ee772529dd..7b833b5f41afde 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/utils.ts
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/utils.ts
@@ -1,54 +1,5 @@
-import * as diff from 'diff';
 
-import { SchemaDiffSummary } from '@app/entity/dataset/profile/schema/components/SchemaVersionSummary';
-import { KEY_SCHEMA_PREFIX, UNION_TOKEN, VERSION_PREFIX } from '@app/entity/dataset/profile/schema/utils/constants';
-import { ExtendedSchemaFields } from '@app/entity/dataset/profile/schema/utils/types';
-import { convertTagsForUpdate } from '@app/shared/tags/utils/convertTagsForUpdate';
-
-import {
-    EditableSchemaFieldInfo,
-    EditableSchemaMetadata,
-    EditableSchemaMetadataUpdate,
-    PlatformSchema,
-    SchemaField,
-} from '@types';
-
-export function convertEditableSchemaMeta(
-    editableSchemaMeta?: Array<EditableSchemaFieldInfo>,
-    fields?: Array<SchemaField>,
-): Array<SchemaField> {
-    const updatedFields = [...(fields || [])] as Array<SchemaField>;
-    if (editableSchemaMeta && editableSchemaMeta.length > 0) {
-        editableSchemaMeta.forEach((updatedField) => {
-            const originalFieldIndex = updatedFields.findIndex((f) => f.fieldPath === updatedField.fieldPath);
-            if (originalFieldIndex > -1) {
-                updatedFields[originalFieldIndex] = {
-                    ...updatedFields[originalFieldIndex],
-                    description: updatedField.description,
-                    globalTags: { ...updatedField.globalTags },
-                };
-            }
-        });
-    }
-    return updatedFields;
-}
-
-export function convertEditableSchemaMetadataForUpdate(
-    editableSchemaMetadata: EditableSchemaMetadata | null | undefined,
-): EditableSchemaMetadataUpdate {
-    return {
-        editableSchemaFieldInfo:
-            editableSchemaMetadata?.editableSchemaFieldInfo?.map((editableSchemaFieldInfo) => ({
-                fieldPath: editableSchemaFieldInfo?.fieldPath,
-                description: editableSchemaFieldInfo?.description,
-                globalTags: { tags: convertTagsForUpdate(editableSchemaFieldInfo?.globalTags?.tags || []) },
-            })) || [],
-    };
-}
-
-export function filterKeyFieldPath(showKeySchema: boolean, field: SchemaField) {
-    return field.fieldPath.indexOf(KEY_SCHEMA_PREFIX) > -1 ? showKeySchema : !showKeySchema;
-}
+import { KEY_SCHEMA_PREFIX, VERSION_PREFIX } from '@app/entity/dataset/profile/schema/utils/constants';
 
 export function downgradeV2FieldPath(fieldPath?: string | null) {
     if (!fieldPath) {
@@ -64,170 +15,3 @@ export function downgradeV2FieldPath(fieldPath?: string | null) {
         .filter(Boolean)
         .join('.');
 }
-
-export function pathMatchesNewPath(fieldPathA?: string | null, fieldPathB?: string | null) {
-    return fieldPathA === fieldPathB || fieldPathA === downgradeV2FieldPath(fieldPathB);
-}
-
-// group schema fields by fieldPath and grouping for hierarchy in schema table
-export function groupByFieldPath(
-    schemaRows?: Array<SchemaField>,
-    options: { showKeySchema: boolean } = { showKeySchema: false },
-): Array<ExtendedSchemaFields> {
-    const rows = [
-        ...(schemaRows?.filter(filterKeyFieldPath.bind({}, options.showKeySchema)) || []),
-    ] as Array<ExtendedSchemaFields>;
-
-    const outputRows: Array<ExtendedSchemaFields> = [];
-    const outputRowByPath = {};
-
-    for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
-        let parentRow: null | ExtendedSchemaFields = null;
-        const row = { children: undefined, ...rows[rowIndex], depth: 0 };
-
-        for (let j = rowIndex - 1; j >= 0; j--) {
-            const rowTokens = row.fieldPath.split('.');
-            const isQualifyingUnionField = rowTokens[rowTokens.length - 3] === UNION_TOKEN;
-            if (isQualifyingUnionField) {
-                // in the case of unions, parent will not be a subset of the child
-                rowTokens.splice(rowTokens.length - 2, 1);
-                const parentPath = rowTokens.join('.');
-
-                if (rows[j].fieldPath === parentPath) {
-                    parentRow = outputRowByPath[rows[j].fieldPath];
-                    break;
-                }
-            } else {
-                // In the case of structs, arrays, etc, parent will be the first token from
-                // the left of this field's name(last token of the path) that does not enclosed in [].
-                let parentPath: null | string = null;
-                for (
-                    let lastParentTokenIndex = rowTokens.length - 2;
-                    lastParentTokenIndex >= 0;
-                    --lastParentTokenIndex
-                ) {
-                    const lastParentToken: string = rowTokens[lastParentTokenIndex];
-                    if (lastParentToken && lastParentToken[0] !== '[') {
-                        parentPath = rowTokens.slice(0, lastParentTokenIndex + 1).join('.');
-                        break;
-                    }
-                }
-                if (parentPath && rows[j].fieldPath === parentPath) {
-                    parentRow = outputRowByPath[rows[j].fieldPath];
-                    break;
-                }
-            }
-        }
-
-        // if the parent field exists in the ouput, add the current row as a child
-        if (parentRow) {
-            row.depth = (parentRow.depth || 0) + 1;
-            row.parent = parentRow;
-            parentRow.children = [...(parentRow.children || []), row];
-        } else {
-            outputRows.push(row);
-        }
-        outputRowByPath[row.fieldPath] = row;
-    }
-    return outputRows;
-}
-
-export function diffMarkdown(oldStr: string, newStr: string) {
-    const diffArray = diff.diffChars(oldStr || '', newStr || '');
-    return diffArray
-        .map((diffOne) => {
-            if (diffOne.added) {
-                return `<ins class="diff">${diffOne.value}</ins>`;
-            }
-            if (diffOne.removed) {
-                return `<del class="diff">${diffOne.value}</del>`;
-            }
-            return diffOne.value;
-        })
-        .join('');
-}
-
-export function diffJson(oldStr: string, newStr: string) {
-    const diffArray = diff.diffJson(oldStr || '', newStr || '');
-    return diffArray
-        .map((diffOne) => {
-            if (diffOne.added) {
-                return `+${diffOne.value}`;
-            }
-            if (diffOne.removed) {
-                return `-${diffOne.value}`;
-            }
-            return diffOne.value;
-        })
-        .join('');
-}
-
-export function formatRawSchema(schemaValue?: string | null): string {
-    try {
-        if (!schemaValue) {
-            return schemaValue || '';
-        }
-        return JSON.stringify(JSON.parse(schemaValue), null, 2);
-    } catch (e) {
-        return schemaValue || '';
-    }
-}
-
-export function getRawSchema(schema: PlatformSchema | undefined | null, showKeySchema: boolean): string {
-    if (!schema) {
-        return '';
-    }
-
-    if (schema.__typename === 'TableSchema') {
-        return schema.schema;
-    }
-    if (schema.__typename === 'KeyValueSchema') {
-        return showKeySchema ? schema.keySchema : schema.valueSchema;
-    }
-    return '';
-}
-
-// Get diff summary between two versions and prepare to visualize description diff changes
-export function getDiffSummary(
-    currentVersionRows?: Array<SchemaField>,
-    previousVersionRows?: Array<SchemaField>,
-    options: { showKeySchema: boolean } = { showKeySchema: false },
-): { rows: Array<ExtendedSchemaFields>; diffSummary: SchemaDiffSummary } {
-    let rows = [
-        ...(currentVersionRows?.filter(filterKeyFieldPath.bind({}, options.showKeySchema)) || []),
-    ] as Array<ExtendedSchemaFields>;
-    const previousRows = [
-        ...(previousVersionRows?.filter(filterKeyFieldPath.bind({}, options.showKeySchema)) || []),
-    ] as Array<ExtendedSchemaFields>;
-
-    const diffSummary: SchemaDiffSummary = {
-        added: 0,
-        removed: 0,
-        updated: 0,
-    };
-
-    if (previousVersionRows && previousVersionRows.length > 0) {
-        rows.forEach((field, rowIndex) => {
-            const relevantPastFieldIndex = previousRows.findIndex(
-                (pf) => pf.type === rows[rowIndex].type && pf.fieldPath === rows[rowIndex].fieldPath,
-            );
-            if (relevantPastFieldIndex > -1) {
-                if (previousRows[relevantPastFieldIndex].description !== rows[rowIndex].description) {
-                    rows[rowIndex] = {
-                        ...rows[rowIndex],
-                        previousDescription: previousRows[relevantPastFieldIndex].description,
-                    };
-                    diffSummary.updated++; // Increase updated row number in diff summary
-                }
-                previousRows.splice(relevantPastFieldIndex, 1);
-            } else {
-                rows[rowIndex] = { ...rows[rowIndex], isNewRow: true };
-                diffSummary.added++; // Increase added row number in diff summary
-            }
-        });
-        rows = [...rows, ...previousRows.map((pf) => ({ ...pf, isDeletedRow: true }))];
-        diffSummary.removed = previousRows.length; // removed row number in diff summary
-    }
-
-    return { rows, diffSummary };
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/Stats.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/Stats.tsx
deleted file mode 100644
index 73e507ce58c7b1..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/stats/Stats.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Radio } from 'antd';
-import React, { useState } from 'react';
-
-import HistoricalStatsView from '@app/entity/dataset/profile/stats/historical/HistoricalStatsView';
-import LatestStatsView from '@app/entity/dataset/profile/stats/snapshot/LatestStatsView';
-
-import { DatasetProfile } from '@types';
-
-export type Props = {
-    urn: string;
-    profile: DatasetProfile;
-};
-
-enum ViewType {
-    LATEST,
-    HISTORICAL,
-}
-
-export default function Stats({ urn, profile }: Props) {
-    /**
-     * Determines which view should be visible: latest or historical.
-     */
-    const [view, setView] = useState(ViewType.LATEST);
-
-    const onChangeView = (e) => {
-        setView(e.target.value);
-    };
-
-    const toggleView = (
-        <Radio.Group value={view} onChange={onChangeView}>
-            <Radio.Button value={ViewType.LATEST}>Latest</Radio.Button>
-            <Radio.Button value={ViewType.HISTORICAL}>Historical</Radio.Button>
-        </Radio.Group>
-    );
-
-    return (
-        <>
-            {view === ViewType.LATEST && <LatestStatsView profile={profile} toggleView={toggleView} />}
-            {view === ViewType.HISTORICAL && <HistoricalStatsView urn={urn} toggleView={toggleView} />}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/StatsSection.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/StatsSection.tsx
deleted file mode 100644
index 32244ee67cc374..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/stats/StatsSection.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Divider, Row, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const Section = styled.div`
-    padding-top: 24px;
-    padding-bottom: 40px;
-    margin-bottom: 20px;
-    width: 100%;
-`;
-
-const ThinDivider = styled(Divider)`
-    margin-top: 8px;
-    margin-bottom: 8px;
-`;
-
-export type Props = {
-    children: React.ReactNode;
-    title: string;
-    rightFloatView?: React.ReactNode;
-};
-
-export default function StatsSection({ children, title, rightFloatView }: Props) {
-    return (
-        <Section>
-            <Row justify="space-between">
-                <Typography.Title level={3}>{title}</Typography.Title>
-                {rightFloatView || <span />}
-            </Row>
-            <ThinDivider />
-            {children}
-        </Section>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/HistoricalStatsView.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/historical/HistoricalStatsView.tsx
deleted file mode 100644
index c1ec9ff63b5c68..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/HistoricalStatsView.tsx
+++ /dev/null
@@ -1,291 +0,0 @@
-import { Affix, Row, Select, Typography } from 'antd';
-import React, { ReactNode, useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import StatsSection from '@app/entity/dataset/profile/stats/StatsSection';
-import ProfilingRunsChart from '@app/entity/dataset/profile/stats/historical/charts/ProfilingRunsChart';
-import StatChart from '@app/entity/dataset/profile/stats/historical/charts/StatChart';
-import { Message } from '@app/shared/Message';
-import { TimeWindowSize, getFixedLookbackWindow } from '@app/shared/time/timeUtils';
-
-import { useGetDataProfilesLazyQuery } from '@graphql/dataset.generated';
-import { DatasetProfile, DateInterval } from '@types';
-
-const HeaderRow = styled(Row)`
-    padding-top: 24px;
-    padding-bottom: 28px;
-    background-color: white;
-`;
-
-const SubHeaderText = styled(Typography.Text)`
-    color: gray;
-    font-size: 16px;
-`;
-
-const EmbeddedSelect = styled(Select)`
-    padding-left: 8px;
-`;
-
-const isPresent = (val: any) => {
-    return val !== undefined && val !== null;
-};
-
-/**
- * Extracts a set of points used to render charts from a list of Dataset Profiles +
- * a particular numeric statistic name to extract. Note that the stat *must* be numeric for this utility to work.
- */
-const extractChartValuesFromTableProfiles = (profiles: Array<any>, statName: string) => {
-    return profiles
-        .filter((profile) => isPresent(profile[statName]))
-        .map((profile) => ({
-            timeMs: profile.timestampMillis,
-            value: profile[statName] as number,
-        }));
-};
-
-/**
- * Extracts a set of field-specific points used to render charts from a list of Dataset Profiles +
- * a particular numeric statistic name to extract. Note that the stat *must* be numeric for this utility to work.
- */
-const extractChartValuesFromFieldProfiles = (profiles: Array<any>, fieldPath: string, statName: string) => {
-    return profiles
-        .filter((profile) => profile.fieldProfiles)
-        .map((profile) => {
-            const fieldProfiles = profile.fieldProfiles
-                ?.filter((field) => field.fieldPath === fieldPath)
-                .filter((field) => field[statName] !== null && field[statName] !== undefined);
-
-            if (fieldProfiles?.length === 1) {
-                const fieldProfile = fieldProfiles[0];
-                return {
-                    timeMs: profile.timestampMillis,
-                    value: fieldProfile[statName],
-                };
-            }
-            return null;
-        })
-        .filter((value) => value !== null);
-};
-
-const computeChartTickInterval = (windowSize: TimeWindowSize): DateInterval => {
-    switch (windowSize.interval) {
-        case DateInterval.Day:
-            return DateInterval.Hour;
-        case DateInterval.Week:
-            return DateInterval.Day;
-        case DateInterval.Month:
-            return DateInterval.Week;
-        case DateInterval.Year:
-            return DateInterval.Month;
-        default:
-            throw new Error(`Unrecognized DateInterval provided ${windowSize.interval}`);
-    }
-};
-
-const computeAllFieldPaths = (profiles: Array<DatasetProfile>): Set<string> => {
-    const uniqueFieldPaths = new Set<string>();
-    profiles.forEach((profile) => {
-        const fieldProfiles = profile.fieldProfiles || [];
-        fieldProfiles.forEach((fieldProfile) => {
-            uniqueFieldPaths.add(fieldProfile.fieldPath);
-        });
-    });
-    return uniqueFieldPaths;
-};
-
-/**
- * Change this to add or modify the lookback windows that are selectable via the UI.
- */
-const LOOKBACK_WINDOWS = [
-    { text: '1 day', windowSize: { interval: DateInterval.Day, count: 1 } },
-    { text: '1 week', windowSize: { interval: DateInterval.Week, count: 1 } },
-    { text: '1 month', windowSize: { interval: DateInterval.Month, count: 1 } },
-    { text: '3 months', windowSize: { interval: DateInterval.Month, count: 3 } },
-    { text: '1 year', windowSize: { interval: DateInterval.Year, count: 1 } },
-];
-
-const DEFAULT_LOOKBACK_WINDOW = '3 months';
-
-const getLookbackWindowSize = (text: string) => {
-    for (let i = 0; i < LOOKBACK_WINDOWS.length; i++) {
-        const window = LOOKBACK_WINDOWS[i];
-        if (window.text === text) {
-            return window.windowSize;
-        }
-    }
-    throw new Error(`Unrecognized lookback window size ${text} provided`);
-};
-
-export type Props = {
-    urn: string;
-    toggleView: ReactNode;
-};
-
-export default function HistoricalStatsView({ urn, toggleView }: Props) {
-    const [getDataProfiles, { data: profilesData, loading: profilesLoading }] = useGetDataProfilesLazyQuery({
-        fetchPolicy: 'cache-first',
-    });
-
-    /**
-     * Perform initial fetch of default lookback window stats.
-     */
-    useEffect(() => {
-        getDataProfiles({
-            variables: { urn, ...getFixedLookbackWindow(getLookbackWindowSize(DEFAULT_LOOKBACK_WINDOW)) },
-        });
-    }, [urn, getDataProfiles]);
-
-    /**
-     * Determines which fixed lookback window is used to display historical statistics. See above for valid options.
-     */
-    const [selectedLookbackWindow, setSelectedLookbackWindow] = useState(DEFAULT_LOOKBACK_WINDOW);
-    const selectedWindowSize = getLookbackWindowSize(selectedLookbackWindow);
-    const selectedWindow = getFixedLookbackWindow(selectedWindowSize);
-
-    /**
-     * Determines which field path is highlighted in column stats. Defaults to none.
-     */
-    const [selectedFieldPath, setSelectedFieldPath] = useState('');
-
-    /**
-     *  Change handlers.
-     */
-    const onChangeSelectedLookbackWindow = (text) => {
-        const newWindowSize = getLookbackWindowSize(text);
-        const newTimeWindow = getFixedLookbackWindow(newWindowSize);
-        getDataProfiles({
-            variables: { urn, ...newTimeWindow },
-        });
-        setSelectedLookbackWindow(text);
-    };
-
-    const onChangeSelectedFieldPath = (value) => {
-        setSelectedFieldPath(value);
-    };
-
-    const graphTickInterval = computeChartTickInterval(selectedWindowSize);
-    const graphDateRange = {
-        start: selectedWindow.startTime.toString(),
-        end: selectedWindow.endTime.toString(),
-    };
-
-    const profiles = profilesData?.dataset?.datasetProfiles || [];
-    const allFieldPaths = Array.from(computeAllFieldPaths(profiles));
-
-    if (selectedFieldPath === '' && allFieldPaths.length > 0) {
-        // Set initially selected field path.
-        setSelectedFieldPath(allFieldPaths[0]);
-    }
-
-    const columnSelectView = (
-        <span>
-            <SubHeaderText>Viewing stats for column</SubHeaderText>
-            <EmbeddedSelect style={{ width: 200 }} value={selectedFieldPath} onChange={onChangeSelectedFieldPath}>
-                {allFieldPaths.map((fieldPath) => (
-                    <Select.Option value={fieldPath}>{fieldPath}</Select.Option>
-                ))}
-            </EmbeddedSelect>
-        </span>
-    );
-
-    /**
-     * Compute Table Stat chart data.
-     */
-    const rowCountChartValues = extractChartValuesFromTableProfiles(profiles, 'rowCount');
-    const columnCountChartValues = extractChartValuesFromTableProfiles(profiles, 'columnCount');
-
-    /**
-     * Compute Column Stat chart data.
-     */
-    const nullCountChartValues: Array<any> = extractChartValuesFromFieldProfiles(
-        profiles,
-        selectedFieldPath,
-        'nullCount',
-    );
-    const nullPercentageChartValues: Array<any> = extractChartValuesFromFieldProfiles(
-        profiles,
-        selectedFieldPath,
-        'nullProportion',
-    );
-    const distinctCountChartValues: Array<any> = extractChartValuesFromFieldProfiles(
-        profiles,
-        selectedFieldPath,
-        'uniqueCount',
-    );
-    const distinctPercentageChartValues: Array<any> = extractChartValuesFromFieldProfiles(
-        profiles,
-        selectedFieldPath,
-        'uniqueProportion',
-    );
-
-    return (
-        <>
-            {profilesLoading && <Message type="loading" content="Loading..." style={{ marginTop: '10%' }} />}
-            <Affix offsetTop={127}>
-                <HeaderRow justify="space-between" align="middle">
-                    <div>
-                        <Typography.Title level={2}>Profiling History</Typography.Title>
-                        <span>
-                            <SubHeaderText>Viewing profiling history for the past</SubHeaderText>
-                            <EmbeddedSelect value={selectedLookbackWindow} onChange={onChangeSelectedLookbackWindow}>
-                                {LOOKBACK_WINDOWS.map((lookbackWindow) => (
-                                    <Select.Option value={lookbackWindow.text}>{lookbackWindow.text}</Select.Option>
-                                ))}
-                            </EmbeddedSelect>
-                        </span>
-                    </div>
-                    {toggleView}
-                </HeaderRow>
-            </Affix>
-            <StatsSection title="Profiling Runs">
-                <Row>
-                    <ProfilingRunsChart profiles={profiles} />
-                </Row>
-            </StatsSection>
-            <StatsSection title="Historical Table Stats">
-                <Row>
-                    <StatChart
-                        title="Row Count Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={rowCountChartValues}
-                    />
-                    <StatChart
-                        title="Column Count Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={columnCountChartValues}
-                    />
-                </Row>
-            </StatsSection>
-            <StatsSection title="Historical Column Stats" rightFloatView={columnSelectView}>
-                <Row>
-                    <StatChart
-                        title="Null Count Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={nullCountChartValues}
-                    />
-                    <StatChart
-                        title="Null Percentage Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={nullPercentageChartValues}
-                    />
-                    <StatChart
-                        title="Distinct Count Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={distinctCountChartValues}
-                    />
-                    <StatChart
-                        title="Distinct Percentage Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={distinctPercentageChartValues}
-                    />
-                </Row>
-            </StatsSection>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx
deleted file mode 100644
index f88454c30756df..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { Button, Col, Modal, Table, Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import DataProfileView from '@app/entity/dataset/profile/stats/snapshot/SnapshotStatsView';
-
-import { DatasetProfile } from '@types';
-
-export const ChartTable = styled(Table)`
-    margin: 12px;
-    box-shadow: ${(props) => props.theme.styles['box-shadow']};
-`;
-
-export type Props = {
-    profiles: Array<DatasetProfile>;
-};
-
-export default function ProfilingRunsChart({ profiles }: Props) {
-    const [showModal, setShowModal] = useState(false);
-    const [selectedProfileIndex, setSelectedProfileIndex] = useState(-1);
-
-    const showProfileModal = (index: number) => {
-        setSelectedProfileIndex(index);
-        setShowModal(true);
-    };
-
-    const onClose = () => {
-        setShowModal(false);
-        setSelectedProfileIndex(-1);
-    };
-
-    const tableData = profiles.map((profile) => {
-        const profileDate = new Date(profile.timestampMillis);
-        return {
-            timestamp: `${profileDate.toLocaleDateString()} at ${profileDate.toLocaleTimeString()}`,
-            rowCount: profile.rowCount?.toString() || 'unknown',
-            columnCount: profile.columnCount?.toString() || 'unknown',
-        };
-    });
-
-    const tableColumns = [
-        {
-            title: 'Recent Profiles',
-            key: 'Recent Profiles',
-            dataIndex: 'timestamp',
-            render: (title, record, index) => {
-                return (
-                    <Button type="text" onClick={() => showProfileModal(index)}>
-                        <Typography.Text underline>{title}</Typography.Text>
-                    </Button>
-                );
-            },
-        },
-        {
-            title: 'Row Count',
-            key: 'Row Count',
-            dataIndex: 'rowCount',
-        },
-        {
-            title: 'Column Count',
-            key: 'Column Count',
-            dataIndex: 'columnCount',
-        },
-    ];
-
-    const selectedProfile = (selectedProfileIndex >= 0 && profiles[selectedProfileIndex]) || undefined;
-    const profileModalTitle =
-        selectedProfile &&
-        `Showing profile from ${new Date(selectedProfile?.timestampMillis).toLocaleDateString()} at ${new Date(
-            selectedProfile?.timestampMillis,
-        ).toLocaleTimeString()}`;
-
-    return (
-        <>
-            {selectedProfile && (
-                <Modal width="100%" footer={null} title={profileModalTitle} open={showModal} onCancel={onClose}>
-                    <DataProfileView profile={selectedProfile} />
-                </Modal>
-            )}
-            <Col sm={24} md={24} lg={12} xl={12}>
-                <ChartTable
-                    scroll={{ y: 400 }}
-                    bordered
-                    style={{ width: '100%', maxHeight: 440 }}
-                    columns={tableColumns}
-                    dataSource={tableData}
-                    pagination={false}
-                    size="small"
-                />
-            </Col>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/StatChart.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/StatChart.tsx
deleted file mode 100644
index 3a8866ad62d651..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/charts/StatChart.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import { Col, Divider, Typography } from 'antd';
-import React, { useMemo } from 'react';
-import styled from 'styled-components';
-
-import { ChartCard } from '@app/analyticsDashboard/components/ChartCard';
-import { ChartContainer } from '@app/analyticsDashboard/components/ChartContainer';
-import { TimeSeriesChart } from '@app/analyticsDashboard/components/TimeSeriesChart';
-
-import { DateInterval, DateRange } from '@types';
-
-const ChartTitle = styled(Typography.Title)`
-    && {
-        margin-bottom: 20px;
-        text-align: left;
-        width: 100%;
-    }
-`;
-
-const ThinDivider = styled(Divider)`
-    margin: 0px;
-    padding: 0px;
-`;
-
-type Point = {
-    timeMs: number;
-    value: number;
-};
-
-export type Props = {
-    title: string;
-    values: Array<Point>;
-    tickInterval: DateInterval;
-    dateRange: DateRange;
-};
-
-/**
- * Change these to change the chart axis & line colors
- * TODO: Add this to the theme config.
- */
-const DEFAULT_LINE_COLOR = '#20d3bd';
-const DEFAULT_AXIS_COLOR = '#D8D8D8';
-const DEFAULT_AXIS_WIDTH = 2;
-
-/**
- * Time Series Chart with a single line.
- */
-export default function StatChart({ title, values, tickInterval: interval, dateRange }: Props) {
-    const timeSeriesData = useMemo(
-        () =>
-            values
-                .sort((a, b) => a.timeMs - b.timeMs)
-                .map((value) => {
-                    const dateStr = new Date(value.timeMs).toISOString();
-                    return {
-                        x: dateStr,
-                        y: value.value,
-                    };
-                }),
-        [values],
-    );
-
-    const chartData = {
-        title,
-        lines: [
-            {
-                name: 'line_1',
-                data: timeSeriesData,
-            },
-        ],
-        interval,
-        dateRange,
-    };
-
-    return (
-        <>
-            <Col sm={24} md={24} lg={8} xl={8}>
-                <ChartCard $shouldScroll={false}>
-                    <ChartContainer>
-                        <ChartTitle level={5}>{chartData.title}</ChartTitle>
-                        <ThinDivider />
-                        <TimeSeriesChart
-                            style={{
-                                lineColor: DEFAULT_LINE_COLOR,
-                                axisColor: DEFAULT_AXIS_COLOR,
-                                axisWidth: DEFAULT_AXIS_WIDTH,
-                            }}
-                            hideLegend
-                            chartData={chartData}
-                            width={360}
-                            height={300}
-                        />
-                    </ChartContainer>
-                </ChartCard>
-            </Col>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/snapshot/LatestStatsView.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/snapshot/LatestStatsView.tsx
deleted file mode 100644
index 3b422ca47ce79b..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/stats/snapshot/LatestStatsView.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Affix, Row, Typography } from 'antd';
-import React, { ReactNode } from 'react';
-import styled from 'styled-components';
-
-import DataProfileView from '@app/entity/dataset/profile/stats/snapshot/SnapshotStatsView';
-
-import { DatasetProfile } from '@types';
-
-const HeaderRow = styled(Row)`
-    padding-top: 24px;
-    padding-bottom: 28px;
-    background-color: white;
-`;
-
-export type Props = {
-    profile: DatasetProfile;
-    toggleView: ReactNode;
-};
-
-export default function LatestStatsView({ profile, toggleView }: Props) {
-    const reportedAtDate = new Date(profile.timestampMillis);
-    return (
-        <>
-            <Affix offsetTop={127}>
-                <HeaderRow justify="space-between" align="middle">
-                    <div>
-                        <Typography.Title level={2}>Latest Stats</Typography.Title>
-                        <Typography.Text style={{ color: 'gray' }}>
-                            Reported on {reportedAtDate.toLocaleDateString()} at {reportedAtDate.toLocaleTimeString()}
-                        </Typography.Text>
-                    </div>
-                    {toggleView}
-                </HeaderRow>
-            </Affix>
-            <DataProfileView profile={profile} />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/snapshot/SnapshotStatsView.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/snapshot/SnapshotStatsView.tsx
deleted file mode 100644
index 2b44f340117356..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/stats/snapshot/SnapshotStatsView.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-import { Row, Table, Tag, Typography } from 'antd';
-import { ColumnType, ColumnsType } from 'antd/lib/table';
-import React, { useMemo } from 'react';
-import styled from 'styled-components';
-
-import { Highlight } from '@app/analyticsDashboard/components/Highlight';
-import StatsSection from '@app/entity/dataset/profile/stats/StatsSection';
-
-import { DatasetProfile } from '@types';
-
-const ColumnStatsTable = styled(Table)`
-    margin-top: 24px;
-`;
-
-const isPresent = (val: any) => {
-    return val !== undefined && val !== null;
-};
-
-const decimalToPercentStr = (decimal: number, precision: number): string => {
-    return `${(decimal * 100).toFixed(precision)}%`;
-};
-
-export type Props = {
-    profile: DatasetProfile;
-};
-
-export default function DataProfileView({ profile }: Props) {
-    const columnStatsTableData = useMemo(
-        () =>
-            profile.fieldProfiles?.map((doc) => ({
-                name: doc.fieldPath,
-                min: doc.min,
-                max: doc.max,
-                mean: doc.mean,
-                median: doc.median,
-                stdev: doc.stdev,
-                nullCount: isPresent(doc.nullCount) && doc.nullCount!.toString(),
-                nullPercentage: isPresent(doc.nullProportion) && decimalToPercentStr(doc.nullProportion!, 2),
-                distinctCount: isPresent(doc.uniqueCount) && doc.uniqueCount!.toString(),
-                distinctPercentage: isPresent(doc.uniqueProportion) && decimalToPercentStr(doc.uniqueProportion!, 2),
-                sampleValues: doc.sampleValues,
-            })) || [],
-        [profile],
-    );
-
-    /**
-     * Returns a placeholder value to show in the column data table when data is null.
-     */
-    const unknownValue = () => {
-        return <Typography.Text style={{ color: '#B8B8B8' }}>unknown</Typography.Text>;
-    };
-
-    /**
-     * Computes a set of the object keys across all items in a given array.
-     */
-    const getItemKeySet = (items: Array<any>) => {
-        const keySet = new Set<string>();
-        items.forEach((item) => {
-            Object.keys(item).forEach((key) => {
-                keySet.add(key);
-            });
-        });
-        return keySet;
-    };
-
-    /**
-     * Dynamically builds column stat table columns based on the fields present in the dataset profile data.
-     */
-    const buildColumnStatsColumns = (tableData: Array<any>) => {
-        // Optional columns. Defines how to render a column given a value exists somewhere in the profile.
-        const optionalColumns: ColumnsType<any> = [
-            {
-                title: 'Min',
-                dataIndex: 'min',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Max',
-                dataIndex: 'max',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Mean',
-                dataIndex: 'mean',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Median',
-                dataIndex: 'median',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Null Count',
-                dataIndex: 'nullCount',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Null %',
-                dataIndex: 'nullPercentage',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Distinct Count',
-                dataIndex: 'distinctCount',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Distinct %',
-                dataIndex: 'distinctPercentage',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Std. Dev',
-                dataIndex: 'stdev',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Sample Values',
-                dataIndex: 'sampleValues',
-                render: (sampleValues: Array<string>) => {
-                    return (
-                        (sampleValues &&
-                            sampleValues
-                                .slice(0, sampleValues.length < 3 ? sampleValues?.length : 3)
-                                .map((value) => <Tag key={value}>{value}</Tag>)) ||
-                        unknownValue()
-                    );
-                },
-            },
-        ];
-
-        // Name column always required.
-        const requiredColumns: ColumnsType<any> = [
-            {
-                title: 'Name',
-                dataIndex: 'name',
-            },
-        ];
-
-        // Retrieves a set of names of columns that should be shown based on their presence in the data profile.
-        const columnsPresent: Set<string> = getItemKeySet(tableData);
-
-        // Compute the final columns to render.
-        const columns = [
-            ...requiredColumns,
-            ...optionalColumns.filter((column: ColumnType<any>) => columnsPresent.has(column.dataIndex as string)),
-        ];
-
-        // TODO: Support Quantiles && Distinct Value Frequencies.
-        return columns;
-    };
-
-    const columnStatsColumns = buildColumnStatsColumns(columnStatsTableData);
-
-    const rowCount = (isPresent(profile?.rowCount) ? profile?.rowCount : -1) as number;
-    const rowCountTitle = (rowCount >= 0 && 'Rows') || 'Row Count Unknown';
-
-    const columnCount = (isPresent(profile?.columnCount) ? profile?.columnCount : -1) as number;
-    const columnCountTitle = (columnCount >= 0 && 'Columns') || 'Column Count Unknown';
-
-    return (
-        <>
-            <StatsSection title="Table Stats">
-                <Row align="top" justify="start">
-                    <Highlight highlight={{ value: rowCount, title: rowCountTitle, body: '' }} />
-                    <Highlight highlight={{ value: columnCount, title: columnCountTitle, body: '' }} />
-                </Row>
-            </StatsSection>
-            <StatsSection title="Column Stats">
-                <ColumnStatsTable
-                    bordered
-                    pagination={false}
-                    columns={columnStatsColumns}
-                    dataSource={columnStatsTableData}
-                    // TODO: this table's types should be cleaned up so `any` is not needed here or in the column definitions
-                    rowKey={(record: any) => record.name}
-                />
-            </StatsSection>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stories/documentation.ts b/datahub-web-react/src/app/entity/dataset/profile/stories/documentation.ts
deleted file mode 100644
index 345d33faddfec0..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/stories/documentation.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { EntityType } from '@types';
-
-export const sampleDocs = [
-    {
-        url: 'https://www.google.com',
-        description: 'This doc spans the internet web',
-        author: { urn: 'urn:li:corpuser:1', username: '1', type: EntityType.CorpUser },
-        created: {
-            time: 0,
-            actor: 'urn:li:corpuser:1',
-        },
-    },
-];
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stories/lineageEntities.ts b/datahub-web-react/src/app/entity/dataset/profile/stories/lineageEntities.ts
deleted file mode 100644
index 3583ca1a8e2dc0..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/stories/lineageEntities.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { EntityType, FabricType, PlatformNativeType } from '@types';
-
-export const sampleUpstreamEntities = [
-    {
-        name: 'Upstream HiveDataset',
-        type: EntityType.Dataset,
-        urn: 'abc',
-        platform: {
-            urn: 'urn:li:dataPlatform:hive',
-            name: 'Hive',
-            type: EntityType.DataPlatform,
-        },
-        origin: FabricType.Prod,
-        description: 'this is a dataset',
-        platformNativeType: PlatformNativeType.Table,
-        tags: [],
-        created: {
-            time: 0,
-        },
-        lastModified: {
-            time: 0,
-        },
-    },
-    {
-        name: 'Upstream KafkaDataset',
-        type: EntityType.Dataset,
-        urn: 'abc',
-        platform: {
-            urn: 'urn:li:dataPlatform:hive',
-            name: 'Hive',
-            type: EntityType.DataPlatform,
-        },
-        origin: FabricType.Prod,
-        description: 'this is a dataset',
-        platformNativeType: PlatformNativeType.Table,
-        tags: [],
-        created: {
-            time: 0,
-        },
-        lastModified: {
-            time: 0,
-        },
-    },
-];
-
-export const sampleDownstreamEntities = [
-    {
-        name: 'Downstream HiveDataset',
-        type: EntityType.Dataset,
-        urn: 'abc',
-        platform: {
-            urn: 'urn:li:dataPlatform:hive',
-            name: 'Hive',
-            type: EntityType.DataPlatform,
-        },
-        origin: FabricType.Prod,
-        description: 'this is a dataset',
-        platformNativeType: PlatformNativeType.Table,
-        tags: [],
-        created: {
-            time: 0,
-        },
-        lastModified: {
-            time: 0,
-        },
-    },
-    {
-        name: 'Downstream KafkaDataset',
-        type: EntityType.Dataset,
-        urn: 'abc',
-        platform: {
-            urn: 'urn:li:dataPlatform:hive',
-            name: 'Hive',
-            type: EntityType.DataPlatform,
-        },
-        origin: FabricType.Prod,
-        description: 'this is a dataset',
-        platformNativeType: PlatformNativeType.Table,
-        tags: [],
-        created: {
-            time: 0,
-        },
-        lastModified: {
-            time: 0,
-        },
-    },
-];
-
-export const sampleRelationship = {
-    entities: sampleUpstreamEntities.map((entity) => ({
-        entity,
-        created: { time: 0 },
-    })),
-};
-
-export const sampleDownstreamRelationship = {
-    entities: sampleDownstreamEntities.map((entity) => ({
-        entity,
-        created: { time: 0 },
-    })),
-};
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stories/properties.ts b/datahub-web-react/src/app/entity/dataset/profile/stories/properties.ts
deleted file mode 100644
index dc74984113df14..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/stories/properties.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export const sampleProperties = [
-    {
-        key: 'Number of Partitions',
-        value: '18',
-    },
-    {
-        key: 'Cluster Name',
-        value: 'Testing',
-    },
-];
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stories/sampleSchema.ts b/datahub-web-react/src/app/entity/dataset/profile/stories/sampleSchema.ts
deleted file mode 100644
index 9ce31ac0469f91..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/stories/sampleSchema.ts
+++ /dev/null
@@ -1,367 +0,0 @@
-import { dataset3 } from '@src/Mocks';
-
-import { EntityType, Schema, SchemaField, SchemaFieldDataType, SchemaMetadata } from '@types';
-
-// Extending the schema type with an option for tags
-export type TaggedSchemaField = {
-    tags: Tag[];
-} & SchemaField;
-
-export type Tag = {
-    name: string;
-    value?: string;
-    color: string;
-    category: string;
-    descriptor?: boolean;
-};
-
-export const sampleSchema: SchemaMetadata | Schema | null = {
-    name: 'MockSchema',
-    platformUrn: 'mock:urn',
-    version: 1,
-    hash: '',
-    fields: [
-        {
-            fieldPath: 'id',
-            nullable: false,
-            description: 'order id',
-            type: SchemaFieldDataType.Number,
-            nativeDataType: 'number',
-            recursive: false,
-        },
-        {
-            fieldPath: 'name',
-            nullable: true,
-            description: 'the name of the order',
-            type: SchemaFieldDataType.String,
-            nativeDataType: 'string',
-            recursive: false,
-        },
-        {
-            fieldPath: 'shipping_address',
-            nullable: true,
-            description: 'the address the order ships to',
-            type: SchemaFieldDataType.String,
-            nativeDataType: 'string',
-            recursive: false,
-        },
-        {
-            fieldPath: 'count',
-            nullable: true,
-            description: 'the number of items in the order',
-            type: SchemaFieldDataType.Number,
-            nativeDataType: 'number',
-            recursive: false,
-        },
-        {
-            fieldPath: 'cost',
-            nullable: true,
-            description: 'the dollar value of the order',
-            type: SchemaFieldDataType.Number,
-            nativeDataType: 'number',
-            recursive: false,
-        },
-        {
-            fieldPath: 'was_returned',
-            nullable: true,
-            description: 'if the order was sent back',
-            type: SchemaFieldDataType.Boolean,
-            nativeDataType: 'boolean',
-            recursive: false,
-        },
-        {
-            fieldPath: 'payload',
-            nullable: true,
-            description: 'payload attached to the order',
-            type: SchemaFieldDataType.Bytes,
-            nativeDataType: 'bytes',
-            recursive: false,
-        },
-        {
-            fieldPath: 'payment_information',
-            nullable: true,
-            description: 'struct representing the payment information',
-            type: SchemaFieldDataType.Struct,
-            nativeDataType: 'struct',
-            recursive: false,
-        },
-    ],
-    platformSchema: {
-        __typename: 'TableSchema',
-        schema: '{ "type": "record", "name": "SampleHdfsSchema", "namespace": "com.linkedin.dataset", "doc": "Sample HDFS dataset", "fields": [ { "name": "field_foo", "type": [ "string" ] }, { "name": "field_bar", "type": [ "boolean" ] } ] }',
-    },
-};
-
-export const sampleSchemaWithTags: Schema = {
-    name: 'MockSchema',
-    platformUrn: 'mock:urn',
-    version: 1,
-    hash: '',
-    fields: [
-        {
-            fieldPath: 'id',
-            nullable: false,
-            description: 'order id',
-            type: SchemaFieldDataType.Number,
-            nativeDataType: 'number',
-            recursive: false,
-            globalTags: {
-                tags: [
-                    {
-                        tag: {
-                            urn: 'urn:li:tag:Legacy',
-                            name: 'Legacy',
-                            description: 'this is a legacy dataset',
-                            type: EntityType.Tag,
-                        },
-                        associatedUrn: 'mock:urn',
-                    },
-                ],
-            },
-            glossaryTerms: {
-                terms: [
-                    {
-                        term: {
-                            type: EntityType.GlossaryTerm,
-                            name: 'sample-glossary-term',
-                            urn: 'urn:li:glossaryTerm:sample-glossary-term',
-                            hierarchicalName: 'example.sample-glossary-term',
-                            properties: {
-                                name: 'sample-glossary-term',
-                                description: 'sample definition',
-                                definition: 'sample definition',
-                                termSource: 'sample term source',
-                            },
-                        },
-                        associatedUrn: 'mock:urn',
-                    },
-                ],
-            },
-        },
-        {
-            fieldPath: 'name',
-            nullable: true,
-            description: 'the name of the order',
-            type: SchemaFieldDataType.String,
-            nativeDataType: 'string',
-            recursive: false,
-        } as SchemaField,
-        {
-            fieldPath: 'shipping_address',
-            nullable: true,
-            description: 'the address the order ships to',
-            type: SchemaFieldDataType.String,
-            nativeDataType: 'string',
-            recursive: false,
-        } as SchemaField,
-        {
-            fieldPath: 'count',
-            nullable: true,
-            description: 'the number of items in the order',
-            type: SchemaFieldDataType.Number,
-            nativeDataType: 'number',
-            recursive: false,
-        },
-        {
-            fieldPath: 'cost',
-            nullable: true,
-            description: 'the dollar value of the order',
-            type: SchemaFieldDataType.Number,
-            nativeDataType: 'number',
-            recursive: false,
-        } as SchemaField,
-        {
-            fieldPath: 'was_returned',
-            nullable: true,
-            description: 'if the order was sent back',
-            type: SchemaFieldDataType.Boolean,
-            nativeDataType: 'boolean',
-            recursive: false,
-        },
-        {
-            fieldPath: 'payload',
-            nullable: true,
-            description: 'payload attached to the order',
-            type: SchemaFieldDataType.Bytes,
-            nativeDataType: 'bytes',
-            recursive: false,
-        },
-        {
-            fieldPath: 'payment_information',
-            nullable: true,
-            description: 'struct representing the payment information',
-            type: SchemaFieldDataType.Struct,
-            nativeDataType: 'struct',
-            recursive: false,
-        } as SchemaField,
-    ],
-};
-
-export const sampleSchemaWithPkFk: SchemaMetadata = {
-    primaryKeys: ['name'],
-    foreignKeys: [
-        {
-            name: 'constraint',
-            sourceFields: [
-                {
-                    urn: 'datasetUrn',
-                    type: EntityType.Dataset,
-                    parent: { urn: 'test', type: EntityType.Dataset },
-                    fieldPath: 'shipping_address',
-                },
-            ],
-            foreignFields: [
-                {
-                    urn: dataset3.urn,
-                    type: EntityType.Dataset,
-                    parent: { urn: dataset3.name, type: EntityType.Dataset },
-                    fieldPath: 'address',
-                },
-            ],
-            foreignDataset: dataset3,
-        },
-    ],
-    name: 'MockSchema',
-    platformUrn: 'mock:urn',
-    version: 1,
-    hash: '',
-    fields: [
-        {
-            fieldPath: 'id',
-            nullable: false,
-            description: 'order id',
-            type: SchemaFieldDataType.Number,
-            nativeDataType: 'number',
-            recursive: false,
-            globalTags: {
-                tags: [
-                    {
-                        tag: {
-                            urn: 'urn:li:tag:Legacy',
-                            name: 'Legacy',
-                            description: 'this is a legacy dataset',
-                            type: EntityType.Tag,
-                        },
-                        associatedUrn: 'mock:urn',
-                    },
-                ],
-            },
-            glossaryTerms: {
-                terms: [
-                    {
-                        term: {
-                            type: EntityType.GlossaryTerm,
-                            urn: 'urn:li:glossaryTerm:sample-glossary-term',
-                            name: 'sample-glossary-term',
-                            hierarchicalName: 'example.sample-glossary-term',
-                            properties: {
-                                name: 'sample-glossary-term',
-                                description: 'sample definition',
-                                definition: 'sample definition',
-                                termSource: 'sample term source',
-                            },
-                        },
-                        associatedUrn: 'mock:urn',
-                    },
-                ],
-            },
-        },
-        {
-            fieldPath: 'name',
-            nullable: true,
-            description: 'the name of the order',
-            type: SchemaFieldDataType.String,
-            nativeDataType: 'string',
-            recursive: false,
-        } as SchemaField,
-        {
-            fieldPath: 'shipping_address',
-            nullable: true,
-            description: 'the address the order ships to',
-            type: SchemaFieldDataType.String,
-            nativeDataType: 'string',
-            recursive: false,
-        } as SchemaField,
-        {
-            fieldPath: 'count',
-            nullable: true,
-            description: 'the number of items in the order',
-            type: SchemaFieldDataType.Number,
-            nativeDataType: 'number',
-            recursive: false,
-        },
-        {
-            fieldPath: 'cost',
-            nullable: true,
-            description: 'the dollar value of the order',
-            type: SchemaFieldDataType.Number,
-            nativeDataType: 'number',
-            recursive: false,
-        } as SchemaField,
-        {
-            fieldPath: 'was_returned',
-            nullable: true,
-            description: 'if the order was sent back',
-            type: SchemaFieldDataType.Boolean,
-            nativeDataType: 'boolean',
-            recursive: false,
-        },
-        {
-            fieldPath: 'payload',
-            nullable: true,
-            description: 'payload attached to the order',
-            type: SchemaFieldDataType.Bytes,
-            nativeDataType: 'bytes',
-            recursive: false,
-        },
-        {
-            fieldPath: 'payment_information',
-            nullable: true,
-            description: 'struct representing the payment information',
-            type: SchemaFieldDataType.Struct,
-            nativeDataType: 'struct',
-            recursive: false,
-        } as SchemaField,
-    ],
-};
-
-export const sampleSchemaWithoutFields: SchemaMetadata | Schema | null = {
-    name: 'MockSchema',
-    platformUrn: 'mock:urn',
-    version: 1,
-    hash: '',
-    fields: [],
-};
-
-export const sampleSchemaWithKeyValueFields: SchemaMetadata | Schema | null = {
-    name: 'MockSchema',
-    platformUrn: 'mock:urn',
-    version: 1,
-    hash: '',
-    fields: [
-        {
-            fieldPath: '[key=True].[version=2.0].id',
-            nullable: true,
-            description: 'the number of items in the order',
-            type: SchemaFieldDataType.Number,
-            nativeDataType: 'number',
-            recursive: false,
-        },
-        {
-            fieldPath: 'count',
-            nullable: true,
-            description: 'the number of items in the order',
-            type: SchemaFieldDataType.Number,
-            nativeDataType: 'number',
-            recursive: false,
-        },
-        {
-            fieldPath: 'cost',
-            nullable: true,
-            description: 'the dollar value of the order',
-            type: SchemaFieldDataType.Number,
-            nativeDataType: 'number',
-            recursive: false,
-        } as SchemaField,
-    ],
-};
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stories/stats.ts b/datahub-web-react/src/app/entity/dataset/profile/stories/stats.ts
deleted file mode 100644
index a4afa38ec7090f..00000000000000
--- a/datahub-web-react/src/app/entity/dataset/profile/stories/stats.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { DatasetProfile } from '@types';
-
-export const completeSampleProfile: DatasetProfile = {
-    rowCount: 1000,
-    columnCount: 2000,
-    timestampMillis: 0,
-    fieldProfiles: [
-        {
-            fieldPath: 'testColumn',
-            uniqueCount: 1,
-            uniqueProportion: 0.111,
-            nullCount: 2,
-            nullProportion: 0.222,
-            min: '3',
-            max: '4',
-            mean: '5',
-            median: '6',
-            stdev: '7',
-            sampleValues: ['value1', 'value2', 'value3'],
-        },
-        {
-            fieldPath: 'testColumn2',
-            uniqueCount: 8,
-            uniqueProportion: 0.333,
-            nullCount: 9,
-            nullProportion: 0.444,
-            min: '10',
-            max: '11',
-            mean: '12',
-            median: '13',
-            stdev: '14',
-            sampleValues: ['value4', 'value5', 'value6'],
-        },
-    ],
-};
-
-export const missingFieldStatsProfile: DatasetProfile = {
-    rowCount: 1000,
-    columnCount: 2000,
-    timestampMillis: 0,
-};
-
-export const missingTableStatsProfile: DatasetProfile = {
-    timestampMillis: 0,
-    fieldProfiles: [
-        {
-            fieldPath: 'testColumn',
-            uniqueCount: 1,
-            uniqueProportion: 0.111,
-            nullCount: 2,
-            nullProportion: 0.222,
-            min: '3',
-            max: '4',
-            mean: '5',
-            median: '6',
-            stdev: '7',
-            sampleValues: ['value1', 'value2', 'value3'],
-        },
-        {
-            fieldPath: 'testColumn2',
-            uniqueCount: 8,
-            uniqueProportion: 0.333,
-            nullCount: 9,
-            nullProportion: 0.444,
-            min: '10',
-            max: '11',
-            mean: '12',
-            median: '13',
-            stdev: '14',
-            sampleValues: ['value4', 'value5', 'value6'],
-        },
-    ],
-};
diff --git a/datahub-web-react/src/app/entity/domain/DataProductsTab/CreateDataProductModal.tsx b/datahub-web-react/src/app/entity/domain/DataProductsTab/CreateDataProductModal.tsx
deleted file mode 100644
index 97e922c65e535c..00000000000000
--- a/datahub-web-react/src/app/entity/domain/DataProductsTab/CreateDataProductModal.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Button, Modal, message } from 'antd';
-import React, { useState } from 'react';
-
-import DataProductBuilderForm from '@app/entity/domain/DataProductsTab/DataProductBuilderForm';
-import { DataProductBuilderState } from '@app/entity/domain/DataProductsTab/types';
-
-import { useCreateDataProductMutation } from '@graphql/dataProduct.generated';
-import { DataProduct, Domain } from '@types';
-
-export const MODAL_WIDTH = '75vw';
-
-export const MODAL_BODY_STYLE = {
-    overflow: 'auto',
-    width: '80vw',
-    maxWidth: 800,
-};
-
-const DEFAULT_STATE = {
-    name: '',
-};
-
-type Props = {
-    domain: Domain;
-    onClose: () => void;
-    onCreateDataProduct: (dataProduct: DataProduct) => void;
-};
-
-export default function CreateDataProductModal({ domain, onCreateDataProduct, onClose }: Props) {
-    const [builderState, updateBuilderState] = useState<DataProductBuilderState>(DEFAULT_STATE);
-    const [createDataProductMutation] = useCreateDataProductMutation();
-
-    function createDataProduct() {
-        createDataProductMutation({
-            variables: {
-                input: {
-                    domainUrn: domain.urn,
-                    id: builderState.id,
-                    properties: {
-                        name: builderState.name,
-                        description: builderState.description || undefined,
-                    },
-                },
-            },
-        })
-            .then(({ data, errors }) => {
-                if (!errors) {
-                    message.success('Created Data Product!');
-                    if (data?.createDataProduct) {
-                        const updateDataProduct = { ...data.createDataProduct, domain: { domain } };
-                        onCreateDataProduct(updateDataProduct as DataProduct);
-                    }
-                    onClose();
-                }
-            })
-            .catch((error) => {
-                onClose();
-                message.destroy();
-                message.error({ content: `Failed to create Data Product: ${error.message}.` });
-            });
-    }
-
-    return (
-        <Modal
-            title="Create new Data Product"
-            onCancel={onClose}
-            style={MODAL_BODY_STYLE}
-            width={MODAL_WIDTH}
-            open
-            footer={
-                <>
-                    <Button onClick={onClose} type="text">
-                        Cancel
-                    </Button>
-                    <Button onClick={createDataProduct} disabled={!builderState.name}>
-                        Create
-                    </Button>
-                </>
-            }
-        >
-            <DataProductBuilderForm builderState={builderState} updateBuilderState={updateBuilderState} />
-        </Modal>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductAdvancedOption.tsx b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductAdvancedOption.tsx
deleted file mode 100644
index 70907084ee7934..00000000000000
--- a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductAdvancedOption.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { Collapse, Form, Input, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { DataProductBuilderFormProps } from '@app/entity/domain/DataProductsTab/types';
-import { validateCustomUrnId } from '@app/shared/textUtil';
-
-const FormItem = styled(Form.Item)`
-    .ant-form-item-label {
-        padding-bottom: 2px;
-    }
-`;
-
-const FormItemWithMargin = styled(FormItem)`
-    margin-bottom: 16px;
-`;
-
-const FormItemNoMargin = styled(FormItem)`
-    margin-bottom: 0;
-`;
-
-const AdvancedLabel = styled(Typography.Text)`
-    color: #373d44;
-`;
-
-export function DataProductAdvancedOption({ builderState, updateBuilderState }: DataProductBuilderFormProps) {
-    function updateDataProductId(id: string) {
-        updateBuilderState({
-            ...builderState,
-            id,
-        });
-    }
-
-    return (
-        <Collapse ghost>
-            <Collapse.Panel header={<AdvancedLabel>Advanced Options</AdvancedLabel>} key="1">
-                <FormItemWithMargin
-                    label={<Typography.Text strong>Data Product Id</Typography.Text>}
-                    help="By default, a random UUID will be generated to uniquely identify this data product. If
-                        you'd like to provide a custom id instead to more easily keep track of this data product,
-                        you may provide it here. Be careful, you cannot easily change the data product id after
-                        creation."
-                >
-                    <FormItemNoMargin
-                        rules={[
-                            () => ({
-                                validator(_, value) {
-                                    if (value && validateCustomUrnId(value)) {
-                                        return Promise.resolve();
-                                    }
-                                    return Promise.reject(new Error('Please enter a valid Data product id'));
-                                },
-                            }),
-                        ]}
-                    >
-                        <Input
-                            data-testid="data-product-id"
-                            placeholder="engineering"
-                            value={builderState.id}
-                            onChange={(e) => updateDataProductId(e.target.value)}
-                        />
-                    </FormItemNoMargin>
-                </FormItemWithMargin>
-            </Collapse.Panel>
-        </Collapse>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductBuilderForm.tsx b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductBuilderForm.tsx
deleted file mode 100644
index 758942bf9366eb..00000000000000
--- a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductBuilderForm.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Form, Input, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { DataProductAdvancedOption } from '@app/entity/domain/DataProductsTab/DataProductAdvancedOption';
-import { DataProductBuilderFormProps } from '@app/entity/domain/DataProductsTab/types';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { Editor as MarkdownEditor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor';
-
-const StyledEditor = styled(MarkdownEditor)`
-    border: 1px solid ${ANTD_GRAY[4]};
-`;
-
-export default function DataProductBuilderForm({ builderState, updateBuilderState }: DataProductBuilderFormProps) {
-    function updateName(name: string) {
-        updateBuilderState({
-            ...builderState,
-            name,
-        });
-    }
-
-    function updateDescription(description: string) {
-        updateBuilderState({
-            ...builderState,
-            description,
-        });
-    }
-
-    return (
-        <Form layout="vertical">
-            <Form.Item
-                rules={[{ min: 1, max: 500 }]}
-                hasFeedback
-                label={<Typography.Text strong>Name</Typography.Text>}
-                required
-            >
-                <Input
-                    autoFocus
-                    value={builderState.name}
-                    onChange={(e) => updateName(e.target.value)}
-                    placeholder="Revenue Dashboards"
-                />
-            </Form.Item>
-            <Form.Item label={<Typography.Text strong>Description</Typography.Text>}>
-                <StyledEditor doNotFocus content={builderState.description} onChange={updateDescription} />
-            </Form.Item>
-            <DataProductAdvancedOption builderState={builderState} updateBuilderState={updateBuilderState} />
-        </Form>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductResult.tsx b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductResult.tsx
deleted file mode 100644
index b0170d7b064753..00000000000000
--- a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductResult.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-import { DeleteOutlined, EditOutlined } from '@ant-design/icons';
-import { Button, Dropdown, Modal, message } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { PreviewType } from '@app/entity/Entity';
-import EditDataProductModal from '@app/entity/domain/DataProductsTab/EditDataProductModal';
-import { MenuIcon } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useDeleteDataProductMutation } from '@graphql/dataProduct.generated';
-import { DataProduct, EntityType } from '@types';
-
-const ResultWrapper = styled.div`
-    background-color: white;
-    border-radius: 8px;
-    max-width: 1200px;
-    margin: 0 auto 8px auto;
-    padding: 8px 16px;
-    display: flex;
-    width: 100%;
-`;
-
-const StyledButton = styled(Button)`
-    border: none;
-    box-shadow: none;
-    outline: none;
-    height: 18px;
-    width: 18px;
-    padding: 0;
-
-    svg {
-        height: 14px;
-        width: 14px;
-    }
-`;
-
-const ButtonsWrapper = styled.div`
-    margin-left: 16px;
-    display: flex;
-`;
-
-const StyledMenuIcon = styled(MenuIcon)`
-    margin-left: 8px;
-    height: 18px;
-    width: 18px;
-`;
-
-const PreviewWrapper = styled.div`
-    max-width: 94%;
-    flex: 1;
-`;
-
-const MenuItem = styled.div``;
-
-interface Props {
-    dataProduct: DataProduct;
-    onUpdateDataProduct: (dataProduct: DataProduct) => void;
-    setDeletedDataProductUrns: React.Dispatch<React.SetStateAction<string[]>>;
-}
-
-export default function DataProductResult({ dataProduct, onUpdateDataProduct, setDeletedDataProductUrns }: Props) {
-    const entityRegistry = useEntityRegistry();
-    const [isEditModalVisible, setIsEditModalVisible] = useState(false);
-    const [deleteDataProductMutation] = useDeleteDataProductMutation();
-
-    function deleteDataProduct() {
-        deleteDataProductMutation({ variables: { urn: dataProduct.urn } })
-            .then(() => {
-                message.success('Deleted Data Product');
-                setDeletedDataProductUrns((currentUrns) => [...currentUrns, dataProduct.urn]);
-            })
-            .catch(() => {
-                message.destroy();
-                message.error({ content: 'Failed to delete Data Product. An unexpected error occurred' });
-            });
-    }
-
-    function onRemove() {
-        Modal.confirm({
-            title: `Delete ${entityRegistry.getDisplayName(EntityType.DataProduct, dataProduct)}`,
-            content: `Are you sure you want to delete this Data Product?`,
-            onOk() {
-                deleteDataProduct();
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    }
-
-    const items = [
-        {
-            key: '0',
-            label: (
-                <MenuItem onClick={onRemove}>
-                    <DeleteOutlined /> &nbsp;Delete
-                </MenuItem>
-            ),
-        },
-    ];
-
-    return (
-        <>
-            <ResultWrapper>
-                <PreviewWrapper>
-                    {entityRegistry.renderPreview(EntityType.DataProduct, PreviewType.SEARCH, dataProduct)}
-                </PreviewWrapper>
-                <ButtonsWrapper>
-                    <StyledButton icon={<EditOutlined />} onClick={() => setIsEditModalVisible(true)} />
-                    <Dropdown menu={{ items }} trigger={['click']}>
-                        <StyledMenuIcon />
-                    </Dropdown>
-                </ButtonsWrapper>
-            </ResultWrapper>
-            {isEditModalVisible && (
-                <EditDataProductModal
-                    dataProduct={dataProduct}
-                    onClose={() => setIsEditModalVisible(false)}
-                    onUpdateDataProduct={onUpdateDataProduct}
-                />
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductsTab.tsx b/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductsTab.tsx
deleted file mode 100644
index 148b5642bbadc5..00000000000000
--- a/datahub-web-react/src/app/entity/domain/DataProductsTab/DataProductsTab.tsx
+++ /dev/null
@@ -1,165 +0,0 @@
-import { LoadingOutlined, PlusOutlined } from '@ant-design/icons';
-import { Button, Empty, Pagination } from 'antd';
-import * as QueryString from 'query-string';
-import React, { useState } from 'react';
-import { useLocation } from 'react-router';
-import styled from 'styled-components';
-
-import { DomainsPaginationContainer } from '@app/domain/DomainsList';
-import CreateDataProductModal from '@app/entity/domain/DataProductsTab/CreateDataProductModal';
-import DataProductResult from '@app/entity/domain/DataProductsTab/DataProductResult';
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { SearchBar } from '@app/search/SearchBar';
-import { DOMAINS_FILTER_NAME } from '@app/search/utils/constants';
-import { scrollToTop } from '@app/shared/searchUtils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated';
-import { DataProduct, Domain, EntityType } from '@types';
-
-const DataProductsPaginationWrapper = styled(DomainsPaginationContainer)`
-    justify-content: center;
-`;
-
-const ResultsWrapper = styled.div`
-    flex: 1;
-    background-color: ${ANTD_GRAY[2]};
-    padding: 16px;
-    overflow: auto;
-`;
-
-const StyledLoading = styled(LoadingOutlined)`
-    font-size: 32px;
-`;
-
-const LoadingWrapper = styled.div`
-    display: flex;
-    justify-content: center;
-    margin-top: 25%;
-`;
-
-const DEFAULT_PAGE_SIZE = 10;
-
-export default function DataProductsTab() {
-    const { entityData } = useEntityData();
-    const entityRegistry = useEntityRegistry();
-    const location = useLocation();
-    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
-    const paramsQuery = (params?.query as string) || undefined;
-    const [query, setQuery] = useState<string | undefined>(paramsQuery);
-    const [page, setPage] = useState(1);
-    const [isCreateModalVisible, setIsCreateModalVisible] = useState(false);
-    const [createdDataProducts, setCreatedDataProducts] = useState<DataProduct[]>([]);
-    const [editedDataProducts, setEditedDataProducts] = useState<DataProduct[]>([]);
-    const [deletedDataProductUrns, setDeletedDataProductUrns] = useState<string[]>([]);
-
-    const start = (page - 1) * DEFAULT_PAGE_SIZE;
-    const domainUrn = entityData?.urn || '';
-
-    const { data, loading } = useGetSearchResultsForMultipleQuery({
-        skip: !domainUrn,
-        variables: {
-            input: {
-                types: [EntityType.DataProduct],
-                query: query || '',
-                start,
-                count: DEFAULT_PAGE_SIZE,
-                orFilters: [{ and: [{ field: DOMAINS_FILTER_NAME, values: [domainUrn] }] }],
-                searchFlags: { skipCache: true },
-            },
-        },
-        fetchPolicy: 'no-cache',
-    });
-    const totalResults = data?.searchAcrossEntities?.total || 0;
-    const searchResults = data?.searchAcrossEntities?.searchResults?.map((r) => r.entity) || [];
-    const dataProducts = [...createdDataProducts, ...searchResults];
-    const displayedDataProducts = dataProducts
-        .map(
-            (dataProduct) =>
-                editedDataProducts.find((editedDataProduct) => editedDataProduct.urn === dataProduct.urn) ||
-                dataProduct,
-        )
-        .filter((dataProduct) => !deletedDataProductUrns.includes(dataProduct.urn));
-
-    const onChangePage = (newPage: number) => {
-        scrollToTop();
-        setPage(newPage);
-    };
-
-    function onCreateDataProduct(dataProduct: DataProduct) {
-        setCreatedDataProducts([dataProduct, ...createdDataProducts]);
-    }
-
-    function onUpdateDataProduct(dataProduct: DataProduct) {
-        setEditedDataProducts([dataProduct, ...editedDataProducts]);
-    }
-
-    return (
-        <>
-            <TabToolbar>
-                <Button type="text" onClick={() => setIsCreateModalVisible(true)}>
-                    <PlusOutlined /> New Data Product
-                </Button>
-                <SearchBar
-                    initialQuery={query || ''}
-                    placeholderText="Search data products..."
-                    suggestions={[]}
-                    style={{
-                        maxWidth: 220,
-                        padding: 0,
-                    }}
-                    inputStyle={{
-                        height: 32,
-                        fontSize: 12,
-                    }}
-                    onSearch={() => null}
-                    onQueryChange={(q) => setQuery(q && q.length > 0 ? q : undefined)}
-                    entityRegistry={entityRegistry}
-                    hideRecommendations
-                />
-            </TabToolbar>
-            <ResultsWrapper>
-                {!loading && !displayedDataProducts.length && (
-                    <Empty
-                        description="No Data Products"
-                        image={Empty.PRESENTED_IMAGE_SIMPLE}
-                        style={{ color: ANTD_GRAY[7] }}
-                    />
-                )}
-                {loading && (
-                    <LoadingWrapper>
-                        <StyledLoading />
-                    </LoadingWrapper>
-                )}
-                {!loading &&
-                    displayedDataProducts.map((dataProduct) => (
-                        <DataProductResult
-                            key={dataProduct.urn}
-                            dataProduct={dataProduct as DataProduct}
-                            onUpdateDataProduct={onUpdateDataProduct}
-                            setDeletedDataProductUrns={setDeletedDataProductUrns}
-                        />
-                    ))}
-            </ResultsWrapper>
-            <DataProductsPaginationWrapper>
-                <Pagination
-                    current={page}
-                    pageSize={DEFAULT_PAGE_SIZE}
-                    total={totalResults}
-                    showLessItems
-                    onChange={onChangePage}
-                    showSizeChanger={false}
-                />
-            </DataProductsPaginationWrapper>
-            {isCreateModalVisible && (
-                <CreateDataProductModal
-                    domain={entityData as Domain}
-                    onCreateDataProduct={onCreateDataProduct}
-                    onClose={() => setIsCreateModalVisible(false)}
-                />
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/domain/DataProductsTab/EditDataProductModal.tsx b/datahub-web-react/src/app/entity/domain/DataProductsTab/EditDataProductModal.tsx
deleted file mode 100644
index 57f21a8bcd0724..00000000000000
--- a/datahub-web-react/src/app/entity/domain/DataProductsTab/EditDataProductModal.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Button, Modal, message } from 'antd';
-import React, { useState } from 'react';
-
-import { MODAL_BODY_STYLE, MODAL_WIDTH } from '@app/entity/domain/DataProductsTab/CreateDataProductModal';
-import DataProductBuilderForm from '@app/entity/domain/DataProductsTab/DataProductBuilderForm';
-import { DataProductBuilderState } from '@app/entity/domain/DataProductsTab/types';
-
-import { useUpdateDataProductMutation } from '@graphql/dataProduct.generated';
-import { DataProduct } from '@types';
-
-type Props = {
-    dataProduct: DataProduct;
-    onClose: () => void;
-    onUpdateDataProduct: (dataProduct: DataProduct) => void;
-};
-
-export default function EditDataProductModal({ dataProduct, onUpdateDataProduct, onClose }: Props) {
-    const [builderState, updateBuilderState] = useState<DataProductBuilderState>({
-        name: dataProduct.properties?.name || '',
-        description: dataProduct.properties?.description || '',
-    });
-    const [updateDataProductMutation] = useUpdateDataProductMutation();
-
-    function updateDataProduct() {
-        updateDataProductMutation({
-            variables: {
-                urn: dataProduct.urn,
-                input: {
-                    name: builderState.name,
-                    description: builderState.description || undefined,
-                },
-            },
-        })
-            .then(({ data, errors }) => {
-                if (!errors) {
-                    message.success('Updates Data Product!');
-                    if (data?.updateDataProduct) {
-                        onUpdateDataProduct(data.updateDataProduct as DataProduct);
-                    }
-                    onClose();
-                }
-            })
-            .catch(() => {
-                onClose();
-                message.destroy();
-                message.error({ content: 'Failed to update Data Product. An unexpected error occurred' });
-            });
-    }
-
-    return (
-        <Modal
-            title={`Update ${dataProduct.properties?.name || 'Data Product'}`}
-            onCancel={onClose}
-            style={MODAL_BODY_STYLE}
-            width={MODAL_WIDTH}
-            open
-            footer={
-                <>
-                    <Button onClick={onClose} type="text">
-                        Cancel
-                    </Button>
-                    <Button onClick={updateDataProduct} disabled={!builderState.name}>
-                        Update
-                    </Button>
-                </>
-            }
-        >
-            <DataProductBuilderForm builderState={builderState} updateBuilderState={updateBuilderState} />
-        </Modal>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/domain/DataProductsTab/types.ts b/datahub-web-react/src/app/entity/domain/DataProductsTab/types.ts
deleted file mode 100644
index 2015b97f1433b7..00000000000000
--- a/datahub-web-react/src/app/entity/domain/DataProductsTab/types.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export type DataProductBuilderState = {
-    name: string;
-    id?: string;
-    description?: string;
-};
-
-export type DataProductBuilderFormProps = {
-    builderState: DataProductBuilderState;
-    updateBuilderState: (newState: DataProductBuilderState) => void;
-};
diff --git a/datahub-web-react/src/app/entity/domain/DomainEntitiesTab.tsx b/datahub-web-react/src/app/entity/domain/DomainEntitiesTab.tsx
deleted file mode 100644
index 213f407d4e6d5f..00000000000000
--- a/datahub-web-react/src/app/entity/domain/DomainEntitiesTab.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection';
-import { UnionType } from '@app/search/utils/constants';
-
-import { EntityType } from '@types';
-
-export const DomainEntitiesTab = () => {
-    const { urn, entityType } = useEntityData();
-
-    let fixedFilter;
-    // Set a fixed filter corresponding to the current entity urn.
-    if (entityType === EntityType.Domain) {
-        fixedFilter = {
-            field: 'domains',
-            values: [urn],
-        };
-    }
-
-    return (
-        <EmbeddedListSearchSection
-            fixedFilters={{
-                unionType: UnionType.AND,
-                filters: [fixedFilter],
-            }}
-            emptySearchQuery="*"
-            placeholderText="Filter domain entities..."
-            skipCache
-            applyView
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/domain/DomainEntity.tsx b/datahub-web-react/src/app/entity/domain/DomainEntity.tsx
deleted file mode 100644
index b20b9f45e0c225..00000000000000
--- a/datahub-web-react/src/app/entity/domain/DomainEntity.tsx
+++ /dev/null
@@ -1,172 +0,0 @@
-import * as React from 'react';
-
-import DomainIcon from '@app/domain/DomainIcon';
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import DataProductsTab from '@app/entity/domain/DataProductsTab/DataProductsTab';
-import { DomainEntitiesTab } from '@app/entity/domain/DomainEntitiesTab';
-import { Preview } from '@app/entity/domain/preview/Preview';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfileTab } from '@app/entity/shared/constants';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { EntityActionItem } from '@app/entity/shared/entity/EntityActions';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-
-import { useGetDomainQuery } from '@graphql/domain.generated';
-import { Domain, EntityType, SearchResult } from '@types';
-
-/**
- * Definition of the DataHub Domain entity.
- */
-export class DomainEntity implements Entity<Domain> {
-    type: EntityType = EntityType.Domain;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <DomainIcon />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <DomainIcon style={{ fontSize, color: color || '#B37FEB' }} />;
-        }
-
-        if (styleType === IconStyleType.SVG) {
-            return (
-                <path
-                    fillRule="evenodd"
-                    clipRule="evenodd"
-                    d="M5.38241 4.45017C5.79578 5.08156 6.64272 5.2583 7.2741 4.84493C7.90549 4.43156 8.08223 3.58462 7.66886 2.95323C7.25549 2.32184 6.40855 2.14511 5.77716 2.55847C5.14578 2.97184 4.96904 3.81878 5.38241 4.45017ZM5.14394 5.70522C5.93376 6.24949 7.0063 6.2952 7.85837 5.73735C8.54707 5.28646 8.93198 4.54586 8.95765 3.78126C10.4383 3.8373 11.732 4.62372 12.4888 5.79063C12.8376 5.61918 13.2124 5.53858 13.5832 5.54251C12.6507 3.85455 10.8528 2.71139 8.78798 2.71139L8.74856 2.71152C8.76299 2.74381 8.77666 2.7763 8.78957 2.80897C8.72977 2.65776 8.65383 2.51033 8.56128 2.36896C7.82523 1.24471 6.31715 0.930005 5.1929 1.66606C4.11266 2.37329 3.77982 3.79327 4.40835 4.90069C3.72087 5.81574 3.31348 6.95324 3.31348 8.18589C3.31348 9.17754 3.57714 10.1076 4.03819 10.9098C4.2114 10.6603 4.43456 10.4392 4.70432 10.2626C4.75298 10.2307 4.80235 10.2008 4.85235 10.1729C4.55031 9.57585 4.38014 8.90074 4.38014 8.18589C4.38014 7.26597 4.66195 6.41188 5.14394 5.70522ZM12.4163 8.72427C12.8297 9.35566 13.6767 9.5324 14.308 9.11903C14.9394 8.70566 15.1162 7.85872 14.7028 7.22733C14.2894 6.59594 13.4425 6.4192 12.8111 6.83257C12.1797 7.24594 12.003 8.09288 12.4163 8.72427ZM13.7973 10.3978C14.1761 10.3609 14.5518 10.2344 14.8923 10.0114C16.0166 9.27539 16.3313 7.76732 15.5952 6.64306C14.8592 5.51881 13.3511 5.2041 12.2268 5.94015C11.1026 6.6762 10.7879 8.18428 11.5239 9.30854C11.8145 9.75234 12.2254 10.07 12.6854 10.2467C11.9457 11.6427 10.4779 12.5937 8.78798 12.5937C8.67553 12.5937 8.56407 12.5895 8.45373 12.5812C8.51807 12.0342 8.39801 11.4624 8.07271 10.9655C7.33667 9.84128 5.82859 9.52658 4.70433 10.2626C3.58008 10.9987 3.26537 12.5068 4.00142 13.631C4.73747 14.7553 6.24555 15.07 7.36981 14.3339C7.66496 14.1407 7.90432 13.8942 8.08351 13.6155C8.31415 13.6451 8.54928 13.6604 8.78798 13.6604C11.0243 13.6604 12.9475 12.3195 13.7973 10.3978ZM6.78554 13.4415C6.15415 13.8549 5.30721 13.6781 4.89384 13.0467C4.48047 12.4154 4.65721 11.5684 5.2886 11.155C5.91999 10.7417 6.76693 10.9184 7.1803 11.5498C7.59367 12.1812 7.41693 13.0281 6.78554 13.4415Z"
-                    fill="currentColor"
-                />
-            );
-        }
-
-        return (
-            <DomainIcon
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getGraphName = () => 'domain';
-
-    getPathName = () => 'domain';
-
-    getEntityName = () => 'Domain';
-
-    getCollectionName = () => 'Domains';
-
-    useEntityQuery = useGetDomainQuery;
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            entityType={EntityType.Domain}
-            useEntityQuery={useGetDomainQuery}
-            useUpdateQuery={undefined}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            headerDropdownItems={new Set([EntityMenuItems.MOVE, EntityMenuItems.DELETE])}
-            headerActionItems={new Set([EntityActionItem.BATCH_ADD_DOMAIN])}
-            isNameEditable
-            tabs={[
-                {
-                    id: EntityProfileTab.DOMAIN_ENTITIES_TAB,
-                    name: 'Entities',
-                    component: DomainEntitiesTab,
-                },
-                {
-                    id: EntityProfileTab.DOCUMENTATION_TAB,
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                },
-                {
-                    id: EntityProfileTab.DATA_PRODUCTS_TAB,
-                    name: 'Data Products',
-                    component: DataProductsTab,
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-        />
-    );
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-    ];
-
-    renderPreview = (_: PreviewType, data: Domain) => {
-        return (
-            <Preview
-                domain={data}
-                urn={data.urn}
-                name={this.displayName(data)}
-                description={data.properties?.description}
-                owners={data.ownership?.owners}
-                logoComponent={this.icon(12, IconStyleType.ACCENT)}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as Domain;
-        return (
-            <Preview
-                domain={data}
-                urn={data.urn}
-                name={this.displayName(data)}
-                description={data.properties?.description}
-                owners={data.ownership?.owners}
-                logoComponent={this.icon(12, IconStyleType.ACCENT)}
-            />
-        );
-    };
-
-    displayName = (data: Domain) => {
-        return data?.properties?.name || data?.id || data.urn;
-    };
-
-    getOverridePropertiesFromEntity = (data: Domain) => {
-        return {
-            name: data.properties?.name,
-        };
-    };
-
-    getGenericEntityProperties = (data: Domain) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    supportedCapabilities = () => {
-        // TODO.. Determine whether SOFT_DELETE should go into here.
-        return new Set([EntityCapabilityType.OWNERS]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/domain/preview/DomainEntitiesSnippet.tsx b/datahub-web-react/src/app/entity/domain/preview/DomainEntitiesSnippet.tsx
deleted file mode 100644
index 2d46e05db3743b..00000000000000
--- a/datahub-web-react/src/app/entity/domain/preview/DomainEntitiesSnippet.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { DatabaseOutlined, FileDoneOutlined } from '@ant-design/icons';
-import { VerticalDivider } from '@remirror/react';
-import React from 'react';
-import styled from 'styled-components';
-
-import DomainIcon from '@app/domain/DomainIcon';
-import { ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-import { pluralize } from '@app/shared/textUtil';
-import { useHoverEntityTooltipContext } from '@src/app/recommendations/HoverEntityTooltipContext';
-
-import { SearchResultFields_Domain_Fragment } from '@graphql/search.generated';
-
-const Wrapper = styled.div`
-    color: ${ANTD_GRAY_V2[8]};
-    font-size: 12px;
-    display: flex;
-    align-items: center;
-    line-height: 20px;
-
-    svg {
-        margin-right: 4px;
-    }
-`;
-
-const StyledDivider = styled(VerticalDivider)`
-    &&& {
-        margin: 0 8px;
-    }
-`;
-
-interface Props {
-    domain: SearchResultFields_Domain_Fragment;
-}
-
-export default function DomainEntitiesSnippet({ domain }: Props) {
-    const { entityCount } = useHoverEntityTooltipContext();
-    const subDomainCount = domain.children?.total || 0;
-    const dataProductCount = domain.dataProducts?.total || 0;
-
-    return (
-        <Wrapper>
-            {!!entityCount && (
-                <>
-                    <DatabaseOutlined /> {entityCount} {entityCount === 1 ? 'entity' : 'entities'}
-                    <StyledDivider />
-                </>
-            )}
-            <DomainIcon /> {subDomainCount} {pluralize(subDomainCount, 'sub-domain')}
-            <StyledDivider />
-            <FileDoneOutlined /> {dataProductCount} {pluralize(dataProductCount, 'data product')}
-        </Wrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/domain/preview/Preview.tsx b/datahub-web-react/src/app/entity/domain/preview/Preview.tsx
deleted file mode 100644
index 01d6e7c90c8de8..00000000000000
--- a/datahub-web-react/src/app/entity/domain/preview/Preview.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import React from 'react';
-
-import DomainIcon from '@app/domain/DomainIcon';
-import DomainEntitiesSnippet from '@app/entity/domain/preview/DomainEntitiesSnippet';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Domain, EntityType, Owner, SearchInsight } from '@types';
-
-export const Preview = ({
-    domain,
-    urn,
-    name,
-    description,
-    owners,
-    insights,
-    logoComponent,
-}: {
-    domain: Domain;
-    urn: string;
-    name: string;
-    description?: string | null;
-    owners?: Array<Owner> | null;
-    insights?: Array<SearchInsight> | null;
-    logoComponent?: JSX.Element;
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.Domain, urn)}
-            name={name || ''}
-            urn={urn}
-            description={description || ''}
-            type="Domain"
-            typeIcon={
-                <DomainIcon
-                    style={{
-                        fontSize: 14,
-                        color: '#BFBFBF',
-                    }}
-                />
-            }
-            owners={owners}
-            insights={insights}
-            logoComponent={logoComponent}
-            parentEntities={domain.parentDomains?.domains}
-            snippet={<DomainEntitiesSnippet domain={domain} />}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/ermodelrelationships/ERModelRelationshipEntity.tsx b/datahub-web-react/src/app/entity/ermodelrelationships/ERModelRelationshipEntity.tsx
deleted file mode 100644
index d2217acebc57be..00000000000000
--- a/datahub-web-react/src/app/entity/ermodelrelationships/ERModelRelationshipEntity.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import '@app/entity/ermodelrelationships/preview/ERModelRelationshipAction.less';
-
-import { DatabaseFilled, DatabaseOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { ERModelRelationshipPreviewCard } from '@app/entity/ermodelrelationships/preview/ERModelRelationshipPreviewCard';
-import ERModelRelationshipSidebarCardinality from '@app/entity/ermodelrelationships/profile/sidebar/ERModelRelationshipSidebarCardinality';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { ERModelRelationshipTab } from '@app/entity/shared/tabs/ERModelRelationship/ERModelRelationshipTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-
-import {
-    useGetErModelRelationshipQuery,
-    useUpdateErModelRelationshipMutation,
-} from '@graphql/ermodelrelationship.generated';
-import { EntityType, ErModelRelationship, OwnershipType, SearchResult } from '@types';
-
-import ermodelrelationshipIcon from '@images/ermodelrelationshipIcon.svg';
-
-/**
- * Definition of the DataHub ErModelRelationship entity.
- */
-
-export class ERModelRelationshipEntity implements Entity<ErModelRelationship> {
-    type: EntityType = EntityType.ErModelRelationship;
-
-    icon = (fontSize: number, styleType: IconStyleType) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <DatabaseOutlined style={{ fontSize }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <DatabaseFilled style={{ fontSize, color: '#B37FEB' }} />;
-        }
-
-        if (styleType === IconStyleType.SVG) {
-            return (
-                <path d="M832 64H192c-17.7 0-32 14.3-32 32v832c0 17.7 14.3 32 32 32h640c17.7 0 32-14.3 32-32V96c0-17.7-14.3-32-32-32zm-600 72h560v208H232V136zm560 480H232V408h560v208zm0 272H232V680h560v208zM304 240a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0zm0 272a40 40 0 1080 0 40 40 0 10-80 0z" />
-            );
-        }
-
-        return <img src={ermodelrelationshipIcon} style={{ height: '16px', width: '16px' }} alt="" />;
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getPathName = () => 'erModelRelationship';
-
-    getCollectionName = () => 'ER Model Relationships';
-
-    getEntityName = () => 'ER-Model-Relationship';
-
-    getGraphName = () => 'erModelRelationship';
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            entityType={EntityType.ErModelRelationship}
-            useEntityQuery={useGetErModelRelationshipQuery}
-            useUpdateQuery={useUpdateErModelRelationshipMutation}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            tabs={[
-                {
-                    name: this.getEntityName(),
-                    component: ERModelRelationshipTab,
-                },
-                {
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-            ]}
-            sidebarSections={[
-                {
-                    component: SidebarAboutSection,
-                },
-                {
-                    component: ERModelRelationshipSidebarCardinality,
-                },
-                {
-                    component: SidebarOwnerSection,
-                    properties: {
-                        defaultOwnerType: OwnershipType.TechnicalOwner,
-                    },
-                },
-                {
-                    component: SidebarTagsSection,
-                    properties: {
-                        hasTags: true,
-                        hasTerms: true,
-                    },
-                },
-            ]}
-            isNameEditable
-        />
-    );
-
-    getOverridePropertiesFromEntity = (_ermodelrelation?: ErModelRelationship | null): GenericEntityProperties => {
-        return {};
-    };
-
-    renderPreview = (_: PreviewType, data: ErModelRelationship) => {
-        return (
-            <>
-                <ERModelRelationshipPreviewCard
-                    urn={data.urn}
-                    name={
-                        <span className="ermodelrelationName">
-                            {data.properties?.name || data.editableProperties?.name || ''}
-                        </span>
-                    }
-                    description={data?.editableProperties?.description || ''}
-                    owners={data.ownership?.owners}
-                    glossaryTerms={data?.glossaryTerms || undefined}
-                    globalTags={data?.tags}
-                    cardinality={data?.properties?.cardinality}
-                />
-            </>
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        return this.renderPreview(PreviewType.SEARCH, result.entity as ErModelRelationship);
-    };
-
-    displayName = (data: ErModelRelationship) => {
-        return data.properties?.name || data.editableProperties?.name || data.urn;
-    };
-
-    getGenericEntityProperties = (data: ErModelRelationship) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/ermodelrelationships/_tests_/ERModelRelationshipSidebarCardinality.test.tsx b/datahub-web-react/src/app/entity/ermodelrelationships/_tests_/ERModelRelationshipSidebarCardinality.test.tsx
deleted file mode 100644
index 0d04e625d32601..00000000000000
--- a/datahub-web-react/src/app/entity/ermodelrelationships/_tests_/ERModelRelationshipSidebarCardinality.test.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { ApolloClient, ApolloProvider, InMemoryCache } from '@apollo/client';
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-import { vi } from 'vitest';
-
-import ERModelRelationshipSidebarCardinality from '@app/entity/ermodelrelationships/profile/sidebar/ERModelRelationshipSidebarCardinality';
-import { EntityContext } from '@app/entity/shared/EntityContext';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { Dataset, EntityType, ErModelRelationshipCardinality } from '@src/types.generated';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-// Create a mock Apollo Client
-const mockApolloClient = new ApolloClient({
-    cache: new InMemoryCache(),
-    uri: 'https://mock-api.com/graphql', // Mock URI
-});
-
-const mockEntityData: GenericEntityProperties = {
-    urn: 'urn:li:ermodelrelationship:123',
-    properties: {
-        cardinality: ErModelRelationshipCardinality.OneN,
-        destination: {
-            urn: 'urn:li:dataset:test-dataset-destination',
-            name: 'Test Dataset Destination',
-        } as Dataset,
-        source: {
-            urn: 'urn:li:dataset:test-dataset-source',
-            name: 'Test Dataset Source',
-        } as Dataset,
-        name: 'Test Relationship',
-    },
-    type: EntityType.ErModelRelationship,
-} as GenericEntityProperties;
-
-describe('ERModelRelationshipSidebarCardinality', () => {
-    it('renders the sidebar header', () => {
-        render(
-            <ApolloProvider client={mockApolloClient}>
-                <TestPageContainer>
-                    <EntityContext.Provider
-                        value={{
-                            entityData: mockEntityData,
-                            urn: 'urn:li:ermodelrelationship:123',
-                            entityType: EntityType.ErModelRelationship,
-                            baseEntity: {},
-                            updateEntity: vi.fn(),
-                            routeToTab: vi.fn(),
-                            refetch: vi.fn(),
-                            loading: false,
-                            lineage: undefined,
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <ERModelRelationshipSidebarCardinality />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </ApolloProvider>,
-        );
-
-        expect(screen.getByText('Cardinality')).toBeInTheDocument();
-        expect(screen.getByText(ErModelRelationshipCardinality.OneN)).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/entity/ermodelrelationships/preview/ERModelRelationshipPreviewCard.tsx b/datahub-web-react/src/app/entity/ermodelrelationships/preview/ERModelRelationshipPreviewCard.tsx
deleted file mode 100644
index deecd613e5fe0d..00000000000000
--- a/datahub-web-react/src/app/entity/ermodelrelationships/preview/ERModelRelationshipPreviewCard.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Card, Collapse } from 'antd';
-import React from 'react';
-
-import { IconStyleType } from '@app/entity/Entity';
-import ERModelSidebarPreviewCard from '@app/preview/ERModelSidebarPreviewCard';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType, ErModelRelationshipCardinality, GlobalTags, GlossaryTerms, Owner } from '@types';
-
-import ermodelrelationshipIcon from '@images/ermodelrelationshipIcon.svg';
-
-const { Panel } = Collapse;
-
-export const ERModelRelationshipPreviewCard = ({
-    urn,
-    name,
-    owners,
-    description,
-    globalTags,
-    glossaryTerms,
-    cardinality,
-}: {
-    urn: string;
-    name: string | any;
-    description: string | any;
-    globalTags?: GlobalTags | null;
-    glossaryTerms?: GlossaryTerms | null;
-    owners?: Array<Owner> | null;
-    cardinality?: ErModelRelationshipCardinality | null;
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    const getERModelRelationHeader = (): JSX.Element => {
-        return (
-            <div style={{ width: '100%', display: 'inline-block' }}>
-                <ERModelSidebarPreviewCard
-                    url={entityRegistry.getEntityUrl(EntityType.ErModelRelationship, urn)}
-                    name={name || ''}
-                    urn={urn}
-                    description={description || ''}
-                    logoComponent={
-                        <img
-                            src={ermodelrelationshipIcon}
-                            alt={entityRegistry.getEntityName(EntityType.ErModelRelationship)}
-                            style={{ fontSize: '20px' }}
-                        />
-                    }
-                    tags={globalTags || undefined}
-                    glossaryTerms={glossaryTerms || undefined}
-                    owners={owners}
-                    type={entityRegistry.getEntityName(EntityType.ErModelRelationship)}
-                    typeIcon={entityRegistry.getIcon(EntityType.ErModelRelationship, 14, IconStyleType.ACCENT)}
-                    titleSizePx={18}
-                    cardinality={cardinality}
-                />
-            </div>
-        );
-    };
-
-    return (
-        <>
-            <Card className="cardStyle" bordered key={`${urn}_1`}>
-                <Panel header={getERModelRelationHeader()} key={`${urn}_2`} />
-            </Card>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/ermodelrelationships/profile/sidebar/ERModelRelationshipSidebarCardinality.tsx b/datahub-web-react/src/app/entity/ermodelrelationships/profile/sidebar/ERModelRelationshipSidebarCardinality.tsx
deleted file mode 100644
index 183a1b7e9a8321..00000000000000
--- a/datahub-web-react/src/app/entity/ermodelrelationships/profile/sidebar/ERModelRelationshipSidebarCardinality.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader';
-import { ErModelRelationship } from '@src/types.generated';
-
-const CardinalitySidebar = styled.div`
-    color: #000000;
-    font-weight: 400;
-    display: flex;
-    flex-flow: column nowrap;
-`;
-
-const ERModelRelationshipCardinality = styled.span`
-    display: flex;
-    align-items: center;
-    gap: 10px;
-`;
-
-const ERModelRelationshipSidebarCardinality = () => {
-    const { entityData } = useEntityData();
-    return (
-        <CardinalitySidebar>
-            <SidebarHeader title="Cardinality" />
-            <ERModelRelationshipCardinality>
-                <>{(entityData as ErModelRelationship)?.properties?.cardinality}</>
-            </ERModelRelationshipCardinality>
-        </CardinalitySidebar>
-    );
-};
-
-export default ERModelRelationshipSidebarCardinality;
diff --git a/datahub-web-react/src/app/entity/glossaryNode/ChildrenTab.tsx b/datahub-web-react/src/app/entity/glossaryNode/ChildrenTab.tsx
deleted file mode 100644
index 816d5558acc9d3..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryNode/ChildrenTab.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { sortGlossaryNodes } from '@app/entity/glossaryNode/utils';
-import { sortGlossaryTerms } from '@app/entity/glossaryTerm/utils';
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import useGlossaryChildren from '@app/entityV2/glossaryNode/useGlossaryChildren';
-import EmptyGlossarySection from '@app/glossary/EmptyGlossarySection';
-import GlossaryEntitiesList from '@app/glossary/GlossaryEntitiesList';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import Loading from '@src/app/shared/Loading';
-
-import { EntityType, GlossaryNode, GlossaryTerm } from '@types';
-
-const ChildrenTabWrapper = styled.div`
-    height: 100%;
-    overflow: auto;
-    padding-bottom: 10px;
-`;
-
-const LoadingWrapper = styled.div`
-    height: 100px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-`;
-
-function ChildrenTab() {
-    const { entityData } = useEntityData();
-    const entityRegistry = useEntityRegistry();
-    const entityUrn = entityData?.urn;
-    const { scrollRef, data, loading } = useGlossaryChildren({ entityUrn });
-
-    if (!entityData) return <></>;
-
-    const childNodes = data
-        .filter((child) => child.type === EntityType.GlossaryNode)
-        .sort((nodeA, nodeB) => sortGlossaryNodes(entityRegistry, nodeA, nodeB));
-    const childTerms = data
-        .filter((child) => child.type === EntityType.GlossaryTerm)
-        .sort((termA, termB) => sortGlossaryTerms(entityRegistry, termA, termB));
-
-    const hasTermsOrNodes = !!childNodes?.length || !!childTerms?.length;
-
-    if (hasTermsOrNodes) {
-        return (
-            <ChildrenTabWrapper>
-                <GlossaryEntitiesList
-                    nodes={(childNodes as GlossaryNode[]) || []}
-                    terms={(childTerms as GlossaryTerm[]) || []}
-                />
-                {loading && (
-                    <LoadingWrapper>
-                        <Loading marginTop={0} height={24} />
-                    </LoadingWrapper>
-                )}
-                <div ref={scrollRef} />
-            </ChildrenTabWrapper>
-        );
-    }
-
-    return <EmptyGlossarySection description="No Terms or Term Groups" />;
-}
-
-export default ChildrenTab;
diff --git a/datahub-web-react/src/app/entity/glossaryNode/GlossaryNodeEntity.tsx b/datahub-web-react/src/app/entity/glossaryNode/GlossaryNodeEntity.tsx
deleted file mode 100644
index b2e3a3dca0b5ec..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryNode/GlossaryNodeEntity.tsx
+++ /dev/null
@@ -1,180 +0,0 @@
-import { FolderFilled, FolderOutlined } from '@ant-design/icons';
-import React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import ChildrenTab from '@app/entity/glossaryNode/ChildrenTab';
-import { Preview } from '@app/entity/glossaryNode/preview/Preview';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import SummaryTab from '@app/entityV2/summary/SummaryTab';
-import { useShowAssetSummaryPage } from '@app/entityV2/summary/useShowAssetSummaryPage';
-
-import { useGetGlossaryNodeQuery } from '@graphql/glossaryNode.generated';
-import { EntityType, GlossaryNode, SearchResult } from '@types';
-
-class GlossaryNodeEntity implements Entity<GlossaryNode> {
-    type: EntityType = EntityType.GlossaryNode;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <FolderOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <FolderFilled style={{ fontSize, color: color || '#B37FEB' }} />;
-        }
-
-        return (
-            <FolderOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    isLineageEnabled = () => false;
-
-    getPathName = () => 'glossaryNode';
-
-    getCollectionName = () => 'Term Groups';
-
-    getEntityName = () => 'Term Group';
-
-    useEntityQuery = useGetGlossaryNodeQuery;
-
-    renderProfile = (urn: string) => {
-        return (
-            <EntityProfile
-                urn={urn}
-                entityType={EntityType.GlossaryNode}
-                useEntityQuery={useGetGlossaryNodeQuery}
-                getOverrideProperties={this.getOverridePropertiesFromEntity}
-                isNameEditable
-                hideBrowseBar
-                tabs={this.getProfileTabs()}
-                sidebarSections={this.getSidebarSections()}
-                headerDropdownItems={
-                    new Set([
-                        EntityMenuItems.ADD_TERM_GROUP,
-                        EntityMenuItems.ADD_TERM,
-                        EntityMenuItems.MOVE,
-                        EntityMenuItems.DELETE,
-                    ])
-                }
-            />
-        );
-    };
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-            properties: {
-                hideLinksButton: true,
-            },
-        },
-        {
-            component: SidebarOwnerSection,
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-    ];
-
-    getProfileTabs = () => {
-        const showSummaryTab = useShowAssetSummaryPage();
-
-        return [
-            ...(showSummaryTab
-                ? [
-                      {
-                          name: 'Summary',
-                          component: SummaryTab,
-                      },
-                  ]
-                : []),
-            {
-                name: 'Contents',
-                component: ChildrenTab,
-            },
-            ...(!showSummaryTab
-                ? [
-                      {
-                          name: 'Documentation',
-                          component: DocumentationTab,
-                          properties: {
-                              hideLinksButton: true,
-                          },
-                      },
-                  ]
-                : []),
-            {
-                name: 'Properties',
-                component: PropertiesTab,
-            },
-        ];
-    };
-
-    displayName = (data: GlossaryNode) => {
-        return data.properties?.name || data.urn;
-    };
-
-    getOverridePropertiesFromEntity = (data: GlossaryNode) => {
-        return {
-            name: this.displayName(data),
-        };
-    };
-
-    renderSearch = (result: SearchResult) => {
-        return this.renderPreview(PreviewType.SEARCH, result.entity as GlossaryNode);
-    };
-
-    renderPreview = (_: PreviewType, data: GlossaryNode) => {
-        return (
-            <Preview
-                urn={data?.urn}
-                parentNodes={data.parentNodes}
-                name={this.displayName(data)}
-                description={data?.properties?.description || ''}
-                owners={data?.ownership?.owners}
-            />
-        );
-    };
-
-    platformLogoUrl = (_: GlossaryNode) => {
-        return undefined;
-    };
-
-    getGenericEntityProperties = (glossaryNode: GlossaryNode) => {
-        return getDataForEntityType({
-            data: glossaryNode,
-            entityType: this.type,
-            getOverrideProperties: (data) => data,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.DEPRECATION,
-            EntityCapabilityType.SOFT_DELETE,
-        ]);
-    };
-
-    getGraphName = () => this.getPathName();
-}
-
-export default GlossaryNodeEntity;
diff --git a/datahub-web-react/src/app/entity/glossaryNode/preview/Preview.tsx b/datahub-web-react/src/app/entity/glossaryNode/preview/Preview.tsx
deleted file mode 100644
index 90fd8bc6e8270d..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryNode/preview/Preview.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { FolderOutlined } from '@ant-design/icons';
-import React from 'react';
-
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType, Owner, ParentNodesResult } from '@types';
-
-export const Preview = ({
-    urn,
-    name,
-    description,
-    owners,
-    parentNodes,
-}: {
-    urn: string;
-    name: string;
-    description?: string | null;
-    owners?: Array<Owner> | null;
-    parentNodes?: ParentNodesResult | null;
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.GlossaryNode, urn)}
-            name={name || ''}
-            urn={urn}
-            description={description || ''}
-            owners={owners}
-            logoComponent={<FolderOutlined style={{ fontSize: '20px' }} />}
-            type={entityRegistry.getEntityName(EntityType.GlossaryNode)}
-            parentEntities={parentNodes?.nodes}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/GlossaryTermEntity.tsx b/datahub-web-react/src/app/entity/glossaryTerm/GlossaryTermEntity.tsx
deleted file mode 100644
index d33836b26ddb5f..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryTerm/GlossaryTermEntity.tsx
+++ /dev/null
@@ -1,190 +0,0 @@
-import { BookFilled, BookOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { Preview } from '@app/entity/glossaryTerm/preview/Preview';
-import GlossaryRelatedEntity from '@app/entity/glossaryTerm/profile/GlossaryRelatedEntity';
-import GlossayRelatedTerms from '@app/entity/glossaryTerm/profile/GlossaryRelatedTerms';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { EntityActionItem } from '@app/entity/shared/entity/EntityActions';
-import { SchemaTab } from '@app/entity/shared/tabs/Dataset/Schema/SchemaTab';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { PageRoutes } from '@conf/Global';
-
-import { GetGlossaryTermQuery, useGetGlossaryTermQuery } from '@graphql/glossaryTerm.generated';
-import { EntityType, GlossaryTerm, SearchResult } from '@types';
-
-/**
- * Definition of the DataHub Dataset entity.
- */
-export class GlossaryTermEntity implements Entity<GlossaryTerm> {
-    type: EntityType = EntityType.GlossaryTerm;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <BookOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <BookFilled style={{ fontSize, color: color || '#B37FEB' }} />;
-        }
-
-        return (
-            <BookOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => true;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    isLineageEnabled = () => false;
-
-    getPathName = () => 'glossaryTerm';
-
-    getCollectionName = () => 'Glossary Terms';
-
-    getEntityName = () => 'Glossary Term';
-
-    useEntityQuery = useGetGlossaryTermQuery;
-
-    getCustomCardUrlPath = () => PageRoutes.GLOSSARY;
-
-    renderProfile = (urn) => {
-        return (
-            <EntityProfile
-                urn={urn}
-                entityType={EntityType.GlossaryTerm}
-                useEntityQuery={useGetGlossaryTermQuery as any}
-                headerActionItems={new Set([EntityActionItem.BATCH_ADD_GLOSSARY_TERM])}
-                headerDropdownItems={
-                    new Set([
-                        EntityMenuItems.UPDATE_DEPRECATION,
-                        EntityMenuItems.CLONE,
-                        EntityMenuItems.MOVE,
-                        EntityMenuItems.DELETE,
-                    ])
-                }
-                isNameEditable
-                hideBrowseBar
-                tabs={[
-                    {
-                        name: 'Documentation',
-                        component: DocumentationTab,
-                    },
-                    {
-                        name: 'Related Entities',
-                        component: GlossaryRelatedEntity,
-                    },
-                    {
-                        name: 'Schema',
-                        component: SchemaTab,
-                        properties: {
-                            editMode: false,
-                        },
-                        display: {
-                            visible: (_, glossaryTerm: GetGlossaryTermQuery) =>
-                                glossaryTerm?.glossaryTerm?.schemaMetadata !== null,
-                            enabled: (_, glossaryTerm: GetGlossaryTermQuery) =>
-                                glossaryTerm?.glossaryTerm?.schemaMetadata !== null,
-                        },
-                    },
-                    {
-                        name: 'Related Terms',
-                        component: GlossayRelatedTerms,
-                    },
-                    {
-                        name: 'Properties',
-                        component: PropertiesTab,
-                    },
-                ]}
-                sidebarSections={this.getSidebarSections()}
-                getOverrideProperties={this.getOverridePropertiesFromEntity}
-            />
-        );
-    };
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-        },
-        {
-            component: SidebarDomainSection,
-            properties: {
-                hideOwnerType: true,
-            },
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-    ];
-
-    getOverridePropertiesFromEntity = (glossaryTerm?: GlossaryTerm | null): GenericEntityProperties => {
-        // if dataset has subTypes filled out, pick the most specific subtype and return it
-        return {
-            customProperties: glossaryTerm?.properties?.customProperties,
-        };
-    };
-
-    renderSearch = (result: SearchResult) => {
-        return this.renderPreview(PreviewType.SEARCH, result.entity as GlossaryTerm);
-    };
-
-    renderPreview = (previewType: PreviewType, data: GlossaryTerm) => {
-        return (
-            <Preview
-                previewType={previewType}
-                urn={data?.urn}
-                parentNodes={data.parentNodes}
-                name={this.displayName(data)}
-                description={data?.properties?.description || ''}
-                owners={data?.ownership?.owners}
-                domain={data.domain?.domain}
-            />
-        );
-    };
-
-    displayName = (data: GlossaryTerm) => {
-        return data.properties?.name || data.name || data.urn;
-    };
-
-    platformLogoUrl = (_: GlossaryTerm) => {
-        return undefined;
-    };
-
-    getGenericEntityProperties = (glossaryTerm: GlossaryTerm) => {
-        return getDataForEntityType({
-            data: glossaryTerm,
-            entityType: this.type,
-            getOverrideProperties: (data) => data,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.DEPRECATION,
-            EntityCapabilityType.SOFT_DELETE,
-        ]);
-    };
-
-    getGraphName = () => this.getPathName();
-}
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/preview/Preview.tsx b/datahub-web-react/src/app/entity/glossaryTerm/preview/Preview.tsx
deleted file mode 100644
index 7d8577153d329b..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryTerm/preview/Preview.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { BookOutlined } from '@ant-design/icons';
-import React from 'react';
-
-import { IconStyleType, PreviewType } from '@app/entity/Entity';
-import { getRelatedEntitiesUrl } from '@app/entity/glossaryTerm/utils';
-import UrlButton from '@app/entity/shared/UrlButton';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Deprecation, Domain, EntityType, Owner, ParentNodesResult } from '@types';
-
-export const Preview = ({
-    urn,
-    name,
-    description,
-    owners,
-    deprecation,
-    parentNodes,
-    previewType,
-    domain,
-}: {
-    urn: string;
-    name: string;
-    description?: string | null;
-    owners?: Array<Owner> | null;
-    deprecation?: Deprecation | null;
-    parentNodes?: ParentNodesResult | null;
-    previewType: PreviewType;
-    domain?: Domain | undefined;
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <DefaultPreviewCard
-            previewType={previewType}
-            url={entityRegistry.getEntityUrl(EntityType.GlossaryTerm, urn)}
-            name={name || ''}
-            urn={urn}
-            description={description || ''}
-            owners={owners}
-            logoComponent={<BookOutlined style={{ fontSize: '20px' }} />}
-            type="Glossary Term"
-            typeIcon={entityRegistry.getIcon(EntityType.GlossaryTerm, 14, IconStyleType.ACCENT)}
-            deprecation={deprecation}
-            parentEntities={parentNodes?.nodes}
-            domain={domain}
-            entityTitleSuffix={
-                <UrlButton href={getRelatedEntitiesUrl(entityRegistry, urn)}>View Related Entities</UrlButton>
-            }
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/preview/__tests__/Preview.test.tsx b/datahub-web-react/src/app/entity/glossaryTerm/preview/__tests__/Preview.test.tsx
deleted file mode 100644
index 02b9508c3b02e0..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryTerm/preview/__tests__/Preview.test.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { render } from '@testing-library/react';
-import React from 'react';
-
-import { PreviewType } from '@app/entity/Entity';
-import { Preview } from '@app/entity/glossaryTerm/preview/Preview';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-describe('Preview', () => {
-    it('renders', () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <Preview
-                        urn="urn:li:glossaryTerm:instruments.FinancialInstrument_v1"
-                        name="name"
-                        description="definition"
-                        owners={null}
-                        previewType={PreviewType.PREVIEW}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('definition')).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx
deleted file mode 100644
index 19a18060cf457a..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/AddRelatedTermsModal.tsx
+++ /dev/null
@@ -1,221 +0,0 @@
-import { Button, Modal, Select, Tag, message } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components/macro';
-
-import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext';
-import GlossaryBrowser from '@app/glossary/GlossaryBrowser/GlossaryBrowser';
-import ParentEntities from '@app/search/filters/ParentEntities';
-import { getParentEntities } from '@app/search/filters/utils';
-import ClickOutside from '@app/shared/ClickOutside';
-import TermLabel from '@app/shared/TermLabel';
-import { BrowserWrapper } from '@app/shared/tags/AddTagsTermsModal';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useAddRelatedTermsMutation } from '@graphql/glossaryTerm.generated';
-import { useGetSearchResultsLazyQuery } from '@graphql/search.generated';
-import { EntityType, SearchResult, TermRelationshipType } from '@types';
-
-const StyledSelect = styled(Select)`
-    width: 480px;
-`;
-
-const SearchResultContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-`;
-
-interface Props {
-    onClose: () => void;
-    relationshipType: TermRelationshipType;
-}
-
-function AddRelatedTermsModal(props: Props) {
-    const { onClose, relationshipType } = props;
-
-    const [inputValue, setInputValue] = useState('');
-    const [selectedUrns, setSelectedUrns] = useState<any[]>([]);
-    const [selectedTerms, setSelectedTerms] = useState<any[]>([]);
-    const [isFocusedOnInput, setIsFocusedOnInput] = useState(false);
-    const entityRegistry = useEntityRegistry();
-    const { urn: entityDataUrn } = useEntityData();
-    const refetch = useRefetch();
-
-    const [AddRelatedTerms] = useAddRelatedTermsMutation();
-
-    function addTerms() {
-        AddRelatedTerms({
-            variables: {
-                input: {
-                    urn: entityDataUrn,
-                    termUrns: selectedUrns,
-                    relationshipType,
-                },
-            },
-        })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to move: \n ${e.message || ''}`, duration: 3 });
-            })
-            .finally(() => {
-                message.loading({ content: 'Adding...', duration: 2 });
-                setTimeout(() => {
-                    message.success({
-                        content: 'Added Related Terms!',
-                        duration: 2,
-                    });
-                    refetch();
-                }, 2000);
-            });
-        onClose();
-    }
-
-    const [termSearch, { data: termSearchData }] = useGetSearchResultsLazyQuery();
-    const termSearchResults = termSearchData?.search?.searchResults || [];
-
-    const tagSearchOptions = termSearchResults.map((result: SearchResult) => {
-        const displayName = entityRegistry.getDisplayName(result.entity.type, result.entity);
-
-        return (
-            <Select.Option value={result.entity.urn} key={result.entity.urn} name={displayName}>
-                <SearchResultContainer>
-                    <ParentEntities parentEntities={getParentEntities(result.entity) || []} />
-                    <TermLabel name={displayName} />
-                </SearchResultContainer>
-            </Select.Option>
-        );
-    });
-
-    const handleSearch = (text: string) => {
-        if (text.length > 0) {
-            termSearch({
-                variables: {
-                    input: {
-                        type: EntityType.GlossaryTerm,
-                        query: text,
-                        start: 0,
-                        count: 20,
-                    },
-                },
-            });
-        }
-    };
-
-    // When a Tag or term search result is selected, add the urn to the Urns
-    const onSelectValue = (urn: string) => {
-        const newUrns = [...selectedUrns, urn];
-        setSelectedUrns(newUrns);
-        const selectedSearchOption = tagSearchOptions.find((option) => option.props.value === urn);
-        setSelectedTerms([
-            ...selectedTerms,
-            { urn, component: <TermLabel name={selectedSearchOption?.props?.name} /> },
-        ]);
-    };
-
-    // When a Tag or term search result is deselected, remove the urn from the Owners
-    const onDeselectValue = (urn: string) => {
-        const newUrns = selectedUrns.filter((u) => u !== urn);
-        setSelectedUrns(newUrns);
-        setInputValue('');
-        setIsFocusedOnInput(true);
-        setSelectedTerms(selectedTerms.filter((term) => term.urn !== urn));
-    };
-
-    function selectTermFromBrowser(urn: string, displayName: string) {
-        setIsFocusedOnInput(false);
-        const newUrns = [...selectedUrns, urn];
-        setSelectedUrns(newUrns);
-        setSelectedTerms([...selectedTerms, { urn, component: <TermLabel name={displayName} /> }]);
-    }
-
-    function clearInput() {
-        setInputValue('');
-        setTimeout(() => setIsFocusedOnInput(true), 0); // call after click outside
-    }
-
-    function handleBlur() {
-        setInputValue('');
-    }
-
-    const tagRender = (properties) => {
-        // eslint-disable-next-line react/prop-types
-        const { closable, onClose: close, value } = properties;
-        const onPreventMouseDown = (event) => {
-            event.preventDefault();
-            event.stopPropagation();
-        };
-        const selectedItem = selectedTerms.find((term) => term.urn === value).component;
-
-        return (
-            <Tag
-                onMouseDown={onPreventMouseDown}
-                closable={closable}
-                onClose={close}
-                style={{
-                    marginRight: 3,
-                    display: 'flex',
-                    justifyContent: 'start',
-                    alignItems: 'center',
-                    whiteSpace: 'nowrap',
-                    opacity: 1,
-                    color: '#434343',
-                    lineHeight: '16px',
-                }}
-            >
-                {selectedItem}
-            </Tag>
-        );
-    };
-
-    const isShowingGlossaryBrowser = !inputValue && isFocusedOnInput;
-
-    return (
-        <Modal
-            title="Add Related Terms"
-            open
-            onCancel={onClose}
-            footer={
-                <>
-                    <Button onClick={onClose} type="text">
-                        Cancel
-                    </Button>
-                    <Button onClick={addTerms} disabled={!selectedUrns.length}>
-                        Add
-                    </Button>
-                </>
-            }
-        >
-            <ClickOutside onClickOutside={() => setIsFocusedOnInput(false)}>
-                <StyledSelect
-                    autoFocus
-                    mode="multiple"
-                    filterOption={false}
-                    placeholder="Search for Glossary Terms..."
-                    showSearch
-                    defaultActiveFirstOption={false}
-                    onSelect={(asset: any) => onSelectValue(asset)}
-                    onDeselect={(asset: any) => onDeselectValue(asset)}
-                    onSearch={(value: string) => {
-                        // eslint-disable-next-line react/prop-types
-                        handleSearch(value.trim());
-                        // eslint-disable-next-line react/prop-types
-                        setInputValue(value.trim());
-                    }}
-                    tagRender={tagRender}
-                    value={selectedUrns}
-                    onClear={clearInput}
-                    onFocus={() => setIsFocusedOnInput(true)}
-                    onBlur={handleBlur}
-                    dropdownStyle={isShowingGlossaryBrowser || !inputValue ? { display: 'none' } : {}}
-                >
-                    {tagSearchOptions}
-                </StyledSelect>
-                <BrowserWrapper isHidden={!isShowingGlossaryBrowser}>
-                    <GlossaryBrowser isSelecting selectTerm={selectTermFromBrowser} />
-                </BrowserWrapper>
-            </ClickOutside>
-        </Modal>
-    );
-}
-
-export default AddRelatedTermsModal;
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedEntity.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedEntity.tsx
deleted file mode 100644
index 2dd49439b90d1a..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedEntity.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import * as React from 'react';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection';
-import { UnionType } from '@app/search/utils/constants';
-
-export default function GlossaryRelatedEntity() {
-    const { entityData } = useEntityData();
-
-    const entityUrn = entityData?.urn;
-
-    const fixedOrFilters =
-        (entityUrn && [
-            {
-                field: 'glossaryTerms',
-                values: [entityUrn],
-            },
-            {
-                field: 'fieldGlossaryTerms',
-                values: [entityUrn],
-            },
-        ]) ||
-        [];
-
-    entityData?.isAChildren?.relationships?.forEach((term) => {
-        const childUrn = term.entity?.urn;
-
-        if (childUrn) {
-            fixedOrFilters.push({
-                field: 'glossaryTerms',
-                values: [childUrn],
-            });
-
-            fixedOrFilters.push({
-                field: 'fieldGlossaryTerms',
-                values: [childUrn],
-            });
-        }
-    });
-
-    return (
-        <EmbeddedListSearchSection
-            fixedFilters={{
-                unionType: UnionType.OR,
-                filters: fixedOrFilters,
-            }}
-            emptySearchQuery="*"
-            placeholderText="Filter entities..."
-            skipCache
-            applyView
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedTerms.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedTerms.tsx
deleted file mode 100644
index 2ab9531ffc6849..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedTerms.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Menu } from 'antd';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components/macro';
-
-import GlossaryRelatedTermsResult, {
-    RelatedTermTypes,
-} from '@app/entity/glossaryTerm/profile/GlossaryRelatedTermsResult';
-import { useEntityData } from '@app/entity/shared/EntityContext';
-
-const DetailWrapper = styled.div`
-    display: inline-flex;
-    flex: 1;
-    width: 100%;
-`;
-
-const MenuWrapper = styled.div`
-    border-right: 2px solid #f5f5f5;
-`;
-
-const Content = styled.div`
-    flex-grow: 1;
-    max-width: 100%;
-    overflow: hidden;
-`;
-
-export default function GlossayRelatedTerms() {
-    const { entityData } = useEntityData();
-    const [selectedKey, setSelectedKey] = useState('');
-    const menuOptionsArray = Object.keys(RelatedTermTypes);
-
-    useEffect(() => {
-        if (menuOptionsArray && menuOptionsArray.length > 0 && selectedKey.length === 0) {
-            setSelectedKey(menuOptionsArray[0]);
-        }
-    }, [menuOptionsArray, selectedKey]);
-
-    const onMenuClick = ({ key }) => {
-        setSelectedKey(key);
-    };
-
-    return (
-        <DetailWrapper>
-            <MenuWrapper>
-                <Menu
-                    selectable={false}
-                    mode="inline"
-                    style={{ width: 256 }}
-                    selectedKeys={[selectedKey]}
-                    onClick={(key) => {
-                        onMenuClick(key);
-                    }}
-                >
-                    {menuOptionsArray.map((option) => (
-                        <Menu.Item data-testid={option} key={option}>
-                            {RelatedTermTypes[option]}
-                        </Menu.Item>
-                    ))}
-                </Menu>
-            </MenuWrapper>
-            <Content>
-                {selectedKey && entityData && (
-                    <GlossaryRelatedTermsResult
-                        glossaryRelatedTermType={RelatedTermTypes[selectedKey]}
-                        glossaryRelatedTermResult={entityData[selectedKey]?.relationships || []}
-                    />
-                )}
-            </Content>
-        </DetailWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx
deleted file mode 100644
index 52a08e44bb56bc..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components/macro';
-
-import AddRelatedTermsModal from '@app/entity/glossaryTerm/profile/AddRelatedTermsModal';
-import RelatedTerm from '@app/entity/glossaryTerm/profile/RelatedTerm';
-import { EmptyTab } from '@app/entity/shared/components/styled/EmptyTab';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { Message } from '@app/shared/Message';
-import { Button } from '@src/alchemy-components';
-
-import { TermRelationshipType } from '@types';
-
-export enum RelatedTermTypes {
-    hasRelatedTerms = 'Contains',
-    isRelatedTerms = 'Inherits',
-    containedBy = 'Contained by',
-    isAChildren = 'Inherited by',
-}
-
-export type Props = {
-    glossaryRelatedTermType: string;
-    glossaryRelatedTermResult: Array<any>;
-};
-
-const ListContainer = styled.div`
-    width: 100%;
-`;
-
-const TitleContainer = styled.div`
-    align-items: center;
-    border-bottom: solid 1px ${ANTD_GRAY[4]};
-    display: flex;
-    justify-content: space-between;
-    padding: 15px 20px;
-    margin-bottom: 30px;
-`;
-
-const messageStyle = { marginTop: '10%' };
-
-export default function GlossaryRelatedTermsResult({ glossaryRelatedTermType, glossaryRelatedTermResult }: Props) {
-    const [isShowingAddModal, setIsShowingAddModal] = useState(false);
-    const glossaryRelatedTermUrns: Array<string> = [];
-    glossaryRelatedTermResult.forEach((item: any) => {
-        glossaryRelatedTermUrns.push(item?.entity?.urn);
-    });
-    const contentLoading = false;
-    const relationshipType =
-        glossaryRelatedTermType === RelatedTermTypes.hasRelatedTerms ||
-        glossaryRelatedTermType === RelatedTermTypes.containedBy
-            ? TermRelationshipType.HasA
-            : TermRelationshipType.IsA;
-    const canEditRelatedTerms =
-        glossaryRelatedTermType === RelatedTermTypes.isRelatedTerms ||
-        glossaryRelatedTermType === RelatedTermTypes.hasRelatedTerms;
-
-    return (
-        <>
-            {contentLoading ? (
-                <Message type="loading" content="Loading..." style={messageStyle} />
-            ) : (
-                <ListContainer>
-                    <TitleContainer>
-                        <Typography.Title style={{ margin: '0' }} level={3}>
-                            {glossaryRelatedTermType}
-                        </Typography.Title>
-                        {canEditRelatedTerms && (
-                            <Button variant="text" onClick={() => setIsShowingAddModal(true)}>
-                                <PlusOutlined /> Add Terms
-                            </Button>
-                        )}
-                    </TitleContainer>
-                    {glossaryRelatedTermUrns.map((urn) => (
-                        <RelatedTerm
-                            key={urn}
-                            urn={urn}
-                            relationshipType={relationshipType}
-                            isEditable={canEditRelatedTerms}
-                        />
-                    ))}
-                    {glossaryRelatedTermUrns.length === 0 && (
-                        <EmptyTab tab={glossaryRelatedTermType.toLocaleLowerCase()} />
-                    )}
-                </ListContainer>
-            )}
-            {isShowingAddModal && (
-                <AddRelatedTermsModal onClose={() => setIsShowingAddModal(false)} relationshipType={relationshipType} />
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossarySidebarAboutSection.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossarySidebarAboutSection.tsx
deleted file mode 100644
index 0565cbf95b70ef..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossarySidebarAboutSection.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useEntityData, useRouteToTab } from '@app/entity/shared/EntityContext';
-import StripMarkdownText from '@app/entity/shared/components/styled/StripMarkdownText';
-import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader';
-
-const DescriptionTypography = styled(Typography.Paragraph)`
-    max-width: 65ch;
-`;
-
-export default function GlossarySidebarAboutSection() {
-    const { entityData }: any = useEntityData();
-    const description = entityData?.glossaryTermInfo?.definition;
-    const source = entityData?.glossaryTermInfo?.sourceRef;
-    const sourceUrl = entityData?.glossaryTermInfo?.sourceUrl;
-    const routeToTab = useRouteToTab();
-
-    return (
-        <div>
-            <SidebarHeader title="About" />
-            {description && (
-                <DescriptionTypography>
-                    <StripMarkdownText
-                        limit={205}
-                        readMore={
-                            <Typography.Link onClick={() => routeToTab({ tabName: 'Documentation' })}>
-                                Read More
-                            </Typography.Link>
-                        }
-                    >
-                        {description}
-                    </StripMarkdownText>
-                </DescriptionTypography>
-            )}
-
-            <SidebarHeader title="Source" />
-            {source && (
-                <DescriptionTypography>
-                    {sourceUrl ? (
-                        <a href={sourceUrl} target="_blank" rel="noreferrer">
-                            {source}
-                        </a>
-                    ) : (
-                        {
-                            source,
-                        }
-                    )}
-                </DescriptionTypography>
-            )}
-        </div>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryTermHeader.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryTermHeader.tsx
deleted file mode 100644
index 104ae35f356436..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/GlossaryTermHeader.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Divider, Space, Typography } from 'antd';
-import React from 'react';
-
-import { AvatarsGroup } from '@app/shared/avatar';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-type Props = {
-    definition: string;
-    sourceRef: string;
-    sourceUrl: string;
-    ownership?: any;
-};
-export default function GlossaryTermHeader({ definition, sourceRef, sourceUrl, ownership }: Props) {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <>
-            <Space direction="vertical" size="middle" style={{ marginBottom: '15px' }}>
-                <Typography.Paragraph>{definition}</Typography.Paragraph>
-                <Space split={<Divider type="vertical" />}>
-                    <Typography.Text>Source</Typography.Text>
-                    <Typography.Text strong>{sourceRef}</Typography.Text>
-                    {sourceUrl && (
-                        <a href={decodeURIComponent(sourceUrl)} target="_blank" rel="noreferrer">
-                            view source
-                        </a>
-                    )}
-                </Space>
-                <AvatarsGroup owners={ownership?.owners} entityRegistry={entityRegistry} />
-            </Space>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/RelatedTerm.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/RelatedTerm.tsx
deleted file mode 100644
index 51f82ffae5964d..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/RelatedTerm.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { DeleteOutlined, MoreOutlined } from '@ant-design/icons';
-import { Divider, Dropdown } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { PreviewType } from '@app/entity/Entity';
-import useRemoveRelatedTerms from '@app/entity/glossaryTerm/profile/useRemoveRelatedTerms';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetGlossaryTermQuery } from '@graphql/glossaryTerm.generated';
-import { EntityType, TermRelationshipType } from '@types';
-
-const ListItem = styled.div`
-    margin: 0 20px;
-`;
-
-const Profile = styled.div`
-    display: felx;
-    marging-bottom: 20px;
-`;
-
-const MenuIcon = styled(MoreOutlined)`
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    font-size: 20px;
-    height: 32px;
-    margin-left: -10px;
-`;
-
-const MenuItem = styled.div`
-    font-size: 12px;
-    padding: 0 4px;
-    color: #262626;
-`;
-
-interface Props {
-    urn: string;
-    relationshipType: TermRelationshipType;
-    isEditable: boolean;
-}
-
-function RelatedTerm(props: Props) {
-    const { urn, relationshipType, isEditable } = props;
-
-    const entityRegistry = useEntityRegistry();
-    const { data, loading } = useGetGlossaryTermQuery({ variables: { urn } });
-    let displayName = '';
-    if (data) {
-        displayName = entityRegistry.getDisplayName(EntityType.GlossaryTerm, data.glossaryTerm);
-    }
-    const { onRemove } = useRemoveRelatedTerms(urn, relationshipType, displayName);
-
-    if (loading) return null;
-
-    const items = [
-        {
-            key: '0',
-            label: (
-                <MenuItem onClick={onRemove}>
-                    <DeleteOutlined /> &nbsp; Remove Term
-                </MenuItem>
-            ),
-        },
-    ];
-
-    return (
-        <ListItem>
-            <Profile>
-                {entityRegistry.renderPreview(EntityType.GlossaryTerm, PreviewType.PREVIEW, data?.glossaryTerm)}
-                {isEditable && (
-                    <Dropdown menu={{ items }} trigger={['click']}>
-                        <MenuIcon />
-                    </Dropdown>
-                )}
-            </Profile>
-            <Divider style={{ margin: '20px 0' }} />
-        </ListItem>
-    );
-}
-
-export default RelatedTerm;
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/SchemaView.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/SchemaView.tsx
deleted file mode 100644
index e004c9d1c597a3..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/SchemaView.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Empty, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-export type Props = {
-    rawSchema: string | null;
-};
-
-const Content = styled.div`
-    margin-left: 32px;
-    flex-grow: 1;
-`;
-
-export default function SchemaView({ rawSchema }: Props) {
-    return (
-        <>
-            {rawSchema && rawSchema.length > 0 ? (
-                <Typography.Text data-testid="schema-raw-view">
-                    <pre>
-                        <code>{rawSchema}</code>
-                    </pre>
-                </Typography.Text>
-            ) : (
-                <Content>
-                    <Empty description="No Schema" image={Empty.PRESENTED_IMAGE_SIMPLE} />
-                </Content>
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx
deleted file mode 100644
index 86b6b19c75c1c0..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryRelatedTerms.test.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { render } from '@testing-library/react';
-import React from 'react';
-
-import GlossaryRelatedTerms from '@app/entity/glossaryTerm/profile/GlossaryRelatedTerms';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-describe('Glossary Related Terms', () => {
-    it('renders and print hasRelatedTerms detail by default', async () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <GlossaryRelatedTerms />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('Contains')).toBeInTheDocument();
-        expect(getByText('Inherits')).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx
deleted file mode 100644
index 79560ab5de0487..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { render } from '@testing-library/react';
-import React from 'react';
-
-import GlossaryTermHeader from '@app/entity/glossaryTerm/profile/GlossaryTermHeader';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-const glossaryTermHeaderData = {
-    definition: 'this is sample definition',
-    sourceUrl: 'sourceUrl',
-    sourceRef: 'Source ref',
-    fqdn: 'fqdn',
-};
-
-describe('Glossary Term Header', () => {
-    it('renders', () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks}>
-                <TestPageContainer>
-                    <GlossaryTermHeader
-                        definition={glossaryTermHeaderData.definition}
-                        sourceUrl={glossaryTermHeaderData.sourceUrl}
-                        sourceRef={glossaryTermHeaderData.sourceRef}
-                        ownership={undefined}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText(glossaryTermHeaderData.definition)).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/useRemoveRelatedTerms.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/useRemoveRelatedTerms.tsx
deleted file mode 100644
index 6d425ef32b4001..00000000000000
--- a/datahub-web-react/src/app/entity/glossaryTerm/profile/useRemoveRelatedTerms.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { Modal, message } from 'antd';
-
-import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useRemoveRelatedTermsMutation } from '@graphql/glossaryTerm.generated';
-import { TermRelationshipType } from '@types';
-
-function useRemoveRelatedTerms(termUrn: string, relationshipType: TermRelationshipType, displayName: string) {
-    const { urn, entityType } = useEntityData();
-    const entityRegistry = useEntityRegistry();
-    const refetch = useRefetch();
-
-    const [removeRelatedTerms] = useRemoveRelatedTermsMutation();
-
-    function handleRemoveRelatedTerms() {
-        removeRelatedTerms({
-            variables: {
-                input: {
-                    urn,
-                    termUrns: [termUrn],
-                    relationshipType,
-                },
-            },
-        })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to remove: \n ${e.message || ''}`, duration: 3 });
-            })
-            .finally(() => {
-                message.loading({
-                    content: 'Removing...',
-                    duration: 2,
-                });
-                setTimeout(() => {
-                    refetch();
-                    message.success({
-                        content: `Removed Glossary Term!`,
-                        duration: 2,
-                    });
-                }, 2000);
-            });
-    }
-
-    function onRemove() {
-        Modal.confirm({
-            title: `Remove ${displayName}`,
-            content: `Are you sure you want to remove this ${entityRegistry.getEntityName(entityType)}?`,
-            onOk() {
-                handleRemoveRelatedTerms();
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    }
-
-    return { onRemove };
-}
-
-export default useRemoveRelatedTerms;
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/utils.ts b/datahub-web-react/src/app/entity/glossaryTerm/utils.ts
index 654126961f5fc6..1c2e0a884b49b3 100644
--- a/datahub-web-react/src/app/entity/glossaryTerm/utils.ts
+++ b/datahub-web-react/src/app/entity/glossaryTerm/utils.ts
@@ -7,7 +7,3 @@ export function sortGlossaryTerms(entityRegistry: EntityRegistry, nodeA?: Entity
     const nodeBName = entityRegistry.getDisplayName(EntityType.GlossaryTerm, nodeB) || '';
     return nodeAName.localeCompare(nodeBName);
 }
-
-export function getRelatedEntitiesUrl(entityRegistry: EntityRegistry, urn: string) {
-    return `${entityRegistry.getEntityUrl(EntityType.GlossaryTerm, urn)}/${encodeURIComponent('Related Entities')}`;
-}
diff --git a/datahub-web-react/src/app/entity/group/EditGroupDescriptionModal.tsx b/datahub-web-react/src/app/entity/group/EditGroupDescriptionModal.tsx
deleted file mode 100644
index e477588c373c32..00000000000000
--- a/datahub-web-react/src/app/entity/group/EditGroupDescriptionModal.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Button, Form, Modal } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor';
-
-type Props = {
-    onClose: () => void;
-    onSaveAboutMe: () => void;
-    setStagedDescription: (des: string) => void;
-    stagedDescription: string | undefined;
-};
-const StyledEditor = styled(Editor)`
-    border: 1px solid ${ANTD_GRAY[4]};
-`;
-
-export default function EditGroupDescriptionModal({
-    onClose,
-    onSaveAboutMe,
-    setStagedDescription,
-    stagedDescription,
-}: Props) {
-    const [form] = Form.useForm();
-    const [aboutText, setAboutText] = useState(stagedDescription);
-
-    function updateDescription(description: string) {
-        setAboutText(aboutText);
-        setStagedDescription(description);
-    }
-
-    const saveDescription = () => {
-        onSaveAboutMe();
-        onClose();
-    };
-
-    return (
-        <Modal
-            width={700}
-            title="Edit Description"
-            open
-            onCancel={onClose}
-            footer={
-                <>
-                    <Button onClick={onClose} type="text">
-                        Cancel
-                    </Button>
-                    <Button id="updateGroupButton" onClick={saveDescription} disabled={!stagedDescription}>
-                        Update
-                    </Button>
-                </>
-            }
-        >
-            <Form form={form} initialValues={{}} layout="vertical">
-                <Form.Item name="description" rules={[{ whitespace: true }, { min: 1, max: 500 }]} hasFeedback>
-                    <div>
-                        <StyledEditor content={aboutText} onChange={updateDescription} />
-                    </div>
-                </Form.Item>
-            </Form>
-        </Modal>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/group/Group.tsx b/datahub-web-react/src/app/entity/group/Group.tsx
deleted file mode 100644
index 26bc5fcc885a01..00000000000000
--- a/datahub-web-react/src/app/entity/group/Group.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { TeamOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, IconStyleType, PreviewType } from '@app/entity/Entity';
-import GroupProfile from '@app/entity/group/GroupProfile';
-import { Preview } from '@app/entity/group/preview/Preview';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-
-import { CorpGroup, EntityType, SearchResult } from '@types';
-
-/**
- * Definition of the DataHub CorpGroup entity.
- */
-export class GroupEntity implements Entity<CorpGroup> {
-    type: EntityType = EntityType.CorpGroup;
-
-    // TODO: update icons for UserGroup
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <TeamOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <TeamOutlined style={{ fontSize, color }} />;
-        }
-
-        return (
-            <TeamOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getGraphName: () => string = () => 'corpGroup';
-
-    getPathName: () => string = () => 'group';
-
-    getEntityName = () => 'Group';
-
-    getCollectionName: () => string = () => 'Groups';
-
-    renderProfile: (urn: string) => JSX.Element = (_) => <GroupProfile />;
-
-    renderPreview = (_: PreviewType, data: CorpGroup) => (
-        <Preview
-            urn={data.urn}
-            name={this.displayName(data)}
-            description={data.info?.description}
-            membersCount={(data as any)?.memberCount?.total || 0}
-        />
-    );
-
-    renderSearch = (result: SearchResult) => {
-        return this.renderPreview(PreviewType.SEARCH, result.entity as CorpGroup);
-    };
-
-    displayName = (data: CorpGroup) => {
-        return data.properties?.displayName || data.info?.displayName || data.name || data.urn;
-    };
-
-    getGenericEntityProperties = (group: CorpGroup) => {
-        return getDataForEntityType({ data: group, entityType: this.type, getOverrideProperties: (data) => data });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/group/GroupAssets.tsx b/datahub-web-react/src/app/entity/group/GroupAssets.tsx
deleted file mode 100644
index 0951cd2a05f56d..00000000000000
--- a/datahub-web-react/src/app/entity/group/GroupAssets.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection';
-import { UnionType } from '@app/search/utils/constants';
-
-const GroupAssetsWrapper = styled.div`
-    height: calc(100vh - 114px);
-`;
-
-type Props = {
-    urn: string;
-};
-
-export const GroupAssets = ({ urn }: Props) => {
-    return (
-        <GroupAssetsWrapper>
-            <EmbeddedListSearchSection
-                skipCache
-                fixedFilters={{
-                    unionType: UnionType.AND,
-                    filters: [{ field: 'owners', values: [urn] }],
-                }}
-                emptySearchQuery="*"
-                placeholderText="Filter entities..."
-            />
-        </GroupAssetsWrapper>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/group/GroupEditModal.tsx b/datahub-web-react/src/app/entity/group/GroupEditModal.tsx
deleted file mode 100644
index b74c565e017b4b..00000000000000
--- a/datahub-web-react/src/app/entity/group/GroupEditModal.tsx
+++ /dev/null
@@ -1,150 +0,0 @@
-import { Button, Form, Input, Modal, Typography, message } from 'antd';
-import React, { useEffect, useState } from 'react';
-
-import { useEnterKeyListener } from '@app/shared/useEnterKeyListener';
-
-import { useUpdateCorpGroupPropertiesMutation } from '@graphql/group.generated';
-
-type PropsData = {
-    email: string | undefined;
-    slack: string | undefined;
-    urn: string | undefined;
-    photoUrl: string | undefined;
-};
-
-type Props = {
-    open: boolean;
-    onClose: () => void;
-    onSave: () => void;
-    editModalData: PropsData;
-};
-/** Regex Validations */
-export const USER_NAME_REGEX = new RegExp('^[a-zA-Z ]*$');
-
-export default function GroupEditModal({ open, onClose, onSave, editModalData }: Props) {
-    const [updateCorpGroupPropertiesMutation] = useUpdateCorpGroupPropertiesMutation();
-    const [form] = Form.useForm();
-
-    const [saveButtonEnabled, setSaveButtonEnabled] = useState(true);
-    const [data, setData] = useState<PropsData>({
-        slack: editModalData.slack,
-        email: editModalData.email,
-        urn: editModalData.urn,
-        photoUrl: editModalData.photoUrl,
-    });
-
-    useEffect(() => {
-        setData({ ...editModalData });
-    }, [editModalData]);
-
-    // save changes function
-    const onSaveChanges = () => {
-        updateCorpGroupPropertiesMutation({
-            variables: {
-                urn: editModalData?.urn || '',
-                input: {
-                    email: data.email,
-                    slack: data.slack,
-                    pictureLink: data.photoUrl,
-                },
-            },
-        })
-            .then(() => {
-                message.success({
-                    content: `Changes saved.`,
-                    duration: 3,
-                });
-                onSave(); // call the refetch function once save
-                // clear the values from edit profile form
-                setData({
-                    email: '',
-                    slack: '',
-                    urn: '',
-                    photoUrl: '',
-                });
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to Save changes!: \n ${e.message || ''}`, duration: 3 });
-            });
-        onClose();
-    };
-
-    // Handle the Enter press
-    useEnterKeyListener({
-        querySelectorToExecuteClick: '#editGroupButton',
-    });
-
-    return (
-        <Modal
-            title="Edit Profile"
-            open={open}
-            onCancel={onClose}
-            footer={
-                <>
-                    <Button onClick={onClose} type="text">
-                        Cancel
-                    </Button>
-                    <Button id="editGroupButton" onClick={onSaveChanges} disabled={saveButtonEnabled}>
-                        Save Changes
-                    </Button>
-                </>
-            }
-        >
-            <Form
-                form={form}
-                initialValues={{ ...editModalData }}
-                autoComplete="off"
-                layout="vertical"
-                onFieldsChange={() =>
-                    setSaveButtonEnabled(form.getFieldsError().some((field) => field.errors.length > 0))
-                }
-            >
-                <Form.Item
-                    name="email"
-                    label={<Typography.Text strong>Email</Typography.Text>}
-                    rules={[
-                        {
-                            type: 'email',
-                            message: 'Please enter valid email',
-                        },
-                        { whitespace: true },
-                        { min: 2, max: 50 },
-                    ]}
-                    hasFeedback
-                >
-                    <Input
-                        placeholder="engineering@example.com"
-                        value={data.email}
-                        onChange={(event) => setData({ ...data, email: event.target.value })}
-                    />
-                </Form.Item>
-                <Form.Item
-                    name="slack"
-                    label={<Typography.Text strong>Slack Channel</Typography.Text>}
-                    rules={[{ whitespace: true }, { min: 2, max: 50 }]}
-                    hasFeedback
-                >
-                    <Input
-                        placeholder="#engineering"
-                        value={data.slack}
-                        onChange={(event) => setData({ ...data, slack: event.target.value })}
-                    />
-                </Form.Item>
-
-                <Form.Item
-                    name="photoUrl"
-                    label={<Typography.Text strong>Image URL</Typography.Text>}
-                    rules={[{ whitespace: true }, { type: 'url', message: 'not valid url' }]}
-                    hasFeedback
-                >
-                    <Input
-                        placeholder="https://www.example.com/photo.png"
-                        value={data.photoUrl}
-                        onChange={(event) => setData({ ...data, photoUrl: event.target.value })}
-                    />
-                </Form.Item>
-            </Form>
-        </Modal>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/group/GroupInfoSideBar.tsx b/datahub-web-react/src/app/entity/group/GroupInfoSideBar.tsx
deleted file mode 100644
index b174ef4da216d6..00000000000000
--- a/datahub-web-react/src/app/entity/group/GroupInfoSideBar.tsx
+++ /dev/null
@@ -1,381 +0,0 @@
-import { EditOutlined, LockOutlined, MailOutlined, SlackOutlined } from '@ant-design/icons';
-import { Button, Col, Divider, Row, Space, Tooltip, Typography, message } from 'antd';
-import React, { useEffect, useState } from 'react';
-import { useHistory, useRouteMatch } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { useUserContext } from '@app/context/useUserContext';
-import EditGroupDescriptionModal from '@app/entity/group/EditGroupDescriptionModal';
-import GroupEditModal from '@app/entity/group/GroupEditModal';
-import GroupMembersSideBarSection from '@app/entity/group/GroupMembersSideBarSection';
-import GroupOwnerSideBarSection from '@app/entity/group/GroupOwnerSideBarSection';
-import {
-    AboutSection,
-    EditButton,
-    EmptyValue,
-    GroupsSection,
-    SideBar,
-    SideBarSubSection,
-    SocialDetails,
-} from '@app/entity/shared/SidebarStyledComponents';
-import StripMarkdownText, { removeMarkdown } from '@app/entity/shared/components/styled/StripMarkdownText';
-import { REDESIGN_COLORS } from '@app/entity/shared/constants';
-import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor';
-import { useBrowserTitle } from '@app/shared/BrowserTabTitleContext';
-import CustomAvatar from '@app/shared/avatar/CustomAvatar';
-
-import { useUpdateCorpGroupPropertiesMutation } from '@graphql/group.generated';
-import { useUpdateNameMutation } from '@graphql/mutations.generated';
-import { EntityRelationshipsResult, Ownership } from '@types';
-
-type SideBarData = {
-    photoUrl: string | undefined;
-    avatarName: string | undefined;
-    name: string | undefined;
-    email: string | undefined;
-    slack: string | undefined;
-    aboutText: string | undefined;
-    groupMemberRelationships: EntityRelationshipsResult;
-    groupOwnerShip: Ownership;
-    isExternalGroup: boolean;
-    externalGroupType: string | undefined;
-    urn: string;
-};
-
-type Props = {
-    sideBarData: SideBarData;
-    refetch: () => Promise<any>;
-};
-
-const AVATAR_STYLE = { margin: '3px 5px 3px 0px' };
-
-const TITLES = {
-    about: 'About',
-    members: 'Members ',
-    editGroup: 'Edit Group',
-};
-
-const GroupNameHeader = styled(Row)`
-    font-size: 20px;
-    line-height: 28px;
-    color: #262626;
-    margin: 16px 16px 8px 8px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    min-height: 100px;
-`;
-
-const GroupTitle = styled(Typography.Title)`
-    max-width: 260px;
-    word-wrap: break-word;
-    width: 140px;
-
-    &&& {
-        margin-bottom: 0;
-        word-break: break-all;
-        margin-left: 10px;
-    }
-
-    .ant-typography-edit {
-        font-size: 16px;
-        margin-left: 10px;
-    }
-`;
-
-const EditIcon = styled(EditOutlined)`
-    cursor: pointer;
-    color: ${REDESIGN_COLORS.BLUE};
-`;
-const AddNewDescription = styled(Button)`
-    display: none;
-    margin: -4px;
-    width: 140px;
-`;
-
-const StyledViewer = styled(Editor)`
-    padding-right: 8px;
-    display: block;
-
-    .remirror-editor.ProseMirror {
-        padding: 0;
-    }
-`;
-
-const DescriptionContainer = styled.div`
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    text-align:left;
-    font-weight: normal;
-    font
-    min-height: 22px;
-
-    &:hover ${AddNewDescription} {
-        display: block;
-    }
-    & ins.diff {
-        background-color: #b7eb8f99;
-        text-decoration: none;
-        &:hover {
-            background-color: #b7eb8faa;
-        }
-    }
-    & del.diff {
-        background-color: #ffa39e99;
-        text-decoration: line-through;
-        &: hover {
-            background-color: #ffa39eaa;
-        }
-    }
-`;
-
-const ExpandedActions = styled.div`
-    height: 10px;
-`;
-const ReadLessText = styled(Typography.Link)`
-    margin-right: 4px;
-`;
-
-/**
- * Responsible for reading & writing users.
- */
-export default function GroupInfoSidebar({ sideBarData, refetch }: Props) {
-    const {
-        avatarName,
-        name,
-        aboutText,
-        groupMemberRelationships,
-        email,
-        photoUrl,
-        slack,
-        urn,
-        isExternalGroup,
-        externalGroupType,
-        groupOwnerShip: ownership,
-    } = sideBarData;
-    const [updateCorpGroupPropertiesMutation] = useUpdateCorpGroupPropertiesMutation();
-    const { url } = useRouteMatch();
-    const history = useHistory();
-
-    const { updateTitle } = useBrowserTitle();
-
-    useEffect(() => {
-        // You can use the title and updateTitle function here
-        // For example, updating the title when the component mounts
-        if (name) {
-            updateTitle(`Group | ${name}`);
-        }
-        // // Don't forget to clean up the title when the component unmounts
-        return () => {
-            if (name) {
-                // added to condition for rerendering issue
-                updateTitle('');
-            }
-        };
-    }, [name, updateTitle]);
-
-    /* eslint-disable @typescript-eslint/no-unused-vars */
-    const [editGroupModal, showEditGroupModal] = useState(false);
-    const me = useUserContext();
-    const canEditGroup = me?.platformPrivileges?.manageIdentities;
-    const [groupTitle, setGroupTitle] = useState(name);
-    const [expanded, setExpanded] = useState(false);
-    const [isUpdatingDescription, SetIsUpdatingDescription] = useState(false);
-    const [stagedDescription, setStagedDescription] = useState(aboutText);
-
-    const [updateName] = useUpdateNameMutation();
-    const overLimit = removeMarkdown(aboutText || '').length > 80;
-    const ABBREVIATED_LIMIT = 80;
-
-    useEffect(() => {
-        setStagedDescription(aboutText);
-    }, [aboutText]);
-
-    useEffect(() => {
-        setGroupTitle(groupTitle);
-    }, [groupTitle]);
-
-    // Update Group Title
-    // eslint-disable-next-line @typescript-eslint/no-shadow
-    const handleTitleUpdate = async (name: string) => {
-        setGroupTitle(name);
-        await updateName({ variables: { input: { name, urn } } })
-            .then(() => {
-                message.success({ content: 'Name Updated', duration: 2 });
-                refetch();
-            })
-            .catch((e: unknown) => {
-                message.destroy();
-                if (e instanceof Error) {
-                    message.error({ content: `Failed to update name: \n ${e.message || ''}`, duration: 3 });
-                }
-            });
-    };
-
-    const getEditModalData = {
-        urn,
-        email,
-        slack,
-        photoUrl,
-    };
-
-    // About Text save
-    const onSaveAboutMe = () => {
-        updateCorpGroupPropertiesMutation({
-            variables: {
-                urn: urn || '',
-                input: {
-                    description: stagedDescription,
-                },
-            },
-        })
-            .then(() => {
-                message.success({
-                    content: `Changes saved.`,
-                    duration: 3,
-                });
-                refetch();
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to Save changes!: \n ${e.message || ''}`, duration: 3 });
-            });
-    };
-    return (
-        <>
-            <SideBar>
-                <SideBarSubSection className={canEditGroup ? '' : 'fullView'}>
-                    <GroupNameHeader>
-                        <Col>
-                            <CustomAvatar
-                                useDefaultAvatar={false}
-                                size={64}
-                                photoUrl={photoUrl}
-                                name={avatarName}
-                                style={AVATAR_STYLE}
-                            />
-                        </Col>
-                        <Col>
-                            <GroupTitle level={3} editable={canEditGroup ? { onChange: handleTitleUpdate } : false}>
-                                {groupTitle}
-                            </GroupTitle>
-                        </Col>
-                        <Col>
-                            {isExternalGroup && (
-                                <Tooltip
-                                    title={`Membership for this group cannot be edited in DataHub as it originates from ${externalGroupType}.`}
-                                >
-                                    <LockOutlined />
-                                </Tooltip>
-                            )}
-                        </Col>
-                    </GroupNameHeader>
-                    <Divider className="divider-infoSection" />
-                    <SocialDetails>
-                        <Space>
-                            <MailOutlined />
-                            {email || <EmptyValue />}
-                        </Space>
-                    </SocialDetails>
-                    <SocialDetails>
-                        <Space>
-                            <SlackOutlined />
-                            {slack || <EmptyValue />}
-                        </Space>
-                    </SocialDetails>
-                    <Divider className="divider-aboutSection" />
-                    <AboutSection>
-                        <Row>
-                            <Col span={22}>{TITLES.about}</Col>
-                            <Col span={2}>
-                                <EditIcon onClick={() => SetIsUpdatingDescription(true)} data-testid="edit-icon" />
-                            </Col>
-                        </Row>
-                    </AboutSection>
-                    <DescriptionContainer>
-                        {(aboutText && expanded) || !overLimit ? (
-                            <>
-                                {/* Read only viewer for displaying group description */}
-                                <StyledViewer content={aboutText} readOnly />
-                                <ExpandedActions>
-                                    {overLimit && (
-                                        <ReadLessText
-                                            onClick={() => {
-                                                setExpanded(false);
-                                            }}
-                                        >
-                                            Read Less
-                                        </ReadLessText>
-                                    )}
-                                </ExpandedActions>
-                            </>
-                        ) : (
-                            <>
-                                {/* Display abbreviated description with option to read more */}
-                                <StripMarkdownText
-                                    limit={ABBREVIATED_LIMIT}
-                                    readMore={
-                                        <>
-                                            <Typography.Link
-                                                onClick={() => {
-                                                    setExpanded(true);
-                                                }}
-                                            >
-                                                Read More
-                                            </Typography.Link>
-                                        </>
-                                    }
-                                    shouldWrap
-                                >
-                                    {aboutText}
-                                </StripMarkdownText>
-                            </>
-                        )}
-                    </DescriptionContainer>
-                    {/* Modal for updating group description */}
-                    {isUpdatingDescription && (
-                        <EditGroupDescriptionModal
-                            onClose={() => {
-                                SetIsUpdatingDescription(false);
-                                setStagedDescription(aboutText);
-                            }}
-                            onSaveAboutMe={onSaveAboutMe}
-                            setStagedDescription={setStagedDescription}
-                            stagedDescription={stagedDescription}
-                        />
-                    )}
-                    <Divider className="divider-groupsSection" />
-                    <GroupsSection>
-                        <GroupOwnerSideBarSection ownership={ownership} urn={urn || ''} refetch={refetch} />
-                    </GroupsSection>
-                    <Divider className="divider-groupsSection" />
-                    <GroupsSection>
-                        <GroupMembersSideBarSection
-                            total={groupMemberRelationships?.total || 0}
-                            relationships={groupMemberRelationships?.relationships || []}
-                            onSeeMore={() => history.replace(`${url}/members`)}
-                        />
-                    </GroupsSection>
-                </SideBarSubSection>
-                {canEditGroup && (
-                    <EditButton>
-                        <Button icon={<EditOutlined />} onClick={() => showEditGroupModal(true)}>
-                            {TITLES.editGroup}
-                        </Button>
-                    </EditButton>
-                )}
-            </SideBar>
-            {/* Modal */}
-            <GroupEditModal
-                open={editGroupModal}
-                onClose={() => showEditGroupModal(false)}
-                onSave={() => {
-                    refetch();
-                }}
-                editModalData={getEditModalData}
-            />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/group/GroupMembers.tsx b/datahub-web-react/src/app/entity/group/GroupMembers.tsx
deleted file mode 100644
index 956c57b154386b..00000000000000
--- a/datahub-web-react/src/app/entity/group/GroupMembers.tsx
+++ /dev/null
@@ -1,245 +0,0 @@
-import { MoreOutlined, UserAddOutlined, UserDeleteOutlined } from '@ant-design/icons';
-import { Button, Col, Dropdown, Empty, MenuProps, Modal, Pagination, Row, Typography, message } from 'antd';
-import React, { useState } from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { AddGroupMembersModal } from '@app/entity/group/AddGroupMembersModal';
-import { CustomAvatar } from '@app/shared/avatar';
-import { scrollToTop } from '@app/shared/searchUtils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetAllGroupMembersQuery, useRemoveGroupMembersMutation } from '@graphql/group.generated';
-import { CorpUser, EntityType } from '@types';
-
-const ADD_MEMBER_STYLE = {
-    backGround: '#ffffff',
-    boxShadow: '0px 2px 6px rgba(0, 0, 0, 0.05)',
-};
-const AVATAR_STYLE = { margin: '5px 5px 5px 0' };
-
-/**
- * Styled Components
- */
-const AddMember = styled(Button)`
-    padding: 13px 13px 30px 30px;
-    cursor: pointer;
-
-    &&& .anticon.anticon-user-add {
-        margin-right: 6px;
-    }
-`;
-
-const AddMemberText = styled(Typography.Text)`
-    font-family: Manrope;
-    font-style: normal;
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 20px;
-`;
-
-const MemberNameSection = styled.div`
-    font-size: 20px;
-    line-height: 28px;
-    color: #262626;
-    display: flex;
-    align-items: center;
-    justify-content: start;
-    padding-left: 12px;
-`;
-
-const GroupMemberWrapper = styled.div`
-    height: calc(100vh - 217px);
-    overflow-y: auto;
-
-    & .groupMemberRow {
-        margin: 0 19px;
-    }
-`;
-
-const MemberColumn = styled(Col)`
-    padding: 19px 0 19px 0;
-    border-bottom: 1px solid #f0f0f0;
-`;
-
-const MemberEditIcon = styled.div`
-    font-size: 22px;
-    float: right;
-`;
-
-const Name = styled.span`
-    font-weight: bold;
-    font-size: 14px;
-    line-height: 22px;
-    color: #262626;
-    margin-left: 8px;
-`;
-
-const NoGroupMembers = styled(Empty)`
-    padding: 40px;
-`;
-
-type Props = {
-    urn: string;
-    pageSize: number;
-    isExternalGroup: boolean;
-    onChangeMembers?: () => void;
-};
-
-export default function GroupMembers({ urn, pageSize, isExternalGroup, onChangeMembers }: Props) {
-    const entityRegistry = useEntityRegistry();
-
-    const [page, setPage] = useState(1);
-    /* eslint-disable @typescript-eslint/no-unused-vars */
-    const [isEditingMembers, setIsEditingMembers] = useState(false);
-    const start = (page - 1) * pageSize;
-    const { data: membersData, refetch } = useGetAllGroupMembersQuery({
-        variables: { urn, start, count: pageSize },
-    });
-    const [removeGroupMembersMutation] = useRemoveGroupMembersMutation();
-
-    const onChangeMembersPage = (newPage: number) => {
-        scrollToTop();
-        setPage(newPage);
-    };
-
-    const removeGroupMember = (userUrn: string) => {
-        removeGroupMembersMutation({
-            variables: {
-                groupUrn: urn,
-                userUrns: [userUrn],
-            },
-        })
-            .then(({ errors }) => {
-                if (!errors) {
-                    message.success({ content: 'Removed Group Member!', duration: 2 });
-                    onChangeMembers?.();
-                    // Hack to deal with eventual consistency
-                    setTimeout(() => {
-                        // Reload the page.
-                        refetch();
-                    }, 2000);
-                }
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to remove group member: \n ${e.message || ''}`, duration: 3 });
-            });
-    };
-
-    const onClickEditMembers = () => {
-        setIsEditingMembers(true);
-    };
-
-    const onAddMembers = () => {
-        onChangeMembers?.();
-        setTimeout(() => {
-            // Reload the page.
-            refetch();
-        }, 3000);
-    };
-
-    const onRemoveMember = (memberEntity: CorpUser) => {
-        const memberName = entityRegistry.getDisplayName(EntityType.CorpUser, memberEntity);
-        Modal.confirm({
-            title: `Confirm Group Member Removal`,
-            content: `Are you sure you want to remove ${memberName} user from the group?`,
-            onOk() {
-                removeGroupMember(memberEntity?.urn);
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    const relationships = membersData && membersData.corpGroup?.relationships;
-    const total = relationships?.total || 0;
-    const groupMembers = relationships?.relationships?.map((rel) => rel.entity as CorpUser) || [];
-
-    const getItems = (userEntity: CorpUser): MenuProps['items'] => {
-        return [
-            {
-                key: 'make',
-                disabled: true,
-                label: (
-                    <span>
-                        <UserAddOutlined /> Make owner
-                    </span>
-                ),
-            },
-            {
-                key: 'remove',
-                disabled: isExternalGroup,
-                onClick: () => onRemoveMember(userEntity),
-                label: (
-                    <span>
-                        <UserDeleteOutlined /> Remove from Group
-                    </span>
-                ),
-            },
-        ];
-    };
-
-    return (
-        <>
-            <Row style={ADD_MEMBER_STYLE}>
-                <AddMember type="text" disabled={isExternalGroup} onClick={onClickEditMembers}>
-                    <UserAddOutlined />
-                    <AddMemberText>Add Member</AddMemberText>
-                </AddMember>
-            </Row>
-            <GroupMemberWrapper>
-                {groupMembers.length === 0 && <NoGroupMembers description="No members in this group yet." />}
-                {groupMembers &&
-                    groupMembers.map((item) => {
-                        const entityUrn = entityRegistry.getEntityUrl(EntityType.CorpUser, item.urn);
-                        return (
-                            <Row className="groupMemberRow" align="middle" key={entityUrn}>
-                                <MemberColumn xl={23} lg={23} md={23} sm={23} xs={23}>
-                                    <Link to={entityUrn}>
-                                        <MemberNameSection>
-                                            <CustomAvatar
-                                                useDefaultAvatar={false}
-                                                size={28}
-                                                photoUrl={item.editableProperties?.pictureLink || ''}
-                                                name={entityRegistry.getDisplayName(EntityType.CorpUser, item)}
-                                                style={AVATAR_STYLE}
-                                            />
-                                            <Name>{entityRegistry.getDisplayName(EntityType.CorpUser, item)}</Name>
-                                        </MemberNameSection>
-                                    </Link>
-                                </MemberColumn>
-                                <MemberColumn xl={1} lg={1} md={1} sm={1} xs={1}>
-                                    <MemberEditIcon>
-                                        <Dropdown menu={{ items: getItems(item) }}>
-                                            <MoreOutlined />
-                                        </Dropdown>
-                                    </MemberEditIcon>
-                                </MemberColumn>
-                            </Row>
-                        );
-                    })}
-            </GroupMemberWrapper>
-            <Row justify="center" style={{ marginTop: '15px' }}>
-                <Pagination
-                    current={page}
-                    pageSize={pageSize}
-                    total={total}
-                    showLessItems
-                    onChange={onChangeMembersPage}
-                    showSizeChanger={false}
-                />
-            </Row>
-            {isEditingMembers && (
-                <AddGroupMembersModal
-                    urn={urn}
-                    open={isEditingMembers}
-                    onSubmit={onAddMembers}
-                    onCloseModal={() => setIsEditingMembers(false)}
-                />
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/group/GroupMembersSideBarSection.tsx b/datahub-web-react/src/app/entity/group/GroupMembersSideBarSection.tsx
deleted file mode 100644
index 1a7d4465da8a70..00000000000000
--- a/datahub-web-react/src/app/entity/group/GroupMembersSideBarSection.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Tag, Tooltip } from 'antd';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import {
-    DisplayCount,
-    EmptyValue,
-    GroupSectionHeader,
-    GroupSectionTitle,
-    GroupsSeeMoreText,
-    TagsSection,
-} from '@app/entity/shared/SidebarStyledComponents';
-import { CustomAvatar } from '@app/shared/avatar';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { CorpUser, EntityRelationship, EntityType } from '@types';
-
-const TITLE = 'Members';
-
-const MemberTag = styled(Tag)`
-    padding: 2px;
-    padding-right: 6px;
-    margin-bottom: 8px;
-    display: inline-flex;
-    align-items: center;
-`;
-
-type Props = {
-    total: number;
-    relationships: Array<EntityRelationship>;
-    onSeeMore: () => void;
-};
-
-export default function GroupMembersSideBarSection({ total, relationships, onSeeMore }: Props) {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <>
-            <GroupSectionHeader>
-                <GroupSectionTitle>{TITLE}</GroupSectionTitle>
-                <DisplayCount>{total}</DisplayCount>
-            </GroupSectionHeader>
-            <TagsSection>
-                {relationships.length === 0 && <EmptyValue />}
-                {relationships.length > 0 &&
-                    relationships.map((item) => {
-                        const user = item.entity as CorpUser;
-                        const name = entityRegistry.getDisplayName(EntityType.CorpUser, user);
-                        return (
-                            <MemberTag key={user.urn}>
-                                <Link to={`${entityRegistry.getEntityUrl(EntityType.CorpUser, user.urn)}`}>
-                                    <CustomAvatar
-                                        name={name}
-                                        photoUrl={user.editableProperties?.pictureLink || undefined}
-                                        useDefaultAvatar={false}
-                                    />
-                                    {name.length > 15 ? (
-                                        <Tooltip title={name}>{`${name.substring(0, 15)}..`}</Tooltip>
-                                    ) : (
-                                        <span>{name}</span>
-                                    )}
-                                </Link>
-                            </MemberTag>
-                        );
-                    })}
-                {relationships.length > 15 && (
-                    <div>
-                        <GroupsSeeMoreText onClick={onSeeMore}>{`+${
-                            relationships.length - 15
-                        } more`}</GroupsSeeMoreText>
-                    </div>
-                )}
-            </TagsSection>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/group/GroupOwnerSideBarSection.tsx b/datahub-web-react/src/app/entity/group/GroupOwnerSideBarSection.tsx
deleted file mode 100644
index 2ad254adb08274..00000000000000
--- a/datahub-web-react/src/app/entity/group/GroupOwnerSideBarSection.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { DisplayCount, GroupSectionHeader, GroupSectionTitle } from '@app/entity/shared/SidebarStyledComponents';
-import { ExpandedOwner } from '@app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner';
-import { EditOwnersModal } from '@app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal';
-
-import { EntityType, Ownership } from '@types';
-
-const TITLE = 'Owners';
-
-const SectionWrapper = styled.div``;
-
-const OwnersWrapper = styled.div`
-    display: flex;
-    gap: 6px;
-    flex-wrap: wrap;
-    margin-bottom: 8px;
-`;
-
-const AddOwnerButton = styled(Button)``;
-
-type Props = {
-    ownership: Ownership;
-    refetch: () => Promise<any>;
-    urn: string;
-};
-
-export default function GroupOwnerSideBarSection({ urn, ownership, refetch }: Props) {
-    const [showAddModal, setShowAddModal] = useState(false);
-    const ownersEmpty = !ownership?.owners?.length;
-
-    return (
-        <>
-            <GroupSectionHeader>
-                <GroupSectionTitle>{TITLE}</GroupSectionTitle>
-                <DisplayCount>{ownership?.owners?.length || ''}</DisplayCount>
-            </GroupSectionHeader>
-            <SectionWrapper>
-                <OwnersWrapper>
-                    {ownership &&
-                        ownership?.owners?.map((owner) => (
-                            <ExpandedOwner entityUrn={urn} owner={owner} refetch={refetch} />
-                        ))}
-                </OwnersWrapper>
-                {ownersEmpty && (
-                    <Typography.Paragraph type="secondary">No group owners added yet.</Typography.Paragraph>
-                )}
-                {ownersEmpty && (
-                    <AddOwnerButton onClick={() => setShowAddModal(true)}>
-                        <PlusOutlined />
-                        Add Owners
-                    </AddOwnerButton>
-                )}
-                {!ownersEmpty && (
-                    <AddOwnerButton type="text" style={{ padding: 0 }} onClick={() => setShowAddModal(true)}>
-                        <PlusOutlined />
-                        Add Owners
-                    </AddOwnerButton>
-                )}
-            </SectionWrapper>
-            {showAddModal && (
-                <EditOwnersModal
-                    urns={[urn]}
-                    hideOwnerType
-                    entityType={EntityType.CorpGroup}
-                    refetch={refetch}
-                    onCloseModal={() => {
-                        setShowAddModal(false);
-                    }}
-                />
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/group/GroupProfile.tsx b/datahub-web-react/src/app/entity/group/GroupProfile.tsx
deleted file mode 100644
index ec41a78f2a5f93..00000000000000
--- a/datahub-web-react/src/app/entity/group/GroupProfile.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import { Col, Row } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { GroupAssets } from '@app/entity/group/GroupAssets';
-import GroupInfoSidebar from '@app/entity/group/GroupInfoSideBar';
-import GroupMembers from '@app/entity/group/GroupMembers';
-import NonExistentEntityPage from '@app/entity/shared/entity/NonExistentEntityPage';
-import { decodeUrn } from '@app/entity/shared/utils';
-import { Message } from '@app/shared/Message';
-import { RoutedTabs } from '@app/shared/RoutedTabs';
-import useUserParams from '@app/shared/entitySearch/routingUtils/useUserParams';
-import { ErrorSection } from '@app/shared/error/ErrorSection';
-
-import { useGetGroupQuery } from '@graphql/group.generated';
-import { EntityRelationshipsResult, OriginType, Ownership } from '@types';
-
-const messageStyle = { marginTop: '10%' };
-
-export enum TabType {
-    Assets = 'Owner Of',
-    Members = 'Members',
-}
-
-const ENABLED_TAB_TYPES = [TabType.Assets, TabType.Members];
-
-const MEMBER_PAGE_SIZE = 15;
-
-/**
- * Styled Components
- */
-const GroupProfileWrapper = styled.div`
-    &&& .ant-tabs-nav {
-        margin: 0;
-    }
-`;
-
-const Content = styled.div`
-    color: #262626;
-    height: calc(100vh - 60px);
-
-    &&& .ant-tabs > .ant-tabs-nav .ant-tabs-nav-wrap {
-        padding-left: 15px;
-    }
-`;
-
-/**
- * Responsible for reading & writing groups.
- */
-export default function GroupProfile() {
-    const { urn: encodedUrn } = useUserParams();
-    const urn = encodedUrn && decodeUrn(encodedUrn);
-    const { loading, error, data, refetch } = useGetGroupQuery({ variables: { urn, membersCount: MEMBER_PAGE_SIZE } });
-
-    const groupMemberRelationships = data?.corpGroup?.relationships as EntityRelationshipsResult;
-    const isExternalGroup: boolean = data?.corpGroup?.origin?.type === OriginType.External;
-    const externalGroupType: string = data?.corpGroup?.origin?.externalType || 'outside DataHub';
-
-    const getTabs = () => {
-        return [
-            {
-                name: TabType.Assets,
-                path: TabType.Assets.toLocaleLowerCase(),
-                content: <GroupAssets urn={urn} />,
-                display: {
-                    enabled: () => true,
-                },
-            },
-            {
-                name: TabType.Members,
-                path: TabType.Members.toLocaleLowerCase(),
-                content: (
-                    <GroupMembers
-                        urn={urn}
-                        pageSize={MEMBER_PAGE_SIZE}
-                        isExternalGroup={isExternalGroup}
-                        onChangeMembers={() => {
-                            setTimeout(() => refetch(), 2000);
-                        }}
-                    />
-                ),
-                display: {
-                    enabled: () => true,
-                },
-            },
-        ].filter((tab) => ENABLED_TAB_TYPES.includes(tab.name));
-    };
-
-    const defaultTabPath = getTabs() && getTabs()?.length > 0 ? getTabs()[0].path : '';
-    const onTabChange = () => null;
-
-    // Side bar data
-    const sideBarData = {
-        photoUrl: data?.corpGroup?.editableProperties?.pictureLink || undefined,
-        avatarName:
-            data?.corpGroup?.properties?.displayName ||
-            data?.corpGroup?.name ||
-            data?.corpGroup?.info?.displayName ||
-            undefined,
-        name:
-            data?.corpGroup?.properties?.displayName ||
-            data?.corpGroup?.name ||
-            data?.corpGroup?.info?.displayName ||
-            undefined,
-        email: data?.corpGroup?.editableProperties?.email || data?.corpGroup?.properties?.email || undefined,
-        slack: data?.corpGroup?.editableProperties?.slack || data?.corpGroup?.properties?.slack || undefined,
-        aboutText:
-            data?.corpGroup?.editableProperties?.description || data?.corpGroup?.properties?.description || undefined,
-        groupMemberRelationships: groupMemberRelationships as EntityRelationshipsResult,
-        groupOwnerShip: data?.corpGroup?.ownership as Ownership,
-        isExternalGroup,
-        externalGroupType,
-        urn,
-    };
-
-    if (data?.corpGroup?.exists === false) {
-        return <NonExistentEntityPage />;
-    }
-    return (
-        <>
-            {error && <ErrorSection />}
-            {loading && <Message type="loading" content="Loading..." style={messageStyle} />}
-            {data && data?.corpGroup && (
-                <GroupProfileWrapper>
-                    <Row>
-                        <Col xl={5} lg={5} md={5} sm={24} xs={24}>
-                            <GroupInfoSidebar sideBarData={sideBarData} refetch={refetch} />
-                        </Col>
-                        <Col xl={19} lg={19} md={19} sm={24} xs={24} style={{ borderLeft: '1px solid #E9E9E9' }}>
-                            <Content>
-                                <RoutedTabs defaultPath={defaultTabPath} tabs={getTabs()} onTabChange={onTabChange} />
-                            </Content>
-                        </Col>
-                    </Row>
-                </GroupProfileWrapper>
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/group/preview/Preview.tsx b/datahub-web-react/src/app/entity/group/preview/Preview.tsx
deleted file mode 100644
index 3899ceba911bf9..00000000000000
--- a/datahub-web-react/src/app/entity/group/preview/Preview.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import { Tag, Typography } from 'antd';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { IconStyleType } from '@app/entity/Entity';
-import NoMarkdownViewer from '@app/entity/shared/components/styled/StripMarkdownText';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import SearchTextHighlighter from '@app/search/matches/SearchTextHighlighter';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType } from '@types';
-
-const PreviewContainer = styled.div`
-    margin-bottom: 4px;
-    display: flex;
-    width: 100%;
-    justify-content: space-between;
-    align-items: center;
-`;
-
-const PlatformInfo = styled.div`
-    margin-bottom: 8px;
-    display: flex;
-    align-items: center;
-    height: 24px;
-`;
-
-const TitleContainer = styled.div`
-    margin-bottom: 8px;
-`;
-
-const PreviewImage = styled.div`
-    max-height: 18px;
-    width: auto;
-    object-fit: contain;
-    margin-right: 10px;
-    background-color: transparent;
-`;
-
-const EntityTitle = styled(Typography.Text)`
-    &&& {
-        margin-bottom: 0;
-        font-size: 16px;
-        font-weight: 600;
-        vertical-align: middle;
-    }
-`;
-
-const PlatformText = styled(Typography.Text)`
-    font-size: 12px;
-    line-height: 20px;
-    font-weight: 700;
-    color: ${ANTD_GRAY[7]};
-`;
-
-const DescriptionContainer = styled.div`
-    margin-top: 5px;
-`;
-
-const MemberCountContainer = styled.span`
-    margin-left: 12px;
-    margin-right: 12px;
-`;
-
-export const Preview = ({
-    urn,
-    name,
-    description,
-    membersCount,
-}: {
-    urn: string;
-    name: string;
-    description?: string | null;
-    membersCount?: number;
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    const url = entityRegistry.getEntityUrl(EntityType.CorpGroup, urn);
-
-    return (
-        <PreviewContainer>
-            <div>
-                <Link to={url}>
-                    <TitleContainer>
-                        <PlatformInfo>
-                            <PreviewImage>
-                                {entityRegistry.getIcon(EntityType.CorpGroup, 20, IconStyleType.HIGHLIGHT)}
-                            </PreviewImage>
-                            <PlatformText>{entityRegistry.getEntityName(EntityType.CorpGroup)}</PlatformText>
-                        </PlatformInfo>
-                        <Link to={url}>
-                            <EntityTitle>{name ? <SearchTextHighlighter field="name" text={name} /> : urn}</EntityTitle>
-                            <MemberCountContainer>
-                                <Tag>{membersCount} members</Tag>
-                            </MemberCountContainer>
-                        </Link>
-                    </TitleContainer>
-                </Link>
-                {description && description.length > 0 && (
-                    <DescriptionContainer>
-                        <NoMarkdownViewer
-                            limit={200}
-                            customRender={(text) => <SearchTextHighlighter field="description" text={text} />}
-                        >
-                            {description}
-                        </NoMarkdownViewer>
-                    </DescriptionContainer>
-                )}
-            </div>
-        </PreviewContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/mlFeature/MLFeatureEntity.tsx b/datahub-web-react/src/app/entity/mlFeature/MLFeatureEntity.tsx
deleted file mode 100644
index b6aa4edfe6da40..00000000000000
--- a/datahub-web-react/src/app/entity/mlFeature/MLFeatureEntity.tsx
+++ /dev/null
@@ -1,217 +0,0 @@
-import { DotChartOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { Preview } from '@app/entity/mlFeature/preview/Preview';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab';
-import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab';
-import { FeatureTableTab } from '@app/entity/shared/tabs/ML/MlFeatureFeatureTableTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { getDataProduct } from '@app/entity/shared/utils';
-
-import { useGetMlFeatureQuery } from '@graphql/mlFeature.generated';
-import { EntityType, MlFeature, OwnershipType, SearchResult } from '@types';
-
-/**
- * Definition of the DataHub MLFeature entity.
- */
-export class MLFeatureEntity implements Entity<MlFeature> {
-    type: EntityType = EntityType.Mlfeature;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <DotChartOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <DotChartOutlined style={{ fontSize, color: color || '#9633b9' }} />;
-        }
-
-        return (
-            <DotChartOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => true;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getGraphName = () => 'mlFeature';
-
-    getPathName = () => 'features';
-
-    getEntityName = () => 'Feature';
-
-    getCollectionName = () => 'Features';
-
-    useEntityQuery = useGetMlFeatureQuery;
-
-    getOverridePropertiesFromEntity = (feature?: MlFeature | null): GenericEntityProperties => {
-        return {
-            // eslint-disable-next-line
-            platform: feature?.['featureTables']?.relationships?.[0]?.entity?.platform,
-        };
-    };
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            key={urn}
-            entityType={EntityType.Mlfeature}
-            useEntityQuery={useGetMlFeatureQuery}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            headerDropdownItems={new Set([EntityMenuItems.UPDATE_DEPRECATION])}
-            tabs={[
-                {
-                    name: 'Feature Tables',
-                    component: FeatureTableTab,
-                },
-                {
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                },
-                {
-                    name: 'Lineage',
-                    component: LineageTab,
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-                {
-                    name: 'Incidents',
-                    component: IncidentTab,
-                    getDynamicName: (_, mlFeature) => {
-                        const activeIncidentCount = mlFeature?.mlFeature?.activeIncidents?.total;
-                        return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
-                    },
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-        />
-    );
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-            properties: {
-                defaultOwnerType: OwnershipType.TechnicalOwner,
-            },
-        },
-        {
-            component: SidebarTagsSection,
-            properties: {
-                hasTags: true,
-                hasTerms: true,
-            },
-        },
-        {
-            component: SidebarDomainSection,
-        },
-        {
-            component: DataProductSection,
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-    ];
-
-    renderPreview = (previewType: PreviewType, data: MlFeature) => {
-        const genericProperties = this.getGenericEntityProperties(data);
-        // eslint-disable-next-line
-        const platform = data?.['featureTables']?.relationships?.[0]?.entity?.platform;
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.name || ''}
-                featureNamespace={data.featureNamespace || ''}
-                description={data.description}
-                owners={data.ownership?.owners}
-                platform={platform}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                previewType={previewType}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as MlFeature;
-        const genericProperties = this.getGenericEntityProperties(data);
-        // eslint-disable-next-line
-        const platform = data?.['featureTables']?.relationships?.[0]?.entity?.platform;
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.name || ''}
-                featureNamespace={data.featureNamespace || ''}
-                description={data.description || ''}
-                owners={data.ownership?.owners}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                platform={platform}
-                platformInstanceId={data.dataPlatformInstance?.instanceId}
-                degree={(result as any).degree}
-                paths={(result as any).paths}
-                previewType={PreviewType.SEARCH}
-            />
-        );
-    };
-
-    displayName = (data: MlFeature) => {
-        return data.name || data.urn;
-    };
-
-    getGenericEntityProperties = (mlFeature: MlFeature) => {
-        return getDataForEntityType({
-            data: mlFeature,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    getLineageVizConfig = (entity: MlFeature) => {
-        return {
-            urn: entity.urn,
-            name: entity.name,
-            type: EntityType.Mlfeature,
-            // eslint-disable-next-line
-            icon: entity?.['featureTables']?.relationships?.[0]?.entity?.platform?.properties?.logoUrl || undefined,
-            // eslint-disable-next-line
-            platform: entity?.['featureTables']?.relationships?.[0]?.entity?.platform,
-        };
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.DOMAINS,
-            EntityCapabilityType.DEPRECATION,
-            EntityCapabilityType.SOFT_DELETE,
-            EntityCapabilityType.DATA_PRODUCTS,
-        ]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/mlFeature/preview/Preview.tsx b/datahub-web-react/src/app/entity/mlFeature/preview/Preview.tsx
deleted file mode 100644
index 0f5a92deb9168c..00000000000000
--- a/datahub-web-react/src/app/entity/mlFeature/preview/Preview.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React from 'react';
-
-import { IconStyleType, PreviewType } from '@app/entity/Entity';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { DataPlatform, DataProduct, EntityPath, EntityType, Owner } from '@types';
-
-export const Preview = ({
-    urn,
-    name,
-    platformInstanceId,
-    featureNamespace,
-    description,
-    dataProduct,
-    owners,
-    platform,
-    degree,
-    paths,
-    previewType,
-}: {
-    urn: string;
-    name: string;
-    featureNamespace: string;
-    platformInstanceId?: string;
-    description?: string | null;
-    dataProduct?: DataProduct | null;
-    owners?: Array<Owner> | null;
-    platform?: DataPlatform | null | undefined;
-    degree?: number;
-    paths?: EntityPath[];
-    previewType: PreviewType;
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.Mlfeature, urn)}
-            name={name}
-            urn={urn}
-            platformInstanceId={platformInstanceId}
-            description={description || ''}
-            platform={
-                platform?.properties?.displayName || capitalizeFirstLetterOnly(platform?.name) || featureNamespace
-            }
-            logoUrl={platform?.properties?.logoUrl || ''}
-            type="ML Feature"
-            typeIcon={entityRegistry.getIcon(EntityType.Mlfeature, 14, IconStyleType.ACCENT)}
-            owners={owners}
-            dataProduct={dataProduct}
-            degree={degree}
-            paths={paths}
-            previewType={previewType}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/MLFeatureTableEntity.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/MLFeatureTableEntity.tsx
deleted file mode 100644
index f3639e985935f7..00000000000000
--- a/datahub-web-react/src/app/entity/mlFeatureTable/MLFeatureTableEntity.tsx
+++ /dev/null
@@ -1,198 +0,0 @@
-import { DotChartOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { Preview } from '@app/entity/mlFeatureTable/preview/Preview';
-import Sources from '@app/entity/mlFeatureTable/profile/Sources';
-import MlFeatureTableFeatures from '@app/entity/mlFeatureTable/profile/features/MlFeatureTableFeatures';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { getDataProduct } from '@app/entity/shared/utils';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-
-import { useGetMlFeatureTableQuery } from '@graphql/mlFeatureTable.generated';
-import { EntityType, MlFeatureTable, OwnershipType, SearchResult } from '@types';
-
-/**
- * Definition of the DataHub MLFeatureTable entity.
- */
-export class MLFeatureTableEntity implements Entity<MlFeatureTable> {
-    type: EntityType = EntityType.MlfeatureTable;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <DotChartOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <DotChartOutlined style={{ fontSize, color: color || '#9633b9' }} />;
-        }
-
-        return (
-            <DotChartOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => true;
-
-    isLineageEnabled = () => true;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getGraphName = () => 'mlFeatureTable';
-
-    getPathName = () => 'featureTables';
-
-    getEntityName = () => 'Feature Table';
-
-    getCollectionName = () => 'Feature Tables';
-
-    getOverridePropertiesFromEntity = (_?: MlFeatureTable | null): GenericEntityProperties => {
-        return {};
-    };
-
-    useEntityQuery = useGetMlFeatureTableQuery;
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-            properties: {
-                defaultOwnerType: OwnershipType.TechnicalOwner,
-            },
-        },
-        {
-            component: SidebarTagsSection,
-            properties: {
-                hasTags: true,
-                hasTerms: true,
-            },
-        },
-        {
-            component: SidebarDomainSection,
-        },
-        {
-            component: DataProductSection,
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-    ];
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            key={urn}
-            entityType={EntityType.MlfeatureTable}
-            useEntityQuery={useGetMlFeatureTableQuery}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            headerDropdownItems={new Set([EntityMenuItems.UPDATE_DEPRECATION])}
-            tabs={[
-                {
-                    name: 'Features',
-                    component: MlFeatureTableFeatures,
-                },
-                {
-                    name: 'Sources',
-                    component: Sources,
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-                {
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-        />
-    );
-
-    renderPreview = (_: PreviewType, data: MlFeatureTable) => {
-        const genericProperties = this.getGenericEntityProperties(data);
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.name || ''}
-                description={data.description}
-                owners={data.ownership?.owners}
-                logoUrl={data.platform?.properties?.logoUrl}
-                platformName={data.platform?.properties?.displayName || capitalizeFirstLetterOnly(data.platform?.name)}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as MlFeatureTable;
-        const genericProperties = this.getGenericEntityProperties(data);
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.name || ''}
-                description={data.description || ''}
-                owners={data.ownership?.owners}
-                logoUrl={data.platform?.properties?.logoUrl}
-                platformName={data.platform?.properties?.displayName || capitalizeFirstLetterOnly(data.platform?.name)}
-                platformInstanceId={data.dataPlatformInstance?.instanceId}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                degree={(result as any).degree}
-                paths={(result as any).paths}
-            />
-        );
-    };
-
-    getLineageVizConfig = (entity: MlFeatureTable) => {
-        return {
-            urn: entity.urn,
-            name: entity.name,
-            type: EntityType.MlfeatureTable,
-            icon: entity.platform.properties?.logoUrl || undefined,
-            platform: entity.platform,
-        };
-    };
-
-    displayName = (data: MlFeatureTable) => {
-        return data.name || data.urn;
-    };
-
-    getGenericEntityProperties = (mlFeatureTable: MlFeatureTable) => {
-        return getDataForEntityType({
-            data: mlFeatureTable,
-            entityType: this.type,
-            getOverrideProperties: (data) => data,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.DOMAINS,
-            EntityCapabilityType.DEPRECATION,
-            EntityCapabilityType.SOFT_DELETE,
-            EntityCapabilityType.DATA_PRODUCTS,
-        ]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/preview/Preview.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/preview/Preview.tsx
deleted file mode 100644
index dcdad78f5a04dd..00000000000000
--- a/datahub-web-react/src/app/entity/mlFeatureTable/preview/Preview.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-
-import { IconStyleType } from '@app/entity/Entity';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { DataProduct, EntityPath, EntityType, Owner } from '@types';
-
-export const Preview = ({
-    urn,
-    name,
-    description,
-    owners,
-    logoUrl,
-    platformName,
-    dataProduct,
-    platformInstanceId,
-    degree,
-    paths,
-}: {
-    urn: string;
-    name: string;
-    description?: string | null;
-    owners?: Array<Owner> | null;
-    logoUrl?: string | null;
-    platformName?: string | null;
-    dataProduct?: DataProduct | null;
-    platformInstanceId?: string;
-    degree?: number;
-    paths?: EntityPath[];
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.MlfeatureTable, urn)}
-            name={name}
-            urn={urn}
-            description={description || ''}
-            type={entityRegistry.getEntityName(EntityType.MlfeatureTable)}
-            typeIcon={entityRegistry.getIcon(EntityType.MlfeatureTable, 14, IconStyleType.ACCENT)}
-            owners={owners}
-            logoUrl={logoUrl || undefined}
-            platform={platformName || ''}
-            platformInstanceId={platformInstanceId}
-            dataProduct={dataProduct}
-            logoComponent={entityRegistry.getIcon(EntityType.MlfeatureTable, 20, IconStyleType.HIGHLIGHT)}
-            degree={degree}
-            paths={paths}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/profile/MLFeatureTableHeader.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/profile/MLFeatureTableHeader.tsx
deleted file mode 100644
index 4bfa562c39062f..00000000000000
--- a/datahub-web-react/src/app/entity/mlFeatureTable/profile/MLFeatureTableHeader.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Image, Row, Space, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import MarkdownViewer from '@app/entity/shared/components/legacy/MarkdownViewer';
-import CompactContext from '@app/shared/CompactContext';
-import { AvatarsGroup } from '@app/shared/avatar';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { MlFeatureTable } from '@types';
-
-const HeaderInfoItem = styled.div`
-    display: inline-block;
-    text-align: left;
-    width: 125px;
-    vertical-align: top;
-`;
-
-const PlatformName = styled(Typography.Text)`
-    font-size: 16px;
-`;
-const PreviewImage = styled(Image)`
-    max-height: 20px;
-    padding-top: 3px;
-    width: auto;
-    object-fit: contain;
-`;
-
-export type Props = {
-    mlFeatureTable: MlFeatureTable;
-};
-
-export default function MLFeatureTableHeader({ mlFeatureTable: { platform, description, ownership } }: Props) {
-    const entityRegistry = useEntityRegistry();
-    const isCompact = React.useContext(CompactContext);
-
-    const platformName = platform.properties?.displayName || capitalizeFirstLetterOnly(platform.name);
-
-    return (
-        <>
-            <Space direction="vertical" size="middle">
-                <Row justify="space-between">
-                    {platform ? (
-                        <HeaderInfoItem>
-                            <div>
-                                <Typography.Text strong type="secondary" style={{ fontSize: 11 }}>
-                                    Platform
-                                </Typography.Text>
-                            </div>
-                            <Space direction="horizontal">
-                                {platform.properties?.logoUrl ? (
-                                    <PreviewImage
-                                        preview={false}
-                                        src={platform.properties?.logoUrl}
-                                        placeholder
-                                        alt={platformName}
-                                    />
-                                ) : null}
-                                <PlatformName>{platformName}</PlatformName>
-                            </Space>
-                        </HeaderInfoItem>
-                    ) : null}
-                </Row>
-                <MarkdownViewer isCompact={isCompact} source={description || ''} />
-                <AvatarsGroup owners={ownership?.owners} entityRegistry={entityRegistry} />
-            </Space>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/profile/Sources.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/profile/Sources.tsx
deleted file mode 100644
index 3c21eced46f0dc..00000000000000
--- a/datahub-web-react/src/app/entity/mlFeatureTable/profile/Sources.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { List, Typography } from 'antd';
-import React, { useMemo } from 'react';
-import styled from 'styled-components';
-
-import { PreviewType } from '@app/entity/Entity';
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { notEmpty } from '@app/entity/shared/utils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { GetMlFeatureTableQuery } from '@graphql/mlFeatureTable.generated';
-import { Dataset, EntityType } from '@types';
-
-const ViewRawButtonContainer = styled.div`
-    display: flex;
-    justify-content: flex-end;
-`;
-
-export default function SourcesView() {
-    const entityRegistry = useEntityRegistry();
-    const baseEntity = useBaseEntity<GetMlFeatureTableQuery>();
-    const featureTable = baseEntity?.mlFeatureTable;
-
-    const features = useMemo(
-        () =>
-            featureTable?.properties &&
-            (featureTable?.properties?.mlFeatures || featureTable?.properties?.mlPrimaryKeys)
-                ? [
-                      ...(featureTable?.properties?.mlPrimaryKeys || []),
-                      ...(featureTable?.properties?.mlFeatures || []),
-                  ].filter(notEmpty)
-                : [],
-        [featureTable?.properties],
-    );
-
-    const sources = useMemo(
-        () =>
-            features?.reduce((accumulator: Array<Dataset>, feature) => {
-                if (feature.__typename === 'MLFeature' && feature.properties?.sources) {
-                    // eslint-disable-next-line array-callback-return
-                    feature.properties?.sources?.map((source: Dataset | null) => {
-                        if (source && accumulator.findIndex((dataset) => dataset.urn === source?.urn) === -1) {
-                            accumulator.push(source);
-                        }
-                    });
-                } else if (feature.__typename === 'MLPrimaryKey' && feature.properties?.sources) {
-                    // eslint-disable-next-line array-callback-return
-                    feature.properties?.sources?.map((source: Dataset | null) => {
-                        if (source && accumulator.findIndex((dataset) => dataset.urn === source?.urn) === -1) {
-                            accumulator.push(source);
-                        }
-                    });
-                }
-                return accumulator;
-            }, []),
-        [features],
-    );
-
-    return (
-        <>
-            <div>
-                <ViewRawButtonContainer>
-                    {
-                        // ToDo: uncomment below these after refactored Lineage to support dynamic entities
-                        /* <Button onClick={() => navigateToLineageUrl({ location, history, isLineageMode: true })}>
-                            View Graph
-                        </Button> */
-                    }
-                </ViewRawButtonContainer>
-            </div>
-            <List
-                style={{ marginTop: '24px', padding: '16px 32px' }}
-                bordered
-                dataSource={sources}
-                header={<Typography.Title level={3}>Sources</Typography.Title>}
-                renderItem={(item) => (
-                    <List.Item style={{ paddingTop: '20px' }}>
-                        {entityRegistry.renderPreview(item?.type || EntityType.Dataset, PreviewType.PREVIEW, item)}
-                    </List.Item>
-                )}
-            />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx
deleted file mode 100644
index 7f72f206129a4c..00000000000000
--- a/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/MlFeatureDataTypeIcon.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import {
-    AudioOutlined,
-    ClockCircleOutlined,
-    FieldBinaryOutlined,
-    FieldStringOutlined,
-    FileImageOutlined,
-    LineChartOutlined,
-    NumberOutlined,
-    OrderedListOutlined,
-    QuestionOutlined,
-    StopOutlined,
-    UnorderedListOutlined,
-    VideoCameraOutlined,
-} from '@ant-design/icons';
-import { Tooltip, Typography } from 'antd';
-import React, { FC } from 'react';
-import { VscFileBinary } from 'react-icons/vsc';
-import styled from 'styled-components';
-
-import { capitalizeFirstLetter } from '@app/shared/textUtil';
-
-import { MlFeatureDataType } from '@types';
-
-const TypeIconContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    text-align: center;
-    margin-top: 2.5px;
-    width: 70px;
-`;
-
-const TypeSubtitle = styled(Typography.Text)<{ hasicon?: string }>`
-    font-size: 8px;
-    text-align: center;
-    text-transform: uppercase;
-    ${(props) => (props.hasicon ? '' : 'margin-top: 4px;')}
-`;
-
-const IconSpan = styled.span`
-    font-size: 18px;
-`;
-
-const DATA_TYPE_ICON_MAP: Record<MlFeatureDataType, { icon: FC<{ style: any }> | null; size: number; text: string }> = {
-    [MlFeatureDataType.Byte]: {
-        icon: () => (
-            <IconSpan role="img" aria-label="calendar" className="anticon anticon-calendar">
-                <VscFileBinary />
-            </IconSpan>
-        ),
-        size: 18,
-        text: 'Byte',
-    },
-    [MlFeatureDataType.Time]: { icon: ClockCircleOutlined, size: 18, text: 'Time' },
-    [MlFeatureDataType.Set]: { icon: UnorderedListOutlined, size: 18, text: 'Set' },
-    [MlFeatureDataType.Unknown]: { icon: QuestionOutlined, size: 16, text: 'Unknown' },
-    [MlFeatureDataType.Map]: { icon: UnorderedListOutlined, size: 14, text: 'Map' },
-    [MlFeatureDataType.Useless]: { icon: StopOutlined, size: 18, text: 'Useless' },
-    [MlFeatureDataType.Nominal]: { icon: NumberOutlined, size: 14, text: 'Nominal' },
-    [MlFeatureDataType.Ordinal]: { icon: OrderedListOutlined, size: 18, text: 'Ordinal' },
-    [MlFeatureDataType.Binary]: { icon: FieldBinaryOutlined, size: 16, text: 'Binary' },
-    [MlFeatureDataType.Count]: { icon: NumberOutlined, size: 14, text: 'Count' },
-    [MlFeatureDataType.Interval]: { icon: ClockCircleOutlined, size: 16, text: 'Interval' },
-    [MlFeatureDataType.Image]: { icon: FileImageOutlined, size: 16, text: 'Image' },
-    [MlFeatureDataType.Video]: { icon: VideoCameraOutlined, size: 16, text: 'Video' },
-    [MlFeatureDataType.Audio]: { icon: AudioOutlined, size: 16, text: 'Audio' },
-    [MlFeatureDataType.Text]: { icon: FieldStringOutlined, size: 18, text: 'Text' },
-    [MlFeatureDataType.Sequence]: { icon: OrderedListOutlined, size: 16, text: 'Sequence' },
-    [MlFeatureDataType.Continuous]: { icon: LineChartOutlined, size: 16, text: 'Continuous' },
-};
-
-type Props = {
-    dataType?: MlFeatureDataType;
-};
-
-export default function MlFeatureDataTypeIcon({ dataType }: Props) {
-    const { icon: Icon, size, text } = DATA_TYPE_ICON_MAP[dataType || MlFeatureDataType.Unknown];
-
-    // eslint-disable-next-line react/prop-types
-    const NativeDataTypeTooltip = ({ children }) => (
-        <Tooltip placement="top" title={capitalizeFirstLetter(text)}>
-            {children}
-        </Tooltip>
-    );
-
-    return (
-        <NativeDataTypeTooltip>
-            <TypeIconContainer>
-                {Icon && <Icon style={{ fontSize: size }} />}
-                <TypeSubtitle type="secondary" hasicon={Icon ? 'yes' : undefined}>
-                    {text}
-                </TypeSubtitle>
-            </TypeIconContainer>
-        </NativeDataTypeTooltip>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx
deleted file mode 100644
index cb7a92a204daf0..00000000000000
--- a/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/MlFeatureTableFeatures.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-
-import TableOfMlFeatures from '@app/entity/mlFeatureTable/profile/features/TableOfMlFeatures';
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { notEmpty } from '@app/entity/shared/utils';
-
-import { GetMlFeatureTableQuery } from '@graphql/mlFeatureTable.generated';
-import { MlFeature, MlPrimaryKey } from '@types';
-
-export default function MlFeatureTableFeatures() {
-    const baseEntity = useBaseEntity<GetMlFeatureTableQuery>();
-    const featureTable = baseEntity?.mlFeatureTable;
-
-    const features = (
-        featureTable?.properties && (featureTable?.properties?.mlFeatures || featureTable?.properties?.mlPrimaryKeys)
-            ? [
-                  ...(featureTable?.properties?.mlPrimaryKeys || []),
-                  ...(featureTable?.properties?.mlFeatures || []),
-              ].filter(notEmpty)
-            : []
-    ) as Array<MlFeature | MlPrimaryKey>;
-
-    return <TableOfMlFeatures features={features} />;
-}
diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/TableOfMlFeatures.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/TableOfMlFeatures.tsx
deleted file mode 100644
index 5c8d6a2df2e35f..00000000000000
--- a/datahub-web-react/src/app/entity/mlFeatureTable/profile/features/TableOfMlFeatures.tsx
+++ /dev/null
@@ -1,161 +0,0 @@
-import { CheckSquareOutlined } from '@ant-design/icons';
-import { Table, Typography } from 'antd';
-import { AlignType } from 'rc-table/lib/interface';
-import React, { useState } from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import SchemaDescriptionField from '@app/entity/dataset/profile/schema/components/SchemaDescriptionField';
-import MlFeatureDataTypeIcon from '@app/entity/mlFeatureTable/profile/features/MlFeatureDataTypeIcon';
-import { useRefetch } from '@app/entity/shared/EntityContext';
-import TagTermGroup from '@app/shared/tags/TagTermGroup';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useUpdateDescriptionMutation } from '@graphql/mutations.generated';
-import { MlFeature, MlFeatureDataType, MlPrimaryKey } from '@types';
-
-const FeaturesContainer = styled.div`
-    margin-bottom: 100px;
-`;
-
-const defaultColumns = [
-    {
-        title: 'Type',
-        dataIndex: 'dataType',
-        key: 'dataType',
-        width: 100,
-        align: 'left' as AlignType,
-        render: (dataType: MlFeatureDataType) => {
-            return <MlFeatureDataTypeIcon dataType={dataType} />;
-        },
-    },
-];
-
-type Props = {
-    features: Array<MlFeature | MlPrimaryKey>;
-};
-
-export default function TableOfMlFeatures({ features }: Props) {
-    const refetch = useRefetch();
-    const [updateDescription] = useUpdateDescriptionMutation();
-    const entityRegistry = useEntityRegistry();
-
-    const [tagHoveredIndex, setTagHoveredIndex] = useState<string | undefined>(undefined);
-    const [expandedRows, setExpandedRows] = useState({});
-
-    const onTagTermCell = (record: any, rowIndex: number | undefined) => ({
-        onMouseEnter: () => {
-            setTagHoveredIndex(`${record.urn}-${rowIndex}`);
-        },
-        onMouseLeave: () => {
-            setTagHoveredIndex(undefined);
-        },
-    });
-
-    const nameColumn = {
-        title: 'Name',
-        dataIndex: 'name',
-        key: 'name',
-        width: 100,
-        render: (name: string, feature: MlFeature | MlPrimaryKey) => (
-            <Link to={entityRegistry.getEntityUrl(feature.type, feature.urn)}>
-                <Typography.Text strong>{name}</Typography.Text>
-            </Link>
-        ),
-    };
-
-    const descriptionColumn = {
-        title: 'Description',
-        dataIndex: 'description',
-        key: 'description',
-        render: (_, feature: MlFeature | MlPrimaryKey, index: number) => (
-            <SchemaDescriptionField
-                onExpanded={(expanded) => {
-                    setExpandedRows((prev) => ({ ...prev, [index]: expanded }));
-                }}
-                expanded={!!expandedRows[index]}
-                description={feature?.editableProperties?.description || feature?.properties?.description || ''}
-                original={feature?.properties?.description}
-                isEdited={!!feature?.editableProperties?.description}
-                onUpdate={(updatedDescription) =>
-                    updateDescription({
-                        variables: {
-                            input: {
-                                description: updatedDescription,
-                                resourceUrn: feature.urn,
-                            },
-                        },
-                    }).then(refetch)
-                }
-            />
-        ),
-        width: 300,
-    };
-
-    const tagColumn = {
-        width: 125,
-        title: 'Tags',
-        dataIndex: 'tags',
-        key: 'tags',
-        render: (_, feature: MlFeature | MlPrimaryKey, rowIndex: number) => (
-            <TagTermGroup
-                editableTags={feature.tags}
-                canRemove
-                buttonProps={{ size: 'small' }}
-                canAddTag={tagHoveredIndex === `${feature.urn}-${rowIndex}`}
-                onOpenModal={() => setTagHoveredIndex(undefined)}
-                entityUrn={feature.urn}
-                entityType={feature.type}
-                refetch={refetch}
-            />
-        ),
-        onCell: onTagTermCell,
-    };
-
-    const termColumn = {
-        width: 125,
-        title: 'Terms',
-        dataIndex: 'glossaryTerms',
-        key: 'glossaryTerms',
-        render: (_, feature: MlFeature | MlPrimaryKey, rowIndex: number) => (
-            <TagTermGroup
-                editableGlossaryTerms={feature.glossaryTerms}
-                canRemove
-                buttonProps={{ size: 'small' }}
-                canAddTerm={tagHoveredIndex === `${feature.urn}-${rowIndex}`}
-                onOpenModal={() => setTagHoveredIndex(undefined)}
-                entityUrn={feature.urn}
-                entityType={feature.type}
-                refetch={refetch}
-            />
-        ),
-        onCell: onTagTermCell,
-    };
-
-    const primaryKeyColumn = {
-        title: 'Primary Key',
-        dataIndex: 'primaryKey',
-        key: 'primaryKey',
-        render: (_: any, record: MlFeature | MlPrimaryKey) =>
-            record.__typename === 'MLPrimaryKey' ? <CheckSquareOutlined /> : null,
-        width: 50,
-    };
-
-    const allColumns = [...defaultColumns, nameColumn, descriptionColumn, tagColumn, termColumn, primaryKeyColumn];
-
-    return (
-        <FeaturesContainer>
-            {features && features.length > 0 && (
-                <Table
-                    columns={allColumns}
-                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                    // @ts-ignore
-                    dataSource={features}
-                    rowKey={(record) => `${record.dataType}-${record.name}`}
-                    expandable={{ defaultExpandAllRows: true, expandRowByClick: true }}
-                    pagination={false}
-                />
-            )}
-        </FeaturesContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx b/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx
deleted file mode 100644
index e9e9d137be9ebb..00000000000000
--- a/datahub-web-react/src/app/entity/mlModel/MLModelEntity.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-import { CodeSandboxOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { Preview } from '@app/entity/mlModel/preview/Preview';
-import MLModelGroupsTab from '@app/entity/mlModel/profile/MLModelGroupsTab';
-import MLModelSummary from '@app/entity/mlModel/profile/MLModelSummary';
-import MlModelFeaturesTab from '@app/entity/mlModel/profile/MlModelFeaturesTab';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-
-import { useGetMlModelQuery } from '@graphql/mlModel.generated';
-import { EntityType, MlModel, OwnershipType, SearchResult } from '@types';
-
-/**
- * Definition of the DataHub MlModel entity.
- */
-export class MLModelEntity implements Entity<MlModel> {
-    type: EntityType = EntityType.Mlmodel;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <CodeSandboxOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <CodeSandboxOutlined style={{ fontSize, color: color || '#9633b9' }} />;
-        }
-
-        return (
-            <CodeSandboxOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => true;
-
-    isLineageEnabled = () => true;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getGraphName = () => 'mlModel';
-
-    getPathName = () => 'mlModels';
-
-    getEntityName = () => 'ML Model';
-
-    getCollectionName = () => 'ML Models';
-
-    getOverridePropertiesFromEntity = (mlModel?: MlModel | null): GenericEntityProperties => {
-        return {
-            externalUrl: mlModel?.properties?.externalUrl,
-        };
-    };
-
-    useEntityQuery = useGetMlModelQuery;
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-            properties: {
-                defaultOwnerType: OwnershipType.TechnicalOwner,
-            },
-        },
-        {
-            component: SidebarTagsSection,
-            properties: {
-                hasTags: true,
-                hasTerms: true,
-            },
-        },
-        {
-            component: SidebarDomainSection,
-        },
-        {
-            component: DataProductSection,
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-    ];
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            key={urn}
-            entityType={EntityType.Mlmodel}
-            useEntityQuery={useGetMlModelQuery}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            headerDropdownItems={new Set([EntityMenuItems.UPDATE_DEPRECATION])}
-            tabs={[
-                {
-                    name: 'Summary',
-                    component: MLModelSummary,
-                },
-                {
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                },
-                {
-                    name: 'Group',
-                    component: MLModelGroupsTab,
-                },
-                {
-                    name: 'Features',
-                    component: MlModelFeaturesTab,
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-                {
-                    name: 'Incidents',
-                    component: IncidentTab,
-                    getDynamicName: (_, mlModel) => {
-                        const activeIncidentCount = mlModel?.mlModel?.activeIncidents?.total;
-                        return `Incidents${(activeIncidentCount && ` (${activeIncidentCount})`) || ''}`;
-                    },
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-        />
-    );
-
-    renderPreview = (_: PreviewType, data: MlModel) => {
-        return <Preview model={data} />;
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as MlModel;
-        return <Preview model={data} degree={(result as any).degree} paths={(result as any).paths} />;
-    };
-
-    getLineageVizConfig = (entity: MlModel) => {
-        return {
-            urn: entity.urn,
-            // eslint-disable-next-line @typescript-eslint/dot-notation
-            name: entity.properties?.['propertiesName'] || entity.name,
-            type: EntityType.Mlmodel,
-            icon: entity.platform?.properties?.logoUrl || undefined,
-            platform: entity.platform,
-        };
-    };
-
-    displayName = (data: MlModel) => {
-        return data.properties?.name || data.name || data.urn;
-    };
-
-    getGenericEntityProperties = (mlModel: MlModel) => {
-        return getDataForEntityType({ data: mlModel, entityType: this.type, getOverrideProperties: (data) => data });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.DOMAINS,
-            EntityCapabilityType.DEPRECATION,
-            EntityCapabilityType.SOFT_DELETE,
-            EntityCapabilityType.DATA_PRODUCTS,
-        ]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/mlModel/preview/Preview.tsx b/datahub-web-react/src/app/entity/mlModel/preview/Preview.tsx
deleted file mode 100644
index 0ee5698658846c..00000000000000
--- a/datahub-web-react/src/app/entity/mlModel/preview/Preview.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-
-import { IconStyleType } from '@app/entity/Entity';
-import { getDataProduct } from '@app/entity/shared/utils';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityPath, EntityType, MlModel } from '@types';
-
-export const Preview = ({
-    model,
-    degree,
-    paths,
-}: {
-    model: MlModel;
-    degree?: number;
-    paths?: EntityPath[];
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    const genericProperties = entityRegistry.getGenericEntityProperties(EntityType.Mlmodel, model);
-
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.Mlmodel, model.urn)}
-            // eslint-disable-next-line @typescript-eslint/dot-notation
-            name={model.properties?.['propertiesName'] || model.name || ''}
-            urn={model.urn}
-            description={model.description || ''}
-            platformInstanceId={model.dataPlatformInstance?.instanceId}
-            type={entityRegistry.getEntityName(EntityType.Mlmodel)}
-            typeIcon={entityRegistry.getIcon(EntityType.Mlmodel, 14, IconStyleType.ACCENT)}
-            platform={model?.platform?.properties?.displayName || capitalizeFirstLetterOnly(model?.platform?.name)}
-            qualifier={model.origin}
-            tags={model.globalTags || undefined}
-            owners={model?.ownership?.owners}
-            dataProduct={getDataProduct(genericProperties?.dataProduct)}
-            degree={degree}
-            paths={paths}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/mlModel/profile/MLModelGroupsTab.tsx b/datahub-web-react/src/app/entity/mlModel/profile/MLModelGroupsTab.tsx
deleted file mode 100644
index fda5a50ea42f20..00000000000000
--- a/datahub-web-react/src/app/entity/mlModel/profile/MLModelGroupsTab.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Space, Table, Typography } from 'antd';
-import { ColumnsType } from 'antd/es/table';
-import Link from 'antd/lib/typography/Link';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { GetMlModelQuery } from '@graphql/mlModel.generated';
-import { EntityType, MlModelGroup } from '@types';
-
-const TabContent = styled.div`
-    padding: 16px;
-`;
-
-export default function MLModelGroupsTab() {
-    const baseEntity = useBaseEntity<GetMlModelQuery>();
-    const model = baseEntity?.mlModel;
-
-    const entityRegistry = useEntityRegistry();
-
-    const propertyTableColumns: ColumnsType<MlModelGroup> = [
-        {
-            title: 'Group',
-            dataIndex: 'name',
-            render: (name, record) => {
-                return (
-                    <Link href={entityRegistry.getEntityUrl(EntityType.MlmodelGroup, record.urn)}>
-                        {record.properties?.name || name}
-                    </Link>
-                );
-            },
-        },
-        {
-            title: 'Description',
-            dataIndex: 'description',
-        },
-    ];
-
-    return (
-        <TabContent>
-            <Space direction="vertical" style={{ width: '100%' }} size="large">
-                <Typography.Title level={3}>Groups</Typography.Title>
-                <Table
-                    pagination={false}
-                    columns={propertyTableColumns}
-                    dataSource={model?.properties?.groups as MlModelGroup[]}
-                />
-            </Space>
-        </TabContent>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx b/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx
deleted file mode 100644
index 7e7652b30b650b..00000000000000
--- a/datahub-web-react/src/app/entity/mlModel/profile/MLModelSummary.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import { Space, Table, Typography } from 'antd';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { Pill } from '@components/components/Pills';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { InfoItem } from '@app/entity/shared/components/styled/InfoItem';
-import { notEmpty } from '@app/entity/shared/utils';
-import { TimestampPopover } from '@app/sharedV2/TimestampPopover';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { colors } from '@src/alchemy-components/theme';
-
-import { GetMlModelQuery } from '@graphql/mlModel.generated';
-import { EntityType, MlHyperParam, MlMetric } from '@types';
-
-const TabContent = styled.div`
-    padding: 16px;
-`;
-
-const InfoItemContainer = styled.div<{ justifyContent }>`
-    display: flex;
-    position: relative;
-    justify-content: ${(props) => props.justifyContent};
-    padding: 0px 2px;
-`;
-
-const InfoItemContent = styled.div`
-    padding-top: 8px;
-    width: 100px;
-    overflow-wrap: break-word;
-`;
-
-const JobLink = styled(Link)`
-    color: ${colors.blue[700]};
-    &:hover {
-        text-decoration: underline;
-    }
-`;
-
-export default function MLModelSummary() {
-    const baseEntity = useBaseEntity<GetMlModelQuery>();
-    const model = baseEntity?.mlModel;
-    const entityRegistry = useEntityRegistry();
-
-    const propertyTableColumns = [
-        {
-            title: 'Name',
-            dataIndex: 'name',
-            width: 450,
-        },
-        {
-            title: 'Value',
-            dataIndex: 'value',
-        },
-    ];
-
-    const renderTrainingJobs = () => {
-        const trainingJobs =
-            model?.trainedBy?.relationships?.map((relationship) => relationship.entity).filter(notEmpty) || [];
-
-        if (trainingJobs.length === 0) return '-';
-
-        return (
-            <div>
-                {trainingJobs.map((job, index) => {
-                    const { urn, name } = job as { urn: string; name?: string };
-                    return (
-                        <span key={urn}>
-                            <JobLink to={entityRegistry.getEntityUrl(EntityType.DataProcessInstance, urn)}>
-                                {name || urn}
-                            </JobLink>
-                            {index < trainingJobs.length - 1 && ', '}
-                        </span>
-                    );
-                })}
-            </div>
-        );
-    };
-
-    return (
-        <TabContent>
-            <Space direction="vertical" style={{ width: '100%' }} size="large">
-                <Typography.Title level={3}>Model Details</Typography.Title>
-                <InfoItemContainer justifyContent="left">
-                    <InfoItem title="Version">
-                        <InfoItemContent>{model?.versionProperties?.version?.versionTag}</InfoItemContent>
-                    </InfoItem>
-                    <InfoItem title="Registered At">
-                        <TimestampPopover timestamp={model?.properties?.created?.time} title="Registered At" />
-                    </InfoItem>
-                    <InfoItem title="Last Modified At">
-                        <TimestampPopover timestamp={model?.properties?.lastModified?.time} title="Last Modified At" />
-                    </InfoItem>
-                    <InfoItem title="Created By">
-                        <InfoItemContent>{model?.properties?.created?.actor || '-'}</InfoItemContent>
-                    </InfoItem>
-                </InfoItemContainer>
-                <InfoItemContainer justifyContent="left">
-                    <InfoItem title="Aliases">
-                        <InfoItemContent>
-                            {model?.versionProperties?.aliases?.map((alias) => (
-                                <Pill
-                                    label={alias.versionTag ?? '-'}
-                                    key={alias.versionTag}
-                                    color="blue"
-                                    clickable={false}
-                                />
-                            ))}
-                        </InfoItemContent>
-                    </InfoItem>
-                    <InfoItem title="Source Run">
-                        <InfoItemContent>{renderTrainingJobs()}</InfoItemContent>
-                    </InfoItem>
-                </InfoItemContainer>
-                <Typography.Title level={3}>Training Metrics</Typography.Title>
-                <Table
-                    pagination={false}
-                    columns={propertyTableColumns}
-                    dataSource={model?.properties?.trainingMetrics as MlMetric[]}
-                />
-                <Typography.Title level={3}>Hyper Parameters</Typography.Title>
-                <Table
-                    pagination={false}
-                    columns={propertyTableColumns}
-                    dataSource={model?.properties?.hyperParams as MlHyperParam[]}
-                />
-            </Space>
-        </TabContent>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/mlModel/profile/MlModelFeaturesTab.tsx b/datahub-web-react/src/app/entity/mlModel/profile/MlModelFeaturesTab.tsx
deleted file mode 100644
index cac4135307f722..00000000000000
--- a/datahub-web-react/src/app/entity/mlModel/profile/MlModelFeaturesTab.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-
-import TableOfMlFeatures from '@app/entity/mlFeatureTable/profile/features/TableOfMlFeatures';
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-
-import { GetMlModelQuery } from '@graphql/mlModel.generated';
-import { MlFeature, MlPrimaryKey } from '@types';
-
-export default function MlModelFeaturesTab() {
-    const entity = useBaseEntity() as GetMlModelQuery;
-
-    const model = entity && entity.mlModel;
-    const features = model?.features?.relationships?.map((relationship) => relationship.entity) as Array<
-        MlFeature | MlPrimaryKey
-    >;
-
-    return <TableOfMlFeatures features={features || []} />;
-}
diff --git a/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx b/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx
deleted file mode 100644
index d3448c96e3a558..00000000000000
--- a/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-import { CodeSandboxOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { Preview } from '@app/entity/mlModelGroup/preview/Preview';
-import ModelGroupModels from '@app/entity/mlModelGroup/profile/ModelGroupModels';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-
-import { useGetMlModelGroupQuery } from '@graphql/mlModelGroup.generated';
-import { EntityType, MlModelGroup, OwnershipType, SearchResult } from '@types';
-
-/**
- * Definition of the DataHub MlModelGroup entity.
- */
-export class MLModelGroupEntity implements Entity<MlModelGroup> {
-    type: EntityType = EntityType.MlmodelGroup;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <CodeSandboxOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <CodeSandboxOutlined style={{ fontSize, color: color || '#9633b9' }} />;
-        }
-
-        return (
-            <CodeSandboxOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => true;
-
-    isLineageEnabled = () => true;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getGraphName = () => 'mlModelGroup';
-
-    getPathName = () => 'mlModelGroup';
-
-    getEntityName = () => 'ML Group';
-
-    getCollectionName = () => 'ML Groups';
-
-    getOverridePropertiesFromEntity = (_?: MlModelGroup | null): GenericEntityProperties => {
-        return {};
-    };
-
-    useEntityQuery = useGetMlModelGroupQuery;
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-            properties: {
-                defaultOwnerType: OwnershipType.TechnicalOwner,
-            },
-        },
-        {
-            component: SidebarTagsSection,
-            properties: {
-                hasTags: true,
-                hasTerms: true,
-            },
-        },
-        {
-            component: SidebarDomainSection,
-        },
-        {
-            component: DataProductSection,
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-    ];
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            key={urn}
-            entityType={EntityType.MlmodelGroup}
-            useEntityQuery={useGetMlModelGroupQuery}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            headerDropdownItems={new Set([EntityMenuItems.UPDATE_DEPRECATION])}
-            tabs={[
-                {
-                    name: 'Models',
-                    component: ModelGroupModels,
-                },
-                {
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-        />
-    );
-
-    renderPreview = (_: PreviewType, data: MlModelGroup) => {
-        return <Preview group={data} />;
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as MlModelGroup;
-        return <Preview group={data} degree={(result as any).degree} paths={(result as any).paths} />;
-    };
-
-    getLineageVizConfig = (entity: MlModelGroup) => {
-        return {
-            urn: entity.urn,
-            // eslint-disable-next-line @typescript-eslint/dot-notation
-            name: entity.properties?.['propertiesName'] || entity.name,
-            type: EntityType.MlmodelGroup,
-            icon: entity.platform?.properties?.logoUrl || undefined,
-            platform: entity.platform,
-        };
-    };
-
-    displayName = (data: MlModelGroup) => {
-        return data.properties?.name || data.name || data.urn;
-    };
-
-    getGenericEntityProperties = (mlModelGroup: MlModelGroup) => {
-        return getDataForEntityType({
-            data: mlModelGroup,
-            entityType: this.type,
-            getOverrideProperties: (data) => data,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.DOMAINS,
-            EntityCapabilityType.DEPRECATION,
-            EntityCapabilityType.SOFT_DELETE,
-            EntityCapabilityType.DATA_PRODUCTS,
-        ]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/mlModelGroup/preview/Preview.tsx b/datahub-web-react/src/app/entity/mlModelGroup/preview/Preview.tsx
deleted file mode 100644
index fb7cb6587fa344..00000000000000
--- a/datahub-web-react/src/app/entity/mlModelGroup/preview/Preview.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-
-import { getDataProduct } from '@app/entity/shared/utils';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityPath, EntityType, MlModelGroup } from '@types';
-
-export const Preview = ({
-    group,
-    degree,
-    paths,
-}: {
-    group: MlModelGroup;
-    degree?: number;
-    paths?: EntityPath[];
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    const genericProperties = entityRegistry.getGenericEntityProperties(EntityType.MlmodelGroup, group);
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.MlmodelGroup, group.urn)}
-            // eslint-disable-next-line @typescript-eslint/dot-notation
-            name={group?.properties?.['propertiesName'] || group?.name || ''}
-            urn={group.urn}
-            platformInstanceId={group.dataPlatformInstance?.instanceId}
-            description={group?.description || ''}
-            type="MLModel Group"
-            logoUrl={group?.platform?.properties?.logoUrl || ''}
-            platform={group?.platform?.properties?.displayName || capitalizeFirstLetterOnly(group?.platform?.name)}
-            qualifier={group?.origin}
-            owners={group?.ownership?.owners}
-            dataProduct={getDataProduct(genericProperties?.dataProduct)}
-            degree={degree}
-            paths={paths}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx b/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx
deleted file mode 100644
index 22a2f93ed2ff6c..00000000000000
--- a/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx
+++ /dev/null
@@ -1,188 +0,0 @@
-import { Table, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { EmptyTab } from '@app/entity/shared/components/styled/EmptyTab';
-import { InfoItem } from '@app/entity/shared/components/styled/InfoItem';
-import { notEmpty } from '@app/entity/shared/utils';
-import { TimestampPopover } from '@app/sharedV2/TimestampPopover';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { Pill } from '@src/alchemy-components/components/Pills';
-import { colors } from '@src/alchemy-components/theme';
-
-import { GetMlModelGroupQuery } from '@graphql/mlModelGroup.generated';
-import { EntityType } from '@types';
-
-const InfoItemContainer = styled.div<{ justifyContent }>`
-    display: flex;
-    position: relative;
-    justify-content: ${(props) => props.justifyContent};
-    padding: 12px 2px 20px 2px;
-`;
-
-const InfoItemContent = styled.div`
-    padding-top: 8px;
-    width: 100px;
-`;
-
-const NameContainer = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const NameLink = styled.a`
-    font-weight: 700;
-    color: inherit;
-    font-size: 0.9rem;
-
-    &:hover {
-        color: ${colors.blue[400]} !important;
-    }
-`;
-
-const TagContainer = styled.div`
-    display: inline-flex;
-    margin-left: 0px;
-    margin-top: 3px;
-    flex-wrap: wrap;
-    margin-right: 8px;
-    backgroundcolor: white;
-    gap: 5px;
-`;
-
-const StyledTable = styled(Table)`
-    &&& .ant-table-cell {
-        padding: 16px;
-    }
-` as typeof Table;
-
-const ModelsContainer = styled.div`
-    width: 100%;
-    padding: 20px;
-`;
-
-const VersionContainer = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-export default function MLGroupModels() {
-    const baseEntity = useBaseEntity<GetMlModelGroupQuery>();
-    const entityRegistry = useEntityRegistry();
-    const modelGroup = baseEntity?.mlModelGroup;
-
-    const models =
-        baseEntity?.mlModelGroup?.incoming?.relationships
-            ?.map((relationship) => relationship.entity)
-            .filter(notEmpty) || [];
-
-    const columns = [
-        {
-            title: 'Name',
-            dataIndex: 'name',
-            key: 'name',
-            width: 300,
-            render: (_: any, record) => (
-                <NameContainer>
-                    <NameLink href={entityRegistry.getEntityUrl(EntityType.Mlmodel, record.urn)}>
-                        {record?.properties?.propertiesName || record?.name}
-                    </NameLink>
-                </NameContainer>
-            ),
-        },
-        {
-            title: 'Version',
-            key: 'version',
-            width: 70,
-            render: (_: any, record: any) => (
-                <VersionContainer>{record.versionProperties?.version?.versionTag || '-'}</VersionContainer>
-            ),
-        },
-        {
-            title: 'Created At',
-            key: 'createdAt',
-            width: 150,
-            render: (_: any, record: any) => (
-                <TimestampPopover timestamp={record.properties?.createdTS?.time} title="Created At" showPopover />
-            ),
-        },
-        {
-            title: 'Aliases',
-            key: 'aliases',
-            width: 200,
-            render: (_: any, record: any) => {
-                const aliases = record.versionProperties?.aliases || [];
-
-                return (
-                    <TagContainer>
-                        {aliases.map((alias) => (
-                            <Pill key={alias.versionTag} label={alias.versionTag} color="blue" clickable={false} />
-                        ))}
-                    </TagContainer>
-                );
-            },
-        },
-        {
-            title: 'Properties',
-            key: 'properties',
-            width: 200,
-            render: (_: any, record: any) => {
-                const tags = record.properties?.tags || [];
-
-                return (
-                    <TagContainer>
-                        {tags.map((tag) => (
-                            <Pill key={tag} label={tag} clickable={false} />
-                        ))}
-                    </TagContainer>
-                );
-            },
-        },
-        {
-            title: 'Description',
-            dataIndex: 'description',
-            key: 'description',
-            width: 300,
-            render: (_: any, record: any) => {
-                const editableDesc = record.editableProperties?.description;
-                const originalDesc = record.description;
-
-                return <Typography.Text>{editableDesc || originalDesc || '-'}</Typography.Text>;
-            },
-        },
-    ];
-
-    return (
-        <ModelsContainer>
-            <Typography.Title level={3}>Model Group Details</Typography.Title>
-            <InfoItemContainer justifyContent="left">
-                <InfoItem title="Created At">
-                    <TimestampPopover timestamp={modelGroup?.properties?.created?.time} title="Created At" />
-                </InfoItem>
-                <InfoItem title="Last Modified At">
-                    <TimestampPopover timestamp={modelGroup?.properties?.lastModified?.time} title="Last Modified At" />
-                </InfoItem>
-                {modelGroup?.properties?.created?.actor && (
-                    <InfoItem title="Created By">
-                        <InfoItemContent>{modelGroup.properties.created?.actor}</InfoItemContent>
-                    </InfoItem>
-                )}
-            </InfoItemContainer>
-            <Typography.Title level={3}>Models</Typography.Title>
-            <StyledTable
-                columns={columns}
-                dataSource={models}
-                pagination={false}
-                rowKey="urn"
-                expandable={{
-                    defaultExpandAllRows: true,
-                    expandRowByClick: true,
-                }}
-                locale={{
-                    emptyText: <EmptyTab tab="mlModel" />,
-                }}
-            />
-        </ModelsContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/mlPrimaryKey/MLPrimaryKeyEntity.tsx b/datahub-web-react/src/app/entity/mlPrimaryKey/MLPrimaryKeyEntity.tsx
deleted file mode 100644
index 2ca67e208e0fbb..00000000000000
--- a/datahub-web-react/src/app/entity/mlPrimaryKey/MLPrimaryKeyEntity.tsx
+++ /dev/null
@@ -1,204 +0,0 @@
-import { DotChartOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { Preview } from '@app/entity/mlPrimaryKey/preview/Preview';
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import SidebarStructuredPropsSection from '@app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab';
-import { FeatureTableTab } from '@app/entity/shared/tabs/ML/MlPrimaryKeyFeatureTableTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { getDataProduct } from '@app/entity/shared/utils';
-
-import { useGetMlPrimaryKeyQuery } from '@graphql/mlPrimaryKey.generated';
-import { EntityType, MlPrimaryKey, OwnershipType, SearchResult } from '@types';
-
-/**
- * Definition of the DataHub MLPrimaryKey entity.
- */
-export class MLPrimaryKeyEntity implements Entity<MlPrimaryKey> {
-    type: EntityType = EntityType.MlprimaryKey;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <DotChartOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <DotChartOutlined style={{ fontSize, color: color || '#9633b9' }} />;
-        }
-
-        return (
-            <DotChartOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => true;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getGraphName = () => 'mlPrimaryKey';
-
-    getPathName = () => 'mlPrimaryKeys';
-
-    getEntityName = () => 'ML Primary Key';
-
-    getCollectionName = () => 'ML Primary Keys';
-
-    getOverridePropertiesFromEntity = (key?: MlPrimaryKey | null): GenericEntityProperties => {
-        return {
-            // eslint-disable-next-line
-            platform: key?.['featureTables']?.relationships?.[0]?.entity?.platform,
-        };
-    };
-
-    useEntityQuery = useGetMlPrimaryKeyQuery;
-
-    renderProfile = (urn: string) => (
-        <EntityProfile
-            urn={urn}
-            key={urn}
-            entityType={EntityType.MlprimaryKey}
-            useEntityQuery={useGetMlPrimaryKeyQuery}
-            getOverrideProperties={this.getOverridePropertiesFromEntity}
-            tabs={[
-                {
-                    name: 'Feature Tables',
-                    component: FeatureTableTab,
-                },
-                {
-                    name: 'Documentation',
-                    component: DocumentationTab,
-                },
-                {
-                    name: 'Lineage',
-                    component: LineageTab,
-                },
-                {
-                    name: 'Properties',
-                    component: PropertiesTab,
-                },
-            ]}
-            sidebarSections={this.getSidebarSections()}
-        />
-    );
-
-    getSidebarSections = () => [
-        {
-            component: SidebarAboutSection,
-        },
-        {
-            component: SidebarOwnerSection,
-            properties: {
-                defaultOwnerType: OwnershipType.TechnicalOwner,
-            },
-        },
-        {
-            component: SidebarTagsSection,
-            properties: {
-                hasTags: true,
-                hasTerms: true,
-            },
-        },
-        {
-            component: SidebarDomainSection,
-        },
-        {
-            component: DataProductSection,
-        },
-        {
-            component: SidebarStructuredPropsSection,
-        },
-    ];
-
-    renderPreview = (_: PreviewType, data: MlPrimaryKey) => {
-        const genericProperties = this.getGenericEntityProperties(data);
-        // eslint-disable-next-line
-        const platform = data?.['featureTables']?.relationships?.[0]?.entity?.platform;
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.name || ''}
-                featureNamespace={data.featureNamespace || ''}
-                description={data.description}
-                owners={data.ownership?.owners}
-                platform={platform}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => {
-        const data = result.entity as MlPrimaryKey;
-        const genericProperties = this.getGenericEntityProperties(data);
-        // eslint-disable-next-line
-        const platform = data?.['featureTables']?.relationships?.[0]?.entity?.platform;
-        return (
-            <Preview
-                urn={data.urn}
-                name={data.name || ''}
-                featureNamespace={data.featureNamespace || ''}
-                description={data.description || ''}
-                owners={data.ownership?.owners}
-                platform={platform}
-                platformInstanceId={data.dataPlatformInstance?.instanceId}
-                dataProduct={getDataProduct(genericProperties?.dataProduct)}
-                degree={(result as any).degree}
-                paths={(result as any).paths}
-            />
-        );
-    };
-
-    displayName = (data: MlPrimaryKey) => {
-        return data.name || data.urn;
-    };
-
-    getGenericEntityProperties = (mlPrimaryKey: MlPrimaryKey) => {
-        return getDataForEntityType({
-            data: mlPrimaryKey,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    getLineageVizConfig = (entity: MlPrimaryKey) => {
-        return {
-            urn: entity.urn,
-            name: entity.name,
-            type: EntityType.MlprimaryKey,
-            // eslint-disable-next-line
-            icon: entity?.['featureTables']?.relationships?.[0]?.entity?.platform?.properties?.logoUrl || undefined,
-            // eslint-disable-next-line
-            platform: entity?.['featureTables']?.relationships?.[0]?.entity?.platform?.name,
-        };
-    };
-
-    supportedCapabilities = () => {
-        return new Set([
-            EntityCapabilityType.OWNERS,
-            EntityCapabilityType.GLOSSARY_TERMS,
-            EntityCapabilityType.TAGS,
-            EntityCapabilityType.DOMAINS,
-            EntityCapabilityType.DEPRECATION,
-            EntityCapabilityType.SOFT_DELETE,
-            EntityCapabilityType.DATA_PRODUCTS,
-        ]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/mlPrimaryKey/preview/Preview.tsx b/datahub-web-react/src/app/entity/mlPrimaryKey/preview/Preview.tsx
deleted file mode 100644
index 70fb631b2f5c8e..00000000000000
--- a/datahub-web-react/src/app/entity/mlPrimaryKey/preview/Preview.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import React from 'react';
-
-import { IconStyleType } from '@app/entity/Entity';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { DataPlatform, DataProduct, EntityPath, EntityType, Owner } from '@types';
-
-export const Preview = ({
-    urn,
-    name,
-    featureNamespace,
-    description,
-    owners,
-    platform,
-    dataProduct,
-    platformInstanceId,
-    degree,
-    paths,
-}: {
-    urn: string;
-    name: string;
-    featureNamespace: string;
-    description?: string | null;
-    owners?: Array<Owner> | null;
-    platform?: DataPlatform | null | undefined;
-    dataProduct?: DataProduct | null;
-    platformInstanceId?: string;
-    degree?: number;
-    paths?: EntityPath[];
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <DefaultPreviewCard
-            url={entityRegistry.getEntityUrl(EntityType.MlprimaryKey, urn)}
-            name={name}
-            urn={urn}
-            description={description || ''}
-            platform={
-                platform?.properties?.displayName || capitalizeFirstLetterOnly(platform?.name) || featureNamespace
-            }
-            logoUrl={platform?.properties?.logoUrl || ''}
-            type="ML Primary Key"
-            typeIcon={entityRegistry.getIcon(EntityType.MlprimaryKey, 14, IconStyleType.ACCENT)}
-            owners={owners}
-            dataProduct={dataProduct}
-            platformInstanceId={platformInstanceId}
-            degree={degree}
-            paths={paths}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/ownership/ManageOwnership.tsx b/datahub-web-react/src/app/entity/ownership/ManageOwnership.tsx
deleted file mode 100644
index ccc27e948c8e09..00000000000000
--- a/datahub-web-react/src/app/entity/ownership/ManageOwnership.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { OwnershipList } from '@app/entity/ownership/OwnershipList';
-
-const PageContainer = styled.div`
-    padding-top: 20px;
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    overflow: auto;
-`;
-
-const PageHeaderContainer = styled.div`
-    && {
-        padding-left: 24px;
-    }
-`;
-
-const PageTitle = styled(Typography.Title)`
-    && {
-        margin-bottom: 12px;
-    }
-`;
-
-const ListContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    overflow: auto;
-`;
-
-/**
- * Component used for displaying the 'Manage Ownership' experience.
- */
-export const ManageOwnership = () => {
-    return (
-        <PageContainer>
-            <PageHeaderContainer>
-                <PageTitle level={3}>Manage Ownership</PageTitle>
-                <Typography.Paragraph type="secondary">
-                    Create, edit, and remove custom Ownership Types.
-                </Typography.Paragraph>
-            </PageHeaderContainer>
-            <ListContainer>
-                <OwnershipList />
-            </ListContainer>
-        </PageContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/ownership/OwnershipBuilderModal.tsx b/datahub-web-react/src/app/entity/ownership/OwnershipBuilderModal.tsx
deleted file mode 100644
index 42bf0da7b57d14..00000000000000
--- a/datahub-web-react/src/app/entity/ownership/OwnershipBuilderModal.tsx
+++ /dev/null
@@ -1,227 +0,0 @@
-import { Button, Form, Input, Modal, Typography, message, notification } from 'antd';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components/macro';
-
-import { OwnershipTypeBuilderState } from '@app/entity/ownership/table/types';
-
-import { useCreateOwnershipTypeMutation, useUpdateOwnershipTypeMutation } from '@graphql/ownership.generated';
-import { OwnershipTypeEntity } from '@types';
-
-const NAME_INPUT_TEST_ID = 'ownership-type-name-input';
-const DESCRIPTION_INPUT_TEST_ID = 'ownership-type-description-input';
-
-const TitleContainer = styled.div`
-    display: flex;
-    justify-content: space-between;
-`;
-
-const TitleText = styled(Typography.Text)`
-    font-size: 16px;
-    font-weight: 700;
-`;
-
-const FormItemContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-`;
-
-const FormItemTitle = styled(Typography.Text)`
-    margin-bottom: 8px;
-    font-weight: 700;
-`;
-
-const StyledFormItem = styled(Form.Item)`
-    margin-bottom: 8px;
-`;
-
-const SaveButtonContainer = styled.div`
-    width: 100%;
-    display: flex;
-    justify-content: right;
-`;
-
-const CancelButton = styled(Button)`
-    margin-right: 12px;
-`;
-
-type Props = {
-    isOpen: boolean;
-    onClose: () => void;
-    refetch: () => void;
-    ownershipType?: OwnershipTypeEntity;
-};
-
-export const OwnershipBuilderModal = ({ isOpen, onClose, refetch, ownershipType }: Props) => {
-    // State
-    const [ownershipTypeBuilderState, setOwnershipTypeBuilderState] = useState<OwnershipTypeBuilderState>({
-        name: ownershipType?.info?.name || ownershipType?.urn || '',
-        description: ownershipType?.info?.description || '',
-    });
-    const setName = (name: string) => {
-        setOwnershipTypeBuilderState({ ...ownershipTypeBuilderState, name });
-    };
-    const setDescription = (description: string) => {
-        setOwnershipTypeBuilderState({ ...ownershipTypeBuilderState, description });
-    };
-    const [form] = Form.useForm();
-    form.setFieldsValue(ownershipTypeBuilderState);
-
-    // Side effects
-    useEffect(() => {
-        if (ownershipType) {
-            const ownershipTypeName = ownershipType?.info?.name || ownershipType?.urn;
-            const ownershipTypeDescription = ownershipType?.info?.description || '';
-            setOwnershipTypeBuilderState({
-                name: ownershipTypeName,
-                description: ownershipTypeDescription,
-            });
-        } else {
-            setOwnershipTypeBuilderState({
-                name: '',
-                description: '',
-            });
-        }
-    }, [ownershipType]);
-
-    // Queries
-    const [createOwnershipTypeMutation] = useCreateOwnershipTypeMutation();
-    const [updateOwnershipTypeMutation] = useUpdateOwnershipTypeMutation();
-
-    const onCreateOwnershipType = () => {
-        if (ownershipTypeBuilderState.name) {
-            createOwnershipTypeMutation({
-                variables: {
-                    input: {
-                        name: ownershipTypeBuilderState.name,
-                        description: ownershipTypeBuilderState.description,
-                    },
-                },
-            })
-                .then(() => {
-                    setName('');
-                    setDescription('');
-                    onClose();
-                    notification.success({
-                        message: `Success`,
-                        description: 'Successfully created ownership type.',
-                        placement: 'bottomLeft',
-                        duration: 3,
-                    });
-                    setTimeout(() => {
-                        refetch();
-                    }, 3000);
-                })
-                .catch((e: unknown) => {
-                    message.destroy();
-                    if (e instanceof Error) {
-                        message.error({
-                            content: `Failed to create ownership type`,
-                            duration: 3,
-                        });
-                    }
-                });
-        }
-    };
-
-    const onUpdateOwnershipType = () => {
-        if (ownershipType) {
-            updateOwnershipTypeMutation({
-                variables: {
-                    urn: ownershipType?.urn || '',
-                    input: {
-                        name: ownershipTypeBuilderState.name,
-                        description: ownershipTypeBuilderState.description,
-                    },
-                },
-            })
-                .then(() => {
-                    setName('');
-                    setDescription('');
-                    onClose();
-                    notification.success({
-                        message: `Success`,
-                        description: 'Successfully updated ownership type.',
-                        placement: 'bottomLeft',
-                        duration: 3,
-                    });
-                    setTimeout(() => {
-                        refetch();
-                    }, 3000);
-                })
-                .catch((e: unknown) => {
-                    message.destroy();
-                    if (e instanceof Error) {
-                        message.error({
-                            content: `Failed to update ownership type`,
-                            duration: 3,
-                        });
-                    }
-                });
-        }
-    };
-
-    const onUpsert = ownershipType ? onUpdateOwnershipType : onCreateOwnershipType;
-    const titleText = ownershipType ? 'Edit ownership type' : 'Add a new ownership type';
-    return (
-        <Modal
-            open={isOpen}
-            onCancel={onClose}
-            title={
-                <TitleContainer>
-                    <TitleText>{titleText}</TitleText>
-                </TitleContainer>
-            }
-            footer={null}
-        >
-            <Form form={form}>
-                <FormItemContainer>
-                    <FormItemTitle>Name</FormItemTitle>
-                    <StyledFormItem
-                        name="name"
-                        rules={[
-                            {
-                                required: true,
-                                message: 'Please input a name for the ownership type',
-                            },
-                            { whitespace: true },
-                            { min: 1, max: 50 },
-                        ]}
-                    >
-                        <Input
-                            data-testid={NAME_INPUT_TEST_ID}
-                            placeholder="Ownership type name"
-                            onChange={(e) => {
-                                setName(e.target.value);
-                            }}
-                        />
-                    </StyledFormItem>
-                </FormItemContainer>
-                <FormItemContainer>
-                    <FormItemTitle>Description</FormItemTitle>
-                    <StyledFormItem name="description" rules={[{ whitespace: true }, { min: 1, max: 250 }]}>
-                        <Input
-                            data-testid={DESCRIPTION_INPUT_TEST_ID}
-                            placeholder="Ownership type description"
-                            onChange={(e) => {
-                                setDescription(e.target.value);
-                            }}
-                        />
-                    </StyledFormItem>
-                </FormItemContainer>
-            </Form>
-            <SaveButtonContainer>
-                <CancelButton data-testid="ownership-builder-cancel" onClick={onClose}>
-                    Cancel
-                </CancelButton>
-                <Button
-                    data-testid="ownership-builder-save"
-                    type="primary"
-                    disabled={!ownershipTypeBuilderState.name}
-                    onClick={onUpsert}
-                >
-                    Save
-                </Button>
-            </SaveButtonContainer>
-        </Modal>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/ownership/OwnershipList.tsx b/datahub-web-react/src/app/entity/ownership/OwnershipList.tsx
deleted file mode 100644
index 617ed303d6b248..00000000000000
--- a/datahub-web-react/src/app/entity/ownership/OwnershipList.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Pagination, message } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components/macro';
-
-import { OwnershipBuilderModal } from '@app/entity/ownership/OwnershipBuilderModal';
-import { OwnershipTable } from '@app/entity/ownership/table/OwnershipTable';
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import { SearchBar } from '@app/search/SearchBar';
-import { Message } from '@app/shared/Message';
-import { scrollToTop } from '@app/shared/searchUtils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useListOwnershipTypesQuery } from '@graphql/ownership.generated';
-import { OwnershipTypeEntity } from '@types';
-
-const PaginationContainer = styled.div`
-    display: flex;
-    justify-content: center;
-`;
-
-const StyledPagination = styled(Pagination)`
-    margin: 40px;
-`;
-
-const searchBarStyle = {
-    maxWidth: 220,
-    padding: 0,
-};
-
-const searchBarInputStyle = {
-    height: 32,
-    fontSize: 12,
-};
-
-/**
- * This component renders a paginated, searchable list of Ownership Types.
- */
-export const OwnershipList = () => {
-    /**
-     * Context
-     */
-    const entityRegistry = useEntityRegistry();
-
-    /**
-     * State
-     */
-    const [page, setPage] = useState(1);
-    const [showOwnershipBuilder, setShowOwnershipBuilder] = useState<boolean>(false);
-    const [ownershipType, setOwnershipType] = useState<undefined | OwnershipTypeEntity>(undefined);
-    const [query, setQuery] = useState<undefined | string>(undefined);
-
-    /**
-     * Queries
-     */
-    const pageSize = 10;
-    const start: number = (page - 1) * pageSize;
-    const { data, loading, error, refetch } = useListOwnershipTypesQuery({
-        variables: {
-            input: {
-                start,
-                count: pageSize,
-                query,
-            },
-        },
-    });
-    const totalOwnershipTypes = data?.listOwnershipTypes?.total || 0;
-    const ownershipTypes =
-        data?.listOwnershipTypes?.ownershipTypes?.filter((type) => type.urn !== 'urn:li:ownershipType:none') || [];
-
-    const onClickCreateOwnershipType = () => {
-        setShowOwnershipBuilder(true);
-    };
-
-    const onCloseModal = () => {
-        setShowOwnershipBuilder(false);
-        setOwnershipType(undefined);
-    };
-
-    const onChangePage = (newPage: number) => {
-        scrollToTop();
-        setPage(newPage);
-    };
-
-    return (
-        <>
-            {!data && loading && <Message type="loading" content="Loading Ownership Types..." />}
-            {error &&
-                message.error({
-                    content: `Failed to load Ownership Types! An unexpected error occurred.`,
-                    duration: 3,
-                })}
-            <TabToolbar>
-                <Button type="text" onClick={onClickCreateOwnershipType} data-testid="create-owner-type-v1">
-                    <PlusOutlined /> Create Ownership Type
-                </Button>
-                <SearchBar
-                    initialQuery=""
-                    placeholderText="Search by Name..."
-                    suggestions={[]}
-                    style={searchBarStyle}
-                    inputStyle={searchBarInputStyle}
-                    onSearch={() => null}
-                    onQueryChange={(q) => setQuery(q.length > 0 ? q : undefined)}
-                    entityRegistry={entityRegistry}
-                />
-            </TabToolbar>
-            <OwnershipTable
-                ownershipTypes={ownershipTypes}
-                setIsOpen={setShowOwnershipBuilder}
-                setOwnershipType={setOwnershipType}
-                refetch={refetch}
-            />
-            {totalOwnershipTypes >= pageSize && (
-                <PaginationContainer>
-                    <StyledPagination
-                        current={page}
-                        pageSize={pageSize}
-                        total={totalOwnershipTypes}
-                        showLessItems
-                        onChange={onChangePage}
-                        showSizeChanger={false}
-                    />
-                </PaginationContainer>
-            )}
-            <OwnershipBuilderModal
-                isOpen={showOwnershipBuilder}
-                onClose={onCloseModal}
-                refetch={refetch}
-                ownershipType={ownershipType}
-            />
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/ownership/table/ActionsColumn.tsx b/datahub-web-react/src/app/entity/ownership/table/ActionsColumn.tsx
deleted file mode 100644
index 31613811691d96..00000000000000
--- a/datahub-web-react/src/app/entity/ownership/table/ActionsColumn.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-import { CopyOutlined, DeleteOutlined, EditOutlined, MoreOutlined } from '@ant-design/icons';
-import { Dropdown, MenuProps, Popconfirm, Typography, message, notification } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { useDeleteOwnershipTypeMutation } from '@graphql/ownership.generated';
-import { OwnershipTypeEntity } from '@types';
-
-const DROPDOWN_TEST_ID = 'ownership-table-dropdown';
-const EDIT_OWNERSHIP_TYPE_TEST_ID = 'edit-ownership-type';
-const DELETE_OWNERSHIP_TYPE_TEST_ID = 'delete-ownership-type';
-
-const StyledDropdown = styled(Dropdown)``;
-
-const MenuButtonContainer = styled.div`
-    display: flex;
-    justify-content: center;
-    align-items: center;
-`;
-
-const MenuButtonText = styled(Typography.Text)`
-    font-size: 14px;
-    font-weight: 400;
-    margin-left: 8px;
-`;
-
-const StyledMoreOutlined = styled(MoreOutlined)`
-    width: 20px;
-    &&& {
-        padding-left: 0px;
-        padding-right: 0px;
-        font-size: 18px;
-    }
-    :hover {
-        cursor: pointer;
-    }
-`;
-
-type Props = {
-    ownershipType: OwnershipTypeEntity;
-    setIsOpen: (isOpen: boolean) => void;
-    setOwnershipType: (ownershipType: OwnershipTypeEntity) => void;
-    refetch: () => void;
-};
-
-export const ActionsColumn = ({ ownershipType, setIsOpen, setOwnershipType, refetch }: Props) => {
-    const editOnClick = () => {
-        setIsOpen(true);
-        setOwnershipType(ownershipType);
-    };
-
-    const onCopy = () => {
-        navigator.clipboard.writeText(ownershipType.urn);
-    };
-
-    const [deleteOwnershipTypeMutation] = useDeleteOwnershipTypeMutation();
-
-    const onDelete = () => {
-        deleteOwnershipTypeMutation({
-            variables: {
-                urn: ownershipType.urn,
-            },
-        })
-            .then(() => {
-                notification.success({
-                    message: `Success`,
-                    description: 'You have deleted an ownership type.',
-                    placement: 'bottomLeft',
-                    duration: 3,
-                });
-                setTimeout(() => {
-                    refetch();
-                }, 3000);
-            })
-            .catch((e: unknown) => {
-                message.destroy();
-                if (e instanceof Error) {
-                    message.error({
-                        content: `Failed to delete an ownership type`,
-                        duration: 3,
-                    });
-                }
-            });
-    };
-
-    const items: MenuProps['items'] = [
-        {
-            key: 'edit',
-            icon: (
-                <MenuButtonContainer data-testid={EDIT_OWNERSHIP_TYPE_TEST_ID}>
-                    <EditOutlined />
-                    <MenuButtonText>Edit</MenuButtonText>
-                </MenuButtonContainer>
-            ),
-        },
-        {
-            key: 'delete',
-            icon: (
-                <Popconfirm
-                    title={<Typography.Text>Are you sure you want to delete this ownership type?</Typography.Text>}
-                    placement="left"
-                    onCancel={() => {}}
-                    onConfirm={onDelete}
-                    okText="Yes"
-                    cancelText="No"
-                >
-                    <MenuButtonContainer data-testid={DELETE_OWNERSHIP_TYPE_TEST_ID}>
-                        <DeleteOutlined />
-                        <MenuButtonText>Delete</MenuButtonText>
-                    </MenuButtonContainer>
-                </Popconfirm>
-            ),
-        },
-        {
-            key: 'copy',
-            icon: (
-                <MenuButtonContainer>
-                    <CopyOutlined />
-                    <MenuButtonText>Copy Urn</MenuButtonText>
-                </MenuButtonContainer>
-            ),
-        },
-    ];
-
-    const onClick: MenuProps['onClick'] = (e) => {
-        const key = e.key as string;
-        if (key === 'edit') {
-            editOnClick();
-        } else if (key === 'copy') {
-            onCopy();
-        }
-    };
-
-    const menuProps: MenuProps = {
-        items,
-        onClick,
-    };
-
-    return (
-        <StyledDropdown menu={menuProps}>
-            <StyledMoreOutlined data-testid={DROPDOWN_TEST_ID} style={{ display: undefined }} />
-        </StyledDropdown>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/ownership/table/DescriptionColumn.tsx b/datahub-web-react/src/app/entity/ownership/table/DescriptionColumn.tsx
deleted file mode 100644
index e53c37b778c132..00000000000000
--- a/datahub-web-react/src/app/entity/ownership/table/DescriptionColumn.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { OwnershipTypeEntity } from '@types';
-
-const DescriptionText = styled(Typography.Text)`
-    font-size: 14px;
-    font-weight: 400;
-`;
-
-type Props = {
-    ownershipType: OwnershipTypeEntity;
-};
-
-export const DescriptionColumn = ({ ownershipType }: Props) => {
-    const description = ownershipType?.info?.description || '';
-
-    return <DescriptionText>{description}</DescriptionText>;
-};
diff --git a/datahub-web-react/src/app/entity/ownership/table/NameColumn.tsx b/datahub-web-react/src/app/entity/ownership/table/NameColumn.tsx
deleted file mode 100644
index 4358dac1557d53..00000000000000
--- a/datahub-web-react/src/app/entity/ownership/table/NameColumn.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { OwnershipTypeEntity } from '@types';
-
-const NameText = styled(Typography.Text)`
-    font-size: 14px;
-    font-weight: 700;
-`;
-
-type Props = {
-    ownershipType: OwnershipTypeEntity;
-};
-
-export const NameColumn = ({ ownershipType }: Props) => {
-    const name = ownershipType?.info?.name || ownershipType?.urn;
-
-    return <NameText>{name}</NameText>;
-};
diff --git a/datahub-web-react/src/app/entity/ownership/table/OwnershipTable.tsx b/datahub-web-react/src/app/entity/ownership/table/OwnershipTable.tsx
deleted file mode 100644
index 9430899f9e8d71..00000000000000
--- a/datahub-web-react/src/app/entity/ownership/table/OwnershipTable.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { Empty } from 'antd';
-import React from 'react';
-
-import { ActionsColumn } from '@app/entity/ownership/table/ActionsColumn';
-import { DescriptionColumn } from '@app/entity/ownership/table/DescriptionColumn';
-import { NameColumn } from '@app/entity/ownership/table/NameColumn';
-import { StyledTable } from '@app/entity/shared/components/styled/StyledTable';
-
-import { OwnershipTypeEntity } from '@types';
-
-type Props = {
-    ownershipTypes: OwnershipTypeEntity[];
-    setIsOpen: (isOpen: boolean) => void;
-    setOwnershipType: (ownershipType: OwnershipTypeEntity) => void;
-    refetch: () => void;
-};
-
-export const OwnershipTable = ({ ownershipTypes, setIsOpen, setOwnershipType, refetch }: Props) => {
-    const tableColumns = [
-        {
-            title: 'Name',
-            dataIndex: 'name',
-            sorter: (a: any, b: any) => a?.info?.name?.localeCompare(b?.info?.name),
-            key: 'name',
-            render: (_, record: any) => <NameColumn ownershipType={record} />,
-        },
-        {
-            title: 'Description',
-            dataIndex: 'description',
-            key: 'description',
-            render: (_, record: any) => <DescriptionColumn ownershipType={record} />,
-        },
-        {
-            dataIndex: 'actions',
-            key: 'actions',
-            render: (_, record: any) => (
-                <ActionsColumn
-                    ownershipType={record}
-                    setIsOpen={setIsOpen}
-                    setOwnershipType={setOwnershipType}
-                    refetch={refetch}
-                />
-            ),
-        },
-    ];
-
-    const getRowKey = (ownershipType: OwnershipTypeEntity) => {
-        return ownershipType?.info?.name || ownershipType.urn;
-    };
-
-    return (
-        <StyledTable
-            columns={tableColumns}
-            dataSource={ownershipTypes}
-            rowKey={getRowKey}
-            locale={{
-                emptyText: <Empty description="No Ownership Types found!" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
-            }}
-            pagination={false}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/ownership/table/types.ts b/datahub-web-react/src/app/entity/ownership/table/types.ts
deleted file mode 100644
index 6d7f9bdcf760b7..00000000000000
--- a/datahub-web-react/src/app/entity/ownership/table/types.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * The object represents the state of the Ownership Type Builder form.
- */
-export interface OwnershipTypeBuilderState {
-    /**
-     * The name of the Ownership Type.
-     */
-    name: string;
-
-    /**
-     * The description of the Ownership Type.
-     */
-    description: string;
-}
diff --git a/datahub-web-react/src/app/entity/query/QueryEntity.tsx b/datahub-web-react/src/app/entity/query/QueryEntity.tsx
deleted file mode 100644
index 33b1069d40dec6..00000000000000
--- a/datahub-web-react/src/app/entity/query/QueryEntity.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import { ConsoleSqlOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, IconStyleType } from '@app/entity/Entity';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { TYPE_ICON_CLASS_NAME } from '@app/entityV2/shared/components/subtypes';
-
-import { useGetQueryQuery } from '@graphql/query.generated';
-import { DataPlatform, EntityType, QueryEntity as Query } from '@types';
-
-/**
- * Definition of the DataHub DataPlatformInstance entity.
- * Most of this still needs to be filled out.
- */
-export class QueryEntity implements Entity<Query> {
-    type: EntityType = EntityType.Query;
-
-    icon = (fontSize?: number, _styleType?: IconStyleType, color?: string) => {
-        return (
-            <ConsoleSqlOutlined
-                className={TYPE_ICON_CLASS_NAME}
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => false;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getPathName = () => 'query';
-
-    getEntityName = () => 'Query';
-
-    getCollectionName = () => 'Queries';
-
-    useEntityQuery = useGetQueryQuery;
-
-    renderProfile = (_urn: string) => {
-        return <></>;
-    };
-
-    getOverridePropertiesFromEntity = (query?: Query | null): GenericEntityProperties => {
-        return {
-            name: query && this.displayName(query),
-            platform: query?.platform,
-        };
-    };
-
-    renderEmbeddedProfile = (_: string) => <></>;
-
-    renderPreview = () => {
-        return <></>;
-    };
-
-    renderSearch = () => {
-        return <></>;
-    };
-
-    getLineageVizConfig = (query: Query) => {
-        // TODO: Set up types better here
-        const platform: DataPlatform | undefined = (query as any)?.queryPlatform;
-        return {
-            urn: query.urn,
-            name: query.properties?.name || query.urn,
-            type: EntityType.Query,
-            icon: platform?.properties?.logoUrl || undefined,
-            platform: platform || undefined,
-        };
-    };
-
-    displayName = (data: Query) => {
-        return data?.properties?.name || (data?.properties?.source === 'SYSTEM' && 'System Query') || data?.urn;
-    };
-
-    getGenericEntityProperties = (data: Query) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([]);
-    };
-
-    getGraphName = () => {
-        return 'query';
-    };
-}
diff --git a/datahub-web-react/src/app/entity/restricted/RestrictedEntity.tsx b/datahub-web-react/src/app/entity/restricted/RestrictedEntity.tsx
deleted file mode 100644
index 348fe0fddd4dbf..00000000000000
--- a/datahub-web-react/src/app/entity/restricted/RestrictedEntity.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { QuestionOutlined } from '@ant-design/icons';
-import React from 'react';
-
-import { Entity, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { RestrictedEntityProfile } from '@app/entity/restricted/RestrictedEntityProfile';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-
-import { EntityType, Restricted, SearchResult } from '@types';
-
-import RestrictedIcon from '@images/restricted.svg';
-
-/**
- * Definition of the DataHub Data Product entity.
- */
-export class RestrictedEntity implements Entity<Restricted> {
-    type: EntityType = EntityType.Restricted;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <QuestionOutlined />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <QuestionOutlined style={{ fontSize, color: color || '#B37FEB' }} />;
-        }
-
-        return (
-            <QuestionOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => false;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => true;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getPathName = () => 'restricted';
-
-    getEntityName = () => 'Restricted';
-
-    getCollectionName = () => 'Restricted Assets';
-
-    renderProfile = (_: string) => <RestrictedEntityProfile />;
-
-    renderPreview = (_: PreviewType, _data: Restricted) => {
-        return <RestrictedEntityProfile />;
-    };
-
-    renderSearch = (_result: SearchResult) => {
-        return <RestrictedEntityProfile />;
-    };
-
-    getLineageVizConfig = (entity: Restricted) => {
-        return {
-            urn: entity?.urn,
-            name: 'Restricted Asset',
-            type: EntityType.Restricted,
-            icon: RestrictedIcon,
-        };
-    };
-
-    displayName = (_data: Restricted) => {
-        return 'Restricted Asset';
-    };
-
-    getOverridePropertiesFromEntity = (_data: Restricted) => {
-        return {};
-    };
-
-    getGenericEntityProperties = (data: Restricted) => {
-        return getDataForEntityType({
-            data,
-            entityType: this.type,
-            getOverrideProperties: this.getOverridePropertiesFromEntity,
-        });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([]);
-    };
-
-    getGraphName = () => {
-        return 'restricted';
-    };
-}
diff --git a/datahub-web-react/src/app/entity/restricted/RestrictedEntityProfile.tsx b/datahub-web-react/src/app/entity/restricted/RestrictedEntityProfile.tsx
deleted file mode 100644
index 1c9d50afcab4a6..00000000000000
--- a/datahub-web-react/src/app/entity/restricted/RestrictedEntityProfile.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { EntityTitle } from '@app/entity/shared/containers/profile/header/EntityName';
-import {
-    LogoIcon,
-    PlatformContentWrapper,
-    PlatformText,
-    PreviewImage,
-} from '@app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView';
-
-import RestrictedIcon from '@images/restricted.svg';
-
-const SubHeader = styled.div`
-    margin-top: 8px;
-    font-size: 14px;
-`;
-
-export function RestrictedEntityProfile() {
-    return (
-        <>
-            <PlatformContentWrapper>
-                <LogoIcon>
-                    <PreviewImage preview={false} src={RestrictedIcon} alt="restricted" />
-                </LogoIcon>
-                <PlatformText>Restricted</PlatformText>
-            </PlatformContentWrapper>
-            <EntityTitle level={3}>Restricted Asset</EntityTitle>
-            <SubHeader>This asset is Restricted. Please request access to see more.</SubHeader>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/schemaField/SchemaFieldPropertiesEntity.tsx b/datahub-web-react/src/app/entity/schemaField/SchemaFieldPropertiesEntity.tsx
deleted file mode 100644
index 0cc5c4969de4c2..00000000000000
--- a/datahub-web-react/src/app/entity/schemaField/SchemaFieldPropertiesEntity.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import { PicCenterOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { Preview } from '@app/entity/schemaField/preview/Preview';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-
-import { Dataset, EntityType, SchemaFieldEntity, SearchResult } from '@types';
-
-export class SchemaFieldPropertiesEntity implements Entity<SchemaFieldEntity> {
-    type: EntityType = EntityType.SchemaField;
-
-    icon = (fontSize: number, styleType: IconStyleType, color = '#BFBFBF') => (
-        <PicCenterOutlined style={{ fontSize, color }} />
-    );
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => false;
-
-    getParentDataset = (parent) => {
-        return {
-            urn: parent?.urn,
-            name: parent?.name,
-            type: parent?.type,
-            platform: parent?.platfrom,
-            properties: parent?.properties,
-        } as Dataset;
-    };
-
-    // Currently unused.
-    getAutoCompleteFieldName = () => 'schemaField';
-
-    // Currently unused.
-    getPathName = () => 'schemaField';
-
-    getEntityName = () => 'Column';
-
-    getCollectionName = () => 'Columns';
-
-    // Currently unused.
-    renderProfile = (_: string) => <></>;
-
-    getGraphName = () => 'schemaField';
-
-    renderPreview = (previewType: PreviewType, data: SchemaFieldEntity) => {
-        const parent = data.parent as Dataset;
-        return (
-            <Preview
-                previewType={previewType}
-                datasetUrn={data.parent.urn}
-                name={data.fieldPath}
-                parentContainers={parent?.parentContainers}
-                platformName={
-                    parent?.platform?.properties?.displayName || capitalizeFirstLetterOnly(parent?.platform?.name)
-                }
-                platformLogo={parent?.platform?.properties?.logoUrl || ''}
-                platformInstanceId={parent?.dataPlatformInstance?.instanceId}
-                parentDataset={this.getParentDataset(parent)}
-            />
-        );
-    };
-
-    renderSearch = (result: SearchResult) => this.renderPreview(PreviewType.SEARCH, result.entity as SchemaFieldEntity);
-
-    displayName = (data: SchemaFieldEntity) => data?.fieldPath || data.urn;
-
-    getGenericEntityProperties = (data: SchemaFieldEntity) =>
-        getDataForEntityType({ data, entityType: this.type, getOverrideProperties: (newData) => newData });
-
-    supportedCapabilities = () => new Set([]);
-}
diff --git a/datahub-web-react/src/app/entity/schemaField/preview/Preview.tsx b/datahub-web-react/src/app/entity/schemaField/preview/Preview.tsx
deleted file mode 100644
index 75e6ef31081ff2..00000000000000
--- a/datahub-web-react/src/app/entity/schemaField/preview/Preview.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { PicCenterOutlined } from '@ant-design/icons';
-import React from 'react';
-
-import { IconStyleType, PreviewType } from '@app/entity/Entity';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Dataset, EntityType, Owner, ParentContainersResult } from '@types';
-
-export const Preview = ({
-    datasetUrn,
-    name,
-    description,
-    owners,
-    previewType,
-    parentContainers,
-    platformName,
-    platformLogo,
-    platformInstanceId,
-    parentDataset,
-}: {
-    datasetUrn: string;
-    name: string;
-    description?: string | null;
-    owners?: Array<Owner> | null;
-    previewType: PreviewType;
-    parentContainers?: ParentContainersResult | null;
-    platformName?: string;
-    platformLogo?: string | null;
-    platformInstanceId?: string;
-    parentDataset?: Dataset;
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-
-    const url = `${entityRegistry.getEntityUrl(EntityType.Dataset, datasetUrn)}/${encodeURIComponent(
-        'Schema',
-    )}?schemaFilter=${encodeURIComponent(name)}`;
-
-    return (
-        <DefaultPreviewCard
-            previewType={previewType}
-            url={url}
-            name={name ?? ''}
-            urn={datasetUrn}
-            description={description ?? ''}
-            owners={owners}
-            logoComponent={<PicCenterOutlined style={{ fontSize: '20px' }} />}
-            type="Column"
-            typeIcon={entityRegistry.getIcon(EntityType.SchemaField, 14, IconStyleType.ACCENT)}
-            logoUrl={platformLogo || ''}
-            platform={platformName}
-            platformInstanceId={platformInstanceId}
-            parentContainers={parentContainers}
-            parentDataset={parentDataset}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/EntityContext.ts b/datahub-web-react/src/app/entity/shared/EntityContext.ts
index b2bfe2aef3494a..d18f20699ed33d 100644
--- a/datahub-web-react/src/app/entity/shared/EntityContext.ts
+++ b/datahub-web-react/src/app/entity/shared/EntityContext.ts
@@ -19,7 +19,6 @@ export const EntityContext = React.createContext<EntityContextType>({
     entityState: { shouldRefetchContents: false, setShouldRefetchContents: () => {} },
 });
 
-export default EntityContext;
 
 export function useEntityContext() {
     return useContext(EntityContext);
@@ -55,11 +54,6 @@ export const useRefetch = () => {
     return refetch;
 };
 
-export const useLineageData = () => {
-    const { lineage } = useContext(EntityContext);
-    return lineage;
-};
-
 export const useMutationUrn = () => {
     const { urn, entityData } = useContext(EntityContext);
     const isHideSiblingMode = useIsSeparateSiblingsMode();
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/DomainParentSelect.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/DomainParentSelect.tsx
index 35b65666000049..02f9333ca3655a 100644
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/DomainParentSelect.tsx
+++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/DomainParentSelect.tsx
@@ -21,7 +21,7 @@ const SearchResultContainer = styled.div`
 `;
 
 // filter out entity itself and its children
-export function filterResultsForMove(entity: Domain, entityUrn: string) {
+function filterResultsForMove(entity: Domain, entityUrn: string) {
     return (
         entity.urn !== entityUrn &&
         entity.__typename === 'Domain' &&
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx
index d94e405468bc38..c5a7d112f29441 100644
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx
+++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/NodeParentSelect.tsx
@@ -20,7 +20,7 @@ const SearchResultContainer = styled.div`
 `;
 
 // filter out entity itself and its children
-export function filterResultsForMove(entity: GlossaryNode, entityUrn: string) {
+function filterResultsForMove(entity: GlossaryNode, entityUrn: string) {
     return (
         entity.urn !== entityUrn &&
         entity.__typename === 'GlossaryNode' &&
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx
deleted file mode 100644
index 07f32fa6f570a8..00000000000000
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/__tests__/NodeParentSelect.test.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { filterResultsForMove } from '@app/entity/shared/EntityDropdown/NodeParentSelect';
-import { glossaryNode1, glossaryNode2, glossaryNode3, glossaryNode4 } from '@src/Mocks';
-
-describe('filterResultsForMove', () => {
-    it('should return true if the given node is different than given urn and the node is not a child of the given urn', () => {
-        const shouldKeep = filterResultsForMove(glossaryNode4, glossaryNode1.urn);
-        expect(shouldKeep).toBe(true);
-    });
-
-    it('should return false if the given node has the same urn as the given urn', () => {
-        const shouldKeep = filterResultsForMove(glossaryNode1, glossaryNode1.urn);
-        expect(shouldKeep).toBe(false);
-    });
-
-    it('should return false if the given node is a direct child of the given urn', () => {
-        const shouldKeep = filterResultsForMove(glossaryNode2, glossaryNode1.urn);
-        expect(shouldKeep).toBe(false);
-    });
-
-    it('should return false if the given node is a child of a child of the given urn', () => {
-        const shouldKeep = filterResultsForMove(glossaryNode3, glossaryNode1.urn);
-        expect(shouldKeep).toBe(false);
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/useDeleteGlossaryEntity.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/useDeleteGlossaryEntity.tsx
deleted file mode 100644
index e08fccc3c830c4..00000000000000
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/useDeleteGlossaryEntity.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Modal, message } from 'antd';
-import { useState } from 'react';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useDeleteGlossaryEntityMutation } from '@graphql/glossary.generated';
-
-function useDeleteGlossaryEntity() {
-    const [hasBeenDeleted, setHasBeenDeleted] = useState(false);
-    const { entityData, urn: entityDataUrn, entityType } = useEntityData();
-    const entityRegistry = useEntityRegistry();
-
-    const [deleteGlossaryEntity] = useDeleteGlossaryEntityMutation();
-
-    function handleDeleteGlossaryEntity() {
-        deleteGlossaryEntity({
-            variables: {
-                urn: entityDataUrn,
-            },
-        })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to delete: \n ${e.message || ''}`, duration: 3 });
-            })
-            .finally(() => {
-                message.loading({
-                    content: 'Deleting...',
-                    duration: 2,
-                });
-                setTimeout(() => {
-                    setHasBeenDeleted(true);
-                    message.success({
-                        content: `Deleted ${entityRegistry.getEntityName(entityType)}!`,
-                        duration: 2,
-                    });
-                }, 2000);
-            });
-    }
-
-    function onDeleteEntity() {
-        Modal.confirm({
-            title: `Delete ${entityRegistry.getDisplayName(entityType, entityData)}`,
-            content: `Are you sure you want to remove this ${entityRegistry.getEntityName(entityType)}?`,
-            onOk() {
-                handleDeleteGlossaryEntity();
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    }
-
-    return { onDeleteEntity, hasBeenDeleted };
-}
-
-export default useDeleteGlossaryEntity;
diff --git a/datahub-web-react/src/app/entity/shared/EntityGroups.tsx b/datahub-web-react/src/app/entity/shared/EntityGroups.tsx
deleted file mode 100644
index bc857048736dca..00000000000000
--- a/datahub-web-react/src/app/entity/shared/EntityGroups.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Tag } from 'antd';
-import React from 'react';
-import { Link } from 'react-router-dom';
-
-import { EmptyValue, GroupsSeeMoreText, Tags, TagsSection } from '@app/entity/shared/SidebarStyledComponents';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityRelationship, EntityType } from '@types';
-
-type Props = {
-    readMore: boolean;
-    setReadMore: (readMore: boolean) => void;
-    groupMemberRelationships: Array<EntityRelationship>;
-};
-
-/**
- * EntityGroups- to display the groups category in sidebar section
- */
-export default function EntityGroups({ readMore, setReadMore, groupMemberRelationships }: Props) {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <TagsSection>
-            {groupMemberRelationships?.length === 0 && <EmptyValue />}
-            {!readMore &&
-                groupMemberRelationships?.slice(0, 2).map((item) => {
-                    if (!item?.entity?.urn) return null;
-                    const entityUrn = entityRegistry.getEntityUrl(EntityType.CorpGroup, item?.entity?.urn);
-                    return (
-                        <Link to={entityUrn} key={entityUrn}>
-                            <Tags>
-                                <Tag>{entityRegistry.getDisplayName(EntityType.CorpGroup, item.entity)}</Tag>
-                            </Tags>
-                        </Link>
-                    );
-                })}
-            {readMore &&
-                groupMemberRelationships?.length > 2 &&
-                groupMemberRelationships?.map((item) => {
-                    if (!item?.entity?.urn) return null;
-                    const entityUrn = entityRegistry.getEntityUrl(EntityType.CorpGroup, item.entity.urn);
-                    return (
-                        <Link to={entityUrn} key={entityUrn}>
-                            <Tags>
-                                <Tag>{entityRegistry.getDisplayName(EntityType.CorpGroup, item.entity)}</Tag>
-                            </Tags>
-                        </Link>
-                    );
-                })}
-            {!readMore && groupMemberRelationships?.length > 2 && (
-                <GroupsSeeMoreText onClick={() => setReadMore(!readMore)}>
-                    {`+${groupMemberRelationships?.length - 2} more`}
-                </GroupsSeeMoreText>
-            )}
-        </TagsSection>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/EntitySearchInput/EntitySearchInput.tsx b/datahub-web-react/src/app/entity/shared/EntitySearchInput/EntitySearchInput.tsx
deleted file mode 100644
index a1a06daec87128..00000000000000
--- a/datahub-web-react/src/app/entity/shared/EntitySearchInput/EntitySearchInput.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import { Select, Tag, Tooltip } from 'antd';
-import React from 'react';
-
-import { EntitySearchInputResult } from '@app/entity/shared/EntitySearchInput/EntitySearchInputResult';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetSearchResultsForMultipleLazyQuery } from '@graphql/search.generated';
-import { EntityType } from '@types';
-
-type Props = {
-    selectedUrns: string[];
-    entityTypes: EntityType[];
-    placeholder?: string;
-    mode?: 'multiple' | 'single';
-    style?: any;
-    onChangeSelectedUrns: (newUrns: string[]) => void;
-};
-
-export const EntitySearchInput = ({
-    selectedUrns,
-    entityTypes,
-    placeholder,
-    style,
-    mode,
-    onChangeSelectedUrns,
-}: Props) => {
-    const entityRegistry = useEntityRegistry();
-    const [searchResources, { data: resourcesSearchData }] = useGetSearchResultsForMultipleLazyQuery();
-    const searchResults = resourcesSearchData?.searchAcrossEntities?.searchResults || [];
-
-    const urnToSearchResultEntity = new Map();
-    searchResults.forEach((result) => {
-        urnToSearchResultEntity[result.entity.urn] = {
-            urn: result.entity.urn,
-            type: result.entity.type,
-            displayName: entityRegistry.getDisplayName(result.entity.type, result.entity),
-        };
-    });
-
-    const onSelect = (newUrn) => {
-        if (mode === 'single') {
-            onChangeSelectedUrns([newUrn]);
-        } else {
-            const newUrns = [...selectedUrns, newUrn];
-            onChangeSelectedUrns(newUrns);
-        }
-    };
-
-    const onDeselect = (urn) => {
-        if (mode === 'single') {
-            onChangeSelectedUrns([]);
-        } else {
-            onChangeSelectedUrns(selectedUrns.filter((u) => u !== urn));
-        }
-    };
-
-    const onSearch = (text: string) => {
-        searchResources({
-            variables: {
-                input: {
-                    types: entityTypes,
-                    query: text,
-                    start: 0,
-                    count: 10,
-                },
-            },
-        });
-    };
-
-    return (
-        <Select
-            value={selectedUrns}
-            mode="multiple"
-            style={style}
-            filterOption={false}
-            placeholder={placeholder || 'Search for entities...'}
-            onSelect={onSelect}
-            onDeselect={onDeselect}
-            onSearch={onSearch}
-            tagRender={(tagProps) => {
-                const displayName = tagProps.value as string; // TODO: Support display name resolution.
-                return (
-                    <Tag closable={tagProps.closable} onClose={tagProps.onClose}>
-                        <Tooltip title={displayName}>{displayName}</Tooltip>
-                    </Tag>
-                );
-            }}
-        >
-            {searchResults?.map((result) => (
-                <Select.Option value={result.entity.urn}>
-                    <EntitySearchInputResult entity={result.entity} />
-                </Select.Option>
-            ))}
-        </Select>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/EntitySearchInput/EntitySearchInputResult.tsx b/datahub-web-react/src/app/entity/shared/EntitySearchInput/EntitySearchInputResult.tsx
deleted file mode 100644
index 29bccfa4437556..00000000000000
--- a/datahub-web-react/src/app/entity/shared/EntitySearchInput/EntitySearchInputResult.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { IconStyleType } from '@app/entity/Entity';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-type Props = {
-    entity: any;
-};
-
-const Container = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-    padding: 12px;
-`;
-
-const IconContainer = styled.div`
-    margin-right: 8px;
-`;
-
-export const EntitySearchInputResult = ({ entity }: Props) => {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <Container>
-            <IconContainer>{entityRegistry.getIcon(entity.type, 12, IconStyleType.ACCENT)}</IconContainer>
-            {entityRegistry.getDisplayName(entity.type, entity)}
-        </Container>
-    );
-};
-
-export default EntitySearchInputResult;
diff --git a/datahub-web-react/src/app/entity/shared/ExternalUrlButton.tsx b/datahub-web-react/src/app/entity/shared/ExternalUrlButton.tsx
deleted file mode 100644
index f806ae9f8e368f..00000000000000
--- a/datahub-web-react/src/app/entity/shared/ExternalUrlButton.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-
-import analytics, { EntityActionType, EventType } from '@app/analytics';
-import UrlButton from '@app/entity/shared/UrlButton';
-
-import { EntityType } from '@types';
-
-const GITHUB_LINK = 'github.com';
-const GITHUB = 'GitHub';
-const GITLAB_LINK = 'gitlab.';
-const GITLAB = 'GitLab';
-
-interface Props {
-    externalUrl: string;
-    platformName?: string;
-    entityUrn: string;
-    entityType?: string;
-}
-
-export default function ExternalUrlButton({ externalUrl, platformName, entityType, entityUrn }: Props) {
-    function sendAnalytics() {
-        analytics.event({
-            type: EventType.EntityActionEvent,
-            actionType: EntityActionType.ClickExternalUrl,
-            entityType: entityType as EntityType,
-            entityUrn,
-        });
-    }
-
-    let displayedName = platformName;
-    if (externalUrl.toLocaleLowerCase().includes(GITHUB_LINK)) {
-        displayedName = GITHUB;
-    } else if (externalUrl.toLocaleLowerCase().includes(GITLAB_LINK)) {
-        displayedName = GITLAB;
-    }
-
-    return (
-        <UrlButton href={externalUrl} onClick={sendAnalytics}>
-            {displayedName ? `View in ${displayedName}` : 'View link'}
-        </UrlButton>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/PreviewContext.tsx b/datahub-web-react/src/app/entity/shared/PreviewContext.tsx
index f4b2bc34b1ea0c..e1024b8deec366 100644
--- a/datahub-web-react/src/app/entity/shared/PreviewContext.tsx
+++ b/datahub-web-react/src/app/entity/shared/PreviewContext.tsx
@@ -4,7 +4,3 @@ import { GenericEntityProperties } from '@app/entity/shared/types';
 
 const PreviewContext = React.createContext<GenericEntityProperties | null>(null);
 export default PreviewContext;
-
-export function usePreviewData() {
-    return React.useContext(PreviewContext);
-}
diff --git a/datahub-web-react/src/app/entity/shared/SidebarStyledComponents.tsx b/datahub-web-react/src/app/entity/shared/SidebarStyledComponents.tsx
deleted file mode 100644
index 8d66b17b0b8d71..00000000000000
--- a/datahub-web-react/src/app/entity/shared/SidebarStyledComponents.tsx
+++ /dev/null
@@ -1,202 +0,0 @@
-import styled from 'styled-components';
-
-/**
- * Styled Components- Users and Groups Side bar component
- * Description: The following styles are used for User and Groups UI for sidebar.
- */
-
-export const SideBar = styled.div`
-    padding: 0 0 0 17px;
-    text-align: center;
-
-    font-style: normal;
-    font-weight: bold;
-    height: calc(100vh - 60px);
-    position: relative;
-
-    &&& .ant-avatar.ant-avatar-icon {
-        font-size: 46px !important;
-    }
-
-    .divider-infoSection {
-        margin: 18px 0px 18px 0;
-    }
-    .divider-aboutSection {
-        margin: 23px 0px 11px 0;
-    }
-    .divider-groupsSection {
-        margin: 23px 0px 11px 0;
-    }
-`;
-
-export const SideBarSubSection = styled.div`
-    height: calc(100vh - 135px);
-    overflow: auto;
-    padding-right: 18px;
-    &.fullView {
-        height: calc(100vh - 70px);
-    }
-    &::-webkit-scrollbar {
-        height: 12px;
-        width: 1px;
-        background: #d6d6d6;
-    }
-    &::-webkit-scrollbar-thumb {
-        background: #d6d6d6;
-        -webkit-border-radius: 1ex;
-        -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);
-    }
-`;
-
-export const EmptyValue = styled.div`
-    &:after {
-        content: 'None';
-        color: #b7b7b7;
-        font-style: italic;
-        font-weight: 100;
-    }
-`;
-
-export const Name = styled.div`
-    font-size: 20px;
-    line-height: 28px;
-    color: #262626;
-    margin: 13px 0 7px 0;
-`;
-
-export const UserDetails = styled.div`
-    font-size: 14px;
-    line-height: 35px;
-    font-weight: 400;
-    line-height: 28px;
-    text-align: center;
-`;
-
-export const TitleRole = styled.div`
-    font-size: 14px;
-    line-height: 22px;
-    color: #595959;
-    margin-bottom: 7px;
-`;
-
-export const Team = styled.div`
-    font-size: 12px;
-    line-height: 20px;
-    font-weight: 400;
-    padding-bottom: 10px;
-    color: #8c8c8c;
-`;
-
-export const SocialDetails = styled.div`
-    font-size: 12px;
-    line-height: 20px;
-    color: #262626;
-    text-align: left;
-    margin: 6px 0;
-`;
-
-export const EditButton = styled.div`
-    bottom: 24px;
-    position: absolute;
-    right: 27px;
-    width: 80%;
-    left: 50%;
-    -webkit-transform: translateX(-50%);
-    -moz-transform: translateX(-50%);
-    transform: translateX(-50%);
-
-    button {
-        width: 100%;
-        font-size: 12px;
-        line-height: 20px;
-        color: #262626;
-    }
-`;
-
-export const AboutSection = styled.div`
-    text-align: left;
-    font-weight: bold;
-    font-size: 14px;
-    line-height: 22px;
-    color: #262626;
-`;
-
-export const LocationSection = styled.div`
-    text-align: left;
-    font-weight: bold;
-    font-size: 14px;
-    line-height: 26px;
-    color: #262626;
-`;
-
-export const LocationSectionText = styled.div`
-    text-align: left;
-    font-weight: normal;
-    font-size: 14px;
-    line-height: 26px;
-    margin-bottom: -10px;
-    color: #262626;
-`;
-
-export const AboutSectionText = styled.div`
-    font-size: 12px;
-    font-weight: 100;
-    line-height: 15px;
-    padding: 5px 0;
-
-    &&& .ant-typography {
-        margin-bottom: 0;
-    }
-    &&& .ant-typography-edit-content {
-        padding-left: 15px;
-        padding-top: 5px;
-    }
-`;
-
-export const GroupsSection = styled.div`
-    text-align: left;
-    font-weight: bold;
-    font-size: 14px;
-    line-height: 22px;
-    color: #262626;
-`;
-
-export const TagsSection = styled.div`
-    height: calc(75vh - 460px);
-    padding: 0px 5px 5px 0;
-`;
-
-export const NoDataFound = styled.span`
-    font-size: 12px;
-    color: #262626;
-    font-weight: 100;
-`;
-
-export const Tags = styled.div`
-    margin-top: 5px;
-`;
-
-export const GroupsSeeMoreText = styled.span`
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 20px;
-    color: #1890ff;
-    cursor: pointer;
-`;
-
-export const DisplayCount = styled.span`
-    font-family: Manrope;
-    font-style: normal;
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 20px;
-    color: #8c8c8c;
-`;
-
-export const GroupSectionTitle = styled.span`
-    margin-right: 8px;
-`;
-
-export const GroupSectionHeader = styled.div`
-    padding-bottom: 12px;
-`;
diff --git a/datahub-web-react/src/app/entity/shared/UrlButton.tsx b/datahub-web-react/src/app/entity/shared/UrlButton.tsx
deleted file mode 100644
index 17099c93e6ed1d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/UrlButton.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { ArrowRightOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React, { ReactNode } from 'react';
-import styled from 'styled-components/macro';
-
-const UrlButtonContainer = styled.span`
-    font-size: 12px;
-`;
-
-const StyledButton = styled(Button)`
-    > :hover {
-        text-decoration: underline;
-    }
-    &&& {
-        padding-bottom: 0px;
-    }
-    padding-left: 12px;
-    padding-right: 12px;
-`;
-
-interface Props {
-    href: string;
-    children: ReactNode;
-    onClick?: () => void;
-}
-
-const NOOP = () => {};
-
-export default function UrlButton({ href, children, onClick = NOOP }: Props) {
-    return (
-        <UrlButtonContainer>
-            <StyledButton type="link" href={href} target="_blank" rel="noreferrer noopener" onClick={onClick}>
-                {children} <ArrowRightOutlined style={{ fontSize: 12 }} />
-            </StyledButton>
-        </UrlButtonContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/__tests__/siblingsUtils.test.ts b/datahub-web-react/src/app/entity/shared/__tests__/siblingsUtils.test.ts
deleted file mode 100644
index 8e13386d9ddd91..00000000000000
--- a/datahub-web-react/src/app/entity/shared/__tests__/siblingsUtils.test.ts
+++ /dev/null
@@ -1,731 +0,0 @@
-import {
-    cleanHelper,
-    combineEntityDataWithSiblings,
-    mergeOwners,
-    shouldEntityBeTreatedAsPrimary,
-} from '@app/entity/shared/siblingUtils';
-import { dataset3WithLineage, dataset3WithSchema, dataset4WithLineage } from '@src/Mocks';
-
-import { EntityType, OwnershipType, SchemaFieldDataType } from '@types';
-
-const usageStats = {
-    buckets: [
-        {
-            bucket: 1650412800000,
-            duration: 'DAY',
-            resource: 'urn:li:dataset:4',
-            metrics: {
-                uniqueUserCount: 1,
-                totalSqlQueries: 37,
-                topSqlQueries: ['some sql query'],
-                __typename: 'UsageAggregationMetrics',
-            },
-            __typename: 'UsageAggregation',
-        },
-    ],
-    aggregations: {
-        uniqueUserCount: 2,
-        totalSqlQueries: 39,
-        users: [
-            {
-                user: {
-                    urn: 'urn:li:corpuser:user',
-                    username: 'user',
-                    __typename: 'CorpUser',
-                },
-                count: 2,
-                userEmail: 'user@datahubproject.io',
-                __typename: 'UserUsageCounts',
-            },
-        ],
-        fields: [
-            {
-                fieldName: 'field',
-                count: 7,
-                __typename: 'FieldUsageCounts',
-            },
-        ],
-        __typename: 'UsageQueryResultAggregations',
-    },
-    __typename: 'UsageQueryResult',
-};
-
-const datasetPrimary = {
-    ...dataset3WithLineage,
-    ...dataset3WithSchema.dataset,
-    properties: {
-        ...dataset3WithLineage.properties,
-        description: 'primary description',
-    },
-    editableProperties: {
-        description: null,
-    },
-    globalTags: {
-        tags: [
-            {
-                tag: {
-                    type: EntityType.Tag,
-                    urn: 'urn:li:tag:primary-tag',
-                    name: 'primary-tag',
-                    description: 'primary tag',
-                    properties: {
-                        name: 'primary-tag',
-                        description: 'primary tag',
-                        colorHex: 'primary tag color',
-                    },
-                },
-            },
-        ],
-    },
-    siblings: {
-        isPrimary: true,
-    },
-};
-
-const datasetUnprimary = {
-    ...dataset4WithLineage,
-    usageStats,
-    properties: {
-        ...dataset4WithLineage.properties,
-        description: 'unprimary description',
-    },
-    editableProperties: {
-        description: 'secondary description',
-    },
-    globalTags: {
-        tags: [
-            {
-                tag: {
-                    type: EntityType.Tag,
-                    urn: 'urn:li:tag:unprimary-tag',
-                    name: 'unprimary-tag',
-                    description: 'unprimary tag',
-                    properties: {
-                        name: 'unprimary-tag',
-                        description: 'unprimary tag',
-                        colorHex: 'unprimary tag color',
-                    },
-                },
-            },
-        ],
-    },
-    schemaMetadata: {
-        ...dataset4WithLineage.schemaMetadata,
-        fields: [
-            {
-                __typename: 'SchemaField',
-                nullable: false,
-                recursive: false,
-                fieldPath: 'new_one',
-                description: 'Test to make sure fields merge works',
-                type: SchemaFieldDataType.String,
-                nativeDataType: 'varchar(100)',
-                isPartOfKey: false,
-                jsonPath: null,
-                globalTags: null,
-                glossaryTerms: null,
-                label: 'hi',
-            },
-            ...(dataset4WithLineage.schemaMetadata?.fields || []),
-            {
-                __typename: 'SchemaField',
-                nullable: false,
-                recursive: false,
-                fieldPath: 'duplicate_field',
-                description: 'Test to make sure fields merge works case insensitive',
-                type: SchemaFieldDataType.String,
-                nativeDataType: 'varchar(100)',
-                isPartOfKey: false,
-                jsonPath: null,
-                globalTags: null,
-                glossaryTerms: null,
-                label: 'hi',
-            },
-        ],
-    },
-    siblings: {
-        isPrimary: false,
-    },
-};
-
-const datasetPrimaryWithSiblings = {
-    ...datasetPrimary,
-    schemaMetadata: {
-        ...datasetPrimary.schemaMetadata,
-        fields: [
-            ...(datasetPrimary.schemaMetadata?.fields || []),
-            {
-                __typename: 'SchemaField',
-                nullable: false,
-                recursive: false,
-                fieldPath: 'DUPLICATE_FIELD',
-                description: 'Test to make sure fields merge works case insensitive',
-                type: SchemaFieldDataType.String,
-                nativeDataType: 'varchar(100)',
-                isPartOfKey: false,
-                jsonPath: null,
-                globalTags: null,
-                glossaryTerms: null,
-                label: 'hi',
-            },
-        ],
-    },
-
-    siblings: {
-        isPrimary: true,
-        siblings: [datasetUnprimary],
-    },
-    siblingsSearch: {
-        count: 1,
-        total: 1,
-        searchResults: [{ entity: datasetUnprimary, matchedFields: [] }],
-    },
-};
-
-const datasetUnprimaryWithPrimarySiblings = {
-    ...datasetUnprimary,
-    siblings: {
-        isPrimary: false,
-        siblings: [datasetPrimary],
-    },
-    siblingsSearch: {
-        count: 1,
-        total: 1,
-        searchResults: [{ entity: datasetPrimary, matchedFields: [] }],
-    },
-};
-
-const datasetUnprimaryWithNoPrimarySiblings = {
-    ...datasetUnprimary,
-    siblings: {
-        isPrimary: false,
-        siblings: [datasetUnprimary],
-    },
-    siblingsSearch: {
-        count: 1,
-        total: 1,
-        searchResults: [{ entity: datasetUnprimary, matchedFields: [] }],
-    },
-};
-
-describe('siblingUtils', () => {
-    describe('combineEntityDataWithSiblings', () => {
-        it('combines my metadata with my siblings as primary', () => {
-            const baseEntity = { dataset: datasetPrimaryWithSiblings };
-            expect(baseEntity.dataset.usageStats).toBeNull();
-            const combinedData = combineEntityDataWithSiblings(baseEntity);
-            // will merge properties only one entity has
-            expect(combinedData.dataset.usageStats).toEqual(usageStats);
-
-            // will merge arrays
-            expect(combinedData.dataset.globalTags.tags).toHaveLength(2);
-            expect(combinedData.dataset.globalTags.tags[0].tag.urn).toEqual('urn:li:tag:unprimary-tag');
-            expect(combinedData.dataset.globalTags.tags[1].tag.urn).toEqual('urn:li:tag:primary-tag');
-
-            // merges schema metadata properly  by fieldPath
-            expect(combinedData.dataset.schemaMetadata?.fields).toHaveLength(4);
-            expect(combinedData.dataset.schemaMetadata?.fields[0]?.fieldPath).toEqual('new_one');
-            expect(combinedData.dataset.schemaMetadata?.fields[1]?.fieldPath).toEqual('DUPLICATE_FIELD');
-            expect(combinedData.dataset.schemaMetadata?.fields[2]?.fieldPath).toEqual('user_id');
-            expect(combinedData.dataset.schemaMetadata?.fields[3]?.fieldPath).toEqual('user_name');
-
-            // will overwrite string properties w/ primary
-            expect(combinedData.dataset.editableProperties.description).toEqual('secondary description');
-
-            // will take secondary string properties in the case of empty string
-            expect(combinedData.dataset.properties.description).toEqual('primary description');
-
-            // will stay primary
-            expect(combinedData.dataset.siblings.isPrimary).toBeTruthy();
-        });
-
-        it('combines my metadata with my siblings as secondary', () => {
-            const baseEntity = { dataset: datasetUnprimaryWithPrimarySiblings };
-            const combinedData = combineEntityDataWithSiblings(baseEntity);
-
-            // will stay secondary
-            expect(combinedData.dataset.siblings.isPrimary).toBeFalsy();
-        });
-    });
-
-    describe('shouldEntityBeTreatedAsPrimary', () => {
-        it('will say a primary entity is primary', () => {
-            expect(shouldEntityBeTreatedAsPrimary(datasetPrimaryWithSiblings)).toBeTruthy();
-        });
-
-        it('will say a un-primary entity is not primary', () => {
-            expect(shouldEntityBeTreatedAsPrimary(datasetUnprimaryWithPrimarySiblings)).toBeFalsy();
-        });
-
-        it('will say a un-primary entity is primary if it has no primary sibling', () => {
-            expect(shouldEntityBeTreatedAsPrimary(datasetUnprimaryWithNoPrimarySiblings)).toBeTruthy();
-        });
-    });
-
-    describe('cleanHelper', () => {
-        let visited: Set<any>;
-
-        beforeEach(() => {
-            visited = new Set();
-        });
-
-        it('should return the object immediately if it has already been visited', () => {
-            const obj = { test: 'value' };
-            visited.add(obj);
-            const result = cleanHelper(obj, visited);
-            expect(result).toBe(obj);
-        });
-
-        it('should remove null properties from objects', () => {
-            const obj = {
-                validProperty: 'test',
-                nullProperty: null,
-                anotherValid: 42,
-            };
-            const result = cleanHelper(obj, visited);
-            expect(result).toEqual({
-                validProperty: 'test',
-                anotherValid: 42,
-            });
-            expect(result).not.toHaveProperty('nullProperty');
-        });
-
-        it('should remove undefined properties from objects', () => {
-            const obj = {
-                validProperty: 'test',
-                undefinedProperty: undefined,
-                anotherValid: 42,
-            };
-            const result = cleanHelper(obj, visited);
-            expect(result).toEqual({
-                validProperty: 'test',
-                anotherValid: 42,
-            });
-            expect(result).not.toHaveProperty('undefinedProperty');
-        });
-
-        it('should remove empty object properties', () => {
-            const obj = {
-                validProperty: 'test',
-                emptyObject: {},
-                anotherValid: 42,
-            };
-            const result = cleanHelper(obj, visited);
-            expect(result).toEqual({
-                validProperty: 'test',
-                anotherValid: 42,
-            });
-            expect(result).not.toHaveProperty('emptyObject');
-        });
-
-        it('should recursively clean nested objects', () => {
-            const obj = {
-                level1: {
-                    validProp: 'test',
-                    nullProp: null,
-                    level2: {
-                        nestedValid: 'nested',
-                        nestedNull: null,
-                        emptyNested: {},
-                    },
-                },
-                topLevel: 'value',
-            };
-            const result = cleanHelper(obj, visited);
-            expect(result).toEqual({
-                level1: {
-                    validProp: 'test',
-                    level2: {
-                        nestedValid: 'nested',
-                    },
-                },
-                topLevel: 'value',
-            });
-        });
-
-        it('should not modify arrays when they contain null, undefined, or empty objects', () => {
-            const obj = {
-                arrayProp: ['valid', null, undefined, {}, { validNested: 'test' }],
-                regularProp: 'test',
-            };
-            const result = cleanHelper(obj, visited);
-            expect(result.arrayProp).toHaveLength(5);
-            expect(result.arrayProp[0]).toBe('valid');
-            expect(result.arrayProp[1]).toBe(null);
-            expect(result.arrayProp[2]).toBe(undefined);
-            expect(result.arrayProp[3]).toEqual({});
-            expect(result.arrayProp[4]).toEqual({ validNested: 'test' });
-        });
-
-        it('should still clean objects within arrays recursively', () => {
-            const obj = {
-                arrayProp: [
-                    {
-                        validProp: 'test',
-                        nullProp: null,
-                        nestedObj: {
-                            valid: 'nested',
-                            invalid: null,
-                        },
-                    },
-                ],
-            };
-            const result = cleanHelper(obj, visited);
-            expect(result.arrayProp[0]).toEqual({
-                validProp: 'test',
-                nestedObj: {
-                    valid: 'nested',
-                },
-            });
-            expect(result.arrayProp[0]).not.toHaveProperty('nullProp');
-        });
-
-        it('should handle circular references without infinite recursion', () => {
-            const obj: any = {
-                validProp: 'test',
-                nullProp: null,
-            };
-            obj.circular = obj;
-
-            const result = cleanHelper(obj, visited);
-            expect(result.validProp).toBe('test');
-            expect(result).not.toHaveProperty('nullProp');
-            expect(result.circular).toBe(result);
-        });
-
-        it('should handle objects with non-configurable properties gracefully', () => {
-            const obj = {
-                validProp: 'test',
-                nullProp: null,
-            };
-
-            // Make a property non-configurable
-            Object.defineProperty(obj, 'nonConfigurable', {
-                value: null,
-                configurable: false,
-                enumerable: true,
-                writable: true,
-            });
-
-            const result = cleanHelper(obj, visited);
-            expect(result.validProp).toBe('test');
-            expect(result).not.toHaveProperty('nullProp');
-            // Non-configurable null property should remain
-            expect(result).toHaveProperty('nonConfigurable');
-            expect(result.nonConfigurable).toBe(null);
-        });
-
-        it('should preserve valid nested structures', () => {
-            const obj = {
-                user: {
-                    name: 'John',
-                    age: 30,
-                    preferences: {
-                        theme: 'dark',
-                        notifications: true,
-                    },
-                },
-                metadata: {
-                    created: '2023-01-01',
-                    tags: ['important', 'user'],
-                },
-            };
-
-            const result = cleanHelper(obj, visited);
-            expect(result).toEqual(obj);
-        });
-
-        it('should handle complex mixed structures', () => {
-            const obj = {
-                validString: 'test',
-                validNumber: 42,
-                validBoolean: true,
-                validArray: [1, 2, 3],
-                nullValue: null,
-                undefinedValue: undefined,
-                emptyObject: {},
-                nestedValid: {
-                    innerValid: 'nested',
-                    innerNull: null,
-                    innerArray: ['a', null, 'b'],
-                    innerEmpty: {},
-                },
-                mixedArray: [{ valid: 'item', invalid: null }, null, 'string', 42],
-            };
-
-            const result = cleanHelper(obj, visited);
-            expect(result).toEqual({
-                validString: 'test',
-                validNumber: 42,
-                validBoolean: true,
-                validArray: [1, 2, 3],
-                nestedValid: {
-                    innerValid: 'nested',
-                    innerArray: ['a', null, 'b'],
-                },
-                mixedArray: [{ valid: 'item' }, null, 'string', 42],
-            });
-        });
-
-        it('should handle edge case of empty input object', () => {
-            const obj = {};
-            const result = cleanHelper(obj, visited);
-            expect(result).toEqual({});
-        });
-
-        it('should handle edge case where object becomes empty after cleaning', () => {
-            const obj = {
-                nullProp: null,
-                undefinedProp: undefined,
-                emptyProp: {},
-            };
-            const result = cleanHelper(obj, visited);
-            expect(result).toEqual({});
-        });
-    });
-
-    describe('mergeOwners', () => {
-        const createOwner = (ownerUrn: string, ownershipTypeUrn?: string, associatedUrn?: string) => ({
-            associatedUrn:
-                associatedUrn ||
-                'urn:li:dataset(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.customers,PROD)',
-            owner: { urn: ownerUrn },
-            ownershipType: ownershipTypeUrn ? { urn: ownershipTypeUrn } : undefined,
-        });
-
-        it('should merge two arrays with no duplicates', () => {
-            const destinationArray = [
-                createOwner('urn:li:corpGroup:bfoo', 'urn:li:ownershipType:__system__technical_owner'),
-            ];
-            const sourceArray = [createOwner('urn:li:corpGroup:bar', 'urn:li:ownershipType:__system__business_owner')];
-
-            const result = mergeOwners(destinationArray, sourceArray, {});
-
-            expect(result).toHaveLength(2);
-            expect(result).toEqual([
-                createOwner('urn:li:corpGroup:bfoo', 'urn:li:ownershipType:__system__technical_owner'),
-                createOwner('urn:li:corpGroup:bar', 'urn:li:ownershipType:__system__business_owner'),
-            ]);
-        });
-
-        it('should deduplicate owners with same owner.urn and ownershipType.urn', () => {
-            const duplicateOwner = createOwner(
-                'urn:li:corpGroup:bfoo',
-                'urn:li:ownershipType:__system__technical_owner',
-            );
-            const destinationArray = [duplicateOwner];
-            const sourceArray = [duplicateOwner];
-
-            const result = mergeOwners(destinationArray, sourceArray, {});
-
-            expect(result).toHaveLength(1);
-            expect(result[0]).toEqual(duplicateOwner);
-        });
-
-        it('should keep owners with same owner.urn but different ownershipType.urn as separate entries', () => {
-            const destinationArray = [
-                createOwner('urn:li:corpGroup:bfoo', 'urn:li:ownershipType:__system__technical_owner'),
-            ];
-            const sourceArray = [createOwner('urn:li:corpGroup:bfoo', 'urn:li:ownershipType:__system__business_owner')];
-
-            const result = mergeOwners(destinationArray, sourceArray, {});
-
-            expect(result).toHaveLength(2);
-            expect(result[0].owner.urn).toBe('urn:li:corpGroup:bfoo');
-            expect(result[0].ownershipType?.urn).toBe('urn:li:ownershipType:__system__technical_owner');
-            expect(result[1].owner.urn).toBe('urn:li:corpGroup:bfoo');
-            expect(result[1].ownershipType?.urn).toBe('urn:li:ownershipType:__system__business_owner');
-        });
-
-        it('should keep owners with different owner.urn but same ownershipType.urn as separate entries', () => {
-            const destinationArray = [
-                createOwner('urn:li:corpGroup:bfoo', 'urn:li:ownershipType:__system__technical_owner'),
-            ];
-            const sourceArray = [createOwner('urn:li:corpGroup:bar', 'urn:li:ownershipType:__system__technical_owner')];
-
-            const result = mergeOwners(destinationArray, sourceArray, {});
-
-            expect(result).toHaveLength(2);
-            expect(result[0].owner.urn).toBe('urn:li:corpGroup:bfoo');
-            expect(result[1].owner.urn).toBe('urn:li:corpGroup:bar');
-            expect(result[0].ownershipType?.urn).toBe('urn:li:ownershipType:__system__technical_owner');
-            expect(result[1].ownershipType?.urn).toBe('urn:li:ownershipType:__system__technical_owner');
-        });
-
-        it('should handle empty destination array', () => {
-            const destinationArray: any[] = [];
-            const sourceArray = [
-                createOwner('urn:li:corpGroup:bfoo', 'urn:li:ownershipType:__system__technical_owner'),
-            ];
-
-            const result = mergeOwners(destinationArray, sourceArray, {});
-
-            expect(result).toHaveLength(1);
-            expect(result[0]).toEqual(sourceArray[0]);
-        });
-
-        it('should handle empty source array', () => {
-            const destinationArray = [
-                createOwner('urn:li:corpGroup:bfoo', 'urn:li:ownershipType:__system__technical_owner'),
-            ];
-            const sourceArray: any[] = [];
-
-            const result = mergeOwners(destinationArray, sourceArray, {});
-
-            expect(result).toHaveLength(1);
-            expect(result[0]).toEqual(destinationArray[0]);
-        });
-
-        it('should handle both arrays being empty', () => {
-            const destinationArray: any[] = [];
-            const sourceArray: any[] = [];
-
-            const result = mergeOwners(destinationArray, sourceArray, {});
-
-            expect(result).toHaveLength(0);
-            expect(result).toEqual([]);
-        });
-
-        it('should handle owners with missing ownershipType', () => {
-            const destinationArray = [
-                createOwner('urn:li:corpGroup:bfoo'), // no ownershipType
-            ];
-            const sourceArray = [
-                createOwner('urn:li:corpGroup:bfoo', 'urn:li:ownershipType:__system__technical_owner'),
-            ];
-
-            const result = mergeOwners(destinationArray, sourceArray, {});
-
-            expect(result).toHaveLength(2);
-            expect(result[0].ownershipType).toBeUndefined();
-            expect(result[1].ownershipType?.urn).toBe('urn:li:ownershipType:__system__technical_owner');
-        });
-
-        it('should handle owners with missing ownershipTypes and the same deprecated types', () => {
-            const destinationArray = [{ ...createOwner('urn:li:corpGroup:bfoo'), type: OwnershipType.BusinessOwner }];
-            const sourceArray = [{ ...createOwner('urn:li:corpGroup:bfoo'), type: OwnershipType.BusinessOwner }];
-
-            const result = mergeOwners(destinationArray, sourceArray, {});
-
-            expect(result).toHaveLength(1);
-            expect(result[0].owner.urn).toBe('urn:li:corpGroup:bfoo');
-            expect(result[0].type).toBe(OwnershipType.BusinessOwner);
-        });
-
-        it('should handle owners with missing ownershipTypes and different deprecated types', () => {
-            const destinationArray = [{ ...createOwner('urn:li:corpGroup:bfoo'), type: OwnershipType.TechnicalOwner }];
-            const sourceArray = [{ ...createOwner('urn:li:corpGroup:bfoo'), type: OwnershipType.BusinessOwner }];
-
-            const result = mergeOwners(destinationArray, sourceArray, {});
-
-            expect(result).toHaveLength(2);
-            expect(result[0].owner.urn).toBe('urn:li:corpGroup:bfoo');
-            expect(result[0].type).toBe(OwnershipType.TechnicalOwner);
-            expect(result[1].owner.urn).toBe('urn:li:corpGroup:bfoo');
-            expect(result[1].type).toBe(OwnershipType.BusinessOwner);
-        });
-
-        it('should deduplicate owners that both have undefined ownershipType', () => {
-            const ownerWithoutType = createOwner('urn:li:corpGroup:bfoo');
-            const destinationArray = [ownerWithoutType];
-            const sourceArray = [createOwner('urn:li:corpGroup:bfoo')]; // same owner, no ownershipType
-
-            const result = mergeOwners(destinationArray, sourceArray, {});
-
-            expect(result).toHaveLength(1);
-            expect(result[0].owner.urn).toBe('urn:li:corpGroup:bfoo');
-            expect(result[0].ownershipType).toBeUndefined();
-        });
-
-        it('should preserve order with destination array items first', () => {
-            const destinationArray = [
-                createOwner('urn:li:corpGroup:dest1', 'urn:li:ownershipType:__system__technical_owner'),
-                createOwner('urn:li:corpGroup:dest2', 'urn:li:ownershipType:__system__business_owner'),
-            ];
-            const sourceArray = [
-                createOwner('urn:li:corpGroup:src1', 'urn:li:ownershipType:__system__data_owner'),
-                createOwner('urn:li:corpGroup:src2', 'urn:li:ownershipType:__system__steward'),
-            ];
-
-            const result = mergeOwners(destinationArray, sourceArray, {});
-
-            expect(result).toHaveLength(4);
-            expect(result[0].owner.urn).toBe('urn:li:corpGroup:dest1');
-            expect(result[1].owner.urn).toBe('urn:li:corpGroup:dest2');
-            expect(result[2].owner.urn).toBe('urn:li:corpGroup:src1');
-            expect(result[3].owner.urn).toBe('urn:li:corpGroup:src2');
-        });
-
-        it('should handle complex scenario with multiple duplicates and unique entries', () => {
-            const destinationArray = [
-                createOwner('urn:li:corpGroup:common', 'urn:li:ownershipType:__system__technical_owner'),
-                createOwner('urn:li:corpGroup:dest_only', 'urn:li:ownershipType:__system__business_owner'),
-                createOwner('urn:li:corpGroup:common', 'urn:li:ownershipType:__system__data_owner'),
-            ];
-            const sourceArray = [
-                createOwner('urn:li:corpGroup:common', 'urn:li:ownershipType:__system__technical_owner'), // duplicate
-                createOwner('urn:li:corpGroup:src_only', 'urn:li:ownershipType:__system__steward'),
-                createOwner('urn:li:corpGroup:common', 'urn:li:ownershipType:__system__business_owner'), // different type
-            ];
-
-            const result = mergeOwners(destinationArray, sourceArray, {});
-
-            expect(result).toHaveLength(5);
-
-            // Should contain all unique combinations
-            const ownerCombinations = result.map((owner) => ({
-                ownerUrn: owner.owner.urn,
-                ownershipTypeUrn: owner.ownershipType?.urn,
-            }));
-
-            expect(ownerCombinations).toContainEqual({
-                ownerUrn: 'urn:li:corpGroup:common',
-                ownershipTypeUrn: 'urn:li:ownershipType:__system__technical_owner',
-            });
-            expect(ownerCombinations).toContainEqual({
-                ownerUrn: 'urn:li:corpGroup:dest_only',
-                ownershipTypeUrn: 'urn:li:ownershipType:__system__business_owner',
-            });
-            expect(ownerCombinations).toContainEqual({
-                ownerUrn: 'urn:li:corpGroup:common',
-                ownershipTypeUrn: 'urn:li:ownershipType:__system__data_owner',
-            });
-            expect(ownerCombinations).toContainEqual({
-                ownerUrn: 'urn:li:corpGroup:src_only',
-                ownershipTypeUrn: 'urn:li:ownershipType:__system__steward',
-            });
-            expect(ownerCombinations).toContainEqual({
-                ownerUrn: 'urn:li:corpGroup:common',
-                ownershipTypeUrn: 'urn:li:ownershipType:__system__business_owner',
-            });
-        });
-
-        it('should maintain all properties of owner objects beyond just owner.urn and ownershipType.urn', () => {
-            const destinationArray = [
-                {
-                    associatedUrn: 'urn:li:dataset:123',
-                    owner: { urn: 'urn:li:corpGroup:bfoo', name: 'Test Group' },
-                    ownershipType: { urn: 'urn:li:ownershipType:__system__technical_owner', name: 'Technical Owner' },
-                    extraProperty: 'destination_value',
-                },
-            ];
-            const sourceArray = [
-                {
-                    associatedUrn: 'urn:li:dataset:456',
-                    owner: { urn: 'urn:li:corpGroup:bar', displayName: 'Another Group' },
-                    ownershipType: {
-                        urn: 'urn:li:ownershipType:__system__business_owner',
-                        description: 'Business Owner',
-                    },
-                    extraProperty: 'source_value',
-                },
-            ];
-
-            const result = mergeOwners(destinationArray, sourceArray, {});
-
-            expect(result).toHaveLength(2);
-            expect(result[0]).toEqual(destinationArray[0]);
-            expect(result[1]).toEqual(sourceArray[0]);
-        });
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/components/legacy/MarkdownViewer.tsx b/datahub-web-react/src/app/entity/shared/components/legacy/MarkdownViewer.tsx
index ab52706eee32c8..733f12c6b12a0c 100644
--- a/datahub-web-react/src/app/entity/shared/components/legacy/MarkdownViewer.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/legacy/MarkdownViewer.tsx
@@ -63,7 +63,7 @@ const MarkdownViewContainer = styled.div<{
         `}
 `;
 
-export const MarkdownView = styled(MDEditor.Markdown)`
+const MarkdownView = styled(MDEditor.Markdown)`
     display: block;
     overflow-wrap: break-word;
     word-wrap: break-word;
@@ -73,7 +73,7 @@ export const MarkdownView = styled(MDEditor.Markdown)`
     font-weight: 400;
 `;
 
-export type Props = {
+type Props = {
     source: string;
     limit?: number;
     // eslint-disable-next-line react/no-unused-prop-types
diff --git a/datahub-web-react/src/app/entity/shared/components/legacy/Properties.tsx b/datahub-web-react/src/app/entity/shared/components/legacy/Properties.tsx
deleted file mode 100644
index 075c458e0a49c9..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/legacy/Properties.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Space, Table, Typography } from 'antd';
-import { ColumnsType } from 'antd/es/table';
-import React from 'react';
-
-import { StringMapEntry } from '@types';
-
-export type Props = {
-    properties: StringMapEntry[];
-};
-
-export function Properties({ properties }: Props) {
-    const propertyTableColumns: ColumnsType<StringMapEntry> = [
-        {
-            title: 'Name',
-            dataIndex: 'key',
-            sorter: (a, b) => a.key.localeCompare(b.key),
-            defaultSortOrder: 'ascend',
-        },
-        {
-            title: 'Value',
-            dataIndex: 'value',
-        },
-    ];
-
-    return (
-        <Space direction="vertical" style={{ width: '100%' }} size="large">
-            <Typography.Title level={3}>Properties</Typography.Title>
-            <Table pagination={false} columns={propertyTableColumns} dataSource={properties} />
-        </Space>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/components/legacy/UpdatableDescription.tsx b/datahub-web-react/src/app/entity/shared/components/legacy/UpdatableDescription.tsx
deleted file mode 100644
index 70eb7a1ff78765..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/legacy/UpdatableDescription.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import { FetchResult, MutationFunctionOptions } from '@apollo/client';
-import { Tag, message } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import analytics, { EntityActionType, EventType } from '@app/analytics';
-import UpdateDescriptionModal from '@app/entity/shared/components/legacy/DescriptionModal';
-import MarkdownViewer from '@app/entity/shared/components/legacy/MarkdownViewer';
-
-import { EntityType } from '@types';
-
-const DescriptionText = styled(MarkdownViewer)`
-    ${(props) => (props.isCompact ? 'max-width: 377px;' : '')};
-`;
-
-const AddNewDescription = styled(Tag)`
-    cursor: pointer;
-`;
-
-export type Props = {
-    isCompact?: boolean;
-    updateEntity: (options?: MutationFunctionOptions<any, any> | undefined) => Promise<FetchResult>;
-    updatedDescription?: string | null;
-    originalDescription?: string | null;
-    entityType: EntityType;
-    urn: string;
-};
-
-export default function UpdatableDescription({
-    isCompact,
-    updateEntity,
-    updatedDescription,
-    originalDescription,
-    entityType,
-    urn,
-}: Props) {
-    const [showAddDescModal, setShowAddDescModal] = useState(false);
-    const onSubmit = async (description: string | null) => {
-        message.loading({ content: 'Updating...' });
-        try {
-            await updateEntity({
-                variables: { urn, input: { editableProperties: { description: description || '' } } },
-            });
-            message.destroy();
-            analytics.event({
-                type: EventType.EntityActionEvent,
-                actionType: EntityActionType.UpdateDescription,
-                entityType,
-                entityUrn: urn,
-            });
-            message.success({ content: 'Updated!', duration: 2 });
-        } catch (e: unknown) {
-            message.destroy();
-            if (e instanceof Error) message.error({ content: `Update Failed! \n ${e.message || ''}`, duration: 2 });
-        }
-        setShowAddDescModal(false);
-    };
-
-    return (
-        <>
-            {updatedDescription || originalDescription ? (
-                <>
-                    <DescriptionText
-                        isCompact={isCompact}
-                        source={updatedDescription || originalDescription || ''}
-                        editable
-                        onEditClicked={() => setShowAddDescModal(true)}
-                    />
-                    {showAddDescModal && (
-                        <UpdateDescriptionModal
-                            title="Update description"
-                            onClose={() => setShowAddDescModal(false)}
-                            onSubmit={onSubmit}
-                            original={originalDescription || ''}
-                            description={updatedDescription || ''}
-                        />
-                    )}
-                </>
-            ) : (
-                <>
-                    <AddNewDescription color="success" onClick={() => setShowAddDescModal(true)}>
-                        + Add Description
-                    </AddNewDescription>
-                    {showAddDescModal && (
-                        <UpdateDescriptionModal
-                            title="Add description"
-                            onClose={() => setShowAddDescModal(false)}
-                            onSubmit={onSubmit}
-                            isAddDesc
-                        />
-                    )}
-                </>
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/AddLinkModal.tsx b/datahub-web-react/src/app/entity/shared/components/styled/AddLinkModal.tsx
deleted file mode 100644
index fff9d0bb21d00b..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/AddLinkModal.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Form, Input, Modal, message } from 'antd';
-import React, { useState } from 'react';
-
-import analytics, { EntityActionType, EventType } from '@app/analytics';
-import { useUserContext } from '@app/context/useUserContext';
-import { useEntityData, useMutationUrn } from '@app/entity/shared/EntityContext';
-import { getModalDomContainer } from '@utils/focus';
-
-import { useAddLinkMutation } from '@graphql/mutations.generated';
-
-type AddLinkProps = {
-    buttonProps?: Record<string, unknown>;
-    refetch?: () => Promise<any>;
-};
-
-export const AddLinkModal = ({ buttonProps, refetch }: AddLinkProps) => {
-    const [isModalVisible, setIsModalVisible] = useState(false);
-    const mutationUrn = useMutationUrn();
-    const user = useUserContext();
-    const { entityType } = useEntityData();
-    const [addLinkMutation] = useAddLinkMutation();
-
-    const [form] = Form.useForm();
-
-    const showModal = () => {
-        setIsModalVisible(true);
-    };
-
-    const handleClose = () => {
-        form.resetFields();
-        setIsModalVisible(false);
-    };
-
-    const handleAdd = async (formData: any) => {
-        if (user?.urn) {
-            try {
-                await addLinkMutation({
-                    variables: { input: { linkUrl: formData.url, label: formData.label, resourceUrn: mutationUrn } },
-                });
-                message.success({ content: 'Link Added', duration: 2 });
-                analytics.event({
-                    type: EventType.EntityActionEvent,
-                    entityType,
-                    entityUrn: mutationUrn,
-                    actionType: EntityActionType.UpdateLinks,
-                });
-            } catch (e: unknown) {
-                message.destroy();
-                if (e instanceof Error) {
-                    message.error({ content: `Failed to add link: \n ${e.message || ''}`, duration: 3 });
-                }
-            }
-            refetch?.();
-            handleClose();
-        } else {
-            message.error({ content: `Error adding link: no user`, duration: 2 });
-        }
-    };
-
-    return (
-        <>
-            <Button data-testid="add-link-button" icon={<PlusOutlined />} onClick={showModal} {...buttonProps}>
-                Add Link
-            </Button>
-            <Modal
-                title="Add Link"
-                open={isModalVisible}
-                destroyOnClose
-                onCancel={handleClose}
-                footer={[
-                    <Button type="text" onClick={handleClose}>
-                        Cancel
-                    </Button>,
-                    <Button
-                        data-testid="link-form-modal-submit-button"
-                        form="addLinkForm"
-                        key="submit"
-                        htmlType="submit"
-                    >
-                        Add
-                    </Button>,
-                ]}
-                getContainer={getModalDomContainer}
-            >
-                <Form form={form} name="addLinkForm" onFinish={handleAdd} layout="vertical">
-                    <Form.Item
-                        data-testid="link-form-modal-url"
-                        name="url"
-                        label="URL"
-                        rules={[
-                            {
-                                required: true,
-                                message: 'A URL is required.',
-                            },
-                            {
-                                type: 'url',
-                                warningOnly: true,
-                                message: 'This field must be a valid url.',
-                            },
-                        ]}
-                    >
-                        <Input placeholder="https://" autoFocus />
-                    </Form.Item>
-                    <Form.Item
-                        data-testid="link-form-modal-label"
-                        name="label"
-                        label="Label"
-                        rules={[
-                            {
-                                required: true,
-                                message: 'A label is required.',
-                            },
-                        ]}
-                    >
-                        <Input placeholder="A short label for this link" />
-                    </Form.Item>
-                </Form>
-            </Modal>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/DemoButton.tsx b/datahub-web-react/src/app/entity/shared/components/styled/DemoButton.tsx
deleted file mode 100644
index 63a9ff061dc782..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/DemoButton.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Button } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const StyledButton = styled(Button)`
-    padding: 8px;
-    font-size: 14px;
-    margin-left: 18px;
-`;
-
-export default function DemoButton() {
-    return (
-        <StyledButton
-            type="primary"
-            href="https://www.datahub.com/demo?utm_source=datahub&utm_medium=referral&utm_campaign=acryl_signup"
-            target="_blank"
-            rel="noopener noreferrer"
-        >
-            Schedule a Demo
-        </StyledButton>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/DeprecationPill.tsx b/datahub-web-react/src/app/entity/shared/components/styled/DeprecationPill.tsx
deleted file mode 100644
index 334ed97b8c8aff..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/DeprecationPill.tsx
+++ /dev/null
@@ -1,247 +0,0 @@
-import { blue } from '@ant-design/colors';
-import { InfoCircleOutlined } from '@ant-design/icons';
-import { Popover, Tooltip, colors } from '@components';
-import { Divider, Modal, Typography, message } from 'antd';
-import moment from 'moment';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import StripMarkdownText, { removeMarkdown } from '@app/entity/shared/components/styled/StripMarkdownText';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor';
-import { getLocaleTimezone } from '@app/shared/time/timeUtils';
-
-import { useBatchUpdateDeprecationMutation } from '@graphql/mutations.generated';
-import { Deprecation } from '@types';
-
-const DeprecatedContainer = styled.div`
-    height: 18px;
-    border: 1px solid ${colors.red[500]};
-    border-radius: 15px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    color: ${colors.red[500]};
-    padding-top: 8px;
-    padding-bottom: 8px;
-    padding-right: 4px;
-    padding-left: 4px;
-`;
-
-const DeprecatedText = styled.div`
-    padding-right: 2px;
-    padding-left: 2px;
-    font-size: 10px;
-`;
-
-const DeprecatedTitle = styled(Typography.Text)`
-    display: block;
-    font-size: 14px;
-    margin-bottom: 5px;
-    font-weight: bold;
-`;
-
-const LastEvaluatedAtLabel = styled.div`
-    padding: 0;
-    margin: 0;
-    display: flex;
-    align-items: center;
-    color: ${ANTD_GRAY[7]};
-`;
-
-const ThinDivider = styled(Divider)`
-    margin-top: 8px;
-    margin-bottom: 8px;
-`;
-
-const UndeprecatedIcon = styled(InfoCircleOutlined)`
-    font-size: 14px;
-    padding-right: 6px;
-`;
-
-const IconGroup = styled.div`
-    font-size: 12px;
-    color: 'black';
-    &:hover {
-        color: ${blue[4]};
-        cursor: pointer;
-    }
-`;
-
-const DescriptionContainer = styled.div`
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    height: 100%;
-    min-height: 22px;
-    margin-bottom: 14px;
-`;
-const StyledViewer = styled(Editor)`
-    padding-right: 8px;
-    display: block;
-
-    .remirror-editor.ProseMirror {
-        padding: 0;
-    }
-`;
-
-const ExpandedActions = styled.div`
-    height: 10px;
-`;
-const ReadLessText = styled(Typography.Link)`
-    margin-right: 4px;
-`;
-type Props = {
-    urn: string;
-    deprecation: Deprecation;
-    refetch?: () => void;
-    showUndeprecate: boolean | null;
-};
-const ABBREVIATED_LIMIT = 80;
-
-export const DeprecationPill = ({ deprecation, urn, refetch, showUndeprecate }: Props) => {
-    const [batchUpdateDeprecationMutation] = useBatchUpdateDeprecationMutation();
-    const [expanded, setExpanded] = useState(false);
-    const overLimit = deprecation?.note && removeMarkdown(deprecation?.note).length > 80;
-    /**
-     * Deprecation Decommission Timestamp
-     */
-    const localeTimezone = getLocaleTimezone();
-
-    let decommissionTimeSeconds;
-    if (deprecation.decommissionTime) {
-        if (deprecation.decommissionTime < 943920000000) {
-            // Time is set in way past if it was milli-second so considering this as set in seconds
-            decommissionTimeSeconds = deprecation.decommissionTime;
-        } else {
-            decommissionTimeSeconds = deprecation.decommissionTime / 1000;
-        }
-    }
-    const decommissionTimeLocal =
-        (decommissionTimeSeconds &&
-            `Scheduled to be decommissioned on ${moment
-                .unix(decommissionTimeSeconds)
-                .format('DD/MMM/YYYY')} (${localeTimezone})`) ||
-        undefined;
-    const decommissionTimeGMT =
-        decommissionTimeSeconds && moment.unix(decommissionTimeSeconds).utc().format('dddd, DD/MMM/YYYY HH:mm:ss z');
-
-    const hasDetails = deprecation.note !== '' || deprecation.decommissionTime !== null;
-    const isDividerNeeded = deprecation.note !== '' && deprecation.decommissionTime !== null;
-
-    const batchUndeprecate = () => {
-        batchUpdateDeprecationMutation({
-            variables: {
-                input: {
-                    resources: [{ resourceUrn: urn }],
-                    deprecated: false,
-                },
-            },
-        })
-            .then(({ errors }) => {
-                if (!errors) {
-                    message.success({ content: 'Marked assets as un-deprecated!', duration: 2 });
-                    refetch?.();
-                }
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({
-                    content: `Failed to mark assets as un-deprecated: \n ${e.message || ''}`,
-                    duration: 3,
-                });
-            });
-    };
-
-    return (
-        <Popover
-            overlayStyle={{ maxWidth: 480 }}
-            placement="right"
-            content={
-                hasDetails ? (
-                    <>
-                        {deprecation?.note !== '' && <DeprecatedTitle>Deprecation note</DeprecatedTitle>}
-                        {isDividerNeeded && <ThinDivider />}
-                        <DescriptionContainer>
-                            {expanded || !overLimit ? (
-                                <>
-                                    {deprecation?.note && deprecation?.note !== '' && (
-                                        <>
-                                            <StyledViewer content={deprecation.note} readOnly />
-                                            <ExpandedActions>
-                                                {overLimit && (
-                                                    <ReadLessText
-                                                        onClick={() => {
-                                                            setExpanded(false);
-                                                        }}
-                                                    >
-                                                        Read Less
-                                                    </ReadLessText>
-                                                )}
-                                            </ExpandedActions>
-                                        </>
-                                    )}
-                                </>
-                            ) : (
-                                <>
-                                    <StripMarkdownText
-                                        limit={ABBREVIATED_LIMIT}
-                                        readMore={
-                                            <>
-                                                <Typography.Link
-                                                    onClick={() => {
-                                                        setExpanded(true);
-                                                    }}
-                                                >
-                                                    Read More
-                                                </Typography.Link>
-                                            </>
-                                        }
-                                        shouldWrap
-                                    >
-                                        {deprecation.note}
-                                    </StripMarkdownText>
-                                </>
-                            )}
-                        </DescriptionContainer>
-                        {deprecation?.decommissionTime !== null && (
-                            <Typography.Text type="secondary">
-                                <Tooltip placement="right" title={decommissionTimeGMT}>
-                                    <LastEvaluatedAtLabel>{decommissionTimeLocal}</LastEvaluatedAtLabel>
-                                </Tooltip>
-                            </Typography.Text>
-                        )}
-                        {isDividerNeeded && <ThinDivider />}
-                        {showUndeprecate && (
-                            <IconGroup
-                                onClick={() =>
-                                    Modal.confirm({
-                                        title: `Confirm Mark as un-deprecated`,
-                                        content: `Are you sure you want to mark this asset as un-deprecated?`,
-                                        onOk() {
-                                            batchUndeprecate();
-                                        },
-                                        onCancel() {},
-                                        okText: 'Yes',
-                                        maskClosable: true,
-                                        closable: true,
-                                    })
-                                }
-                            >
-                                <UndeprecatedIcon />
-                                Mark as un-deprecated
-                            </IconGroup>
-                        )}
-                    </>
-                ) : (
-                    'No additional details'
-                )
-            }
-        >
-            <DeprecatedContainer>
-                <DeprecatedText>DEPRECATED</DeprecatedText>
-            </DeprecatedContainer>
-        </Popover>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx
deleted file mode 100644
index 2188fd39b0f11b..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.tsx
+++ /dev/null
@@ -1,455 +0,0 @@
-import '@app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal.less';
-
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Form, Input, Modal, Select, Table, message } from 'antd';
-import TextArea from 'antd/lib/input/TextArea';
-import React, { useState } from 'react';
-
-import { useUserContext } from '@app/context/useUserContext';
-import {
-    ERModelRelationDataType,
-    checkDuplicateERModelRelation,
-    getDatasetName,
-    validateERModelRelation,
-} from '@app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils';
-import { EditableCell } from '@app/entity/shared/components/styled/ERModelRelationship/EditableCell';
-import { EditableRow } from '@app/entity/shared/components/styled/ERModelRelationship/EditableRow';
-
-import {
-    useCreateErModelRelationshipMutation,
-    useUpdateErModelRelationshipMutation,
-} from '@graphql/ermodelrelationship.generated';
-import { useAddOwnerMutation } from '@graphql/mutations.generated';
-import { useGetSearchResultsQuery } from '@graphql/search.generated';
-import { EntityType, ErModelRelationship, ErModelRelationshipCardinality, OwnerEntityType } from '@types';
-
-import arrow from '@images/Arrow.svg';
-
-type Props = {
-    table1?: any;
-    table1Schema?: any;
-    table2?: any;
-    table2Schema?: any;
-    open: boolean;
-    setModalVisible?: any;
-    onCancel: () => void;
-    editERModelRelation?: ErModelRelationship;
-    isEditing?: boolean;
-    refetch: () => Promise<any>;
-    entityName: any;
-};
-
-type EditableTableProps = Parameters<typeof Table>[0];
-type ColumnTypes = Exclude<EditableTableProps['columns'], undefined>;
-
-export const CreateERModelRelationModal = ({
-    table1,
-    table1Schema,
-    table2,
-    table2Schema,
-    open,
-    setModalVisible,
-    onCancel,
-    editERModelRelation,
-    isEditing,
-    refetch,
-    entityName,
-}: Props) => {
-    const [form] = Form.useForm();
-    const { user } = useUserContext();
-    const ownerEntityType =
-        user && user.type === EntityType.CorpGroup ? OwnerEntityType.CorpGroup : OwnerEntityType.CorpUser;
-    const table1Dataset = editERModelRelation?.properties?.source || table1?.dataset;
-    const table1DatasetSchema = editERModelRelation?.properties?.source || table1Schema;
-    const table2Dataset = editERModelRelation?.properties?.destination || table2?.dataset;
-    const table2DatasetSchema = editERModelRelation?.properties?.destination || table2Schema?.dataset;
-
-    const [details, setDetails] = useState<string>(editERModelRelation?.editableProperties?.description || '');
-    const [ermodelrelationName, setERModelRelationName] = useState<string>(
-        editERModelRelation?.editableProperties?.name ||
-            editERModelRelation?.properties?.name ||
-            editERModelRelation?.id ||
-            '',
-    );
-    const [ermodelrelationCardinality, setERModelRelationCardinality] = useState(
-        editERModelRelation?.properties?.cardinality,
-    );
-    const [tableData, setTableData] = useState<ERModelRelationDataType[]>(
-        editERModelRelation?.properties?.relationshipFieldMappings?.map((item, index) => {
-            return {
-                key: index,
-                field1Name: item.sourceField,
-                field2Name: item.destinationField,
-            };
-        }) || [
-            { key: '0', field1Name: '', field2Name: '' },
-            { key: '1', field1Name: '', field2Name: '' },
-        ],
-    );
-    const [count, setCount] = useState(editERModelRelation?.properties?.relationshipFieldMappings?.length || 2);
-    const [createMutation] = useCreateErModelRelationshipMutation();
-    const [updateMutation] = useUpdateErModelRelationshipMutation();
-    const [addOwnerMutation] = useAddOwnerMutation();
-    const { refetch: getSearchResultsERModelRelations } = useGetSearchResultsQuery({
-        skip: true,
-    });
-
-    const handleDelete = (record) => {
-        const newData = tableData.filter((item) => item.key !== record.key);
-        setTableData(newData);
-    };
-    const onCancelSelect = () => {
-        Modal.confirm({
-            title: `Exit`,
-            className: 'cancel-modal',
-            content: `Are you sure you want to exit?  The changes made to the ${entityName} will not be applied.`,
-            onOk() {
-                setERModelRelationName(editERModelRelation?.properties?.name || '');
-                setERModelRelationCardinality(editERModelRelation?.properties?.cardinality);
-                setDetails(editERModelRelation?.editableProperties?.description || '');
-                setTableData(
-                    editERModelRelation?.properties?.relationshipFieldMappings?.map((item, index) => {
-                        return {
-                            key: index,
-                            field1Name: item.sourceField,
-                            field2Name: item.destinationField,
-                        };
-                    }) || [
-                        { key: '0', field1Name: '', field2Name: '' },
-                        { key: '1', field1Name: '', field2Name: '' },
-                    ],
-                );
-                setCount(editERModelRelation?.properties?.relationshipFieldMappings?.length || 2);
-                onCancel?.();
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-    const createERModelRelationship = () => {
-        createMutation({
-            variables: {
-                input: {
-                    properties: {
-                        source: table1Dataset?.urn || '',
-                        destination: table2Dataset?.urn || '',
-                        name: ermodelrelationName,
-                        relationshipFieldmappings: tableData.map((r) => {
-                            return {
-                                sourceField: r.field1Name,
-                                destinationField: r.field2Name,
-                            };
-                        }),
-                        erModelRelationshipCardinality: ermodelrelationCardinality,
-                        created: true,
-                    },
-                    editableProperties: {
-                        name: ermodelrelationName,
-                        description: details,
-                    },
-                },
-            },
-        })
-            .then(({ data }) => {
-                message.loading({
-                    content: 'Create...',
-                    duration: 2,
-                });
-                setTimeout(() => {
-                    refetch();
-                    message.success({
-                        content: `${entityName} created!`,
-                        duration: 2,
-                    });
-                }, 2000);
-                addOwnerMutation({
-                    variables: {
-                        input: {
-                            ownerUrn: user?.urn || '',
-                            resourceUrn: data?.createERModelRelationship?.urn || '',
-                            ownershipTypeUrn: 'urn:li:ownershipType:__system__technical_owner',
-                            ownerEntityType: ownerEntityType || EntityType,
-                        },
-                    },
-                });
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to create ${entityName}: ${e.message || ''}`, duration: 3 });
-            });
-    };
-    const originalERModelRelationName = editERModelRelation?.properties?.name;
-    const updateERModelRelationship = () => {
-        updateMutation({
-            variables: {
-                urn: editERModelRelation?.urn || '',
-                input: {
-                    properties: {
-                        source: table1Dataset?.urn || '',
-                        destination: table2Dataset?.urn || '',
-                        name: originalERModelRelationName || '',
-                        erModelRelationshipCardinality: ermodelrelationCardinality,
-                        createdBy: editERModelRelation?.properties?.createdActor?.urn || user?.urn,
-                        createdAt: editERModelRelation?.properties?.createdTime || 0,
-                        relationshipFieldmappings: tableData.map((r) => {
-                            return {
-                                sourceField: r.field1Name,
-                                destinationField: r.field2Name,
-                            };
-                        }),
-                    },
-                    editableProperties: {
-                        name: ermodelrelationName,
-                        description: details,
-                    },
-                },
-            },
-        })
-            .then(() => {
-                message.loading({
-                    content: 'updating...',
-                    duration: 2,
-                });
-                setTimeout(() => {
-                    refetch();
-                    message.success({
-                        content: `${entityName} updated!`,
-                        duration: 2,
-                    });
-                }, 2000);
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to update ${entityName}: ${e.message || ''}`, duration: 3 });
-            });
-    };
-    const onSubmit = async () => {
-        const errors = validateERModelRelation(
-            ermodelrelationName,
-            tableData,
-            isEditing,
-            getSearchResultsERModelRelations,
-            entityName,
-        );
-        if ((await errors).length > 0) {
-            const err = (await errors).join(`, `);
-            message.error(err);
-            return;
-        }
-        if (isEditing) {
-            updateERModelRelationship();
-        } else {
-            createERModelRelationship();
-            setERModelRelationName('');
-            setERModelRelationCardinality(undefined);
-            setDetails('');
-            setTableData([
-                { key: '0', field1Name: '', field2Name: '' },
-                { key: '1', field1Name: '', field2Name: '' },
-            ]);
-            setCount(2);
-        }
-        setModalVisible(false);
-    };
-
-    const table1NameBusiness = getDatasetName(table1Dataset);
-    const table1NameTech = table1Dataset?.name || table1Dataset?.urn?.split(',')?.at(1) || '';
-    const table2NameBusiness = getDatasetName(table2Dataset);
-    const table2NameTech = table2Dataset?.name || table2Dataset?.urn?.split(',')?.at(1) || '';
-
-    const handleAdd = () => {
-        const newData: ERModelRelationDataType = {
-            key: count,
-            field1Name: '',
-            field2Name: '',
-        };
-        setTableData([...tableData, newData]);
-        setCount(count + 1);
-    };
-    const defaultColumns: (ColumnTypes[number] & { editable?: boolean; dataIndex: string; tableRecord?: any })[] = [
-        {
-            title: (
-                <p className="titleContent">
-                    <div className="firstRow">
-                        <span className="titleNameDisplay"> {table1NameBusiness || table1NameTech}</span>
-                    </div>
-                    <div className="editableNameDisplay">{table1NameTech !== table1NameBusiness && table1NameTech}</div>
-                </p>
-            ),
-            dataIndex: 'field1Name',
-            tableRecord: table1DatasetSchema || {},
-            editable: true,
-        },
-        {
-            title: '',
-            dataIndex: '',
-            editable: false,
-            render: () => <img src={arrow} alt="" />,
-        },
-        {
-            title: (
-                <p className="titleContent">
-                    <div className="firstRow">
-                        <span className="titleNameDisplay"> {table2NameBusiness || table2NameTech}</span>
-                    </div>
-                    <div className="editableNameDisplay">{table2NameTech !== table2NameBusiness && table2NameTech}</div>
-                </p>
-            ),
-            dataIndex: 'field2Name',
-            tableRecord: table2DatasetSchema || {},
-            editable: true,
-        },
-        {
-            title: 'Action',
-            dataIndex: '',
-            editable: false,
-            render: (record) =>
-                tableData.length > 1 ? (
-                    <Button type="link" onClick={() => handleDelete(record)}>
-                        Delete
-                    </Button>
-                ) : null,
-        },
-    ];
-    const handleSave = (row: ERModelRelationDataType) => {
-        const newData = [...tableData];
-        const index = newData.findIndex((item) => row.key === item.key);
-        const item = newData[index];
-        newData.splice(index, 1, {
-            ...item,
-            ...row,
-        });
-        setTableData(newData);
-    };
-    const components = {
-        body: {
-            row: EditableRow,
-            cell: EditableCell,
-        },
-    };
-
-    const columns = defaultColumns.map((col) => {
-        if (!col.editable) {
-            return col;
-        }
-        return {
-            ...col,
-            onCell: (record: ERModelRelationDataType) => ({
-                record,
-                editable: col.editable,
-                dataIndex: col.dataIndex,
-                tableRecord: col.tableRecord,
-                title: col.title,
-                handleSave,
-            }),
-        };
-    });
-    return (
-        <Modal
-            title={
-                <div className="footer-parent-div">
-                    <p className="ermodelrelation-title">{entityName} Parameters</p>
-                    <div>
-                        <Button onClick={onCancelSelect} className="cancel-btn" size="large">
-                            Cancel
-                        </Button>
-                    </div>
-                    <div>
-                        <Button className="submit-btn" size="large" id="continueButton" onClick={onSubmit}>
-                            Submit
-                        </Button>
-                    </div>
-                </div>
-            }
-            open={open}
-            closable={false}
-            className="CreateERModelRelationModal"
-            okButtonProps={{ hidden: true }}
-            cancelButtonProps={{ hidden: true }}
-            onCancel={onCancelSelect}
-            destroyOnClose
-        >
-            <div className="inner-div">
-                <p className="all-table-heading">Table 1</p>
-                <p className="all-information">{table1NameBusiness}</p>
-                <div className="techNameDisplay">{table1NameTech !== table1NameBusiness && table1NameTech}</div>
-                <p className="all-content-heading">Table 2</p>
-                <p className="all-information">{table2NameBusiness}</p>
-                <div className="techNameDisplay">{table2NameTech !== table2NameBusiness && table2NameTech}</div>
-                <p className="all-content-heading">{entityName} name</p>
-                <Form
-                    form={form}
-                    layout="vertical"
-                    fields={[
-                        { name: 'ermodelrelationNameForm', value: ermodelrelationName },
-                        { name: 'ermodelrelationCardinality', value: ermodelrelationCardinality },
-                        { name: 'ermodelrelationDetails', value: details },
-                    ]}
-                    onFinish={onSubmit}
-                >
-                    <Form.Item
-                        style={{ margin: 0 }}
-                        name="ermodelrelationNameForm"
-                        rules={[
-                            {
-                                required: true,
-                                message: `${entityName} name is required.`,
-                            },
-                            {
-                                validator: (_, value) =>
-                                    checkDuplicateERModelRelation(getSearchResultsERModelRelations, value?.trim()).then(
-                                        (result) => {
-                                            return result === true && !isEditing
-                                                ? Promise.reject(
-                                                      new Error(
-                                                          `This ${entityName} name already exists. A unique name for each ${entityName} is required.`,
-                                                      ),
-                                                  )
-                                                : Promise.resolve();
-                                        },
-                                    ),
-                            },
-                        ]}
-                    >
-                        <Input
-                            size="large"
-                            className="ermodelrelation-name"
-                            onChange={(e) => setERModelRelationName(e.target.value)}
-                        />
-                    </Form.Item>
-                    <p className="all-content-heading">Cardinality</p>
-                    <Form.Item style={{ margin: 0 }} name="ermodelrelationCardinality">
-                        <Select className="cardinality-select" onChange={(e) => setERModelRelationCardinality(e)}>
-                            <Select.Option value="ONE_ONE">{ErModelRelationshipCardinality.OneOne}</Select.Option>
-                            <Select.Option value="ONE_N">{ErModelRelationshipCardinality.OneN}</Select.Option>
-                            <Select.Option value="N_ONE">{ErModelRelationshipCardinality.NOne}</Select.Option>
-                            <Select.Option value="N_N">{ErModelRelationshipCardinality.NN}</Select.Option>
-                        </Select>
-                    </Form.Item>
-                    <p className="all-content-heading">Fields</p>
-                    <Table
-                        bordered
-                        components={components}
-                        dataSource={tableData}
-                        className="ERModelRelationTable"
-                        columns={columns as ColumnTypes}
-                        pagination={false}
-                    />
-                    <Button type="link" className="add-btn-link" onClick={handleAdd}>
-                        <PlusOutlined /> Add Row
-                    </Button>
-                    <p className="all-content-heading">{entityName} details</p>
-                    <Form.Item style={{ margin: 0 }} name="ermodelrelationDetails">
-                        <TextArea
-                            className="ermodelrelation-details-ta"
-                            placeholder={`Please enter ${entityName} details here`}
-                            onChange={(e) => setDetails(e.target.value)}
-                        />
-                    </Form.Item>
-                </Form>
-            </div>
-        </Modal>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview.tsx
deleted file mode 100644
index 32dc2f9f197972..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview.tsx
+++ /dev/null
@@ -1,222 +0,0 @@
-import '@app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview.less';
-
-import { RightOutlined } from '@ant-design/icons';
-import { Button, Row, Table } from 'antd';
-import React, { useState } from 'react';
-
-import { CreateERModelRelationModal } from '@app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal';
-import { getDatasetName } from '@app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType, ErModelRelationship, ErModelRelationshipCardinality } from '@types';
-
-import arrow from '@images/Arrow.svg';
-import editIcon from '@images/editIconBlack.svg';
-
-type ERModelRelationRecord = {
-    sourceField: string;
-    destinationField: string;
-};
-type Props = {
-    ermodelrelationData: ErModelRelationship;
-    baseEntityUrn?: any;
-    prePageType?: string;
-    refetch: () => Promise<any>;
-};
-type EditableTableProps = Parameters<typeof Table>[0];
-type ColumnTypes = Exclude<EditableTableProps['columns'], undefined>;
-export const ERModelRelationPreview = ({ ermodelrelationData, baseEntityUrn, prePageType, refetch }: Props) => {
-    const entityRegistry = useEntityRegistry();
-    const handleViewEntity = (entityType, urn) => {
-        const entityUrl = entityRegistry.getEntityUrl(entityType, urn);
-        window.open(entityUrl, '_blank');
-    };
-    const entityName = entityRegistry.getEntityName(EntityType.ErModelRelationship);
-    const [modalVisible, setModalVisible] = useState(false);
-    const shuffleFlag =
-        prePageType === 'Dataset' ? !(baseEntityUrn === ermodelrelationData?.properties?.source?.urn) : false;
-    const table1EditableName = shuffleFlag
-        ? getDatasetName(ermodelrelationData?.properties?.destination)
-        : getDatasetName(ermodelrelationData?.properties?.source);
-    const table2EditableName = shuffleFlag
-        ? getDatasetName(ermodelrelationData?.properties?.source)
-        : getDatasetName(ermodelrelationData?.properties?.destination);
-    const table1Name =
-        shuffleFlag && prePageType !== 'ERModelRelationship'
-            ? ermodelrelationData?.properties?.destination?.name
-            : ermodelrelationData?.properties?.source?.name;
-    const table2Name =
-        shuffleFlag && prePageType !== 'ERModelRelationship'
-            ? ermodelrelationData?.properties?.source?.name
-            : ermodelrelationData?.properties?.destination?.name;
-    const table1Urn =
-        shuffleFlag && prePageType !== 'ERModelRelationship'
-            ? ermodelrelationData?.properties?.destination?.urn
-            : ermodelrelationData?.properties?.source?.urn;
-    const table2Urn =
-        shuffleFlag && prePageType !== 'ERModelRelationship'
-            ? ermodelrelationData?.properties?.source?.urn
-            : ermodelrelationData?.properties?.destination?.urn;
-    const ermodelrelationHeader =
-        ermodelrelationData?.editableProperties?.name || ermodelrelationData?.properties?.name || '';
-    function getFieldMap(): ERModelRelationRecord[] {
-        const newData = [] as ERModelRelationRecord[];
-        if (shuffleFlag && prePageType !== 'ERModelRelationship') {
-            ermodelrelationData?.properties?.relationshipFieldMappings?.map((item) => {
-                return newData.push({
-                    sourceField: item.destinationField,
-                    destinationField: item.sourceField,
-                });
-            });
-        } else {
-            ermodelrelationData?.properties?.relationshipFieldMappings?.map((item) => {
-                return newData.push({
-                    sourceField: item.sourceField,
-                    destinationField: item.destinationField,
-                });
-            });
-        }
-        return newData;
-    }
-    const columns = [
-        {
-            title: (
-                <p>
-                    <div className="firstRow">
-                        <div className="titleNameDisplay"> {table1EditableName || table1Name}</div>
-                        <div>
-                            {prePageType === 'ERModelRelationship' && (
-                                <Button
-                                    type="link"
-                                    className="div-view-dataset"
-                                    onClick={() => handleViewEntity(EntityType.Dataset, table1Urn)}
-                                >
-                                    View dataset <RightOutlined />
-                                </Button>
-                            )}
-                        </div>
-                    </div>
-
-                    <div className="editableNameDisplay">{table1Name !== table1EditableName && table1Name}</div>
-                </p>
-            ),
-            dataIndex: 'sourceField',
-            width: '48%',
-            sorter: ({ sourceField: a }, { sourceField: b }) => a.localeCompare(b),
-        },
-        {
-            title: '',
-            dataIndex: '',
-            width: '4%',
-            render: () => <img src={arrow} alt="" />,
-        },
-        {
-            title: (
-                <p>
-                    <div className="firstRow">
-                        <div className="titleNameDisplay"> {table2EditableName || table2Name}</div>
-                        <div>
-                            <Button
-                                type="link"
-                                className="div-view-dataset"
-                                onClick={() => handleViewEntity(EntityType.Dataset, table2Urn)}
-                            >
-                                View dataset <RightOutlined />
-                            </Button>
-                        </div>
-                    </div>
-                    <div className="editableNameDisplay">{table2Name !== table2EditableName && table2Name}</div>
-                </p>
-            ),
-            width: '48%',
-            dataIndex: 'destinationField',
-            sorter: ({ destinationField: a }, { destinationField: b }) => a.localeCompare(b),
-        },
-    ];
-
-    const adjustCardinality = (cardinality) => {
-        // Reverse the cardinality if the source and destination are reversed
-        // Only for one_n and n_one, rest are same
-        if (shuffleFlag && prePageType !== 'ERModelRelationship') {
-            if (cardinality === ErModelRelationshipCardinality.OneN) return ErModelRelationshipCardinality.NOne;
-            if (cardinality === ErModelRelationshipCardinality.NOne) return ErModelRelationshipCardinality.OneN;
-        }
-        return cardinality;
-    };
-
-    return (
-        <div className="ERModelRelationPreview">
-            {ermodelrelationData?.properties?.relationshipFieldMappings !== undefined && (
-                <CreateERModelRelationModal
-                    open={modalVisible}
-                    setModalVisible={setModalVisible}
-                    onCancel={() => {
-                        setModalVisible(false);
-                    }}
-                    editERModelRelation={ermodelrelationData}
-                    isEditing
-                    refetch={refetch}
-                    entityName={entityName}
-                />
-            )}
-            <div className="preview-main-div">
-                <div>
-                    {(prePageType === 'Dataset' || ermodelrelationHeader !== ermodelrelationData?.properties?.name) && (
-                        <Row>
-                            <p className="all-table-heading">{ermodelrelationHeader}</p>
-                            {prePageType === 'Dataset' && (
-                                <div className="div-view">
-                                    <Button
-                                        type="link"
-                                        onClick={() =>
-                                            handleViewEntity(EntityType.ErModelRelationship, ermodelrelationData?.urn)
-                                        }
-                                    >
-                                        View {entityName} <RightOutlined />{' '}
-                                    </Button>
-                                </div>
-                            )}
-                        </Row>
-                    )}
-                </div>
-                <div>
-                    <Button
-                        type="link"
-                        className="btn-edit"
-                        onClick={() => {
-                            setModalVisible(true);
-                        }}
-                    >
-                        <div className="div-edit-img">
-                            <img src={editIcon} alt="" /> <div className="div-edit">Edit {entityName}</div>
-                            {prePageType === 'ERModelRelationship' && <div className="extra-margin-rev" />}
-                        </div>
-                    </Button>
-                </div>
-            </div>
-            {prePageType === 'Dataset' && (
-                <div className="cardinality-div">
-                    <span>
-                        <b>Cardinality: </b>
-                        {adjustCardinality(ermodelrelationData?.properties?.cardinality)}
-                    </span>
-                </div>
-            )}
-            <Row>
-                <Table
-                    bordered
-                    dataSource={getFieldMap()}
-                    className="ERModelRelationTable"
-                    columns={columns as ColumnTypes}
-                    pagination={false}
-                />
-            </Row>
-            {prePageType === 'Dataset' && (
-                <div>
-                    <p className="all-content-heading">{entityName} details</p>
-                    <p className="all-content-info">{ermodelrelationData?.editableProperties?.description}</p>
-                </div>
-            )}
-        </div>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils.tsx
deleted file mode 100644
index 1bdda7bc5f1c7a..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { FormInstance } from 'antd';
-import React from 'react';
-
-import { EntityType } from '@types';
-
-export const EditableContext = React.createContext<FormInstance<any> | null>(null);
-export interface ERModelRelationDataType {
-    key: React.Key;
-    field1Name: string;
-    field2Name: string;
-}
-
-export const checkDuplicateERModelRelation = async (getSearchResultsERModelRelations, name): Promise<boolean> => {
-    const { data: searchResults } = await getSearchResultsERModelRelations({
-        input: {
-            type: EntityType.ErModelRelationship,
-            query: '',
-            orFilters: [
-                {
-                    and: [
-                        {
-                            field: 'name',
-                            values: [name],
-                        },
-                    ],
-                },
-            ],
-            start: 0,
-            count: 1000,
-        },
-    });
-    const recordExists = searchResults && searchResults.search && searchResults.search.total > 0;
-    return recordExists || false;
-};
-const validateTableData = (fieldMappingData: ERModelRelationDataType) => {
-    if (fieldMappingData.field1Name !== '' && fieldMappingData.field2Name !== '') {
-        return true;
-    }
-    return false;
-};
-export const validateERModelRelation = async (
-    nameField: string,
-    tableSchema: ERModelRelationDataType[],
-    editFlag,
-    getSearchResultsERModelRelations,
-    entityName,
-) => {
-    const errors: string[] = [];
-    const bDuplicateName = await checkDuplicateERModelRelation(
-        getSearchResultsERModelRelations,
-        nameField?.trim(),
-    ).then((result) => result);
-    if (nameField === '') {
-        errors.push(`${entityName} name is required`);
-    }
-    if (bDuplicateName && !editFlag) {
-        errors.push(`This ${entityName} name already exists. A unique name for each ${entityName} is required`);
-    }
-    const faultyRows = tableSchema.filter((item) => validateTableData(item) !== true);
-    if (faultyRows.length > 0) {
-        errors.push(`Please fill out or remove all empty ${entityName} fields`);
-    }
-    return errors;
-};
-
-export function getDatasetName(datainput: any): string {
-    return (
-        datainput?.editableProperties?.name ||
-        datainput?.properties?.name ||
-        datainput?.name ||
-        datainput?.urn?.split(',')?.at(1)
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableCell.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableCell.tsx
deleted file mode 100644
index 26c440546488d3..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableCell.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Form, Select } from 'antd';
-import React, { useContext } from 'react';
-
-import { EditableContext } from '@app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils';
-
-import { Dataset } from '@types';
-
-interface EditableCellProps {
-    editable: boolean;
-    children: React.ReactNode;
-    dataIndex: keyof ERModelRelationRecord;
-    record: ERModelRelationRecord;
-    tableRecord?: Dataset;
-    value?: any;
-    handleSave: (record: ERModelRelationRecord) => void;
-}
-interface ERModelRelationRecord {
-    key: string;
-    field1Name: string;
-    field2Name: string;
-}
-export const EditableCell = ({
-    editable,
-    children,
-    dataIndex,
-    record,
-    tableRecord,
-    value,
-    handleSave,
-    ...restProps
-}: EditableCellProps) => {
-    const form = useContext(EditableContext)!;
-    const save = async () => {
-        try {
-            const values = await form.validateFields();
-            handleSave({ ...record, ...values });
-        } catch (errInfo) {
-            console.log('Save failed:', errInfo);
-        }
-    };
-
-    let childNode = children;
-    if (editable) {
-        childNode = (
-            <Form.Item
-                style={{ margin: 0 }}
-                name={dataIndex}
-                rules={[
-                    {
-                        required: true,
-                        message: `Field is required.`,
-                    },
-                ]}
-            >
-                <Select
-                    size="large"
-                    className="ermodelrelation-select-selector"
-                    options={tableRecord?.schemaMetadata?.fields?.map((result) => ({
-                        value: result.fieldPath,
-                        label: result.fieldPath,
-                    }))}
-                    value={value}
-                    disabled={tableRecord?.schemaMetadata?.fields?.length === 0}
-                    onChange={save}
-                    placeholder="Select a field"
-                />
-            </Form.Item>
-        );
-        if (record[dataIndex] !== '') {
-            form.setFieldsValue({ [dataIndex]: record[dataIndex] });
-        }
-    } else {
-        childNode = <div className="editable-cell-value-wrap">{children}</div>;
-    }
-
-    return <td {...restProps}>{childNode}</td>;
-};
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableRow.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableRow.tsx
deleted file mode 100644
index 54c79ae882940a..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/ERModelRelationship/EditableRow.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Form } from 'antd';
-import React from 'react';
-
-import { EditableContext } from '@app/entity/shared/components/styled/ERModelRelationship/ERModelRelationUtils';
-
-interface EditableRowProps {
-    index: number;
-}
-export const EditableRow: React.FC<EditableRowProps> = ({ ...propsAt }) => {
-    const [form] = Form.useForm();
-    return (
-        <Form form={form} component={false}>
-            <EditableContext.Provider value={form}>
-                <tr {...propsAt} />
-            </EditableContext.Provider>
-        </Form>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/EmptyTab.tsx b/datahub-web-react/src/app/entity/shared/components/styled/EmptyTab.tsx
deleted file mode 100644
index 0a107324836062..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/EmptyTab.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Empty, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { EMPTY_MESSAGES } from '@app/entity/shared/constants';
-
-const StyledEmpty = styled(Empty)`
-    padding: 40px;
-    .ant-empty-footer {
-        .ant-btn:not(:last-child) {
-            margin-right: 8px;
-        }
-    }
-`;
-
-const EmptyDescription = styled.div`
-    > * {
-        max-width: 70ch;
-        display: block;
-        margin-right: auto;
-        margin-left: auto;
-    }
-`;
-
-type Props = {
-    tab: string;
-    children?: React.ReactNode;
-};
-
-export const EmptyTab = ({ tab, children }: Props) => {
-    return (
-        <StyledEmpty
-            description={
-                <EmptyDescription>
-                    <Typography.Title level={4}>{EMPTY_MESSAGES[tab]?.title}</Typography.Title>
-                    <Typography.Text type="secondary">{EMPTY_MESSAGES[tab]?.description}</Typography.Text>
-                </EmptyDescription>
-            }
-        >
-            {children}
-        </StyledEmpty>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActor.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActor.tsx
deleted file mode 100644
index 5ad87d4068a4db..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActor.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Popover, Tag } from 'antd';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { CustomAvatar } from '@app/shared/avatar';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { CorpGroup, CorpUser, EntityType } from '@types';
-
-type Props = {
-    actor: CorpUser | CorpGroup;
-    popOver?: React.ReactNode;
-    closable?: boolean | undefined;
-    onClose?: () => void;
-};
-
-const ActorTag = styled(Tag)`
-    padding: 2px;
-    padding-right: 6px;
-    margin-bottom: 8px;
-    display: inline-flex;
-    align-items: center;
-`;
-
-export const ExpandedActor = ({ actor, popOver, closable, onClose }: Props) => {
-    const entityRegistry = useEntityRegistry();
-
-    let name = '';
-    if (actor.__typename === 'CorpGroup') {
-        name = entityRegistry.getDisplayName(EntityType.CorpGroup, actor);
-    }
-    if (actor.__typename === 'CorpUser') {
-        name = entityRegistry.getDisplayName(EntityType.CorpUser, actor);
-    }
-
-    const pictureLink = (actor.__typename === 'CorpUser' && actor.editableProperties?.pictureLink) || undefined;
-
-    return (
-        <ActorTag onClose={onClose} closable={closable}>
-            <Link to={`${entityRegistry.getEntityUrl(actor.type, actor.urn)}`}>
-                <CustomAvatar name={name} photoUrl={pictureLink} useDefaultAvatar={false} />
-                {(!popOver && <>{name}</>) || (
-                    <Popover overlayStyle={{ maxWidth: 200 }} placement="left" content={popOver}>
-                        {name}
-                    </Popover>
-                )}
-            </Link>
-        </ActorTag>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActorGroup.tsx b/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActorGroup.tsx
deleted file mode 100644
index ce7e29a9bd9f81..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/ExpandedActorGroup.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Popover, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ExpandedActor } from '@app/entity/shared/components/styled/ExpandedActor';
-
-import { CorpGroup, CorpUser } from '@types';
-
-const PopoverActors = styled.div`
-    max-width: 600px;
-`;
-
-const ActorsContainer = styled.div`
-    display: flex;
-    justify-content: right;
-    flex-wrap: wrap;
-    align-items: center;
-`;
-
-const RemainderText = styled(Typography.Text)`
-    display: flex;
-    justify-content: right;
-    margin-right: 8px;
-`;
-
-type Props = {
-    actors: Array<CorpUser | CorpGroup>;
-    max: number;
-    onClose?: (actor: CorpUser | CorpGroup) => void;
-    containerStyle?: any;
-};
-
-const DEFAULT_MAX = 10;
-
-export const ExpandedActorGroup = ({ actors, max = DEFAULT_MAX, onClose, containerStyle }: Props) => {
-    const finalActors = actors.length > max ? actors.slice(0, max) : actors;
-    const remainder = actors.length > max ? actors.length - max : undefined;
-
-    return (
-        <Popover
-            placement="left"
-            content={
-                <PopoverActors>
-                    {actors.map((actor) => (
-                        <ExpandedActor key={actor.urn} actor={actor} onClose={() => onClose?.(actor)} />
-                    ))}
-                </PopoverActors>
-            }
-        >
-            <ActorsContainer style={containerStyle}>
-                {finalActors.map((actor) => (
-                    <ExpandedActor key={actor.urn} actor={actor} onClose={() => onClose?.(actor)} />
-                ))}
-            </ActorsContainer>
-            {remainder && <RemainderText type="secondary">+ {remainder} more</RemainderText>}
-        </Popover>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/SeeMore.tsx b/datahub-web-react/src/app/entity/shared/components/styled/SeeMore.tsx
deleted file mode 100644
index 47c4ef085af3c0..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/SeeMore.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Button } from 'antd';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-export const SeeMore = styled(Button)`
-    margin-top: -20px;
-    background-color: ${ANTD_GRAY[4]};
-    padding: 8px;
-    border: none;
-    line-height: 8px;
-    height: 20px;
-`;
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StripMarkdownText.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StripMarkdownText.tsx
index 9ed9c8fbece407..1ba17a6e7a3521 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/StripMarkdownText.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/StripMarkdownText.tsx
@@ -11,7 +11,7 @@ const RemoveMarkdownContainer = styled.div<{ shouldWrap: boolean }>`
     text-overflow: ellipsis;
 `;
 
-export type Props = {
+type Props = {
     children: string | undefined | null;
     readMore?: JSX.Element;
     suffix?: JSX.Element;
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StyledButton.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StyledButton.tsx
deleted file mode 100644
index b3e744a5aac728..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/StyledButton.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Button } from 'antd';
-import styled from 'styled-components';
-
-export default styled(Button)`
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-right: 16px;
-    padding-left: 16px;
-    box-shadow: 0px 0px 4px 0px #0000001a;
-    border: 1px solid #d9d9d9;
-
-    font-size: 12px;
-    font-weight: 500;
-    line-height: 20px;
-    vertical-align: top;
-    border-radius: 5px;
-`;
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/StyledMDEditor.tsx b/datahub-web-react/src/app/entity/shared/components/styled/StyledMDEditor.tsx
deleted file mode 100644
index ca44fa319bf809..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/StyledMDEditor.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import MDEditor from '@uiw/react-md-editor';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-export default styled(MDEditor)`
-    height: calc(100% - 46px) !important;
-    z-index: 0;
-    box-shadow: none;
-    border-radius: 0;
-    font-weight: 400;
-    .w-md-editor-toolbar {
-        border-color: ${ANTD_GRAY[4]};
-        background: white;
-        padding: 0 20px;
-        height: 46px !important;
-        li {
-            button {
-                height: 100%;
-                margin: 0 5px;
-            }
-            svg {
-                width: 16px;
-                height: 16px;
-            }
-            &.active > button {
-                color: ${(props) => props.theme.styles['primary-color']};
-                background-color: ${ANTD_GRAY[3]};
-            }
-        }
-    }
-    .w-md-editor-preview {
-        box-shadow: inset 1px 0 0 0 ${ANTD_GRAY[4]};
-    }
-    .w-md-editor-content {
-        height: calc(100% - 46px) !important;
-    }
-`;
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/_tests_/ERModelRelationPreview.test.tsx b/datahub-web-react/src/app/entity/shared/components/styled/_tests_/ERModelRelationPreview.test.tsx
deleted file mode 100644
index 25b7a6c2743754..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/_tests_/ERModelRelationPreview.test.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-import { ApolloClient, ApolloProvider, InMemoryCache } from '@apollo/client';
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-import { vi } from 'vitest';
-
-import { ERModelRelationPreview } from '@app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview';
-
-import { Dataset, EntityType, ErModelRelationship, ErModelRelationshipCardinality } from '@types';
-
-// Create a mock Apollo Client
-const mockApolloClient = new ApolloClient({
-    cache: new InMemoryCache(),
-    uri: 'https://mock-api.com/graphql', // Mock URI
-});
-
-const mockErModelRelationData: ErModelRelationship = {
-    id: '123',
-    urn: 'urn:li:ermodelrelationship:123',
-    properties: {
-        cardinality: ErModelRelationshipCardinality.OneN,
-        relationshipFieldMappings: [
-            { sourceField: 'sourceField1', destinationField: 'destinationField1' },
-            { sourceField: 'sourceField2', destinationField: 'destinationField2' },
-        ],
-        source: {
-            urn: 'urn:li:dataset:source-dataset',
-            name: 'Source Dataset',
-        } as Dataset,
-        destination: {
-            urn: 'urn:li:dataset:destination-dataset',
-            name: 'Destination Dataset',
-        } as Dataset,
-        name: 'Test Relationship',
-    },
-    editableProperties: {
-        name: 'Editable Test Relationship',
-        description: 'This is a test description for the relationship.',
-    },
-    type: EntityType.ErModelRelationship,
-} as ErModelRelationship;
-
-const mockRefetch = vi.fn();
-
-// Corrected Mock for EntityRegistry
-vi.mock('@app/entity/EntityRegistry', async () => {
-    const actual = await vi.importActual('@app/entity/EntityRegistry');
-    return {
-        ...(actual as object),
-        default: vi.fn().mockImplementation(() => ({
-            getEntityName: vi.fn((entityType) => {
-                if (entityType === EntityType.ErModelRelationship) {
-                    return 'ER Model Relationship';
-                }
-                return 'Unknown Entity';
-            }),
-            getEntityUrl: vi.fn((entityType, urn) => `/entity/${entityType}/${urn}`),
-        })),
-    };
-});
-
-describe('ERModelRelationPreview', () => {
-    it('renders the relationship header and description', () => {
-        render(
-            <ApolloProvider client={mockApolloClient}>
-                <ERModelRelationPreview
-                    ermodelrelationData={mockErModelRelationData}
-                    prePageType="Dataset"
-                    refetch={mockRefetch}
-                />
-            </ApolloProvider>,
-        );
-
-        expect(screen.getByText('Editable Test Relationship')).toBeInTheDocument();
-        expect(screen.getByText('This is a test description for the relationship.')).toBeInTheDocument();
-    });
-
-    it('renders the cardinality', () => {
-        render(
-            <ApolloProvider client={mockApolloClient}>
-                <ERModelRelationPreview
-                    ermodelrelationData={mockErModelRelationData}
-                    prePageType="Dataset"
-                    refetch={mockRefetch}
-                />
-            </ApolloProvider>,
-        );
-
-        expect(screen.getByText('Cardinality:')).toBeInTheDocument();
-        expect(screen.getByText(ErModelRelationshipCardinality.NOne)).toBeInTheDocument();
-    });
-
-    it('renders the field mappings table', () => {
-        render(
-            <ApolloProvider client={mockApolloClient}>
-                <ERModelRelationPreview
-                    ermodelrelationData={mockErModelRelationData}
-                    prePageType="Dataset"
-                    refetch={mockRefetch}
-                />
-            </ApolloProvider>,
-        );
-
-        expect(screen.getByText('sourceField1')).toBeInTheDocument();
-        expect(screen.getByText('destinationField1')).toBeInTheDocument();
-        expect(screen.getByText('sourceField2')).toBeInTheDocument();
-        expect(screen.getByText('destinationField2')).toBeInTheDocument();
-    });
-
-    it('renders the "View dataset" buttons', () => {
-        render(
-            <ApolloProvider client={mockApolloClient}>
-                <ERModelRelationPreview
-                    ermodelrelationData={mockErModelRelationData}
-                    prePageType="Dataset"
-                    refetch={mockRefetch}
-                />
-            </ApolloProvider>,
-        );
-
-        const viewSourceDatasetButton = screen.getByText('View dataset');
-        const viewDestinationDatasetButton = screen.getByText('View dataset');
-
-        expect(viewSourceDatasetButton).toBeInTheDocument();
-        expect(viewDestinationDatasetButton).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearch.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearch.tsx
index a64b43280b2809..903f797d0afeff 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearch.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearch.tsx
@@ -50,7 +50,7 @@ function useWrappedSearchResults(params: GetSearchResultsParams) {
 }
 
 // the addFixedQuery checks and generate the query as per params pass to embeddedListSearch
-export const addFixedQuery = (baseQuery: string, fixedQuery: string, emptyQuery: string) => {
+const addFixedQuery = (baseQuery: string, fixedQuery: string, emptyQuery: string) => {
     let finalQuery = ``;
     if (baseQuery && fixedQuery) {
         finalQuery = baseQuery.includes(fixedQuery) ? `${baseQuery}` : `(*${baseQuery}*) AND (${fixedQuery})`;
@@ -66,7 +66,7 @@ export const addFixedQuery = (baseQuery: string, fixedQuery: string, emptyQuery:
 
 // Simply remove the fields that were marked as fixed from the facets that the server
 // responds.
-export const removeFixedFiltersFromFacets = (fixedFilters: FilterSet, facets: FacetMetadata[]) => {
+const removeFixedFiltersFromFacets = (fixedFilters: FilterSet, facets: FacetMetadata[]) => {
     const fixedFields = fixedFilters.filters.map((filter) => filter.field);
     return facets.filter((facet) => !fixedFields.includes(facet.field));
 };
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchSection.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchSection.tsx
deleted file mode 100644
index c5c4ceb6e6f857..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchSection.tsx
+++ /dev/null
@@ -1,186 +0,0 @@
-import { ApolloError } from '@apollo/client';
-import * as QueryString from 'query-string';
-import React from 'react';
-import { useHistory, useLocation } from 'react-router';
-
-import { EmbeddedListSearch } from '@app/entity/shared/components/styled/search/EmbeddedListSearch';
-import { navigateToEntitySearchUrl } from '@app/entity/shared/components/styled/search/navigateToEntitySearchUrl';
-import {
-    FilterSet,
-    GetSearchResultsParams,
-    SearchResultsInterface,
-} from '@app/entity/shared/components/styled/search/types';
-import { useEntityQueryParams } from '@app/entity/shared/containers/profile/utils';
-import {
-    EXTRA_EMBEDDED_LIST_SEARCH_ENTITY_TYPES_TO_SUPPLEMENT_SEARCHABLE_ENTITY_TYPES,
-    UnionType,
-} from '@app/search/utils/constants';
-import {
-    DownloadSearchResults,
-    DownloadSearchResultsInput,
-    DownloadSearchResultsParams,
-} from '@app/search/utils/types';
-import useFilters from '@app/search/utils/useFilters';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { FacetFilterInput } from '@types';
-
-const FILTER = 'filter';
-
-function getParamsWithoutFilters(params: QueryString.ParsedQuery<string>) {
-    const paramsCopy = { ...params };
-    Object.keys(paramsCopy).forEach((key) => {
-        if (key.startsWith(FILTER)) {
-            delete paramsCopy[key];
-        }
-    });
-    return paramsCopy;
-}
-
-type Props = {
-    emptySearchQuery?: string | null;
-    fixedFilters?: FilterSet;
-    fixedQuery?: string | null;
-    placeholderText?: string | null;
-    defaultShowFilters?: boolean;
-    defaultFilters?: Array<FacetFilterInput>;
-    searchBarStyle?: any;
-    searchBarInputStyle?: any;
-    skipCache?: boolean;
-    useGetSearchResults?: (params: GetSearchResultsParams) => {
-        data: SearchResultsInterface | undefined | null;
-        loading: boolean;
-        error: ApolloError | undefined;
-        refetch: (variables: GetSearchResultsParams['variables']) => Promise<SearchResultsInterface | undefined | null>;
-    };
-    useGetDownloadSearchResults?: (params: DownloadSearchResultsParams) => {
-        loading: boolean;
-        error: ApolloError | undefined;
-        searchResults: DownloadSearchResults | undefined | null;
-        refetch: (input: DownloadSearchResultsInput) => Promise<DownloadSearchResults | undefined | null>;
-    };
-    shouldRefetch?: boolean;
-    resetShouldRefetch?: () => void;
-    applyView?: boolean;
-    onLineageClick?: () => void;
-    isLineageTab?: boolean;
-};
-
-export const EmbeddedListSearchSection = ({
-    emptySearchQuery,
-    fixedFilters,
-    fixedQuery,
-    placeholderText,
-    defaultShowFilters,
-    defaultFilters,
-    searchBarStyle,
-    searchBarInputStyle,
-    skipCache,
-    useGetSearchResults,
-    useGetDownloadSearchResults,
-    shouldRefetch,
-    resetShouldRefetch,
-    applyView,
-    onLineageClick,
-    isLineageTab,
-}: Props) => {
-    const history = useHistory();
-    const location = useLocation();
-    const entityQueryParams = useEntityQueryParams();
-
-    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
-    const paramsWithoutFilters = getParamsWithoutFilters(params);
-    const baseParams = { ...entityQueryParams, ...paramsWithoutFilters };
-    const query: string = params?.query as string;
-    const page: number = params.page && Number(params.page as string) > 0 ? Number(params.page as string) : 1;
-    const unionType: UnionType = Number(params.unionType as any as UnionType) || UnionType.AND;
-
-    const entityRegistry = useEntityRegistry();
-
-    const searchableEntityTypes = entityRegistry.getSearchEntityTypes();
-
-    const embeddedListSearchEntityTypes = [
-        ...searchableEntityTypes,
-        ...EXTRA_EMBEDDED_LIST_SEARCH_ENTITY_TYPES_TO_SUPPLEMENT_SEARCHABLE_ENTITY_TYPES,
-    ];
-
-    const filters: Array<FacetFilterInput> = useFilters(params);
-
-    const onSearch = (q: string) => {
-        navigateToEntitySearchUrl({
-            baseUrl: location.pathname,
-            baseParams,
-            query: q,
-            page: 1,
-            filters,
-            history,
-            unionType,
-        });
-    };
-
-    const onChangeFilters = (newFilters: Array<FacetFilterInput>) => {
-        navigateToEntitySearchUrl({
-            baseUrl: location.pathname,
-            baseParams,
-            query,
-            page: 1,
-            filters: newFilters,
-            unionType,
-            history,
-        });
-    };
-
-    const onChangePage = (newPage: number) => {
-        navigateToEntitySearchUrl({
-            baseUrl: location.pathname,
-            baseParams,
-            query,
-            page: newPage,
-            filters,
-            history,
-            unionType,
-        });
-    };
-
-    const onChangeUnionType = (newUnionType: UnionType) => {
-        navigateToEntitySearchUrl({
-            baseUrl: location.pathname,
-            baseParams,
-            query,
-            page,
-            filters,
-            history,
-            unionType: newUnionType,
-        });
-    };
-
-    return (
-        <EmbeddedListSearch
-            entityTypes={embeddedListSearchEntityTypes}
-            query={query || ''}
-            page={page}
-            unionType={unionType}
-            filters={filters}
-            onChangeFilters={onChangeFilters}
-            onChangeQuery={onSearch}
-            onChangePage={onChangePage}
-            onChangeUnionType={onChangeUnionType}
-            emptySearchQuery={emptySearchQuery}
-            fixedFilters={fixedFilters}
-            fixedQuery={fixedQuery}
-            placeholderText={placeholderText}
-            defaultShowFilters={defaultShowFilters}
-            defaultFilters={defaultFilters}
-            searchBarStyle={searchBarStyle}
-            searchBarInputStyle={searchBarInputStyle}
-            skipCache={skipCache}
-            useGetSearchResults={useGetSearchResults}
-            useGetDownloadSearchResults={useGetDownloadSearchResults}
-            shouldRefetch={shouldRefetch}
-            resetShouldRefetch={resetShouldRefetch}
-            applyView={applyView}
-            onLineageClick={onLineageClick}
-            isLineageTab={isLineageTab}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/action/ActionDropdown.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/action/ActionDropdown.tsx
index d64cd1758511b4..89b0dab81265d9 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/search/action/ActionDropdown.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/search/action/ActionDropdown.tsx
@@ -30,7 +30,7 @@ const DropdownWrapper = styled.div<{
     margin-right: 12px;
 `;
 
-export type Action = {
+type Action = {
     title: React.ReactNode;
     onClick: () => void;
 };
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/downloadAsCsvUtil.ts b/datahub-web-react/src/app/entity/shared/components/styled/search/downloadAsCsvUtil.ts
index 5232bfe7e15651..7a230480c8cd4e 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/search/downloadAsCsvUtil.ts
+++ b/datahub-web-react/src/app/entity/shared/components/styled/search/downloadAsCsvUtil.ts
@@ -33,7 +33,7 @@ export const getSearchCsvDownloadHeader = (sampleResult?: SearchResultInterface)
     return result;
 };
 
-export const transformGenericEntityPropertiesToCsvRow = (
+const transformGenericEntityPropertiesToCsvRow = (
     entityRegistry: EntityRegistry,
     properties: GenericEntityProperties | null,
     entityUrl: string,
diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/navigateToEntitySearchUrl.ts b/datahub-web-react/src/app/entity/shared/components/styled/search/navigateToEntitySearchUrl.ts
deleted file mode 100644
index 132ed49f23b6b9..00000000000000
--- a/datahub-web-react/src/app/entity/shared/components/styled/search/navigateToEntitySearchUrl.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import * as QueryString from 'query-string';
-import { RouteComponentProps } from 'react-router';
-
-import { UnionType } from '@app/search/utils/constants';
-import filtersToQueryStringParams from '@app/search/utils/filtersToQueryStringParams';
-
-import { EntityType, FacetFilterInput } from '@types';
-
-export const navigateToEntitySearchUrl = ({
-    baseUrl,
-    baseParams,
-    type: newType,
-    query: newQuery,
-    page: newPage = 1,
-    filters: newFilters,
-    history,
-    unionType,
-}: {
-    baseUrl: string;
-    baseParams: Record<string, string | boolean>;
-    type?: EntityType;
-    query?: string;
-    page?: number;
-    filters?: Array<FacetFilterInput>;
-    history: RouteComponentProps['history'];
-    unionType: UnionType;
-}) => {
-    const constructedFilters = newFilters || [];
-    if (newType) {
-        constructedFilters.push({ field: 'entity', values: [newType] });
-    }
-
-    const search = QueryString.stringify(
-        {
-            ...baseParams,
-            ...filtersToQueryStringParams(constructedFilters),
-            query: newQuery,
-            page: newPage,
-            unionType,
-        },
-        { arrayFormat: 'comma' },
-    );
-
-    history.replace({
-        pathname: `${baseUrl}`,
-        search,
-    });
-};
diff --git a/datahub-web-react/src/app/entity/shared/constants.ts b/datahub-web-react/src/app/entity/shared/constants.ts
index ff6adf11d1690f..c572038ca93f58 100644
--- a/datahub-web-react/src/app/entity/shared/constants.ts
+++ b/datahub-web-react/src/app/entity/shared/constants.ts
@@ -88,7 +88,7 @@ export const EMPTY_MESSAGES = {
     },
 };
 
-export const ELASTIC_MAX_COUNT = 10000;
+const ELASTIC_MAX_COUNT = 10000;
 
 export const getElasticCappedTotalValueText = (count: number) => {
     if (count === ELASTIC_MAX_COUNT) {
@@ -110,10 +110,3 @@ export const GLOSSARY_ENTITY_TYPES = [EntityType.GlossaryTerm, EntityType.Glossa
 export const DEFAULT_SYSTEM_ACTOR_URNS = ['urn:li:corpuser:__datahub_system', 'urn:li:corpuser:unknown'];
 
 export const VIEW_ENTITY_PAGE = 'VIEW_ENTITY_PAGE';
-
-// only values for Domain Entity for custom configurable default tab
-export enum EntityProfileTab {
-    DOMAIN_ENTITIES_TAB = 'DOMAIN_ENTITIES_TAB',
-    DOCUMENTATION_TAB = 'DOCUMENTATION_TAB',
-    DATA_PRODUCTS_TAB = 'DATA_PRODUCTS_TAB',
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/EntityProfile.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/EntityProfile.tsx
deleted file mode 100644
index 0855e31bb39faf..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/EntityProfile.tsx
+++ /dev/null
@@ -1,371 +0,0 @@
-import { MutationHookOptions, MutationTuple, QueryHookOptions, QueryResult } from '@apollo/client/react/types/types';
-import { Alert, Divider } from 'antd';
-import React, { useCallback, useState } from 'react';
-import { useHistory } from 'react-router';
-import styled from 'styled-components/macro';
-
-import analytics, { EventType } from '@app/analytics';
-import { useUpdateDomainEntityDataOnChange } from '@app/domain/utils';
-import { EntityContext } from '@app/entity/shared/EntityContext';
-import { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { EntityHeader } from '@app/entity/shared/containers/profile/header/EntityHeader';
-import { EntityTabs } from '@app/entity/shared/containers/profile/header/EntityTabs';
-import { EntityProfileNavBar } from '@app/entity/shared/containers/profile/nav/EntityProfileNavBar';
-import { EntitySidebar } from '@app/entity/shared/containers/profile/sidebar/EntitySidebar';
-import SidebarFormInfoWrapper from '@app/entity/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper';
-import ProfileSidebar from '@app/entity/shared/containers/profile/sidebar/ProfileSidebar';
-import useGetDataForProfile from '@app/entity/shared/containers/profile/useGetDataForProfile';
-import {
-    getEntityPath,
-    getOnboardingStepIdsForEntityType,
-    sortEntityProfileTabs,
-    useRoutedTab,
-    useUpdateGlossaryEntityDataOnChange,
-} from '@app/entity/shared/containers/profile/utils';
-import { EntityActionItem } from '@app/entity/shared/entity/EntityActions';
-import NonExistentEntityPage from '@app/entity/shared/entity/NonExistentEntityPage';
-import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils';
-import DynamicTab from '@app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTab';
-import {
-    EntitySidebarSection,
-    EntitySubHeaderSection,
-    EntityTab,
-    GenericEntityProperties,
-    GenericEntityUpdate,
-} from '@app/entity/shared/types';
-import LineageExplorer from '@app/lineage/LineageExplorer';
-import useIsLineageMode from '@app/lineage/utils/useIsLineageMode';
-import { OnboardingTour } from '@app/onboarding/OnboardingTour';
-import {
-    LINEAGE_GRAPH_INTRO_ID,
-    LINEAGE_GRAPH_TIME_FILTER_ID,
-} from '@app/onboarding/config/LineageGraphOnboardingConfig';
-import CompactContext from '@app/shared/CompactContext';
-import { EntityHead } from '@app/shared/EntityHead';
-import { ErrorSection } from '@app/shared/error/ErrorSection';
-import { useAppConfig } from '@app/useAppConfig';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType, Exact } from '@types';
-
-type Props<T, U> = {
-    urn: string;
-    entityType: EntityType;
-    useEntityQuery: (
-        baseOptions: QueryHookOptions<
-            T,
-            Exact<{
-                urn: string;
-            }>
-        >,
-    ) => QueryResult<
-        T,
-        Exact<{
-            urn: string;
-        }>
-    >;
-    useUpdateQuery?: (
-        baseOptions?: MutationHookOptions<U, { urn: string; input: GenericEntityUpdate }> | undefined,
-    ) => MutationTuple<U, { urn: string; input: GenericEntityUpdate }>;
-    getOverrideProperties: (T) => GenericEntityProperties;
-    tabs: EntityTab[];
-    sidebarSections: EntitySidebarSection[];
-    subHeader?: EntitySubHeaderSection;
-    headerDropdownItems?: Set<EntityMenuItems>;
-    headerActionItems?: Set<EntityActionItem>;
-    hideBrowseBar?: boolean;
-    isNameEditable?: boolean;
-};
-
-const MAX_COMPACT_WIDTH = 490 - 24 * 2;
-
-const ContentContainer = styled.div`
-    display: flex;
-    height: auto;
-    min-height: 100%;
-    flex: 1;
-    min-width: 0;
-    overflow: hidden;
-`;
-
-const HeaderAndTabs = styled.div`
-    flex-grow: 1;
-    min-width: 640px;
-`;
-
-const HeaderAndTabsFlex = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    height: 100%;
-    max-height: 100%;
-    overflow: hidden;
-    min-height: 0;
-    overflow-y: auto;
-
-    &::-webkit-scrollbar {
-        height: 12px;
-        width: 2px;
-        background: #f2f2f2;
-    }
-    &::-webkit-scrollbar-thumb {
-        background: #cccccc;
-        -webkit-border-radius: 1ex;
-        -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);
-    }
-`;
-
-const Header = styled.div`
-    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
-    padding: 20px 20px 0 20px;
-    flex-shrink: 0;
-`;
-
-const TabContent = styled.div`
-    display: flex;
-    flex-direction: column;
-    flex: 1;
-    overflow: auto;
-`;
-
-const CompactProfile = styled.div`
-    max-width: ${MAX_COMPACT_WIDTH};
-`;
-
-const defaultTabDisplayConfig = {
-    visible: (_, _1) => true,
-    enabled: (_, _1) => true,
-};
-
-export const DEFAULT_SIDEBAR_SECTION = {
-    visible: (_, _1) => true,
-};
-
-/**
- * Container for display of the Entity Page
- */
-export const EntityProfile = <T, U>({
-    urn,
-    useEntityQuery,
-    useUpdateQuery,
-    entityType,
-    getOverrideProperties,
-    tabs,
-    sidebarSections,
-    headerDropdownItems,
-    headerActionItems,
-    isNameEditable,
-    hideBrowseBar,
-    subHeader,
-}: Props<T, U>): JSX.Element => {
-    const { config } = useAppConfig();
-    const { erModelRelationshipFeatureEnabled } = config.featureFlags;
-    const isLineageMode = useIsLineageMode();
-    const isHideSiblingMode = useIsSeparateSiblingsMode();
-    const entityRegistry = useEntityRegistry();
-    const history = useHistory();
-    const appConfig = useAppConfig();
-    const isCompact = React.useContext(CompactContext);
-    const tabsWithDefaults = tabs.map((tab) => ({ ...tab, display: { ...defaultTabDisplayConfig, ...tab.display } }));
-
-    if (erModelRelationshipFeatureEnabled) {
-        const relationIndex = tabsWithDefaults.findIndex((tab) => {
-            return tab.name === 'Relationships';
-        });
-        if (relationIndex >= 0) {
-            tabsWithDefaults[relationIndex] = {
-                ...tabsWithDefaults[relationIndex],
-                display: { ...defaultTabDisplayConfig },
-            };
-        }
-    }
-
-    const sortedTabs = sortEntityProfileTabs(appConfig.config, entityType, tabsWithDefaults);
-    const sideBarSectionsWithDefaults = sidebarSections.map((sidebarSection) => ({
-        ...sidebarSection,
-        display: { ...DEFAULT_SIDEBAR_SECTION, ...sidebarSection.display },
-    }));
-
-    const [shouldRefetchEmbeddedListSearch, setShouldRefetchEmbeddedListSearch] = useState(false);
-    const entityStepIds: string[] = getOnboardingStepIdsForEntityType(entityType);
-    const lineageGraphStepIds: string[] = [LINEAGE_GRAPH_INTRO_ID, LINEAGE_GRAPH_TIME_FILTER_ID];
-    const stepIds = isLineageMode ? lineageGraphStepIds : entityStepIds;
-
-    const routeToTab = useCallback(
-        ({
-            tabName,
-            tabParams,
-            method = 'replace',
-        }: {
-            tabName: string;
-            tabParams?: Record<string, any>;
-            method?: 'push' | 'replace';
-        }) => {
-            analytics.event({
-                type: EventType.EntitySectionViewEvent,
-                entityType,
-                entityUrn: urn,
-                section: tabName.toLowerCase(),
-            });
-            history[method](
-                getEntityPath(entityType, urn, entityRegistry, false, isHideSiblingMode, tabName, tabParams),
-            );
-        },
-        [history, entityType, urn, entityRegistry, isHideSiblingMode],
-    );
-
-    const { entityData, dataPossiblyCombinedWithSiblings, dataNotCombinedWithSiblings, loading, error, refetch } =
-        useGetDataForProfile({ urn, entityType, useEntityQuery, getOverrideProperties });
-
-    useUpdateGlossaryEntityDataOnChange(entityData, entityType);
-    useUpdateDomainEntityDataOnChange(entityData, entityType);
-
-    const maybeUpdateEntity = useUpdateQuery?.({
-        onCompleted: () => refetch(),
-    });
-    let updateEntity;
-    if (maybeUpdateEntity) {
-        [updateEntity] = maybeUpdateEntity;
-    }
-
-    const lineage = entityData ? entityRegistry.getLineageVizConfig(entityType, entityData) : undefined;
-
-    const autoRenderTabs: EntityTab[] =
-        entityData?.autoRenderAspects?.map((aspect) => ({
-            name: aspect.renderSpec?.displayName || aspect.aspectName,
-            component: () => (
-                <DynamicTab
-                    renderSpec={aspect.renderSpec}
-                    type={aspect.renderSpec?.displayType}
-                    payload={aspect.payload}
-                />
-            ),
-            display: {
-                visible: () => true,
-                enabled: () => true,
-            },
-            getDynamicName: () => '',
-        })) || [];
-
-    const visibleTabs = [...sortedTabs, ...autoRenderTabs].filter((tab) =>
-        tab.display?.visible(entityData, dataPossiblyCombinedWithSiblings),
-    );
-
-    const enabledAndVisibleTabs = visibleTabs.filter((tab) =>
-        tab.display?.enabled(entityData, dataPossiblyCombinedWithSiblings),
-    );
-
-    const routedTab = useRoutedTab(enabledAndVisibleTabs);
-
-    if (entityData?.exists === false) {
-        return <NonExistentEntityPage />;
-    }
-
-    if (isCompact) {
-        return (
-            <EntityContext.Provider
-                value={{
-                    urn,
-                    entityType,
-                    entityData,
-                    loading,
-                    baseEntity: dataPossiblyCombinedWithSiblings,
-                    dataNotCombinedWithSiblings,
-                    updateEntity,
-                    routeToTab,
-                    refetch,
-                    lineage,
-                    shouldRefetchEmbeddedListSearch,
-                    setShouldRefetchEmbeddedListSearch,
-                }}
-            >
-                <>
-                    {(error && <ErrorSection />) ||
-                        (!loading && (
-                            <CompactProfile>
-                                <EntityHeader
-                                    headerDropdownItems={headerDropdownItems}
-                                    headerActionItems={headerActionItems}
-                                    subHeader={subHeader}
-                                />
-                                <Divider style={{ marginBottom: '0' }} />
-                                <EntitySidebar sidebarSections={sideBarSectionsWithDefaults} />
-                            </CompactProfile>
-                        ))}
-                </>
-            </EntityContext.Provider>
-        );
-    }
-
-    const isBrowsable = entityRegistry.getBrowseEntityTypes().includes(entityType);
-    const isLineageEnabled = entityRegistry.getLineageEntityTypes().includes(entityType);
-    const showBrowseBar = (isBrowsable || isLineageEnabled) && !hideBrowseBar;
-
-    return (
-        <EntityContext.Provider
-            value={{
-                urn,
-                entityType,
-                entityData,
-                loading,
-                baseEntity: dataPossiblyCombinedWithSiblings,
-                dataNotCombinedWithSiblings,
-                updateEntity,
-                routeToTab,
-                refetch,
-                lineage,
-                shouldRefetchEmbeddedListSearch,
-                setShouldRefetchEmbeddedListSearch,
-            }}
-        >
-            <>
-                <OnboardingTour stepIds={stepIds} />
-                <EntityHead />
-                {showBrowseBar && <EntityProfileNavBar urn={urn} entityType={entityType} />}
-                {entityData?.status?.removed === true && (
-                    <Alert
-                        message={
-                            <>
-                                This entity is marked as soft-deleted, likely due to stateful ingestion or a manual
-                                deletion command, and will not appear in search or lineage graphs. Contact your DataHub
-                                admin for more information.
-                            </>
-                        }
-                        banner
-                    />
-                )}
-                {(error && <ErrorSection />) || (
-                    <ContentContainer>
-                        {isLineageMode ? (
-                            <LineageExplorer type={entityType} urn={urn} />
-                        ) : (
-                            <>
-                                <HeaderAndTabs>
-                                    <HeaderAndTabsFlex>
-                                        <Header>
-                                            <EntityHeader
-                                                headerDropdownItems={headerDropdownItems}
-                                                headerActionItems={headerActionItems}
-                                                isNameEditable={isNameEditable}
-                                                subHeader={subHeader}
-                                            />
-                                            <EntityTabs tabs={visibleTabs} selectedTab={routedTab} />
-                                        </Header>
-                                        <TabContent>
-                                            {routedTab && <routedTab.component properties={routedTab.properties} />}
-                                        </TabContent>
-                                    </HeaderAndTabsFlex>
-                                </HeaderAndTabs>
-                                <ProfileSidebar
-                                    sidebarSections={sidebarSections}
-                                    topSection={{ component: SidebarFormInfoWrapper }}
-                                />
-                            </>
-                        )}
-                    </ContentContainer>
-                )}
-            </>
-        </EntityContext.Provider>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityHeader.test.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityHeader.test.tsx
deleted file mode 100644
index 09308567581862..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityHeader.test.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import { getCanEditName } from '@app/entity/shared/containers/profile/header/EntityHeader';
-import { platformPrivileges } from '@src/Mocks';
-
-import { EntityType } from '@types';
-
-describe('getCanEditName', () => {
-    const entityDataWithManagePrivileges = { privileges: { canManageEntity: true, canEditProperties: true } };
-    const entityDataWithoutManagePrivileges = { privileges: { canManageEntity: false, canEditProperties: false } };
-
-    it('should return true for Terms if manageGlossaries privilege is true', () => {
-        const canEditName = getCanEditName(
-            EntityType.GlossaryTerm,
-            entityDataWithoutManagePrivileges,
-            true,
-            platformPrivileges,
-        );
-
-        expect(canEditName).toBe(true);
-    });
-
-    it('should return false for Terms if manageGlossaries privilege and canManageEntity is false', () => {
-        const privilegesWithoutGlossaries = { ...platformPrivileges, manageGlossaries: false };
-        const canEditName = getCanEditName(
-            EntityType.GlossaryTerm,
-            entityDataWithoutManagePrivileges,
-            true,
-            privilegesWithoutGlossaries,
-        );
-
-        expect(canEditName).toBe(false);
-    });
-
-    it('should return true for Terms if manageGlossaries privilege is false but canManageEntity is true', () => {
-        const privilegesWithoutGlossaries = { ...platformPrivileges, manageGlossaries: false };
-        const canEditName = getCanEditName(
-            EntityType.GlossaryTerm,
-            entityDataWithManagePrivileges,
-            true,
-            privilegesWithoutGlossaries,
-        );
-
-        expect(canEditName).toBe(true);
-    });
-
-    it('should return true for Nodes if manageGlossaries privilege is true', () => {
-        const canEditName = getCanEditName(
-            EntityType.GlossaryNode,
-            entityDataWithoutManagePrivileges,
-            true,
-            platformPrivileges,
-        );
-
-        expect(canEditName).toBe(true);
-    });
-
-    it('should return false for Nodes if manageGlossaries privilege and canManageEntity is false', () => {
-        const privilegesWithoutGlossaries = { ...platformPrivileges, manageGlossaries: false };
-        const canEditName = getCanEditName(
-            EntityType.GlossaryNode,
-            entityDataWithoutManagePrivileges,
-            true,
-            privilegesWithoutGlossaries,
-        );
-
-        expect(canEditName).toBe(false);
-    });
-
-    it('should return true for Nodes if manageGlossaries privilege is false but canManageEntity is true', () => {
-        const privilegesWithoutGlossaries = { ...platformPrivileges, manageGlossaries: false };
-        const canEditName = getCanEditName(
-            EntityType.GlossaryNode,
-            entityDataWithManagePrivileges,
-            true,
-            privilegesWithoutGlossaries,
-        );
-
-        expect(canEditName).toBe(true);
-    });
-
-    it('should return true for Domains if manageDomains privilege is true', () => {
-        const canEditName = getCanEditName(
-            EntityType.Domain,
-            entityDataWithoutManagePrivileges,
-            true,
-            platformPrivileges,
-        );
-
-        expect(canEditName).toBe(true);
-    });
-
-    it('should return false for Domains if manageDomains privilege is false', () => {
-        const privilegesWithoutDomains = { ...platformPrivileges, manageDomains: false };
-        const canEditName = getCanEditName(
-            EntityType.Domain,
-            entityDataWithoutManagePrivileges,
-            true,
-            privilegesWithoutDomains,
-        );
-
-        expect(canEditName).toBe(false);
-    });
-
-    it('should return false for an unsupported entity', () => {
-        const canEditName = getCanEditName(EntityType.Chart, entityDataWithManagePrivileges, true, platformPrivileges);
-
-        expect(canEditName).toBe(false);
-    });
-
-    it('should return true for a dataset if canEditProperties is true', () => {
-        const canEditName = getCanEditName(EntityType.Chart, entityDataWithManagePrivileges, true, platformPrivileges);
-
-        expect(canEditName).toBe(false);
-    });
-
-    it('should return false for a dataset if canEditProperties is false', () => {
-        const canEditName = getCanEditName(
-            EntityType.Chart,
-            entityDataWithoutManagePrivileges,
-            true,
-            platformPrivileges,
-        );
-
-        expect(canEditName).toBe(false);
-    });
-
-    it('should return false for a dataset if isEditableDatasetNameEnabled is false', () => {
-        const canEditName = getCanEditName(EntityType.Chart, entityDataWithManagePrivileges, false, platformPrivileges);
-
-        expect(canEditName).toBe(false);
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx
deleted file mode 100644
index 23154e320b603e..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx
+++ /dev/null
@@ -1,462 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { fireEvent, render, waitFor } from '@testing-library/react';
-import React from 'react';
-
-import { EntityProfile } from '@app/entity/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import { SidebarStatsSection } from '@app/entity/shared/containers/profile/sidebar/Dataset/StatsSidebarSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import QueriesTab from '@app/entity/shared/tabs/Dataset/Queries/QueriesTab';
-import { SchemaTab } from '@app/entity/shared/tabs/Dataset/Schema/SchemaTab';
-import StatsTab from '@app/entity/shared/tabs/Dataset/Stats/StatsTab';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { LineageTab } from '@app/entity/shared/tabs/Lineage/LineageTab';
-import { PropertiesTab } from '@app/entity/shared/tabs/Properties/PropertiesTab';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-import { GetDatasetQuery, useGetDatasetQuery, useUpdateDatasetMutation } from '@graphql/dataset.generated';
-import { EntityType } from '@types';
-
-describe('EntityProfile', () => {
-    it('renders dataset page', async () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
-                    <EntityProfile
-                        urn="urn:li:dataset:3"
-                        entityType={EntityType.Dataset}
-                        useEntityQuery={useGetDatasetQuery}
-                        useUpdateQuery={useUpdateDatasetMutation}
-                        getOverrideProperties={() => ({})}
-                        tabs={[
-                            {
-                                name: 'Schema',
-                                component: SchemaTab,
-                            },
-                            {
-                                name: 'Documentation',
-                                component: DocumentationTab,
-                            },
-                            {
-                                name: 'Properties',
-                                component: PropertiesTab,
-                            },
-                            {
-                                name: 'Lineage',
-                                component: LineageTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 ||
-                                        ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0,
-                                },
-                            },
-                            {
-                                name: 'Queries',
-                                component: QueriesTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
-                                },
-                            },
-                            {
-                                name: 'Stats',
-                                component: StatsTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.datasetProfiles?.length && true) ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                        ]}
-                        sidebarSections={[
-                            {
-                                component: SidebarAboutSection,
-                            },
-                            {
-                                component: SidebarStatsSection,
-                                display: {
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.datasetProfiles?.length && true) ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                            {
-                                component: SidebarTagsSection,
-                            },
-                            {
-                                component: SidebarOwnerSection,
-                            },
-                        ]}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        await waitFor(() => expect(getByText('Yet Another Dataset')).toBeInTheDocument());
-        await waitFor(() =>
-            expect(getByText('This and here we have yet another Dataset (YAN). Are there more?')).toBeInTheDocument(),
-        );
-    });
-
-    it('renders tab content', async () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
-                    <EntityProfile
-                        urn="urn:li:dataset:3"
-                        entityType={EntityType.Dataset}
-                        useEntityQuery={useGetDatasetQuery}
-                        useUpdateQuery={useUpdateDatasetMutation}
-                        getOverrideProperties={() => ({})}
-                        tabs={[
-                            {
-                                name: 'Schema',
-                                component: SchemaTab,
-                            },
-                            {
-                                name: 'Documentation',
-                                component: DocumentationTab,
-                            },
-                            {
-                                name: 'Properties',
-                                component: PropertiesTab,
-                            },
-                            {
-                                name: 'Lineage',
-                                component: LineageTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 ||
-                                        ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0,
-                                },
-                            },
-                            {
-                                name: 'Queries',
-                                component: QueriesTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
-                                },
-                            },
-                            {
-                                name: 'Stats',
-                                component: StatsTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.datasetProfiles?.length && true) ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                        ]}
-                        sidebarSections={[
-                            {
-                                component: SidebarAboutSection,
-                            },
-                            {
-                                component: SidebarStatsSection,
-                                display: {
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.datasetProfiles?.length && true) ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                            {
-                                component: SidebarTagsSection,
-                            },
-                            {
-                                component: SidebarOwnerSection,
-                            },
-                        ]}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        // find the schema fields in the schema table
-        await waitFor(() => expect(getByText('user_name')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('user_id')).toBeInTheDocument());
-    });
-
-    it('switches tab content', async () => {
-        const { getByText, queryByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
-                    <EntityProfile
-                        urn="urn:li:dataset:3"
-                        entityType={EntityType.Dataset}
-                        useEntityQuery={useGetDatasetQuery}
-                        useUpdateQuery={useUpdateDatasetMutation}
-                        getOverrideProperties={() => ({})}
-                        tabs={[
-                            {
-                                name: 'Schema',
-                                component: SchemaTab,
-                            },
-                            {
-                                name: 'Documentation',
-                                component: DocumentationTab,
-                            },
-                            {
-                                name: 'Properties',
-                                component: PropertiesTab,
-                            },
-                            {
-                                name: 'Lineage',
-                                component: LineageTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 ||
-                                        ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0,
-                                },
-                            },
-                            {
-                                name: 'Queries',
-                                component: QueriesTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
-                                },
-                            },
-                            {
-                                name: 'Stats',
-                                component: StatsTab,
-                                display: {
-                                    enabled: (_, _1) => true,
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.datasetProfiles?.length && true) ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                        ]}
-                        sidebarSections={[
-                            {
-                                component: SidebarAboutSection,
-                            },
-                            {
-                                component: SidebarStatsSection,
-                                display: {
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.datasetProfiles?.length && true) ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                            {
-                                component: SidebarTagsSection,
-                            },
-                            {
-                                component: SidebarOwnerSection,
-                            },
-                        ]}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        // find the schema fields in the schema table
-        await waitFor(() => expect(getByText('user_name')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('user_id')).toBeInTheDocument());
-        expect(queryByText('propertyAKey')).not.toBeInTheDocument();
-
-        fireEvent(
-            getByText('Properties'),
-            new MouseEvent('click', {
-                bubbles: true,
-                cancelable: true,
-            }),
-        );
-
-        await waitFor(() => expect(getByText('propertyAKey')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('propertyAValue')).toBeInTheDocument());
-        expect(queryByText('user_name')).not.toBeInTheDocument();
-    });
-
-    it('renders sidebar content', async () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
-                    <EntityProfile
-                        urn="urn:li:dataset:3"
-                        entityType={EntityType.Dataset}
-                        useEntityQuery={useGetDatasetQuery}
-                        useUpdateQuery={useUpdateDatasetMutation}
-                        getOverrideProperties={() => ({})}
-                        tabs={[
-                            {
-                                name: 'Schema',
-                                component: SchemaTab,
-                            },
-                            {
-                                name: 'Documentation',
-                                component: DocumentationTab,
-                            },
-                            {
-                                name: 'Properties',
-                                component: PropertiesTab,
-                            },
-                            {
-                                name: 'Lineage',
-                                component: LineageTab,
-                            },
-                            {
-                                name: 'Queries',
-                                component: QueriesTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
-                                },
-                            },
-                            {
-                                name: 'Stats',
-                                component: StatsTab,
-                                display: {
-                                    enabled: (_, _1) => true,
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.datasetProfiles?.length && true) ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                        ]}
-                        sidebarSections={[
-                            {
-                                component: SidebarAboutSection,
-                            },
-                            {
-                                component: SidebarStatsSection,
-                                display: {
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.datasetProfiles?.length && true) ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                            {
-                                component: SidebarTagsSection,
-                            },
-                            {
-                                component: SidebarOwnerSection,
-                            },
-                        ]}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        // find the tags
-        await waitFor(() => expect(getByText('Tags')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('abc-sample-tag')).toBeInTheDocument());
-    });
-
-    it('renders autorender aspects', async () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
-                    <EntityProfile
-                        urn="urn:li:dataset:3"
-                        entityType={EntityType.Dataset}
-                        useEntityQuery={useGetDatasetQuery}
-                        useUpdateQuery={useUpdateDatasetMutation}
-                        getOverrideProperties={() => ({})}
-                        tabs={[
-                            {
-                                name: 'Schema',
-                                component: SchemaTab,
-                            },
-                            {
-                                name: 'Documentation',
-                                component: DocumentationTab,
-                            },
-                            {
-                                name: 'Properties',
-                                component: PropertiesTab,
-                            },
-                            {
-                                name: 'Lineage',
-                                component: LineageTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 ||
-                                        ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0,
-                                },
-                            },
-                            {
-                                name: 'Queries',
-                                component: QueriesTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
-                                },
-                            },
-                            {
-                                name: 'Stats',
-                                component: StatsTab,
-                                display: {
-                                    enabled: (_, _1) => true,
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.datasetProfiles?.length && true) ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                        ]}
-                        sidebarSections={[
-                            {
-                                component: SidebarAboutSection,
-                            },
-                            {
-                                component: SidebarStatsSection,
-                                display: {
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.datasetProfiles?.length && true) ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                            {
-                                component: SidebarTagsSection,
-                            },
-                            {
-                                component: SidebarOwnerSection,
-                            },
-                        ]}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        // find the tab name
-        await waitFor(() => expect(getByText('Auto Render Aspect Custom Tab Name')).toBeInTheDocument());
-
-        // open the custom tab
-        fireEvent(
-            getByText('Auto Render Aspect Custom Tab Name'),
-            new MouseEvent('click', {
-                bubbles: true,
-                cancelable: true,
-            }),
-        );
-
-        // find the tab contents
-        await waitFor(() => expect(getByText('autoField1')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('autoValue1')).toBeInTheDocument());
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/PlatformContent.test.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/PlatformContent.test.tsx
deleted file mode 100644
index 75d840fa988f48..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/PlatformContent.test.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-import { BrowserRouter } from 'react-router-dom';
-
-import PlatformContentView, {
-    getParentContainerNames,
-} from '@app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView';
-import { container1, container2 } from '@src/Mocks';
-
-import { EntityType } from '@types';
-
-vi.mock('../../../../../useEntityRegistry', () => ({
-    useEntityRegistry: () => ({
-        getEntityUrl: vi.fn(() => 'test'),
-        getDisplayName: vi.fn(() => 'database1'),
-    }),
-}));
-
-describe('PlatformContent', () => {
-    const defaultProps = {
-        platformName: 'mysql',
-        entityLogoComponent: <></>,
-        typeIcon: <></>,
-        entityType: EntityType.Dataset,
-        parentContainers: [],
-        parentContainersRef: React.createRef<HTMLDivElement>(),
-        areContainersTruncated: false,
-    };
-
-    it('should not render any containers if there are none in parentContainers', () => {
-        const { queryAllByTestId } = render(<PlatformContentView {...defaultProps} />);
-
-        expect(queryAllByTestId('container')).toHaveLength(0);
-        expect(queryAllByTestId('right-arrow')).toHaveLength(0);
-    });
-
-    it('should render a direct parent container correctly when there is only one container', () => {
-        const { queryAllByTestId, getByText } = render(
-            <BrowserRouter>
-                <PlatformContentView {...defaultProps} parentContainers={[container1]} />
-            </BrowserRouter>,
-        );
-
-        expect(queryAllByTestId('container')).toHaveLength(1);
-        expect(queryAllByTestId('right-arrow')).toHaveLength(1);
-        expect(getByText('database1')).toBeInTheDocument();
-    });
-
-    it('should render all parent containers properly', () => {
-        const { queryAllByTestId } = render(
-            <BrowserRouter>
-                <PlatformContentView {...defaultProps} parentContainers={[container1, container2]} />
-            </BrowserRouter>,
-        );
-
-        expect(queryAllByTestId('container')).toHaveLength(2);
-        expect(queryAllByTestId('right-arrow')).toHaveLength(2);
-    });
-
-    it('should render the correct number of right arrows with no containers and an instanceId', () => {
-        render(
-            <BrowserRouter>
-                <PlatformContentView {...defaultProps} instanceId="mysql1" />
-            </BrowserRouter>,
-        );
-        expect(screen.queryAllByTestId('right-arrow')).toHaveLength(1);
-    });
-
-    it('should render the correct number of right arrows with multiple containers and an instanceId', () => {
-        render(
-            <BrowserRouter>
-                <PlatformContentView
-                    {...defaultProps}
-                    instanceId="mysql1"
-                    parentContainers={[container1, container2]}
-                />
-            </BrowserRouter>,
-        );
-        expect(screen.queryAllByTestId('right-arrow')).toHaveLength(3);
-    });
-
-    it('should render the correct number of right arrows with one containers and an instanceId', () => {
-        render(
-            <BrowserRouter>
-                <PlatformContentView {...defaultProps} instanceId="mysql1" parentContainers={[container2]} />
-            </BrowserRouter>,
-        );
-        expect(screen.queryAllByTestId('right-arrow')).toHaveLength(2);
-    });
-
-    it('should render the correct number of right arrows with multiple containers and no instanceId', () => {
-        render(
-            <BrowserRouter>
-                <PlatformContentView {...defaultProps} parentContainers={[container1, container2]} />
-            </BrowserRouter>,
-        );
-        expect(screen.queryAllByTestId('right-arrow')).toHaveLength(2);
-    });
-
-    it('should render the correct number of right arrows with one container and no instanceId', () => {
-        render(
-            <BrowserRouter>
-                <PlatformContentView {...defaultProps} parentContainers={[container1]} />
-            </BrowserRouter>,
-        );
-        expect(screen.queryAllByTestId('right-arrow')).toHaveLength(1);
-    });
-
-    it('should render the correct number of right arrows with no containers and no instanceID', () => {
-        render(
-            <BrowserRouter>
-                <PlatformContentView {...defaultProps} parentContainers={[]} />
-            </BrowserRouter>,
-        );
-        expect(screen.queryAllByTestId('right-arrow')).toHaveLength(0);
-    });
-});
-
-describe('getParentContainerNames', () => {
-    it('should return an empty string if there are no parent containers', () => {
-        const parentContainerNames = getParentContainerNames([]);
-        expect(parentContainerNames).toBe('');
-    });
-
-    it('should return the name of the parent container if there is only one', () => {
-        const parentContainerNames = getParentContainerNames([container1]);
-        expect(parentContainerNames).toBe(container1.properties?.name);
-    });
-
-    it('should return the names of the parents in reverse order, separated by cright arrows if there are multiple without manipulating the original array', () => {
-        const parentContainers = [container1, container2];
-        const parentContainersCopy = [...parentContainers];
-        const parentContainerNames = getParentContainerNames(parentContainers);
-
-        expect(parentContainerNames).toBe(`${container2.properties?.name} > ${container1.properties?.name}`);
-        expect(parentContainers).toMatchObject(parentContainersCopy);
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityCount.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityCount.tsx
deleted file mode 100644
index b30da68212648c..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityCount.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-export const EntityCountText = styled(Typography.Text)`
-    display: inline-block;
-    font-size: 12px;
-    line-height: 20px;
-    font-weight: 400;
-    color: ${ANTD_GRAY[7]};
-`;
-
-interface Props {
-    entityCount?: number;
-    displayAssetsText?: boolean;
-}
-
-function EntityCount(props: Props) {
-    const { entityCount, displayAssetsText } = props;
-
-    if (!entityCount || entityCount <= 0) return null;
-
-    return (
-        <EntityCountText className="entityCount">
-            {entityCount.toLocaleString()}{' '}
-            {displayAssetsText ? (
-                <>{entityCount === 1 ? 'asset' : 'assets'}</>
-            ) : (
-                <>{entityCount === 1 ? 'entity' : 'entities'}</>
-            )}
-        </EntityCountText>
-    );
-}
-
-export default EntityCount;
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeader.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeader.tsx
deleted file mode 100644
index b2c35ce502193d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeader.tsx
+++ /dev/null
@@ -1,177 +0,0 @@
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { useUserContext } from '@app/context/useUserContext';
-import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext';
-import EntityDropdown, { EntityMenuItems } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import ExternalUrlButton from '@app/entity/shared/ExternalUrlButton';
-import { DeprecationPill } from '@app/entity/shared/components/styled/DeprecationPill';
-import EntityCount from '@app/entity/shared/containers/profile/header/EntityCount';
-import EntityHeaderLoadingSection from '@app/entity/shared/containers/profile/header/EntityHeaderLoadingSection';
-import { EntityHealth } from '@app/entity/shared/containers/profile/header/EntityHealth';
-import EntityName from '@app/entity/shared/containers/profile/header/EntityName';
-import PlatformContent from '@app/entity/shared/containers/profile/header/PlatformContent';
-import StructuredPropertyBadge from '@app/entity/shared/containers/profile/header/StructuredPropertyBadge';
-import EntityActions, { EntityActionItem } from '@app/entity/shared/entity/EntityActions';
-import { EntitySubHeaderSection, GenericEntityProperties } from '@app/entity/shared/types';
-import { getPlatformName } from '@app/entity/shared/utils';
-import ShareButton from '@app/shared/share/ShareButton';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useIsEditableDatasetNameEnabled } from '@app/useAppConfig';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType, PlatformPrivileges } from '@types';
-
-const TitleWrapper = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-    gap: 8px;
-
-    .ant-typography-edit-content {
-        padding-top: 7px;
-        margin-left: 15px;
-    }
-`;
-
-const HeaderContainer = styled.div`
-    display: flex;
-    flex-direction: row;
-    align-items: space-between;
-    margin-bottom: 4px;
-`;
-
-const MainHeaderContent = styled.div`
-    flex: 1;
-    width: 70%;
-
-    .entityCount {
-        margin: 5px 0 -4px 0;
-    }
-`;
-
-const SideHeaderContent = styled.div`
-    display: flex;
-    flex-direction: column;
-`;
-
-const TopButtonsWrapper = styled.div`
-    display: flex;
-    justify-content: flex-end;
-    margin-bottom: 8px;
-`;
-
-export function getCanEditName(
-    entityType: EntityType,
-    entityData: GenericEntityProperties | null,
-    isEditableDatasetNameEnabled: boolean,
-    privileges?: PlatformPrivileges,
-) {
-    switch (entityType) {
-        case EntityType.GlossaryTerm:
-        case EntityType.GlossaryNode:
-            return privileges?.manageGlossaries || !!entityData?.privileges?.canManageEntity;
-        case EntityType.Domain:
-            return privileges?.manageDomains;
-        case EntityType.DataProduct:
-            return true; // TODO: add permissions for data products
-        case EntityType.BusinessAttribute:
-            return privileges?.manageBusinessAttributes;
-        case EntityType.Dataset:
-            return isEditableDatasetNameEnabled && entityData?.privileges?.canEditProperties;
-        default:
-            return false;
-    }
-}
-
-type Props = {
-    headerDropdownItems?: Set<EntityMenuItems>;
-    headerActionItems?: Set<EntityActionItem>;
-    isNameEditable?: boolean;
-    subHeader?: EntitySubHeaderSection;
-};
-
-export const EntityHeader = ({ headerDropdownItems, headerActionItems, isNameEditable, subHeader }: Props) => {
-    const { urn, entityType, entityData, loading } = useEntityData();
-    const refetch = useRefetch();
-    const me = useUserContext();
-    const platformName = getPlatformName(entityData);
-    const externalUrl = entityData?.externalUrl || undefined;
-    const entityCount = entityData?.entityCount;
-
-    const entityName = entityData?.name;
-    const subType = capitalizeFirstLetterOnly(entityData?.subTypes?.typeNames?.[0]) || undefined;
-
-    const isEditableDatasetNameEnabled = useIsEditableDatasetNameEnabled();
-    const canEditName =
-        isNameEditable &&
-        getCanEditName(
-            entityType,
-            entityData,
-            isEditableDatasetNameEnabled,
-            me?.platformPrivileges as PlatformPrivileges,
-        );
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <>
-            <HeaderContainer data-testid="entity-header-test-id">
-                <MainHeaderContent>
-                    {(loading && <EntityHeaderLoadingSection />) || (
-                        <>
-                            <PlatformContent />
-                            <TitleWrapper>
-                                <EntityName isNameEditable={canEditName || false} />
-                                {entityData?.deprecation?.deprecated && (
-                                    <DeprecationPill
-                                        urn={urn}
-                                        deprecation={entityData?.deprecation}
-                                        showUndeprecate
-                                        refetch={refetch}
-                                    />
-                                )}
-                                {entityData?.health && (
-                                    <EntityHealth
-                                        health={entityData.health}
-                                        baseUrl={entityRegistry.getEntityUrl(entityType, urn)}
-                                    />
-                                )}
-                                <StructuredPropertyBadge structuredProperties={entityData?.structuredProperties} />
-                            </TitleWrapper>
-                            <EntityCount
-                                entityCount={entityCount}
-                                displayAssetsText={entityType === EntityType.DataProduct}
-                            />
-                        </>
-                    )}
-                </MainHeaderContent>
-                <SideHeaderContent>
-                    <TopButtonsWrapper>
-                        {externalUrl && (
-                            <ExternalUrlButton
-                                externalUrl={externalUrl}
-                                entityUrn={urn}
-                                platformName={platformName}
-                                entityType={entityType}
-                            />
-                        )}
-                        {headerActionItems && (
-                            <EntityActions urn={urn} actionItems={headerActionItems} refetchForEntity={refetch} />
-                        )}
-                        <ShareButton entityType={entityType} subType={subType} urn={urn} name={entityName} />
-                        {headerDropdownItems && (
-                            <EntityDropdown
-                                urn={urn}
-                                entityType={entityType}
-                                entityData={entityData}
-                                menuItems={headerDropdownItems}
-                                refetchForEntity={refetch}
-                            />
-                        )}
-                    </TopButtonsWrapper>
-                </SideHeaderContent>
-            </HeaderContainer>
-            {subHeader && <subHeader.component />}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeaderLoadingSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeaderLoadingSection.tsx
deleted file mode 100644
index bbb87a905f1ab0..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHeaderLoadingSection.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Skeleton, Space } from 'antd';
-import * as React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-const ContextSkeleton = styled(Skeleton.Input)`
-    && {
-        width: 320px;
-        border-radius: 4px;
-        background-color: ${ANTD_GRAY[3]};
-    }
-`;
-
-const NameSkeleton = styled(Skeleton.Input)`
-    && {
-        width: 240px;
-        border-radius: 4px;
-        background-color: ${ANTD_GRAY[3]};
-    }
-`;
-
-export default function EntityHeaderLoadingSection() {
-    return (
-        <Space direction="vertical">
-            <ContextSkeleton active size="small" />
-            <NameSkeleton active size="default" />
-        </Space>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityName.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityName.tsx
deleted file mode 100644
index ab7b29b6fcdafc..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityName.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { Typography, message } from 'antd';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components/macro';
-
-import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext';
-import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext';
-import { getParentNodeToUpdate, updateGlossarySidebar } from '@app/glossary/utils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useUpdateNameMutation } from '@graphql/mutations.generated';
-
-export const EntityTitle = styled(Typography.Title)`
-    &&& {
-        margin-bottom: 0;
-        word-break: break-all;
-    }
-
-    .ant-typography-edit {
-        font-size: 16px;
-        margin-left: 10px;
-    }
-`;
-
-interface Props {
-    isNameEditable?: boolean;
-}
-
-function EntityName(props: Props) {
-    const { isNameEditable } = props;
-    const refetch = useRefetch();
-    const entityRegistry = useEntityRegistry();
-    const { isInGlossaryContext, urnsToUpdate, setUrnsToUpdate } = useGlossaryEntityData();
-    const { urn, entityType, entityData } = useEntityData();
-    const entityName = entityData ? entityRegistry.getDisplayName(entityType, entityData) : '';
-    const [updatedName, setUpdatedName] = useState(entityName);
-    const [isEditing, setIsEditing] = useState(false);
-
-    useEffect(() => {
-        setUpdatedName(entityName);
-    }, [entityName]);
-
-    const [updateName, { loading: isMutatingName }] = useUpdateNameMutation();
-
-    const handleStartEditing = () => {
-        setIsEditing(true);
-    };
-
-    const handleChangeName = (name: string) => {
-        if (name === entityName) {
-            setIsEditing(false);
-            return;
-        }
-        updateName({ variables: { input: { name, urn } } })
-            .then(() => {
-                setUpdatedName(name);
-                setIsEditing(false);
-                message.success({ content: 'Name Updated', duration: 2 });
-                refetch();
-                if (isInGlossaryContext) {
-                    const parentNodeToUpdate = getParentNodeToUpdate(entityData, entityType);
-                    updateGlossarySidebar([parentNodeToUpdate], urnsToUpdate, setUrnsToUpdate);
-                }
-            })
-            .catch((e: unknown) => {
-                message.destroy();
-                if (e instanceof Error) {
-                    message.error({ content: `Failed to update name: \n ${e.message || ''}`, duration: 3 });
-                }
-            });
-    };
-
-    return (
-        <>
-            {isNameEditable ? (
-                <EntityTitle
-                    level={3}
-                    disabled={isMutatingName}
-                    editable={{
-                        editing: isEditing,
-                        onChange: handleChangeName,
-                        onStart: handleStartEditing,
-                    }}
-                >
-                    {updatedName}
-                </EntityTitle>
-            ) : (
-                <EntityTitle level={3}>{entityName}</EntityTitle>
-            )}
-        </>
-    );
-}
-
-export default EntityName;
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityTabs.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityTabs.tsx
deleted file mode 100644
index e544c5e8187e8f..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityTabs.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Tabs } from 'antd';
-import React, { useEffect } from 'react';
-import styled from 'styled-components/macro';
-
-import { useBaseEntity, useEntityData, useRouteToTab } from '@app/entity/shared/EntityContext';
-import { EntityTab } from '@app/entity/shared/types';
-
-type Props = {
-    tabs: EntityTab[];
-    selectedTab?: EntityTab;
-};
-
-const UnborderedTabs = styled(Tabs)`
-    &&& .ant-tabs-nav {
-        margin-bottom: 0;
-        &:before {
-            border-bottom: none;
-        }
-    }
-`;
-
-const Tab = styled(Tabs.TabPane)`
-    font-size: 14px;
-    line-height: 22px;
-`;
-
-export const EntityTabs = <T,>({ tabs, selectedTab }: Props) => {
-    const { entityData, loading } = useEntityData();
-    const routeToTab = useRouteToTab();
-    const baseEntity = useBaseEntity<T>();
-
-    const enabledTabs = tabs.filter((tab) => tab.display?.enabled(entityData, baseEntity));
-
-    useEffect(() => {
-        if (!loading && !selectedTab && enabledTabs[0]) {
-            routeToTab({ tabName: enabledTabs[0].name, method: 'replace' });
-        }
-    }, [loading, enabledTabs, selectedTab, routeToTab]);
-
-    return (
-        <UnborderedTabs
-            data-testid="entity-tab-headers-test-id"
-            animated={false}
-            activeKey={selectedTab?.name || ''}
-            size="large"
-            onTabClick={(tab: string) => routeToTab({ tabName: tab })}
-        >
-            {tabs.map((tab) => {
-                const tabName = (tab.getDynamicName && tab.getDynamicName(entityData, baseEntity)) || tab.name;
-                if (!tab.display?.enabled(entityData, baseEntity)) {
-                    return <Tab tab={tabName} key={tab.name} disabled />;
-                }
-                return <Tab tab={tabName} key={tab.name} />;
-            })}
-        </UnborderedTabs>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/DatasetLink.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/DatasetLink.tsx
index 61b62308df5674..e31b3cf37e444f 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/DatasetLink.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/DatasetLink.tsx
@@ -15,7 +15,7 @@ const DatasetText = styled(Typography.Text)`
     color: ${ANTD_GRAY[7]};
 `;
 
-export const DatasetIcon = styled.span`
+const DatasetIcon = styled.span`
     color: ${ANTD_GRAY[7]};
     margin-right: 4px;
     font-size: 12px;
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx
index 6daff61126f447..8d105616bbd571 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx
@@ -1,13 +1,8 @@
-import { FolderOutlined, RightOutlined } from '@ant-design/icons';
-import { Tooltip, Typography } from 'antd';
-import React from 'react';
+import { RightOutlined } from '@ant-design/icons';
+import { Tooltip } from 'antd';
 import styled from 'styled-components';
 
 import { ANTD_GRAY } from '@app/entity/shared/constants';
-import useContentTruncation from '@app/shared/useContentTruncation';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType, GlossaryNode } from '@types';
 
 export const StyledRightOutlined = styled(RightOutlined)`
     color: ${ANTD_GRAY[7]};
@@ -35,59 +30,3 @@ export const StyledTooltip = styled(Tooltip)`
     white-space: nowrap;
     overflow: hidden;
 `;
-
-const GlossaryNodeText = styled(Typography.Text)<{ color: string }>`
-    font-size: 12px;
-    line-height: 20px;
-    color: ${(props) => props.color};
-`;
-
-const GlossaryNodeIcon = styled(FolderOutlined)<{ color: string }>`
-    color: ${(props) => props.color};
-
-    &&& {
-        font-size: 12px;
-        margin-right: 4px;
-    }
-`;
-
-interface Props {
-    parentNodes?: GlossaryNode[] | null;
-}
-
-export default function ParentNodesView({ parentNodes }: Props) {
-    const entityRegistry = useEntityRegistry();
-    const { contentRef, isContentTruncated } = useContentTruncation(parentNodes);
-
-    return (
-        <StyledTooltip
-            title={
-                <>
-                    {[...(parentNodes || [])]?.reverse()?.map((parentNode, idx) => (
-                        <>
-                            <GlossaryNodeIcon color="white" />
-                            <GlossaryNodeText color="white">
-                                {entityRegistry.getDisplayName(EntityType.GlossaryNode, parentNode)}
-                            </GlossaryNodeText>
-                            {idx + 1 !== parentNodes?.length && <StyledRightOutlined data-testid="right-arrow" />}
-                        </>
-                    ))}
-                </>
-            }
-            overlayStyle={isContentTruncated ? {} : { display: 'none' }}
-        >
-            {isContentTruncated && <Ellipsis>...</Ellipsis>}
-            <ParentNodesWrapper ref={contentRef}>
-                {[...(parentNodes || [])]?.map((parentNode, idx) => (
-                    <>
-                        <GlossaryNodeText color={ANTD_GRAY[7]}>
-                            {entityRegistry.getDisplayName(EntityType.GlossaryNode, parentNode)}
-                        </GlossaryNodeText>
-                        <GlossaryNodeIcon color={ANTD_GRAY[7]} />
-                        {idx + 1 !== parentNodes?.length && <StyledRightOutlined data-testid="right-arrow" />}
-                    </>
-                ))}
-            </ParentNodesWrapper>
-        </StyledTooltip>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx
index df12a6b3018ca3..9a4b4536ab2192 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx
@@ -17,20 +17,20 @@ import { useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig';
 
 import { Container, Dataset, Entity } from '@types';
 
-export const LogoIcon = styled.span`
+const LogoIcon = styled.span`
     display: flex;
     gap: 4px;
     margin-right: 8px;
 `;
 
-export const PreviewImage = styled(Image)`
+const PreviewImage = styled(Image)`
     max-height: 17px;
     width: auto;
     object-fit: contain;
     background-color: transparent;
 `;
 
-export const PlatformContentWrapper = styled.div`
+const PlatformContentWrapper = styled.div`
     display: flex;
     align-items: center;
     margin: 0 8px 6px 0;
@@ -38,7 +38,7 @@ export const PlatformContentWrapper = styled.div`
     flex: 1;
 `;
 
-export const PlatformText = styled(Typography.Text)`
+const PlatformText = styled(Typography.Text)`
     font-size: 12px;
     line-height: 20px;
     font-weight: 700;
@@ -55,7 +55,7 @@ const PlatformDivider = styled.div`
     vertical-align: text-top;
 `;
 
-export function getParentContainerNames(containers?: Maybe<Container>[] | null) {
+function getParentContainerNames(containers?: Maybe<Container>[] | null) {
     let parentNames = '';
     if (containers) {
         [...containers].reverse().forEach((container, index) => {
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/utils.ts b/datahub-web-react/src/app/entity/shared/containers/profile/header/utils.ts
index 85a4624941b444..bf431a5f3e986b 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/header/utils.ts
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/header/utils.ts
@@ -1,29 +1,6 @@
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import EntityRegistry from '@src/app/entity/EntityRegistry';
 
-import { EntityType, StructuredPropertiesEntry } from '@types';
 
-export function getDisplayedEntityType(
-    entityData: GenericEntityProperties | null,
-    entityRegistry: EntityRegistry,
-    entityType: EntityType,
-) {
-    return (
-        entityData?.entityTypeOverride ||
-        capitalizeFirstLetterOnly(entityData?.subTypes?.typeNames?.[0]) ||
-        entityRegistry.getEntityName(entityType) ||
-        ''
-    );
-}
-
-export function getEntityPlatforms(entityType: EntityType | null, entityData: GenericEntityProperties | null) {
-    const platform = entityType === EntityType.SchemaField ? entityData?.parent?.platform : entityData?.platform;
-    const platforms =
-        entityType === EntityType.SchemaField ? entityData?.parent?.siblingPlatforms : entityData?.siblingPlatforms;
-
-    return { platform, platforms };
-}
+import { StructuredPropertiesEntry } from '@types';
 
 export function filterForAssetBadge(prop: StructuredPropertiesEntry) {
     return prop.structuredProperty.settings?.showAsAssetBadge && !prop.structuredProperty.settings?.isHidden;
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/nav/EntityProfileNavBar.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/nav/EntityProfileNavBar.tsx
deleted file mode 100644
index 0139024144e6ca..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/nav/EntityProfileNavBar.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Affix } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { ProfileNavBrowsePath } from '@app/entity/shared/containers/profile/nav/ProfileNavBrowsePath';
-import ProfileNavBrowsePathV2 from '@app/entity/shared/containers/profile/nav/ProfileNavBrowsePathV2';
-import { useIsBrowseV2 } from '@app/search/useSearchAndBrowseVersion';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetBrowsePathsQuery } from '@graphql/browse.generated';
-import { EntityType } from '@types';
-
-type Props = {
-    urn: string;
-    entityType: EntityType;
-};
-
-const AffixWithHeight = styled(Affix)``;
-
-export const EntityProfileNavBar = ({ urn, entityType }: Props) => {
-    const showBrowseV2 = useIsBrowseV2();
-    const { data: browseData } = useGetBrowsePathsQuery({
-        variables: { input: { urn, type: entityType } },
-        fetchPolicy: 'cache-first',
-    });
-    const entityRegistry = useEntityRegistry();
-    const isBrowsable = entityRegistry.getBrowseEntityTypes().includes(entityType);
-
-    return (
-        <AffixWithHeight offsetTop={60}>
-            {showBrowseV2 && <ProfileNavBrowsePathV2 urn={urn} type={entityType} />}
-            {!showBrowseV2 && (
-                <ProfileNavBrowsePath
-                    urn={urn}
-                    type={entityType}
-                    breadcrumbLinksEnabled={isBrowsable}
-                    path={browseData?.browsePaths?.[0]?.path || []}
-                />
-            )}
-        </AffixWithHeight>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/nav/LineageSelector.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/nav/LineageSelector.tsx
deleted file mode 100644
index b144f2a64f039a..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/nav/LineageSelector.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-import { blue, grey } from '@ant-design/colors';
-import { InfoCircleOutlined, PartitionOutlined } from '@ant-design/icons';
-import { Badge } from 'antd';
-import React from 'react';
-import { useHistory, useLocation } from 'react-router-dom';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY, ENTITY_TYPES_WITH_MANUAL_LINEAGE } from '@app/entity/shared/constants';
-import { useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils';
-import { navigateToLineageUrl } from '@app/lineage/utils/navigateToLineageUrl';
-import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams';
-import useIsLineageMode from '@app/lineage/utils/useIsLineageMode';
-
-import { useGetLineageCountsQuery } from '@graphql/lineage.generated';
-import { EntityType } from '@types';
-
-const LineageIconGroup = styled.div`
-    width: 180px;
-    display: flex;
-    justify-content: space-between;
-    margin-right: 8px;
-`;
-
-const LineageIcon = styled(PartitionOutlined)`
-    font-size: 20px;
-    vertical-align: middle;
-    padding-right: 6px;
-`;
-
-const DetailIcon = styled(InfoCircleOutlined)`
-    font-size: 20px;
-    vertical-align: middle;
-    padding-right: 6px;
-`;
-
-const IconGroup = styled.div<{ isSelected: boolean; disabled?: boolean }>`
-    font-size: 14px;
-    color: ${(props) => {
-        if (props.disabled) {
-            return grey[2];
-        }
-        return !props.isSelected ? 'black' : props.theme.styles['primary-color'] || blue[4];
-    }};
-    &:hover {
-        color: ${(props) => (props.disabled ? grey[2] : props.theme.styles['primary-color'] || blue[4])};
-        cursor: ${(props) => (props.disabled ? 'not-allowed' : 'pointer')};
-    }
-`;
-
-const LineageNavContainer = styled.div`
-    display: inline-flex;
-    line-height: 24px;
-    align-items: center;
-`;
-
-const LineageSummary = styled.div`
-    margin-left: 16px;
-`;
-
-const LineageBadge = styled(Badge)`
-    &&& .ant-badge-count {
-        background-color: ${ANTD_GRAY[1]};
-        color: ${ANTD_GRAY[9]};
-        border: 1px solid ${ANTD_GRAY[5]};
-        font-size: 12px;
-        font-weight: 600;
-        height: 22px;
-    }
-`;
-
-type Props = {
-    urn: string;
-    type: EntityType;
-};
-
-/**
- * Responsible for rendering a clickable browse path view.
- */
-export const LineageSelector = ({ urn, type }: Props): JSX.Element => {
-    const history = useHistory();
-    const location = useLocation();
-    const isLineageMode = useIsLineageMode();
-    const isHideSiblingsMode = useIsSeparateSiblingsMode();
-    const { startTimeMillis, endTimeMillis } = useGetLineageTimeParams();
-
-    // Fetch the lineage counts for the entity.
-    const { data: lineageData, loading: lineageLoading } = useGetLineageCountsQuery({
-        variables: {
-            urn,
-            separateSiblings: isHideSiblingsMode,
-            startTimeMillis,
-            endTimeMillis,
-        },
-    });
-
-    const upstreamTotal = (lineageData?.entity as any)?.upstream?.total || 0;
-    const upstreamFiltered = (lineageData?.entity as any)?.upstream?.filtered || 0;
-    const upstreamCount = upstreamTotal - upstreamFiltered;
-
-    const downstreamTotal = (lineageData?.entity as any)?.downstream?.total || 0;
-    const downstreamFiltered = (lineageData?.entity as any)?.downstream?.filtered || 0;
-    const downstreamCount = downstreamTotal - downstreamFiltered;
-
-    const hasLineage = upstreamCount > 0 || downstreamCount > 0;
-    const canNavigateToLineage = hasLineage || ENTITY_TYPES_WITH_MANUAL_LINEAGE.has(type);
-
-    const upstreamText = upstreamCount === 100 ? '100+' : upstreamCount;
-    const downstreamText = downstreamCount === 100 ? '100+' : downstreamCount;
-
-    return (
-        <LineageNavContainer>
-            <LineageIconGroup>
-                <IconGroup
-                    disabled={!canNavigateToLineage}
-                    isSelected={!isLineageMode}
-                    onClick={() => {
-                        if (canNavigateToLineage) {
-                            navigateToLineageUrl({
-                                location,
-                                history,
-                                isLineageMode: false,
-                                startTimeMillis,
-                                endTimeMillis,
-                            });
-                        }
-                    }}
-                >
-                    <DetailIcon />
-                    Details
-                </IconGroup>
-                <IconGroup
-                    disabled={!canNavigateToLineage}
-                    isSelected={isLineageMode}
-                    onClick={() => {
-                        if (canNavigateToLineage) {
-                            navigateToLineageUrl({
-                                location,
-                                history,
-                                isLineageMode: true,
-                                startTimeMillis,
-                                endTimeMillis,
-                            });
-                        }
-                    }}
-                >
-                    <LineageIcon />
-                    Lineage
-                </IconGroup>
-            </LineageIconGroup>
-            <LineageSummary>
-                <LineageBadge
-                    count={`${lineageLoading ? '-' : upstreamText} upstream, ${
-                        lineageLoading ? '-' : downstreamText
-                    } downstream`}
-                />
-            </LineageSummary>
-        </LineageNavContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePath.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePath.tsx
deleted file mode 100644
index b6f2638c07a2ba..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePath.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Breadcrumb, Row } from 'antd';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { LineageSelector } from '@app/entity/shared/containers/profile/nav/LineageSelector';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { PageRoutes } from '@conf/Global';
-
-import { EntityType } from '@types';
-
-export const BrowseRow = styled(Row)`
-    padding: 10px 20px;
-    background-color: ${(props) => props.theme.styles['body-background']};
-    display: flex;
-    justify-content: space-between;
-    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
-`;
-
-export const BreadcrumbItem = styled(Breadcrumb.Item)<{ disabled?: boolean }>`
-    &&& :hover {
-        color: ${(props) => (props.disabled ? ANTD_GRAY[7] : props.theme.styles['primary-color'])};
-        cursor: pointer;
-    }
-`;
-
-type Props = {
-    urn: string;
-    type: EntityType;
-    path: Array<string>;
-    breadcrumbLinksEnabled: boolean;
-};
-
-/**
- * Responsible for rendering a clickable browse path view.
- */
-export const ProfileNavBrowsePath = ({ urn, type, path, breadcrumbLinksEnabled }: Props): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-
-    const createPartialPath = (parts: Array<string>) => {
-        return parts.join('/');
-    };
-
-    const baseBrowsePath = `${PageRoutes.BROWSE}/${entityRegistry.getPathName(type)}`;
-
-    const pathCrumbs = path.map((part, index) => (
-        <BreadcrumbItem key={`${part || index}`} disabled={!breadcrumbLinksEnabled}>
-            {breadcrumbLinksEnabled ? (
-                <Link
-                    to={
-                        index === path.length - 1
-                            ? '#'
-                            : `${baseBrowsePath}/${createPartialPath(path.slice(0, index + 1))}`
-                    }
-                    data-testid={`legacy-browse-path-${part}`}
-                >
-                    {part}
-                </Link>
-            ) : (
-                part
-            )}
-        </BreadcrumbItem>
-    ));
-
-    return (
-        <BrowseRow>
-            <Breadcrumb style={{ fontSize: '16px' }} separator=">">
-                <BreadcrumbItem disabled={!breadcrumbLinksEnabled}>
-                    {breadcrumbLinksEnabled ? (
-                        <Link to={breadcrumbLinksEnabled ? baseBrowsePath : undefined}>
-                            {entityRegistry.getCollectionName(type)}
-                        </Link>
-                    ) : (
-                        entityRegistry.getCollectionName(type)
-                    )}
-                </BreadcrumbItem>
-                {pathCrumbs}
-            </Breadcrumb>
-            <LineageSelector urn={urn} type={type} />
-        </BrowseRow>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePathV2.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePathV2.tsx
deleted file mode 100644
index 1969cfe59449ec..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/nav/ProfileNavBrowsePathV2.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import { Breadcrumb } from 'antd';
-import React from 'react';
-import { useHistory } from 'react-router';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { LineageSelector } from '@app/entity/shared/containers/profile/nav/LineageSelector';
-import { BreadcrumbItem, BrowseRow } from '@app/entity/shared/containers/profile/nav/ProfileNavBrowsePath';
-import useHasMultipleEnvironmentsQuery from '@app/entity/shared/containers/profile/nav/useHasMultipleEnvironmentsQuery';
-import { createBrowseV2SearchFilter } from '@app/search/filters/utils';
-import {
-    BROWSE_PATH_V2_FILTER_NAME,
-    ENTITY_SUB_TYPE_FILTER_NAME,
-    ORIGIN_FILTER_NAME,
-    PLATFORM_FILTER_NAME,
-} from '@app/search/utils/constants';
-import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { BrowsePathV2, EntityType, FabricType, FacetFilterInput } from '@types';
-
-const StyledBreadcrumb = styled(Breadcrumb)`
-    font-size: 16px;
-`;
-
-interface Props {
-    urn: string;
-    type: EntityType;
-}
-
-export default function ProfileNavBrowsePathV2({ urn, type }: Props) {
-    const history = useHistory();
-    const entityRegistry = useEntityRegistry();
-    const { entityData } = useEntityData();
-    const isBrowsable = entityRegistry.getBrowseEntityTypes().includes(type);
-    const hasEnvironment = !!entityData?.origin;
-
-    const hasMultipleEnvironments = useHasMultipleEnvironmentsQuery(type);
-
-    function handlePathClick(filters: FacetFilterInput[]) {
-        navigateToSearchUrl({ query: '*', filters, history });
-    }
-
-    function generateFiltersForPlatform() {
-        const filters: FacetFilterInput[] = [{ field: ENTITY_SUB_TYPE_FILTER_NAME, values: [type] }];
-        if (hasMultipleEnvironments && hasEnvironment) {
-            filters.push({ field: ORIGIN_FILTER_NAME, values: [entityData?.origin as FabricType] });
-        }
-        if (entityData?.platform) {
-            filters.push({ field: PLATFORM_FILTER_NAME, values: [entityData.platform.urn] });
-        }
-        return filters;
-    }
-
-    function generateFiltersForBrowsePath(path: string[]) {
-        const filters = generateFiltersForPlatform();
-        const pathValue = createBrowseV2SearchFilter(path);
-        filters.push({ field: BROWSE_PATH_V2_FILTER_NAME, values: [pathValue] });
-        return filters;
-    }
-
-    return (
-        <BrowseRow>
-            <StyledBreadcrumb separator=">">
-                <BreadcrumbItem
-                    disabled={!isBrowsable}
-                    onClick={() => handlePathClick([{ field: ENTITY_SUB_TYPE_FILTER_NAME, values: [type] }])}
-                >
-                    {entityRegistry.getCollectionName(type)}
-                </BreadcrumbItem>
-                {hasMultipleEnvironments && hasEnvironment && (
-                    <BreadcrumbItem
-                        disabled={!isBrowsable}
-                        onClick={() =>
-                            handlePathClick([
-                                { field: ENTITY_SUB_TYPE_FILTER_NAME, values: [type] },
-                                { field: ORIGIN_FILTER_NAME, values: [entityData?.origin as FabricType] },
-                            ])
-                        }
-                    >
-                        {entityData?.origin}
-                    </BreadcrumbItem>
-                )}
-                {entityData?.platform && (
-                    <BreadcrumbItem
-                        disabled={!isBrowsable}
-                        onClick={() => handlePathClick(generateFiltersForPlatform())}
-                    >
-                        {entityRegistry.getDisplayName(EntityType.DataPlatform, entityData.platform)}
-                    </BreadcrumbItem>
-                )}
-                {entityData?.browsePathV2?.path?.map((pathEntry, index) => (
-                    <BreadcrumbItem
-                        key={pathEntry.name}
-                        disabled={!isBrowsable}
-                        onClick={() =>
-                            handlePathClick(
-                                generateFiltersForBrowsePath([
-                                    ...(entityData.browsePathV2 as BrowsePathV2).path
-                                        .slice(0, index + 1)
-                                        .map((e) => e?.name || ''),
-                                ]),
-                            )
-                        }
-                        data-testid={`browse-path-${pathEntry?.name}`}
-                    >
-                        {pathEntry.entity
-                            ? entityRegistry.getDisplayName(pathEntry.entity.type, pathEntry.entity)
-                            : pathEntry.name}
-                    </BreadcrumbItem>
-                ))}
-            </StyledBreadcrumb>
-            <LineageSelector urn={urn} type={type} />
-        </BrowseRow>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/nav/useHasMultipleEnvironmentsQuery.ts b/datahub-web-react/src/app/entity/shared/containers/profile/nav/useHasMultipleEnvironmentsQuery.ts
deleted file mode 100644
index e82f7d33366599..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/nav/useHasMultipleEnvironmentsQuery.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { ENTITY_FILTER_NAME, ORIGIN_FILTER_NAME } from '@app/search/utils/constants';
-
-import { useAggregateAcrossEntitiesQuery } from '@graphql/search.generated';
-import { EntityType } from '@types';
-
-export default function useHasMultipleEnvironmentsQuery(entityType: EntityType) {
-    const { data } = useAggregateAcrossEntitiesQuery({
-        variables: {
-            input: {
-                facets: [ORIGIN_FILTER_NAME],
-                query: '*',
-                orFilters: [{ and: [{ field: ENTITY_FILTER_NAME, values: [entityType] }] }],
-            },
-        },
-    });
-    const environmentAggs = data?.aggregateAcrossEntities?.facets?.find((facet) => facet.field === ORIGIN_FILTER_NAME);
-    return environmentAggs && environmentAggs.aggregations.length > 1;
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx
deleted file mode 100644
index 6ad2f233fffb89..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/DescriptionSection.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import { Typography } from 'antd';
-import DOMPurify from 'dompurify';
-import React, { useState } from 'react';
-import { useHistory } from 'react-router';
-import styled from 'styled-components/macro';
-
-import { useRouteToTab } from '@app/entity/shared/EntityContext';
-import MarkdownViewer, { MarkdownView } from '@app/entity/shared/components/legacy/MarkdownViewer';
-import NoMarkdownViewer, { removeMarkdown } from '@app/entity/shared/components/styled/StripMarkdownText';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { useIsOnTab } from '@app/entity/shared/containers/profile/utils';
-import CompactContext from '@app/shared/CompactContext';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType } from '@types';
-
-const ABBREVIATED_LIMIT = 150;
-
-const ContentWrapper = styled.div`
-    margin-bottom: 8px;
-    font-size: 14px;
-    ${MarkdownView} {
-        font-size: 14px;
-    }
-`;
-
-const BaContentWrapper = styled.div`
-    margin-top: 8px;
-    color: ${ANTD_GRAY[7]};
-    margin-bottom: 8px;
-    font-size: 14px;
-    ${MarkdownView} {
-        font-size: 14px;
-    }
-    color: ${ANTD_GRAY[7]};
-`;
-
-interface Props {
-    description: string;
-    baDescription?: string;
-    isExpandable?: boolean;
-    limit?: number;
-    baUrn?: string;
-}
-
-export default function DescriptionSection({ description, baDescription, isExpandable, limit, baUrn }: Props) {
-    const history = useHistory();
-    const isOverLimit = description && removeMarkdown(description).length > ABBREVIATED_LIMIT;
-    const isBaOverLimit = baDescription && removeMarkdown(baDescription).length > ABBREVIATED_LIMIT;
-    const [isExpanded, setIsExpanded] = useState(!isOverLimit);
-    const [isBaExpanded, setIsBaExpanded] = useState(!isBaOverLimit);
-    const routeToTab = useRouteToTab();
-    const isCompact = React.useContext(CompactContext);
-    const shouldShowReadMore = !useIsOnTab('Documentation') || isExpandable;
-    const entityRegistry = useEntityRegistry();
-
-    // if we're not in compact mode, route them to the Docs tab for the best documentation viewing experience
-    function readMore() {
-        if (isCompact || isExpandable) {
-            setIsExpanded(true);
-        } else {
-            routeToTab({ tabName: 'Documentation' });
-        }
-    }
-
-    function readBAMore() {
-        if (isCompact || isExpandable) {
-            setIsBaExpanded(true);
-        } else if (baUrn != null) {
-            history.push(entityRegistry.getEntityUrl(EntityType.BusinessAttribute, baUrn || ''));
-        }
-    }
-
-    const sanitizedDescription = DOMPurify.sanitize(description);
-    const sanitizedBADescription = DOMPurify.sanitize(baDescription || '');
-
-    return (
-        <>
-            <ContentWrapper>
-                {isExpanded && (
-                    <>
-                        <MarkdownViewer source={sanitizedDescription} ignoreLimit />
-                        {isOverLimit && (
-                            <Typography.Link onClick={() => setIsExpanded(false)}>Read Less</Typography.Link>
-                        )}
-                    </>
-                )}
-                {!isExpanded && (
-                    <NoMarkdownViewer
-                        limit={limit || ABBREVIATED_LIMIT}
-                        readMore={
-                            shouldShowReadMore ? (
-                                <Typography.Link onClick={readMore}>Read More</Typography.Link>
-                            ) : undefined
-                        }
-                        shouldWrap
-                    >
-                        {sanitizedDescription}
-                    </NoMarkdownViewer>
-                )}
-            </ContentWrapper>
-            <BaContentWrapper>
-                {isBaExpanded && (
-                    <>
-                        <MarkdownViewer source={sanitizedBADescription || ''} ignoreLimit />
-                        {isBaOverLimit && (
-                            <Typography.Link onClick={() => setIsBaExpanded(false)}>Read Less</Typography.Link>
-                        )}
-                    </>
-                )}
-                {!isBaExpanded && (
-                    <NoMarkdownViewer
-                        limit={limit || ABBREVIATED_LIMIT}
-                        readMore={
-                            shouldShowReadMore ? (
-                                <Typography.Link onClick={readBAMore}>Read More</Typography.Link>
-                            ) : undefined
-                        }
-                        shouldWrap
-                    >
-                        {sanitizedBADescription}
-                    </NoMarkdownViewer>
-                )}
-            </BaContentWrapper>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx
deleted file mode 100644
index fc28328fe74a49..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { EditOutlined } from '@ant-design/icons';
-import { Button, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useRefetch, useRouteToTab } from '@app/entity/shared/EntityContext';
-import { AddLinkModal } from '@app/entity/shared/components/styled/AddLinkModal';
-import { EMPTY_MESSAGES } from '@app/entity/shared/constants';
-
-const EmptyContentWrapper = styled.div`
-    margin-bottom: 5px;
-    font-size: 14px;
-`;
-
-const EmptyContentMessage = styled(Typography.Paragraph)`
-    font-size: 12px;
-`;
-
-const AddLinkWrapper = styled.span`
-    margin-left: 8px;
-`;
-
-interface Props {
-    hideLinksButton?: boolean;
-    readOnly?: boolean;
-}
-
-export default function EmptyContentSection({ hideLinksButton, readOnly }: Props) {
-    const routeToTab = useRouteToTab();
-    const refetch = useRefetch();
-
-    return (
-        <EmptyContentWrapper>
-            <>
-                <EmptyContentMessage type="secondary">
-                    {EMPTY_MESSAGES.documentation.title}. {EMPTY_MESSAGES.documentation.description}
-                </EmptyContentMessage>
-                {!readOnly && (
-                    <Button onClick={() => routeToTab({ tabName: 'Documentation', tabParams: { editing: true } })}>
-                        <EditOutlined /> Add Documentation
-                    </Button>
-                )}
-                {!readOnly && !hideLinksButton && (
-                    <AddLinkWrapper>
-                        <AddLinkModal refetch={refetch} />
-                    </AddLinkWrapper>
-                )}
-            </>
-        </EmptyContentWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx
deleted file mode 100644
index c3fcbe812ebbf5..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/LinksSection.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext';
-import { AddLinkModal } from '@app/entity/shared/components/styled/AddLinkModal';
-import LinkButton from '@app/entity/shared/containers/profile/sidebar/LinkButton';
-
-const AddLinksWrapper = styled.div`
-    margin-left: -15px;
-`;
-
-interface Props {
-    hideLinksButton?: boolean;
-    readOnly?: boolean;
-}
-
-export default function LinksSection({ hideLinksButton, readOnly }: Props) {
-    const { entityData } = useEntityData();
-    const refetch = useRefetch();
-
-    const links = entityData?.institutionalMemory?.elements || [];
-
-    return (
-        <>
-            {links.map((link) => (
-                <LinkButton link={link} />
-            ))}
-            {!readOnly && !hideLinksButton && (
-                <AddLinksWrapper>
-                    <AddLinkModal buttonProps={{ type: 'text' }} refetch={refetch} />
-                </AddLinksWrapper>
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx
deleted file mode 100644
index 66c05720f4b034..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { EditOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React from 'react';
-
-import { useEntityData, useRouteToTab } from '@app/entity/shared/EntityContext';
-import DescriptionSection from '@app/entity/shared/containers/profile/sidebar/AboutSection/DescriptionSection';
-import EmptyContentSection from '@app/entity/shared/containers/profile/sidebar/AboutSection/EmptyContentSection';
-import LinksSection from '@app/entity/shared/containers/profile/sidebar/AboutSection/LinksSection';
-import SourceRefSection from '@app/entity/shared/containers/profile/sidebar/AboutSection/SourceRefSection';
-import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader';
-
-interface Properties {
-    hideLinksButton?: boolean;
-}
-
-interface Props {
-    properties?: Properties;
-    readOnly?: boolean;
-}
-
-export const SidebarAboutSection = ({ properties, readOnly }: Props) => {
-    const hideLinksButton = properties?.hideLinksButton;
-    const { entityData } = useEntityData();
-    const routeToTab = useRouteToTab();
-
-    const originalDescription = entityData?.properties?.description;
-    const editedDescription = entityData?.editableProperties?.description;
-    const description = editedDescription || originalDescription || '';
-    const links = entityData?.institutionalMemory?.elements || [];
-
-    const hasContent = !!description || links.length > 0;
-
-    return (
-        <div>
-            <SidebarHeader
-                title="About"
-                actions={
-                    hasContent &&
-                    !readOnly && (
-                        <Button
-                            onClick={() => routeToTab({ tabName: 'Documentation', tabParams: { editing: true } })}
-                            type="text"
-                            shape="circle"
-                        >
-                            <EditOutlined />
-                        </Button>
-                    )
-                }
-            />
-            {description && <DescriptionSection description={description} />}
-            {!hasContent && <EmptyContentSection hideLinksButton={hideLinksButton} readOnly={readOnly} />}
-            {hasContent && <LinksSection hideLinksButton={hideLinksButton} readOnly={readOnly} />}
-            <SourceRefSection />
-        </div>
-    );
-};
-
-export default SidebarAboutSection;
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx
deleted file mode 100644
index 1bdb8c94f8f521..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/AboutSection/SourceRefSection.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { LinkOutlined } from '@ant-design/icons';
-import { Typography } from 'antd';
-import React from 'react';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { StyledLink } from '@app/entity/shared/containers/profile/sidebar/LinkButton';
-import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader';
-
-export default function SourceRefSection() {
-    const { entityData } = useEntityData();
-
-    const sourceUrl = entityData?.properties?.sourceUrl;
-    const sourceRef = entityData?.properties?.sourceRef;
-
-    if (!sourceRef) return null;
-
-    return (
-        <>
-            <SidebarHeader title="Source" />
-            <Typography.Paragraph>
-                {sourceUrl ? (
-                    <StyledLink type="link" href={sourceUrl} target="_blank" rel="noreferrer">
-                        <LinkOutlined />
-                        {sourceRef}
-                    </StyledLink>
-                ) : (
-                    <span>{sourceRef}</span>
-                )}
-            </Typography.Paragraph>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx
index 8d9ddf8c676b4f..3c024af733594c 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx
@@ -30,7 +30,7 @@ const StyleTag = styled(Tag)`
     align-items: center;
 `;
 
-export const PreviewImage = styled.img`
+const PreviewImage = styled.img`
     max-height: 18px;
     width: auto;
     object-fit: contain;
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx
deleted file mode 100644
index 305c896b2c5029..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import { EditOutlined } from '@ant-design/icons';
-import { Button, Modal, Typography, message } from 'antd';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { EMPTY_MESSAGES } from '@app/entity/shared/constants';
-import SetDataProductModal from '@app/entity/shared/containers/profile/sidebar/DataProduct/SetDataProductModal';
-import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader';
-import { DataProductLink } from '@app/shared/tags/DataProductLink';
-
-import { useBatchSetDataProductMutation } from '@graphql/dataProduct.generated';
-import { DataProduct } from '@types';
-
-const EmptyText = styled(Typography.Paragraph)`
-    &&& {
-        border-top: none;
-        padding-top: 0;
-    }
-`;
-
-interface Props {
-    readOnly?: boolean;
-}
-
-export default function DataProductSection({ readOnly }: Props) {
-    const [isModalVisible, setIsModalVisible] = useState(false);
-    const { entityData, urn } = useEntityData();
-    const [batchSetDataProductMutation] = useBatchSetDataProductMutation();
-    const [dataProduct, setDataProduct] = useState<DataProduct | null>(null);
-    const dataProductRelationships = entityData?.dataProduct?.relationships;
-    const siblingUrns: string[] =
-        entityData?.siblingsSearch?.searchResults?.map((sibling) => sibling.entity.urn || '') || [];
-
-    useEffect(() => {
-        if (dataProductRelationships && dataProductRelationships.length > 0) {
-            setDataProduct(dataProductRelationships[0].entity as DataProduct);
-        }
-    }, [dataProductRelationships]);
-
-    function removeDataProduct() {
-        batchSetDataProductMutation({ variables: { input: { resourceUrns: [urn, ...siblingUrns] } } })
-            .then(() => {
-                message.success({ content: 'Removed Data Product.', duration: 2 });
-                setDataProduct(null);
-            })
-            .catch((e: unknown) => {
-                message.destroy();
-                if (e instanceof Error) {
-                    message.error({
-                        content: `Failed to remove data product. An unknown error occurred.`,
-                        duration: 3,
-                    });
-                }
-            });
-    }
-
-    const onRemoveDataProduct = () => {
-        Modal.confirm({
-            title: `Confirm Data Product Removal`,
-            content: `Are you sure you want to remove this data product?`,
-            onOk() {
-                removeDataProduct();
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    return (
-        <div>
-            <SidebarHeader title="Data Product" />
-            {dataProduct && (
-                <DataProductLink
-                    dataProduct={dataProduct}
-                    closable={!readOnly}
-                    readOnly={readOnly}
-                    onClose={(e) => {
-                        e.preventDefault();
-                        onRemoveDataProduct();
-                    }}
-                    fontSize={12}
-                />
-            )}
-            {!dataProduct && (
-                <>
-                    <EmptyText type="secondary">
-                        {EMPTY_MESSAGES.dataProduct.title}. {EMPTY_MESSAGES.dataProduct.description}
-                    </EmptyText>
-                    {!readOnly && (
-                        <Button type="default" onClick={() => setIsModalVisible(true)}>
-                            <EditOutlined /> Set Data Product
-                        </Button>
-                    )}
-                </>
-            )}
-            {isModalVisible && (
-                <SetDataProductModal
-                    urns={[urn, ...siblingUrns]}
-                    currentDataProduct={dataProduct || null}
-                    onModalClose={() => setIsModalVisible(false)}
-                    setDataProduct={setDataProduct}
-                />
-            )}
-        </div>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx
deleted file mode 100644
index ae1c544f71d888..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import { Button, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import UsageFacepile from '@app/entity/dataset/profile/UsageFacepile';
-import { useBaseEntity, useRouteToTab } from '@app/entity/shared/EntityContext';
-import { InfoItem } from '@app/entity/shared/components/styled/InfoItem';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader';
-import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber';
-
-import { GetDatasetQuery } from '@graphql/dataset.generated';
-import { DatasetProfile, Operation, UsageQueryResult } from '@types';
-
-const HeaderInfoBody = styled(Typography.Text)`
-    font-size: 16px;
-    color: ${ANTD_GRAY[9]};
-`;
-
-const HeaderContainer = styled.div`
-    justify-content: space-between;
-    display: flex;
-`;
-
-const StatsButton = styled(Button)`
-    margin-top: -4px;
-`;
-
-const StatsRow = styled.div`
-    padding-top: 12px;
-    padding-bottom: 12px;
-`;
-
-const INFO_ITEM_WIDTH_PX = '150px';
-const LAST_UPDATED_WIDTH_PX = '220px';
-
-export const SidebarStatsSection = () => {
-    const baseEntity = useBaseEntity<GetDatasetQuery>();
-
-    const toLocalDateTimeString = (time: number) => {
-        const date = new Date(time);
-        return date.toLocaleString([], {
-            year: 'numeric',
-            month: 'numeric',
-            day: 'numeric',
-            hour: '2-digit',
-            minute: '2-digit',
-            timeZoneName: 'short',
-        });
-    };
-
-    const hasUsageStats = baseEntity?.dataset?.usageStats !== undefined;
-    const hasDatasetProfiles = baseEntity?.dataset?.datasetProfiles !== undefined;
-    const hasOperations = (baseEntity?.dataset?.operations?.length || 0) > 0;
-
-    const usageStats = (hasUsageStats && (baseEntity?.dataset?.usageStats as UsageQueryResult)) || undefined;
-    const datasetProfiles =
-        (hasDatasetProfiles && (baseEntity?.dataset?.datasetProfiles as Array<DatasetProfile>)) || undefined;
-    const latestProfile = datasetProfiles && datasetProfiles[0];
-    const operations = (hasOperations && (baseEntity?.dataset?.operations as Array<Operation>)) || undefined;
-    const latestOperation = operations && operations[0];
-
-    const lastUpdatedTime = latestOperation && toLocalDateTimeString(latestOperation?.lastUpdatedTimestamp);
-
-    const hasUsageStatsAggregations =
-        usageStats?.aggregations?.totalSqlQueries || (usageStats?.aggregations?.users?.length || 0) > 0;
-    const hasLatestProfiles = latestProfile?.rowCount || latestProfile?.columnCount;
-    const hasLatestOperation = latestOperation?.timestampMillis;
-    const routeToTab = useRouteToTab();
-
-    return (
-        <div>
-            <HeaderContainer>
-                <SidebarHeader title="Stats" />
-                <StatsButton onClick={() => routeToTab({ tabName: 'Stats' })} type="link">
-                    More stats &gt;
-                </StatsButton>
-            </HeaderContainer>
-            {/* Dataset Profile Entry */}
-            {hasLatestProfiles && (
-                <StatsRow>
-                    {latestProfile?.rowCount ? (
-                        <InfoItem
-                            title="Rows"
-                            onClick={() => routeToTab({ tabName: 'Queries' })}
-                            width={INFO_ITEM_WIDTH_PX}
-                        >
-                            <HeaderInfoBody>{formatNumberWithoutAbbreviation(latestProfile?.rowCount)}</HeaderInfoBody>
-                        </InfoItem>
-                    ) : null}
-                    {latestProfile?.columnCount ? (
-                        <InfoItem title="Columns" width={INFO_ITEM_WIDTH_PX}>
-                            <HeaderInfoBody>{latestProfile?.columnCount}</HeaderInfoBody>
-                        </InfoItem>
-                    ) : null}
-                </StatsRow>
-            )}
-            {/* Usage Stats Entry */}
-            {hasUsageStatsAggregations && (
-                <StatsRow>
-                    {usageStats?.aggregations?.totalSqlQueries ? (
-                        <InfoItem
-                            title="Monthly Queries"
-                            onClick={() => routeToTab({ tabName: 'Queries' })}
-                            width={INFO_ITEM_WIDTH_PX}
-                        >
-                            <HeaderInfoBody>{usageStats?.aggregations?.totalSqlQueries}</HeaderInfoBody>
-                        </InfoItem>
-                    ) : null}
-                    {(usageStats?.aggregations?.users?.length || 0) > 0 ? (
-                        <InfoItem title="Top Users" width={INFO_ITEM_WIDTH_PX}>
-                            <UsageFacepile users={usageStats?.aggregations?.users} maxNumberDisplayed={10} />
-                        </InfoItem>
-                    ) : null}
-                </StatsRow>
-            )}
-            {/* Operation Entry */}
-            {hasLatestOperation ? (
-                <StatsRow>
-                    <InfoItem
-                        title="Last Updated"
-                        onClick={() => routeToTab({ tabName: 'Queries' })}
-                        width={LAST_UPDATED_WIDTH_PX}
-                    >
-                        <HeaderInfoBody>{lastUpdatedTime}</HeaderInfoBody>
-                    </InfoItem>
-                </StatsRow>
-            ) : null}
-        </div>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx
deleted file mode 100644
index a52e2cb599634e..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Dataset/View/SidebarViewDefinitionSection.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Button, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useBaseEntity, useRouteToTab } from '@app/entity/shared/EntityContext';
-import { InfoItem } from '@app/entity/shared/components/styled/InfoItem';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader';
-
-import { GetDatasetQuery } from '@graphql/dataset.generated';
-
-const HeaderInfoBody = styled(Typography.Text)`
-    font-size: 16px;
-    color: ${ANTD_GRAY[9]};
-`;
-
-const HeaderContainer = styled.div`
-    justify-content: space-between;
-    display: flex;
-`;
-
-const StatsButton = styled(Button)`
-    margin-top: -4px;
-`;
-
-const InfoRow = styled.div`
-    padding-top: 12px;
-    padding-bottom: 12px;
-`;
-
-const INFO_ITEM_WIDTH_PX = '150px';
-
-export const SidebarViewDefinitionSection = () => {
-    const baseEntity = useBaseEntity<GetDatasetQuery>();
-
-    const materialized = baseEntity?.dataset?.viewProperties?.materialized;
-    const language = baseEntity?.dataset?.viewProperties?.language || 'UNKNOWN';
-
-    const routeToTab = useRouteToTab();
-
-    return (
-        <div>
-            <HeaderContainer>
-                <SidebarHeader title="View Definition" />
-                <StatsButton onClick={() => routeToTab({ tabName: 'View Definition' })} type="link">
-                    See View Definition &gt;
-                </StatsButton>
-            </HeaderContainer>
-            <InfoRow>
-                <InfoItem title="Materialized" width={INFO_ITEM_WIDTH_PX}>
-                    <HeaderInfoBody>{materialized ? 'True' : 'False'}</HeaderInfoBody>
-                </InfoItem>
-                <InfoItem title="Language" width={INFO_ITEM_WIDTH_PX}>
-                    <HeaderInfoBody>{language.toUpperCase()}</HeaderInfoBody>
-                </InfoItem>
-            </InfoRow>
-        </div>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx
deleted file mode 100644
index 631671d468a6d0..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import { EditOutlined } from '@ant-design/icons';
-import { Button, Modal, Typography, message } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { useEntityData, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext';
-import { EMPTY_MESSAGES } from '@app/entity/shared/constants';
-import { SetDomainModal } from '@app/entity/shared/containers/profile/sidebar/Domain/SetDomainModal';
-import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader';
-import { ENTITY_PROFILE_DOMAINS_ID } from '@app/onboarding/config/EntityProfileOnboardingConfig';
-import { DomainLink } from '@app/shared/tags/DomainLink';
-
-import { useUnsetDomainMutation } from '@graphql/mutations.generated';
-
-const StyledButton = styled(Button)`
-    display: block;
-    margin-bottom: 8px;
-`;
-
-const ContentWrapper = styled.div<{ displayInline: boolean }>`
-    ${(props) =>
-        props.displayInline &&
-        `
-    display: flex;
-    align-items: center;
-    `}
-`;
-
-interface PropertiesProps {
-    updateOnly?: boolean;
-}
-
-interface Props {
-    readOnly?: boolean;
-    properties?: PropertiesProps;
-}
-
-export const SidebarDomainSection = ({ readOnly, properties }: Props) => {
-    const updateOnly = properties?.updateOnly;
-    const { entityData } = useEntityData();
-    const refetch = useRefetch();
-    const urn = useMutationUrn();
-    const [unsetDomainMutation] = useUnsetDomainMutation();
-    const [showModal, setShowModal] = useState(false);
-    const domain = entityData?.domain?.domain;
-
-    const removeDomain = (urnToRemoveFrom) => {
-        unsetDomainMutation({ variables: { entityUrn: urnToRemoveFrom } })
-            .then(() => {
-                message.success({ content: 'Removed Domain.', duration: 2 });
-                refetch?.();
-            })
-            .catch((e: unknown) => {
-                message.destroy();
-                if (e instanceof Error) {
-                    message.error({ content: `Failed to remove domain: \n ${e.message || ''}`, duration: 3 });
-                }
-            });
-    };
-
-    const onRemoveDomain = (urnToRemoveFrom) => {
-        Modal.confirm({
-            title: `Confirm Domain Removal`,
-            content: `Are you sure you want to remove this domain?`,
-            onOk() {
-                removeDomain(urnToRemoveFrom);
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    return (
-        <div>
-            <div id={ENTITY_PROFILE_DOMAINS_ID} className="sidebar-domain-section">
-                <SidebarHeader title="Domain" />
-                <ContentWrapper displayInline={!!domain}>
-                    {domain && (
-                        <DomainLink
-                            domain={domain}
-                            closable={!readOnly && !updateOnly}
-                            readOnly={readOnly}
-                            onClose={(e) => {
-                                e.preventDefault();
-                                onRemoveDomain(entityData?.domain?.associatedUrn);
-                            }}
-                            fontSize={12}
-                        />
-                    )}
-                    {(!domain || !!updateOnly) && (
-                        <>
-                            {!domain && (
-                                <Typography.Paragraph type="secondary">
-                                    {EMPTY_MESSAGES.domain.title}. {EMPTY_MESSAGES.domain.description}
-                                </Typography.Paragraph>
-                            )}
-                            {!readOnly && (
-                                <StyledButton type="default" onClick={() => setShowModal(true)}>
-                                    <EditOutlined /> Set Domain
-                                </StyledButton>
-                            )}
-                        </>
-                    )}
-                </ContentWrapper>
-                {showModal && (
-                    <SetDomainModal
-                        urns={[urn]}
-                        refetch={refetch}
-                        onCloseModal={() => {
-                            setShowModal(false);
-                        }}
-                    />
-                )}
-            </div>
-        </div>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx
deleted file mode 100644
index ab565d9f31499e..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/SidebarFormInfoWrapper.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import FormInfo from '@app/entity/shared/containers/profile/sidebar/FormInfo/FormInfo';
-import { StyledDivider } from '@app/entity/shared/containers/profile/sidebar/FormInfo/components';
-import { getFormAssociations } from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils';
-import EntityFormModal from '@app/entity/shared/entityForm/EntityFormModal';
-import FormSelectionModal from '@app/entity/shared/entityForm/FormSelectionModal/FormSelectionModal';
-
-const FormInfoWrapper = styled.div`
-    margin-top: 16px;
-`;
-
-export default function SidebarFormInfoWrapper() {
-    const { entityData } = useEntityData();
-    const [isFormSelectionModalVisible, setIsFormSelectionModalVisible] = useState(false);
-    const [isFormVisible, setIsFormVisible] = useState(false);
-    const [selectedFormUrn, setSelectedFormUrn] = useState<string | null>(null);
-    const formAssociations = getFormAssociations(entityData);
-
-    if (!formAssociations.length) return null;
-
-    function openFormModal() {
-        if (formAssociations.length === 1) {
-            setSelectedFormUrn(formAssociations[0].form.urn);
-            setIsFormVisible(true);
-        } else {
-            setIsFormSelectionModalVisible(true);
-        }
-    }
-
-    function selectFormUrn(urn: string) {
-        setSelectedFormUrn(urn);
-        setIsFormVisible(true);
-        setIsFormSelectionModalVisible(false);
-    }
-
-    return (
-        <>
-            <FormInfoWrapper>
-                <FormInfo openFormModal={openFormModal} />
-                <StyledDivider />
-            </FormInfoWrapper>
-            <EntityFormModal
-                selectedFormUrn={selectedFormUrn}
-                isFormVisible={isFormVisible}
-                hideFormModal={() => setIsFormVisible(false)}
-            />
-            <FormSelectionModal
-                isFormSelectionModalVisible={isFormSelectionModalVisible}
-                hideFormSelectionModal={() => setIsFormSelectionModalVisible(false)}
-                selectFormUrn={selectFormUrn}
-            />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/__tests__/utils.test.ts b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/__tests__/utils.test.ts
deleted file mode 100644
index e62a517baf2056..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/__tests__/utils.test.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-import { isAssignedToForm } from '@app/entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned';
-import {
-    getEntityPromptsInfo,
-    getFieldPromptsInfo,
-    getFormAssociations,
-    getNumEntityPromptsRemaining,
-    getNumPromptsCompletedForField,
-    getNumSchemaFieldPromptsRemaining,
-    getPromptsForForm,
-    getVerificationAuditStamp,
-    isVerificationComplete,
-    shouldShowVerificationInfo,
-} from '@app/entity/shared/containers/profile/sidebar/FormInfo/utils';
-import { mockEntityData, mockEntityDataAllVerified } from '@app/entity/shared/entityForm/mocks';
-
-import { FormAssociation, FormPrompt } from '@types';
-
-// only looking at IDs
-const prompts = [{ id: '1' }, { id: '2' }, { id: '3' }, { id: '4' }] as FormPrompt[];
-
-describe('form prompt utils', () => {
-    it('should get the correct number of top-level prompts remaining', () => {
-        const numPromptsRemaining = getNumEntityPromptsRemaining(prompts, mockEntityData);
-        expect(numPromptsRemaining).toBe(2);
-    });
-
-    // if there are 2 top level prompts for schema fields, 8 fields in the schema, then there are 16 total schema-field prompts
-    // there are 5 completed prompts in the mock data, should have 11 remaining
-    it('should get the correct number of field-level prompts remaining', () => {
-        const fieldFormPrompts = [{ id: '1' }, { id: '2' }] as FormPrompt[];
-        const numPromptsRemaining = getNumSchemaFieldPromptsRemaining(mockEntityData, fieldFormPrompts, 8);
-        expect(numPromptsRemaining).toBe(11);
-    });
-
-    it('should get the correct number of field-level prompts remaining given a form urn', () => {
-        const fieldFormPrompts = [{ id: '1' }, { id: '2' }] as FormPrompt[];
-        const numPromptsRemaining = getNumSchemaFieldPromptsRemaining(
-            mockEntityData,
-            fieldFormPrompts,
-            8,
-            'urn:li:form:1',
-        );
-        expect(numPromptsRemaining).toBe(11);
-    });
-
-    it('should get the correct number of field-level prompts remaining given a form urn with no field level prompts completed', () => {
-        const fieldFormPrompts = [{ id: '3' }] as FormPrompt[];
-        const numPromptsRemaining = getNumSchemaFieldPromptsRemaining(
-            mockEntityData,
-            fieldFormPrompts,
-            8,
-            'urn:li:form:2',
-        );
-        // none are completed in this form, with only 1 schema field prompt with 8 schema fields, so all 8 should be remaining
-        expect(numPromptsRemaining).toBe(8);
-    });
-
-    it('should get the numer of completed prompts for a given schema field in incompletePrompts', () => {
-        const numCompleted = getNumPromptsCompletedForField('test2', mockEntityData, 'urn:li:form:1');
-        expect(numCompleted).toBe(1);
-    });
-
-    it('should get the numer of completed prompts for a given schema field in completedPrompts and incompletePrompts', () => {
-        const numCompleted = getNumPromptsCompletedForField('test3', mockEntityData, 'urn:li:form:1');
-        expect(numCompleted).toBe(2);
-    });
-
-    it('should get the prompts for a given form urn correctly', () => {
-        const promptsForForm = getPromptsForForm('urn:li:form:1', mockEntityData);
-        expect(promptsForForm.length).toBe(2);
-        expect(promptsForForm.map((p) => p.id)).toMatchObject(['1', '2']);
-    });
-
-    it('should get information for entity specific prompts', () => {
-        const promptsForForm = getPromptsForForm('urn:li:form:2', mockEntityData);
-        const { entityPrompts, numOptionalEntityPromptsRemaining, numRequiredEntityPromptsRemaining } =
-            getEntityPromptsInfo(promptsForForm, mockEntityData);
-
-        expect(entityPrompts.length).toBe(2);
-        expect(entityPrompts.map((p) => p.id)).toMatchObject(['3', '5']);
-        expect(numOptionalEntityPromptsRemaining).toBe(1);
-        expect(numRequiredEntityPromptsRemaining).toBe(0);
-    });
-
-    it('should get information for field specific prompts', () => {
-        const promptsForForm = getPromptsForForm('urn:li:form:1', mockEntityData);
-        const { fieldPrompts, numOptionalFieldPromptsRemaining, numRequiredFieldPromptsRemaining } =
-            getFieldPromptsInfo(promptsForForm, mockEntityData, 8, 'urn:li:form:1');
-
-        expect(fieldPrompts.length).toBe(2);
-        expect(fieldPrompts.map((p) => p.id)).toMatchObject(['1', '2']);
-        expect(numOptionalFieldPromptsRemaining).toBe(11);
-        expect(numRequiredFieldPromptsRemaining).toBe(0);
-    });
-
-    it('should get all form associations for an entity', () => {
-        const formAssociations = getFormAssociations(mockEntityData);
-        expect(formAssociations.length).toBe(3);
-        expect(formAssociations.map((f) => f.form.urn)).toMatchObject([
-            'urn:li:form:1',
-            'urn:li:form:2',
-            'urn:li:form:3',
-        ]);
-    });
-});
-
-describe('useIsUserAssigned utils tests', () => {
-    it('should return true if user is an owner and the form is assigned to owners', () => {
-        const isAssigned = isAssignedToForm(mockEntityData.forms?.incompleteForms[0] as FormAssociation, true);
-        expect(isAssigned).toBe(true);
-    });
-
-    it('should return false if user is not an owner and the form is assigned to owners', () => {
-        const isAssigned = isAssignedToForm(mockEntityData.forms?.incompleteForms[0] as FormAssociation, false);
-        expect(isAssigned).toBe(false);
-    });
-
-    it('should return true if the user is explicitly assigned', () => {
-        const isAssigned = isAssignedToForm(mockEntityData.forms?.completedForms[0] as FormAssociation, false);
-        expect(isAssigned).toBe(true);
-    });
-});
-
-describe('shouldShowVerificationInfo', () => {
-    it('should return true if a form is supplied that is a verification form', () => {
-        const showVerificationInfo = shouldShowVerificationInfo(mockEntityData, 'urn:li:form:1');
-        expect(showVerificationInfo).toBe(true);
-    });
-
-    it('should return false if a form is supplied that is not a verification form', () => {
-        const isAssigned = shouldShowVerificationInfo(mockEntityData, 'urn:li:form:3');
-        expect(isAssigned).toBe(false);
-    });
-
-    it('should return true if no formUrn is supplied and there is a verification form', () => {
-        const isAssigned = shouldShowVerificationInfo(mockEntityData);
-        expect(isAssigned).toBe(true);
-    });
-});
-
-describe('getVerificationAuditStamp', () => {
-    it('should return the audit stamp for a given form', () => {
-        const auditStamp = getVerificationAuditStamp(mockEntityData, 'urn:li:form:2');
-        expect(auditStamp).toMatchObject({
-            actor: {
-                urn: 'urn:li:corpuser:test',
-            },
-            time: 100,
-        });
-    });
-
-    it('should return undefined for audit stamp for a given form with no verifications', () => {
-        const auditStamp = getVerificationAuditStamp(mockEntityData, 'urn:li:form:1');
-        expect(auditStamp).toBe(null);
-    });
-
-    it('should return the most recent audit stamp when not given form', () => {
-        const auditStamp = getVerificationAuditStamp(mockEntityData);
-        expect(auditStamp).toMatchObject({
-            actor: {
-                urn: 'urn:li:corpuser:test',
-            },
-            time: 101,
-        });
-    });
-});
-
-describe('isVerificationComplete', () => {
-    it('should return true if the given form is verified', () => {
-        const isComplete = isVerificationComplete(mockEntityData, 'urn:li:form:2');
-        expect(isComplete).toBe(true);
-    });
-
-    it('should return false if the given form is not verified', () => {
-        const isComplete = isVerificationComplete(mockEntityData, 'urn:li:form:1');
-        expect(isComplete).toBe(false);
-    });
-
-    it('should return false if no form is given and not all verification forms are complete', () => {
-        const isComplete = isVerificationComplete(mockEntityData);
-        expect(isComplete).toBe(false);
-    });
-
-    it('should return true if no form is given and all verification forms are complete', () => {
-        const isComplete = isVerificationComplete(mockEntityDataAllVerified);
-        expect(isComplete).toBe(true);
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned.ts b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned.ts
index 65141df1889483..395f27d35346f6 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned.ts
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/useIsUserAssigned.ts
@@ -4,7 +4,7 @@ import { getFormAssociations } from '@app/entity/shared/containers/profile/sideb
 
 import { FormAssociation } from '@types';
 
-export function isAssignedToForm(formAssociation: FormAssociation, isUserAnOwner: boolean) {
+function isAssignedToForm(formAssociation: FormAssociation, isUserAnOwner: boolean) {
     const { isAssignedToMe, owners: isAssignedToOwners } = formAssociation.form.info.actors;
     return isAssignedToMe || (isAssignedToOwners && isUserAnOwner);
 }
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/utils.ts b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/utils.ts
index 44447ddd7fe250..5c26d8eb0c54a3 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/utils.ts
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/FormInfo/utils.ts
@@ -44,7 +44,7 @@ function getCompletedFieldPromptsFromPrompt(prompt: FormPromptAssociation, relev
  * Note: we pass in an optional set of prompt IDs to choose from in order to get completed
  * field prompts for a certain set of entity prompts id we choose.
  */
-export function getCompletedFieldPromptsFromForm(
+function getCompletedFieldPromptsFromForm(
     formAssociation: FormAssociation,
     relevantFieldFormPromptIds?: Set<string>,
 ) {
@@ -69,7 +69,7 @@ export function getCompletedFieldPromptsFromForm(
  * For each prompt, get their list of completedFieldPrompts
  * Takes in an optional list of relevant prompt IDs to filter results down.
  */
-export function getCompletedFieldPromptAssociations(
+function getCompletedFieldPromptAssociations(
     entityData: GenericEntityProperties | null,
     relevantFieldFormPromptIds?: Set<string>,
 ) {
@@ -94,7 +94,7 @@ export function getCompletedFieldPromptAssociations(
  * For a given form, gets a list of the completed field prompt associations which live
  * as children to top level prompt associations for each schema field.
  */
-export function getCompletedFieldPromptAssociationsForForm(
+function getCompletedFieldPromptAssociationsForForm(
     formUrn: string,
     entityData: GenericEntityProperties | null,
     relevantFieldFormPromptIds?: Set<string>,
@@ -118,7 +118,7 @@ export function getNumPromptsCompletedForField(
  * on the form multiplied by the number of schema fields.
  * Optionally takes in a formUrn to look at one specific form or all forms
  */
-export function getNumSchemaFieldPromptsRemaining(
+function getNumSchemaFieldPromptsRemaining(
     entityData: GenericEntityProperties | null,
     fieldFormPrompts: FormPrompt[],
     numSchemaFields: number,
@@ -171,7 +171,7 @@ export function isFieldPromptComplete(fieldPrompt, promptAssociation) {
 }
 
 // For every prompt provided, check if it's in our list of completed prompts and return number prompts not completed
-export function getNumEntityPromptsRemaining(entityPrompts: FormPrompt[], entityData: GenericEntityProperties | null) {
+function getNumEntityPromptsRemaining(entityPrompts: FormPrompt[], entityData: GenericEntityProperties | null) {
     const completedPrompts = getCompletedPrompts(entityData);
     let numPromptsRemaining = 0;
 
@@ -254,12 +254,12 @@ export function getFormVerification(formUrn: string, entityData: GenericEntityPr
     return entityData?.forms?.verifications?.find((verification) => verification.form.urn === formUrn);
 }
 
-export function getVerificationForms(entityData: GenericEntityProperties | null) {
+function getVerificationForms(entityData: GenericEntityProperties | null) {
     const formAssociations = getFormAssociations(entityData);
     return formAssociations.filter((formAssociation) => formAssociation.form.info.type === FormType.Verification);
 }
 
-export function areAllFormsVerified(formAssociations: FormAssociation[], entityData: GenericEntityProperties | null) {
+function areAllFormsVerified(formAssociations: FormAssociation[], entityData: GenericEntityProperties | null) {
     return formAssociations.every((formAssociation) => !!getFormVerification(formAssociation.form.urn, entityData));
 }
 
@@ -315,10 +315,3 @@ export function getVerificationAuditStamp(entityData: GenericEntityProperties |
     }
     return getMostRecentVerificationAuditStamp(entityData);
 }
-
-export function getBulkByQuestionPrompts(formUrn: string, entityData: GenericEntityProperties | null) {
-    const formAssociation = getFormAssociation(formUrn, entityData);
-    return (
-        formAssociation?.form?.info?.prompts?.filter((prompt) => !SCHEMA_FIELD_PROMPT_TYPES.includes(prompt.type)) || []
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/HeaderAndTabs.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/HeaderAndTabs.tsx
deleted file mode 100644
index e1fa4129c2df1e..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/HeaderAndTabs.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import React, { useCallback, useState } from 'react';
-import styled from 'styled-components';
-
-let isResizing = false;
-
-export type Props = {
-    children: React.ReactNode;
-};
-
-const ResizableDiv = styled.div<{ width }>`
-    width: ${(props) => props.width}px;
-    min-width: 440px;
-    display: flex;
-    justify-content: space-between;
-`;
-
-const HeaderAndTabs = ({ children }: Props) => {
-    const initialWidth = 70 / (100 / document.documentElement.clientWidth);
-
-    const [sidebarWidth, setSidebarWidth] = useState(initialWidth);
-
-    const cbHandleMouseMove = useCallback((e) => {
-        const offsetRight = e.clientX - document.body.offsetLeft;
-
-        const minWidthVw = 70;
-        const minWidthPx = minWidthVw / (100 / document.documentElement.clientWidth);
-
-        const maxWidthVw = 98;
-        const maxWidthPx = maxWidthVw / (100 / document.documentElement.clientWidth);
-
-        if (offsetRight > minWidthPx && offsetRight < maxWidthPx) {
-            setSidebarWidth(offsetRight);
-        }
-    }, []);
-
-    const cbHandleMouseUp = useCallback(
-        (_) => {
-            if (!isResizing) {
-                return;
-            }
-            isResizing = false;
-            document.removeEventListener('mousemove', cbHandleMouseMove);
-            document.removeEventListener('mouseup', cbHandleMouseUp);
-        },
-        [cbHandleMouseMove],
-    );
-
-    function handleMousedown(e) {
-        e.stopPropagation();
-        e.preventDefault();
-        // we will only add listeners when needed, and remove them afterward
-        document.addEventListener('mousemove', cbHandleMouseMove);
-        document.addEventListener('mouseup', cbHandleMouseUp);
-        isResizing = true;
-    }
-
-    return (
-        <ResizableDiv width={sidebarWidth}>
-            {children}
-            {/* eslint-disable jsx-a11y/no-static-element-interactions */}
-            <div onMouseDown={handleMousedown} style={{ backgroundColor: 'black', width: '5px', height: '100px' }}>
-                header
-            </div>
-        </ResizableDiv>
-    );
-};
-
-export default HeaderAndTabs;
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/LinkButton.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/LinkButton.tsx
deleted file mode 100644
index 65f47712f458cd..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/LinkButton.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { LinkOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { InstitutionalMemoryMetadata } from '@types';
-
-export const StyledLink = styled(Button)`
-    display: flex;
-    align-items: center;
-    min-width: 0;
-    padding: 0;
-    > span:not(.anticon) {
-        display: inline-block;
-        max-width: 100%;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-    }
-`;
-
-interface Props {
-    link: InstitutionalMemoryMetadata;
-}
-
-export default function LinkButton({ link }: Props) {
-    return (
-        <StyledLink
-            type="link"
-            href={link.url}
-            target="_blank"
-            rel="noreferrer"
-            key={`${link.label}-${link.url}-${link.actor.urn}`}
-        >
-            <LinkOutlined />
-            {link.description || link.label}
-        </StyledLink>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx
deleted file mode 100644
index c0c1ed4f1653dd..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { AutoComplete, Form } from 'antd';
-import { FormInstance } from 'antd/es/form/Form';
-import React, { useState } from 'react';
-
-import { useGetAutoCompleteResultsLazyQuery } from '@graphql/search.generated';
-import { EntityType } from '@types';
-
-const OWNER_SEARCH_PLACEHOLDER = 'Search an LDAP';
-
-type Props = {
-    form: FormInstance<any>;
-};
-
-export const LdapFormItem = ({ form }: Props) => {
-    const [getOwnerAutoCompleteResults, { data: searchOwnerSuggestionsData }] = useGetAutoCompleteResultsLazyQuery();
-    const [ownerQuery, setOwnerQuery] = useState('');
-
-    const onSelectSuggestion = (ldap: string) => {
-        setOwnerQuery(ldap);
-    };
-
-    const onChangeOwnerQuery = async (query: string) => {
-        const row = await form.validateFields();
-
-        if (query && query.trim() !== '') {
-            getOwnerAutoCompleteResults({
-                variables: {
-                    input: {
-                        type: row.type,
-                        query,
-                        field: row.type === EntityType.CorpUser ? 'ldap' : 'name',
-                    },
-                },
-            });
-        }
-        setOwnerQuery(query);
-    };
-
-    return (
-        <Form.Item
-            name="ldap"
-            rules={[
-                {
-                    required: true,
-                    type: 'string',
-                    message: `Please provide a valid LDAP!`,
-                },
-            ]}
-        >
-            <AutoComplete
-                options={
-                    (searchOwnerSuggestionsData &&
-                        searchOwnerSuggestionsData.autoComplete &&
-                        searchOwnerSuggestionsData.autoComplete.suggestions.map((suggestion: string) => ({
-                            value: suggestion,
-                        }))) ||
-                    []
-                }
-                value={ownerQuery}
-                onSelect={onSelectSuggestion}
-                onSearch={onChangeOwnerQuery}
-                placeholder={OWNER_SEARCH_PLACEHOLDER}
-            />
-        </Form.Item>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts
index 9c617cb166f64e..a5558960b4289e 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts
@@ -1,10 +1,10 @@
-import { OwnershipType, OwnershipTypeEntity } from '@types';
+import { OwnershipType } from '@types';
 
 /**
  * A mapping from OwnershipType to it's display name & description. In the future,
  * we intend to make this configurable.
  */
-export const OWNERSHIP_DISPLAY_TYPES = [
+const OWNERSHIP_DISPLAY_TYPES = [
     {
         type: OwnershipType.TechnicalOwner,
         name: 'Technical Owner',
@@ -39,7 +39,3 @@ export const getNameFromType = (type: OwnershipType) => {
 export const getDescriptionFromType = (type: OwnershipType) => {
     return ownershipTypeToDetails.get(type)?.description || 'No description';
 };
-
-export function getOwnershipTypeName(ownershipType?: OwnershipTypeEntity | null) {
-    return ownershipType?.info?.name || 'Other';
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx
deleted file mode 100644
index 74d4c6d825b06c..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext';
-import { ExpandedOwner } from '@app/entity/shared/components/styled/ExpandedOwner/ExpandedOwner';
-import { getOwnershipTypeName } from '@app/entity/shared/containers/profile/sidebar/Ownership/ownershipUtils';
-
-import { Owner, OwnershipTypeEntity } from '@types';
-
-const OwnershipTypeContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    margin-bottom: 16px;
-`;
-
-const OwnershipTypeNameText = styled(Typography.Text)`
-    font-family: 'Manrope', sans-serif;
-    font-weight: 500;
-    font-size: 10px;
-    line-height: 14px;
-    color: #434343;
-`;
-
-const OwnersContainer = styled.div`
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-    margin-top: 8px;
-    gap: 6px;
-`;
-
-interface Props {
-    ownershipType: OwnershipTypeEntity;
-    owners: Owner[];
-    readOnly?: boolean;
-}
-
-export const OwnershipTypeSection = ({ ownershipType, owners, readOnly }: Props) => {
-    const mutationUrn = useMutationUrn();
-    const refetch = useRefetch();
-    const ownershipTypeName = getOwnershipTypeName(ownershipType);
-    return (
-        <OwnershipTypeContainer>
-            <OwnershipTypeNameText>{ownershipTypeName}</OwnershipTypeNameText>
-            <OwnersContainer>
-                {owners.map((owner) => (
-                    <ExpandedOwner
-                        key={owner.owner.urn}
-                        entityUrn={owner.associatedUrn || mutationUrn}
-                        owner={owner}
-                        refetch={refetch}
-                        readOnly={readOnly}
-                    />
-                ))}
-            </OwnersContainer>
-        </OwnershipTypeContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx
deleted file mode 100644
index 10a8cc68d794c9..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Typography } from 'antd';
-import React, { useState } from 'react';
-
-import { useEntityData, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext';
-// import { ExpandedOwner } from '../../../../../components/styled/ExpandedOwner/ExpandedOwner';
-import { EMPTY_MESSAGES } from '@app/entity/shared/constants';
-import { EditOwnersModal } from '@app/entity/shared/containers/profile/sidebar/Ownership/EditOwnersModal';
-import { getOwnershipTypeName } from '@app/entity/shared/containers/profile/sidebar/Ownership/ownershipUtils';
-import { OwnershipTypeSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/OwnershipTypeSection';
-import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader';
-import { ENTITY_PROFILE_OWNERS_ID } from '@app/onboarding/config/EntityProfileOnboardingConfig';
-
-import { Owner, OwnershipType, OwnershipTypeEntity } from '@types';
-
-interface Props {
-    properties?: any;
-    readOnly?: boolean;
-}
-
-export const SidebarOwnerSection = ({ properties, readOnly }: Props) => {
-    const { entityType, entityData } = useEntityData();
-    const mutationUrn = useMutationUrn();
-
-    const refetch = useRefetch();
-    const [showAddModal, setShowAddModal] = useState(false);
-    const ownersEmpty = !entityData?.ownership?.owners?.length;
-    const ownershipTypesMap: Map<string, OwnershipTypeEntity> = new Map();
-    const ownersByTypeMap: Map<string, Owner[]> = new Map();
-    entityData?.ownership?.owners?.forEach((owner) => {
-        const ownershipType = owner?.ownershipType;
-        const ownershipTypeName = getOwnershipTypeName(ownershipType);
-        // If ownership type is not in the map, add it
-        if (ownershipType && !ownershipTypesMap.has(ownershipTypeName)) {
-            ownershipTypesMap.set(ownershipTypeName, ownershipType);
-        }
-        if (!ownersByTypeMap.has(ownershipTypeName)) {
-            ownersByTypeMap.set(ownershipTypeName, []);
-        }
-        ownersByTypeMap.get(ownershipTypeName)?.push(owner);
-    });
-    // Sort ownership types by name alphabetically
-    const ownershipTypeNames = Array.from(ownershipTypesMap.keys()).sort();
-
-    let defaultOwnerTypeUrn = 'urn:li:ownershipType:__system__technical_owner';
-    switch (properties?.defaultOwnerType) {
-        case OwnershipType.TechnicalOwner:
-            defaultOwnerTypeUrn = 'urn:li:ownershipType:__system__technical_owner';
-            break;
-        case OwnershipType.BusinessOwner:
-            defaultOwnerTypeUrn = 'urn:li:ownershipType:__system__business_owner';
-            break;
-        case OwnershipType.DataSteward:
-            defaultOwnerTypeUrn = 'urn:li:ownershipType:__system__data_steward';
-            break;
-        default:
-            break;
-    }
-
-    return (
-        <div id={ENTITY_PROFILE_OWNERS_ID}>
-            <SidebarHeader title="Owners" />
-            <div>
-                {ownershipTypeNames.map((ownershipTypeName) => {
-                    const ownershipType = ownershipTypesMap.get(ownershipTypeName) as OwnershipTypeEntity;
-                    const owners = ownersByTypeMap.get(ownershipTypeName) as Owner[];
-                    return <OwnershipTypeSection ownershipType={ownershipType} owners={owners} readOnly={readOnly} />;
-                })}
-                {ownersEmpty && (
-                    <Typography.Paragraph type="secondary">
-                        {EMPTY_MESSAGES.owners.title}. {EMPTY_MESSAGES.owners.description}
-                    </Typography.Paragraph>
-                )}
-                {!readOnly && (
-                    <Button
-                        type={ownersEmpty ? 'default' : 'text'}
-                        onClick={() => setShowAddModal(true)}
-                        data-testid="add-owners-button"
-                    >
-                        <PlusOutlined /> Add Owners
-                    </Button>
-                )}
-            </div>
-            {showAddModal && (
-                <EditOwnersModal
-                    urns={[mutationUrn]}
-                    defaultOwnerType={defaultOwnerTypeUrn}
-                    hideOwnerType={properties?.hideOwnerType || false}
-                    entityType={entityType}
-                    refetch={refetch}
-                    onCloseModal={() => {
-                        setShowAddModal(false);
-                    }}
-                />
-            )}
-        </div>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/ProfileSidebar.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/ProfileSidebar.tsx
index 625d5ac9d33d41..14eebddd5552e0 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/ProfileSidebar.tsx
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/ProfileSidebar.tsx
@@ -5,8 +5,8 @@ import { EntitySidebar } from '@app/entity/shared/containers/profile/sidebar/Ent
 import { ProfileSidebarResizer } from '@app/entity/shared/containers/profile/sidebar/ProfileSidebarResizer';
 import { EntitySidebarSection } from '@app/entity/shared/types';
 
-export const MAX_SIDEBAR_WIDTH = 800;
-export const MIN_SIDEBAR_WIDTH = 200;
+const MAX_SIDEBAR_WIDTH = 800;
+const MIN_SIDEBAR_WIDTH = 200;
 
 const Sidebar = styled.div<{ $width: number; backgroundColor?: string }>`
     max-height: 100%;
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx
deleted file mode 100644
index d8fd8a637eadb7..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader';
-import { RecommendationModule } from '@app/recommendations/RecommendationModule';
-import { RecommendationDisplayType } from '@app/recommendations/types';
-
-import { useListRecommendationsQuery } from '@graphql/recommendations.generated';
-import { EntityType, RecommendationModule as RecommendationModuleType, ScenarioType } from '@types';
-
-const RecommendationsContainer = styled.div``;
-
-const RecommendationContainer = styled.div`
-    margin-bottom: 20px;
-`;
-
-export const SidebarEntityRecommendations = ({
-    userUrn,
-    entityUrn,
-    entityType,
-}: {
-    userUrn: string;
-    entityUrn: string;
-    entityType: EntityType;
-}) => {
-    const scenario = ScenarioType.EntityProfile;
-    const { data } = useListRecommendationsQuery({
-        variables: {
-            input: {
-                userUrn,
-                requestContext: {
-                    scenario,
-                    entityRequestContext: {
-                        urn: entityUrn,
-                        type: entityType,
-                    },
-                },
-                limit: 3,
-            },
-        },
-    });
-    const recommendationModules = data?.listRecommendations?.modules;
-    return (
-        <RecommendationsContainer>
-            {recommendationModules &&
-                recommendationModules.map((module) => (
-                    <RecommendationContainer>
-                        <SidebarHeader title={module.title} />
-                        <RecommendationModule
-                            key={module.moduleId}
-                            module={module as RecommendationModuleType}
-                            scenarioType={scenario}
-                            showTitle={false}
-                            displayType={RecommendationDisplayType.COMPACT}
-                        />
-                    </RecommendationContainer>
-                ))}
-        </RecommendationsContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx
deleted file mode 100644
index a5b4bbb571a43d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { useUserContext } from '@app/context/useUserContext';
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { SidebarEntityRecommendations } from '@app/entity/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations';
-
-const RecommendationsContainer = styled.div``;
-
-export const SidebarRecommendationsSection = () => {
-    const { urn, entityType } = useEntityData();
-    const authenticatedUserUrn = useUserContext()?.user?.urn;
-    return (
-        <RecommendationsContainer>
-            {authenticatedUserUrn && (
-                <SidebarEntityRecommendations userUrn={authenticatedUserUrn} entityUrn={urn} entityType={entityType} />
-            )}
-        </RecommendationsContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarHeader.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarHeader.tsx
deleted file mode 100644
index 212cd8e0766550..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarHeader.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const HeaderContainer = styled.div`
-    min-height: 32px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: 8px;
-    > .ant-typography {
-        margin-bottom: 0;
-    }
-`;
-
-type Props = {
-    title: string;
-    titleComponent?: React.ReactNode;
-    actions?: React.ReactNode;
-    children?: React.ReactNode;
-};
-
-export const SidebarHeader = ({ title, titleComponent, actions, children }: Props) => {
-    return (
-        <HeaderContainer>
-            {titleComponent || <Typography.Title level={5}>{title}</Typography.Title>}
-            {actions && <div>{actions}</div>}
-            {children}
-        </HeaderContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx
deleted file mode 100644
index d4b18b1c64fef9..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarSiblingsSection.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { useDataNotCombinedWithSiblings, useEntityData } from '@app/entity/shared/EntityContext';
-import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader';
-import {
-    SEPARATE_SIBLINGS_URL_PARAM,
-    stripSiblingsFromEntity,
-    useIsSeparateSiblingsMode,
-} from '@app/entity/shared/siblingUtils';
-import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList';
-import { useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig';
-
-import { GetDatasetQuery } from '@graphql/dataset.generated';
-import { Dataset, Entity } from '@types';
-
-const EntityListContainer = styled.div`
-    margin-left: -8px;
-`;
-
-export const SidebarSiblingsSection = () => {
-    const { entityData } = useEntityData();
-    const dataNotCombinedWithSiblings = useDataNotCombinedWithSiblings<GetDatasetQuery>();
-
-    const showSeparateSiblings = useIsShowSeparateSiblingsEnabled();
-    const isHideSiblingMode = useIsSeparateSiblingsMode();
-
-    if (!entityData) {
-        return <></>;
-    }
-
-    // showSeparateSiblings disables the combined view, but with this flag on we show siblings in the sidebar to navigate to them
-    if (!showSeparateSiblings && isHideSiblingMode) {
-        return (
-            <div>
-                <SidebarHeader title="Part Of" />
-                <EntityListContainer>
-                    <CompactEntityNameList entities={[entityData as Entity]} />
-                </EntityListContainer>
-            </div>
-        );
-    }
-
-    const siblingEntities = entityData?.siblingsSearch?.searchResults?.map((r) => r.entity) || [];
-    const entityDataWithoutSiblings = stripSiblingsFromEntity(dataNotCombinedWithSiblings.dataset);
-
-    const allSiblingsInGroup = showSeparateSiblings
-        ? (siblingEntities as Dataset[])
-        : ([...siblingEntities, entityDataWithoutSiblings] as Dataset[]);
-
-    const allSiblingsInGroupThatExist = allSiblingsInGroup.filter((sibling) => sibling.exists);
-
-    if (!allSiblingsInGroupThatExist.length) {
-        return <></>;
-    }
-
-    // you are always going to be in the sibling group, so if the sibling group is just you do not render.
-    // The less than case is likely not neccessary but just there as a safety case for unexpected scenarios
-    if (!showSeparateSiblings && allSiblingsInGroupThatExist.length <= 1) {
-        return <></>;
-    }
-
-    return (
-        <div>
-            <SidebarHeader title="Composed Of" />
-            <EntityListContainer data-testid="siblings-list">
-                <CompactEntityNameList
-                    entities={allSiblingsInGroupThatExist}
-                    linkUrlParams={{ [SEPARATE_SIBLINGS_URL_PARAM]: true }}
-                />
-            </EntityListContainer>
-        </div>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarTagsSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarTagsSection.tsx
deleted file mode 100644
index 4f7e7395288a21..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarTagsSection.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { Divider } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useEntityData, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext';
-import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader';
-import { getNestedValue } from '@app/entity/shared/containers/profile/utils';
-import {
-    ENTITY_PROFILE_GLOSSARY_TERMS_ID,
-    ENTITY_PROFILE_TAGS_ID,
-} from '@app/onboarding/config/EntityProfileOnboardingConfig';
-import TagTermGroup from '@app/shared/tags/TagTermGroup';
-
-const StyledDivider = styled(Divider)`
-    margin: 16px 0;
-`;
-
-interface Props {
-    properties?: any;
-    readOnly?: boolean;
-}
-
-export const SidebarTagsSection = ({ properties, readOnly }: Props) => {
-    const canAddTag = properties?.hasTags;
-    const canAddTerm = properties?.hasTerms;
-
-    const mutationUrn = useMutationUrn();
-
-    const { entityType, entityData } = useEntityData();
-
-    const refetch = useRefetch();
-
-    return (
-        <div>
-            <span id={ENTITY_PROFILE_TAGS_ID}>
-                <SidebarHeader title="Tags" />
-                <TagTermGroup
-                    editableTags={
-                        properties?.customTagPath
-                            ? getNestedValue(entityData, properties?.customTagPath)
-                            : entityData?.globalTags
-                    }
-                    canAddTag={canAddTag}
-                    canRemove
-                    showEmptyMessage
-                    entityUrn={mutationUrn}
-                    entityType={entityType}
-                    refetch={refetch}
-                    readOnly={readOnly}
-                    fontSize={12}
-                />
-            </span>
-            <StyledDivider />
-            <span id={ENTITY_PROFILE_GLOSSARY_TERMS_ID}>
-                <SidebarHeader title="Glossary Terms" />
-                <TagTermGroup
-                    editableGlossaryTerms={
-                        properties?.customTermPath
-                            ? getNestedValue(entityData, properties?.customTermPath)
-                            : entityData?.glossaryTerms
-                    }
-                    canAddTerm={canAddTerm}
-                    canRemove
-                    showEmptyMessage
-                    entityUrn={mutationUrn}
-                    entityType={entityType}
-                    refetch={refetch}
-                    readOnly={readOnly}
-                    fontSize={12}
-                />
-            </span>
-        </div>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection.tsx
deleted file mode 100644
index 5162b8cd0ba010..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-import React from 'react';
-
-import { SidebarHeader } from '@app/entity/shared/containers/profile/sidebar/SidebarHeader';
-import { useUserContext } from '@src/app/context/useUserContext';
-import { useEntityData } from '@src/app/entity/shared/EntityContext';
-import { StyledList } from '@src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties';
-import {
-    SectionHeader,
-    StyledDivider,
-} from '@src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components';
-import { useGetEntityWithSchema } from '@src/app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema';
-import { EditColumn } from '@src/app/entity/shared/tabs/Properties/Edit/EditColumn';
-import StructuredPropertyValue from '@src/app/entity/shared/tabs/Properties/StructuredPropertyValue';
-import { PropertyRow } from '@src/app/entity/shared/tabs/Properties/types';
-import {
-    getDisplayName,
-    getEntityTypesPropertyFilter,
-    getNotHiddenPropertyFilter,
-    getPropertyRowFromSearchResult,
-} from '@src/app/govern/structuredProperties/utils';
-import {
-    SHOW_IN_ASSET_SUMMARY_PROPERTY_FILTER_NAME,
-    SHOW_IN_COLUMNS_TABLE_PROPERTY_FILTER_NAME,
-} from '@src/app/search/utils/constants';
-import EmptySectionText from '@src/app/shared/sidebar/EmptySectionText';
-import { useEntityRegistry } from '@src/app/useEntityRegistry';
-import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated';
-import { EntityType, SchemaField, SearchResult, StdDataType, StructuredPropertyEntity } from '@src/types.generated';
-
-interface Props {
-    properties?: {
-        schemaField?: SchemaField;
-        schemaColumnProperties?: SearchResult[];
-    };
-}
-
-const SidebarStructuredPropsSection = ({ properties }: Props) => {
-    const schemaField = properties?.schemaField;
-    const schemaColumnProperties = properties?.schemaColumnProperties;
-    const { entityData, entityType } = useEntityData();
-    const me = useUserContext();
-    const entityRegistry = useEntityRegistry();
-    const { refetch: refetchSchema } = useGetEntityWithSchema(true);
-
-    const currentProperties = schemaField
-        ? schemaField?.schemaFieldEntity?.structuredProperties
-        : entityData?.structuredProperties;
-
-    const inputs = {
-        types: [EntityType.StructuredProperty],
-        query: '',
-        start: 0,
-        count: 50,
-        searchFlags: { skipCache: true },
-        orFilters: [
-            {
-                and: [
-                    getEntityTypesPropertyFilter(entityRegistry, !!schemaField, entityType),
-                    getNotHiddenPropertyFilter(),
-                    {
-                        field: schemaField
-                            ? SHOW_IN_COLUMNS_TABLE_PROPERTY_FILTER_NAME
-                            : SHOW_IN_ASSET_SUMMARY_PROPERTY_FILTER_NAME,
-                        values: ['true'],
-                    },
-                ],
-            },
-        ],
-    };
-
-    // Execute search
-    const { data } = useGetSearchResultsForMultipleQuery({
-        variables: {
-            input: inputs,
-        },
-        skip: !!schemaColumnProperties,
-        fetchPolicy: 'cache-first',
-    });
-
-    const entityTypeProperties = schemaColumnProperties || data?.searchAcrossEntities?.searchResults;
-
-    const canEditProperties = me.platformPrivileges?.manageStructuredProperties;
-
-    return (
-        <>
-            {entityTypeProperties?.map((property) => {
-                const propertyRow: PropertyRow | undefined = getPropertyRowFromSearchResult(
-                    property,
-                    currentProperties,
-                );
-                const isRichText = propertyRow?.dataType?.info?.type === StdDataType.RichText;
-                const values = propertyRow?.values;
-                const hasMultipleValues = values && values.length > 1;
-                const propertyName = getDisplayName(property.entity as StructuredPropertyEntity);
-
-                return (
-                    <>
-                        <div>
-                            <SidebarHeader
-                                title={propertyName}
-                                titleComponent={<SectionHeader>{propertyName}</SectionHeader>}
-                                actions={
-                                    canEditProperties && (
-                                        <>
-                                            <EditColumn
-                                                structuredProperty={property.entity as StructuredPropertyEntity}
-                                                values={values?.map((v) => v.value) || []}
-                                                isAddMode={!values}
-                                                associatedUrn={schemaField?.schemaFieldEntity?.urn}
-                                                refetch={schemaField ? refetchSchema : undefined}
-                                            />
-                                        </>
-                                    )
-                                }
-                            />
-
-                            {values ? (
-                                <>
-                                    {hasMultipleValues ? (
-                                        <StyledList>
-                                            {values.map((value) => (
-                                                <li>
-                                                    <StructuredPropertyValue value={value} isRichText={isRichText} />
-                                                </li>
-                                            ))}
-                                        </StyledList>
-                                    ) : (
-                                        <>
-                                            {values?.map((value) => (
-                                                <StructuredPropertyValue value={value} isRichText={isRichText} />
-                                            ))}
-                                        </>
-                                    )}
-                                </>
-                            ) : (
-                                <EmptySectionText message="No value set" />
-                            )}
-                        </div>
-                        {schemaField && <StyledDivider />}
-                    </>
-                );
-            })}
-        </>
-    );
-};
-
-export default SidebarStructuredPropsSection;
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx
deleted file mode 100644
index 87bc718699fd9d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/__tests__/LastIngested.test.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { green, orange, red } from '@ant-design/colors';
-import moment from 'moment-timezone';
-
-import { getLastIngestedColor } from '@app/entity/shared/containers/profile/sidebar/LastIngested';
-
-describe('getLastIngestedColor', () => {
-    it('should return green if the last ingested date is the present moment', () => {
-        const lastIngested = moment().valueOf();
-        const lastIngestedColor = getLastIngestedColor(lastIngested);
-        expect(lastIngestedColor).toBe(green[5]);
-    });
-
-    it('should return green if the last ingested date is less than a week ago from now', () => {
-        const lastIngested = moment().subtract(1, 'day').valueOf();
-        const lastIngestedColor = getLastIngestedColor(lastIngested);
-        expect(lastIngestedColor).toBe(green[5]);
-    });
-
-    it('should return orange if the last ingested date is exactly a week ago', () => {
-        const lastIngested = moment().subtract(1, 'week').valueOf();
-        const lastIngestedColor = getLastIngestedColor(lastIngested);
-        expect(lastIngestedColor).toBe(orange[5]);
-    });
-
-    it('should return orange if the last ingested date is more than a week but less than a month ago', () => {
-        const lastIngested = moment().subtract(2, 'week').valueOf();
-        const lastIngestedColor = getLastIngestedColor(lastIngested);
-        expect(lastIngestedColor).toBe(orange[5]);
-    });
-
-    it('should return red if the last ingested date is exactly a month ago', () => {
-        const lastIngested = moment().subtract(1, 'month').valueOf();
-        const lastIngestedColor = getLastIngestedColor(lastIngested);
-        expect(lastIngestedColor).toBe(red[5]);
-    });
-
-    it('should return red if the last ingested date is more than a month ago', () => {
-        const lastIngested = moment().subtract(3, 'month').valueOf();
-        const lastIngestedColor = getLastIngestedColor(lastIngested);
-        expect(lastIngestedColor).toBe(red[5]);
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/useGetDataForProfile.ts b/datahub-web-react/src/app/entity/shared/containers/profile/useGetDataForProfile.ts
deleted file mode 100644
index 4fc7d7529527c1..00000000000000
--- a/datahub-web-react/src/app/entity/shared/containers/profile/useGetDataForProfile.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { QueryHookOptions, QueryResult } from '@apollo/client';
-
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { combineEntityDataWithSiblings, useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-
-import { EntityType, Exact } from '@types';
-
-interface Props<T> {
-    urn: string;
-    entityType: EntityType;
-    useEntityQuery: (
-        baseOptions: QueryHookOptions<
-            T,
-            Exact<{
-                urn: string;
-            }>
-        >,
-    ) => QueryResult<
-        T,
-        Exact<{
-            urn: string;
-        }>
-    >;
-    getOverrideProperties: (T) => GenericEntityProperties;
-}
-
-export default function useGetDataForProfile<T>({ urn, entityType, useEntityQuery, getOverrideProperties }: Props<T>) {
-    const isHideSiblingMode = useIsSeparateSiblingsMode();
-    const {
-        loading,
-        error,
-        data: dataNotCombinedWithSiblings,
-        refetch,
-    } = useEntityQuery({
-        variables: { urn },
-        fetchPolicy: 'cache-first',
-    });
-
-    const dataPossiblyCombinedWithSiblings = isHideSiblingMode
-        ? dataNotCombinedWithSiblings
-        : combineEntityDataWithSiblings(dataNotCombinedWithSiblings);
-
-    const entityData =
-        (dataPossiblyCombinedWithSiblings &&
-            Object.keys(dataPossiblyCombinedWithSiblings).length > 0 &&
-            getDataForEntityType({
-                data: dataPossiblyCombinedWithSiblings[Object.keys(dataPossiblyCombinedWithSiblings)[0]],
-                entityType,
-                getOverrideProperties,
-                isHideSiblingMode,
-            })) ||
-        null;
-
-    return { entityData, dataPossiblyCombinedWithSiblings, dataNotCombinedWithSiblings, loading, error, refetch };
-}
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/utils.ts b/datahub-web-react/src/app/entity/shared/containers/profile/utils.ts
index d515b05e9f8f9d..fcc66681c6f6ae 100644
--- a/datahub-web-react/src/app/entity/shared/containers/profile/utils.ts
+++ b/datahub-web-react/src/app/entity/shared/containers/profile/utils.ts
@@ -1,29 +1,11 @@
-import { isEqual } from 'lodash';
+
 import queryString from 'query-string';
-import { useEffect } from 'react';
 import { useLocation } from 'react-router';
 
 import EntityRegistry from '@app/entity/EntityRegistry';
-import { GLOSSARY_ENTITY_TYPES } from '@app/entity/shared/constants';
-import { SEPARATE_SIBLINGS_URL_PARAM, useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils';
-import { EntityTab, GenericEntityProperties } from '@app/entity/shared/types';
-import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext';
-import useIsLineageMode from '@app/lineage/utils/useIsLineageMode';
-import {
-    ENTITY_PROFILE_DOCUMENTATION_ID,
-    ENTITY_PROFILE_DOMAINS_ID,
-    ENTITY_PROFILE_ENTITIES_ID,
-    ENTITY_PROFILE_GLOSSARY_TERMS_ID,
-    ENTITY_PROFILE_LINEAGE_ID,
-    ENTITY_PROFILE_OWNERS_ID,
-    ENTITY_PROFILE_PROPERTIES_ID,
-    ENTITY_PROFILE_SCHEMA_ID,
-    ENTITY_PROFILE_TAGS_ID,
-} from '@app/onboarding/config/EntityProfileOnboardingConfig';
-import usePrevious from '@app/shared/usePrevious';
-import { useEntityRegistry } from '@app/useEntityRegistry';
+import { SEPARATE_SIBLINGS_URL_PARAM } from '@app/entity/shared/siblingUtils';
 
-import { AppConfig, EntityType } from '@types';
+import { EntityType } from '@types';
 
 /**
  * The structure of our path will be
@@ -32,60 +14,6 @@ import { AppConfig, EntityType } from '@types';
  */
 const ENTITY_TAB_NAME_REGEX_PATTERN = '^/[^/]+/[^/]+/([^/]+).*';
 
-export function getDataForEntityType<T>({
-    data: entityData,
-    getOverrideProperties,
-    isHideSiblingMode,
-}: {
-    data: T;
-    entityType?: EntityType;
-    getOverrideProperties: (T) => GenericEntityProperties;
-    isHideSiblingMode?: boolean;
-}): GenericEntityProperties | null {
-    if (!entityData) {
-        return null;
-    }
-    const anyEntityData = entityData as any;
-    let modifiedEntityData = entityData;
-    // Bring 'customProperties' field to the root level.
-    const customProperties = anyEntityData.properties?.customProperties || anyEntityData.info?.customProperties;
-    if (customProperties) {
-        modifiedEntityData = {
-            ...entityData,
-            customProperties,
-        };
-    }
-    if (anyEntityData.tags) {
-        modifiedEntityData = {
-            ...modifiedEntityData,
-            globalTags: anyEntityData.tags,
-        };
-    }
-
-    if (
-        anyEntityData?.siblingsSearch?.searchResults?.filter((sibling) => sibling.entity.exists).length > 0 &&
-        !isHideSiblingMode
-    ) {
-        const genericSiblingProperties: GenericEntityProperties[] = anyEntityData?.siblingsSearch?.searchResults?.map(
-            (sibling) => getDataForEntityType({ data: sibling.entity, getOverrideProperties: () => ({}) }),
-        );
-
-        const allPlatforms = anyEntityData.siblings.isPrimary
-            ? [anyEntityData.platform, genericSiblingProperties?.[0]?.platform]
-            : [genericSiblingProperties?.[0]?.platform, anyEntityData.platform];
-
-        modifiedEntityData = {
-            ...modifiedEntityData,
-            siblingPlatforms: allPlatforms,
-        };
-    }
-
-    return {
-        ...modifiedEntityData,
-        ...getOverrideProperties(entityData),
-    };
-}
-
 export function getEntityPath(
     entityType: EntityType,
     urn: string,
@@ -105,40 +33,6 @@ export function getEntityPath(
     }${tabParamsString}`;
 }
 
-export function useEntityPath(entityType: EntityType, urn: string, tabName?: string, tabParams?: Record<string, any>) {
-    const isLineageMode = useIsLineageMode();
-    const isHideSiblingMode = useIsSeparateSiblingsMode();
-    const entityRegistry = useEntityRegistry();
-    return getEntityPath(entityType, urn, entityRegistry, isLineageMode, isHideSiblingMode, tabName, tabParams);
-}
-
-export function useRoutedTab(tabs: EntityTab[]): EntityTab | undefined {
-    const { pathname } = useLocation();
-    const trimmedPathName = pathname.endsWith('/') ? pathname.slice(0, pathname.length - 1) : pathname;
-    // Match against the regex
-    const match = trimmedPathName.match(ENTITY_TAB_NAME_REGEX_PATTERN);
-    if (match && match[1]) {
-        const selectedTabPath = match[1];
-        const routedTab = tabs.find((tab) => tab.name === selectedTabPath);
-        return routedTab;
-    }
-    // No match found!
-    return undefined;
-}
-
-export function useIsOnTab(tabName: string): boolean {
-    const { pathname } = useLocation();
-    const trimmedPathName = pathname.endsWith('/') ? pathname.slice(0, pathname.length - 1) : pathname;
-    // Match against the regex
-    const match = trimmedPathName.match(ENTITY_TAB_NAME_REGEX_PATTERN);
-    if (match && match[1]) {
-        const selectedTabPath = match[1];
-        return selectedTabPath === tabName;
-    }
-    // No match found!
-    return false;
-}
-
 export function useGlossaryActiveTabPath(): string {
     const { pathname, search } = useLocation();
     const trimmedPathName = pathname.endsWith('/') ? pathname.slice(0, pathname.length - 1) : pathname;
@@ -154,95 +48,3 @@ export function useGlossaryActiveTabPath(): string {
     // No match found!
     return '';
 }
-
-export function formatDateString(time: number) {
-    const date = new Date(time);
-    return date.toLocaleDateString('en-US');
-}
-
-export function useEntityQueryParams() {
-    const isHideSiblingMode = useIsSeparateSiblingsMode();
-    const response = {};
-    if (isHideSiblingMode) {
-        response[SEPARATE_SIBLINGS_URL_PARAM] = true;
-    }
-
-    return response;
-}
-
-export function useUpdateGlossaryEntityDataOnChange(
-    entityData: GenericEntityProperties | null,
-    entityType: EntityType,
-) {
-    const { setEntityData } = useGlossaryEntityData();
-    const previousEntityData = usePrevious(entityData);
-
-    useEffect(() => {
-        // first check this is a glossary entity to prevent unnecessary comparisons in non-glossary context
-        if (GLOSSARY_ENTITY_TYPES.includes(entityType) && !isEqual(entityData, previousEntityData)) {
-            setEntityData(entityData);
-        }
-    });
-}
-
-export function getOnboardingStepIdsForEntityType(entityType: EntityType): string[] {
-    switch (entityType) {
-        case EntityType.Chart:
-            return [
-                ENTITY_PROFILE_DOCUMENTATION_ID,
-                ENTITY_PROFILE_PROPERTIES_ID,
-                ENTITY_PROFILE_LINEAGE_ID,
-                ENTITY_PROFILE_TAGS_ID,
-                ENTITY_PROFILE_GLOSSARY_TERMS_ID,
-                ENTITY_PROFILE_OWNERS_ID,
-                ENTITY_PROFILE_DOMAINS_ID,
-            ];
-        case EntityType.Container:
-            return [
-                ENTITY_PROFILE_ENTITIES_ID,
-                ENTITY_PROFILE_DOCUMENTATION_ID,
-                ENTITY_PROFILE_PROPERTIES_ID,
-                ENTITY_PROFILE_OWNERS_ID,
-                ENTITY_PROFILE_TAGS_ID,
-                ENTITY_PROFILE_GLOSSARY_TERMS_ID,
-                ENTITY_PROFILE_DOMAINS_ID,
-            ];
-        case EntityType.Dataset:
-            return [
-                ENTITY_PROFILE_SCHEMA_ID,
-                ENTITY_PROFILE_DOCUMENTATION_ID,
-                ENTITY_PROFILE_LINEAGE_ID,
-                ENTITY_PROFILE_PROPERTIES_ID,
-                ENTITY_PROFILE_OWNERS_ID,
-                ENTITY_PROFILE_TAGS_ID,
-                ENTITY_PROFILE_GLOSSARY_TERMS_ID,
-                ENTITY_PROFILE_DOMAINS_ID,
-            ];
-            break;
-        default:
-            return [];
-    }
-}
-
-function sortTabsWithDefaultTabId(tabs: EntityTab[], defaultTabId: string) {
-    return tabs.sort((tabA, tabB) => {
-        if (tabA.id === defaultTabId) return -1;
-        if (tabB.id === defaultTabId) return 1;
-        return 0;
-    });
-}
-
-export function sortEntityProfileTabs(appConfig: AppConfig, entityType: EntityType, tabs: EntityTab[]) {
-    const sortedTabs = [...tabs];
-
-    if (entityType === EntityType.Domain && appConfig.visualConfig.entityProfiles?.domain?.defaultTab) {
-        const defaultTabId = appConfig.visualConfig.entityProfiles?.domain?.defaultTab;
-        sortTabsWithDefaultTabId(sortedTabs, defaultTabId);
-    }
-
-    return sortedTabs;
-}
-
-export function getNestedValue(obj: any, path: string) {
-    return path.split('.').reduce((o, p) => (o || {})[p], obj);
-}
diff --git a/datahub-web-react/src/app/entity/shared/embed/EmbeddedHeader.tsx b/datahub-web-react/src/app/entity/shared/embed/EmbeddedHeader.tsx
deleted file mode 100644
index 5e5daac2af5d7d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/embed/EmbeddedHeader.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import { ArrowRightOutlined } from '@ant-design/icons';
-import { Image, Typography } from 'antd';
-import Link from 'antd/lib/typography/Link';
-import React from 'react';
-import styled, { useTheme } from 'styled-components/macro';
-
-import { EventType } from '@app/analytics';
-import analytics from '@app/analytics/analytics';
-import { IconStyleType } from '@app/entity/Entity';
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { getDisplayedEntityType } from '@app/entity/shared/containers/profile/header/PlatformContent/PlatformContentContainer';
-import { useAppConfig } from '@app/useAppConfig';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { DEFAULT_APP_CONFIG } from '@src/appConfigContext';
-import { resolveRuntimePath } from '@utils/runtimeBasePath';
-
-const HeaderWrapper = styled.div`
-    display: flex;
-`;
-
-const LogoImage = styled(Image)`
-    display: inline-block;
-    height: 40px;
-    width: auto;
-`;
-
-const EntityContent = styled.div`
-    margin-left: 16px;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-`;
-
-const EntityTypeWrapper = styled.div`
-    font-size: 12px;
-    color: ${ANTD_GRAY[8]};
-`;
-
-const TypeIcon = styled.span`
-    margin-right: 5px;
-`;
-
-const EntityName = styled(Typography.Text)`
-    font-size: 16px;
-    font-weight: 700;
-    line-height: 24px;
-`;
-
-const StyledLink = styled(Link)`
-    font-size: 10px;
-    font-weight: 700;
-    line-height: 22px;
-    margin-left: 8px;
-`;
-
-const EntityNameWrapper = styled.div`
-    display: flex;
-    align-items: baseline;
-`;
-
-export default function EmbeddedHeader() {
-    const entityRegistry = useEntityRegistry();
-    const { entityData, entityType, urn } = useEntityData();
-    const appConfig = useAppConfig();
-    const themeConfig = useTheme();
-
-    function trackClickViewInDataHub() {
-        analytics.event({
-            type: EventType.EmbedProfileViewInDataHubEvent,
-            entityType,
-            entityUrn: entityData?.urn || '',
-        });
-    }
-
-    const typeIcon = entityRegistry.getIcon(entityType, 12, IconStyleType.ACCENT, ANTD_GRAY[8]);
-    const displayedEntityType = getDisplayedEntityType(entityData, entityRegistry, entityType);
-    const entityName = entityRegistry.getDisplayName(entityType, entityData);
-    const logoUrl =
-        appConfig.config !== DEFAULT_APP_CONFIG
-            ? appConfig.config.visualConfig.logoUrl || themeConfig.assets.logoUrl
-            : undefined;
-
-    return (
-        <HeaderWrapper>
-            <LogoImage src={logoUrl} preview={false} />
-            <EntityContent>
-                <EntityTypeWrapper>
-                    <TypeIcon>{typeIcon}</TypeIcon>
-                    {displayedEntityType}
-                </EntityTypeWrapper>
-                <EntityNameWrapper>
-                    <EntityName ellipsis={{ tooltip: entityName }} style={{ maxWidth: '75%' }}>
-                        {entityName}
-                    </EntityName>
-                    <StyledLink
-                        href={`${window.location.origin}/${resolveRuntimePath(entityRegistry.getEntityUrl(entityType, urn))}`}
-                        target="_blank"
-                        rel="noreferrer noopener"
-                        onClick={trackClickViewInDataHub}
-                    >
-                        view in DataHub <ArrowRightOutlined />
-                    </StyledLink>
-                </EntityNameWrapper>
-            </EntityContent>
-        </HeaderWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/embed/EmbeddedProfile.tsx b/datahub-web-react/src/app/entity/shared/embed/EmbeddedProfile.tsx
deleted file mode 100644
index 4b1f7b7d511b7f..00000000000000
--- a/datahub-web-react/src/app/entity/shared/embed/EmbeddedProfile.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import { LoadingOutlined } from '@ant-design/icons';
-import { QueryHookOptions, QueryResult } from '@apollo/client';
-import { Divider } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { EntityContext } from '@app/entity/shared/EntityContext';
-import { SidebarAboutSection } from '@app/entity/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import DataProductSection from '@app/entity/shared/containers/profile/sidebar/DataProduct/DataProductSection';
-import { SidebarDomainSection } from '@app/entity/shared/containers/profile/sidebar/Domain/SidebarDomainSection';
-import { SidebarOwnerSection } from '@app/entity/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entity/shared/containers/profile/sidebar/SidebarTagsSection';
-import useGetDataForProfile from '@app/entity/shared/containers/profile/useGetDataForProfile';
-import EmbeddedHeader from '@app/entity/shared/embed/EmbeddedHeader';
-import UpstreamHealth from '@app/entity/shared/embed/UpstreamHealth/UpstreamHealth';
-import NonExistentEntityPage from '@app/entity/shared/entity/NonExistentEntityPage';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-
-import { EntityType, Exact } from '@types';
-
-const LoadingWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 85vh;
-    font-size: 50px;
-`;
-
-const StyledDivider = styled(Divider)`
-    margin: 12px 0;
-`;
-
-interface Props<T> {
-    urn: string;
-    entityType: EntityType;
-    useEntityQuery: (
-        baseOptions: QueryHookOptions<
-            T,
-            Exact<{
-                urn: string;
-            }>
-        >,
-    ) => QueryResult<
-        T,
-        Exact<{
-            urn: string;
-        }>
-    >;
-    getOverrideProperties: (T) => GenericEntityProperties;
-}
-
-export default function EmbeddedProfile<T>({ urn, entityType, getOverrideProperties, useEntityQuery }: Props<T>) {
-    const { entityData, dataPossiblyCombinedWithSiblings, dataNotCombinedWithSiblings, loading, refetch } =
-        useGetDataForProfile({ urn, entityType, useEntityQuery, getOverrideProperties });
-
-    if (entityData?.exists === false) {
-        return <NonExistentEntityPage />;
-    }
-
-    const readOnly = false;
-
-    return (
-        <EntityContext.Provider
-            value={{
-                urn,
-                entityType,
-                entityData,
-                loading,
-                baseEntity: dataPossiblyCombinedWithSiblings,
-                dataNotCombinedWithSiblings,
-                routeToTab: () => {},
-                refetch,
-                lineage: undefined,
-            }}
-        >
-            {loading && (
-                <LoadingWrapper>
-                    <LoadingOutlined />
-                </LoadingWrapper>
-            )}
-            {!loading && entityData && (
-                <>
-                    <EmbeddedHeader />
-                    <StyledDivider />
-                    <UpstreamHealth />
-                    <StyledDivider />
-                    <SidebarAboutSection readOnly={readOnly} />
-                    <StyledDivider />
-                    <SidebarOwnerSection readOnly={readOnly} />
-                    <StyledDivider />
-                    <SidebarTagsSection readOnly={readOnly} properties={{ hasTags: true, hasTerms: true }} />
-                    <StyledDivider />
-                    <SidebarDomainSection readOnly={readOnly} />
-                    <StyledDivider />
-                    <DataProductSection readOnly={readOnly} />
-                </>
-            )}
-        </EntityContext.Provider>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingAssertions.tsx b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingAssertions.tsx
deleted file mode 100644
index 3ed9fd08cf1fc0..00000000000000
--- a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingAssertions.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import FailingEntity from '@app/entity/shared/embed/UpstreamHealth/FailingEntity';
-import { UpstreamSummary, getNumAssertionsFailing } from '@app/entity/shared/embed/UpstreamHealth/utils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-const FailingSectionWrapper = styled.div`
-    margin: 5px 0 0 34px;
-    font-size: 14px;
-    color: black;
-`;
-
-const FailingDataWrapper = styled.div`
-    margin-left: 20px;
-`;
-
-interface Props {
-    upstreamSummary: UpstreamSummary;
-}
-
-export default function FailingAssertions({ upstreamSummary }: Props) {
-    const { datasetsWithFailingAssertions } = upstreamSummary;
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <FailingSectionWrapper>
-            {datasetsWithFailingAssertions.length} data source{datasetsWithFailingAssertions.length > 1 && 's'} with
-            failing assertions
-            <FailingDataWrapper>
-                {datasetsWithFailingAssertions.map((dataset) => {
-                    const totalNumAssertions = dataset.assertions?.assertions?.length;
-                    const numAssertionsFailing = getNumAssertionsFailing(dataset);
-
-                    return (
-                        <FailingEntity
-                            link={entityRegistry.getEntityUrl(dataset.type, dataset.urn)}
-                            displayName={entityRegistry.getDisplayName(dataset.type, dataset)}
-                            contentText={`${numAssertionsFailing} of ${totalNumAssertions} failing`}
-                        />
-                    );
-                })}
-            </FailingDataWrapper>
-        </FailingSectionWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingEntity.tsx b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingEntity.tsx
deleted file mode 100644
index 34473f2d30ebb2..00000000000000
--- a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingEntity.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { red } from '@ant-design/colors';
-import Icon from '@ant-design/icons/lib/components/Icon';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import ExternalLink from '@images/link-out.svg?react';
-
-const DatasetWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    margin-top: 3px;
-`;
-
-const AssertionsSummaryWrapper = styled.span`
-    font-size: 10px;
-    font-weight: 700;
-    line-height: 13px;
-    color: ${red[7]};
-    border: 1px solid ${red[7]};
-    border-radius: 8px;
-    margin-left: 5px;
-    padding: 0 3px;
-    letter-spacing: 0.2px;
-`;
-
-const StyledLink = styled(Typography.Link)`
-    align-items: center;
-    display: flex;
-    img {
-        margin-right: 3px;
-    }
-`;
-
-const StyledIcon = styled(Icon)`
-    margin-right: 3px;
-`;
-
-interface Props {
-    link: string;
-    displayName: string;
-    contentText: string;
-}
-
-export default function FailingEntity({ link, displayName, contentText }: Props) {
-    return (
-        <DatasetWrapper>
-            <StyledLink href={link} target="_blank" rel="noopener noreferrer">
-                <StyledIcon component={ExternalLink} />
-                {displayName}
-            </StyledLink>
-            <AssertionsSummaryWrapper>{contentText}</AssertionsSummaryWrapper>
-        </DatasetWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingInputs.tsx b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingInputs.tsx
deleted file mode 100644
index fd998d79528482..00000000000000
--- a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/FailingInputs.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { orange } from '@ant-design/colors';
-import { DownOutlined, WarningFilled } from '@ant-design/icons';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import FailingAssertions from '@app/entity/shared/embed/UpstreamHealth/FailingAssertions';
-import { UpstreamSummary } from '@app/entity/shared/embed/UpstreamHealth/utils';
-
-const TextWrapper = styled.span`
-    font-size: 16px;
-    line-height: 24px;
-    margin-left: 8px;
-`;
-
-const StyledWarning = styled(WarningFilled)`
-    color: ${orange[5]};
-    font-size: 14px;
-`;
-
-const FailingDetailsWrapper = styled.span`
-    font-size: 14px;
-    color: ${ANTD_GRAY[8]};
-    margin-left: 8px;
-    &:hover {
-        cursor: pointer;
-        color: $ ${(props) => props.theme.styles['primary-color']};
-    }
-`;
-
-const StyledArrow = styled(DownOutlined)<{ isOpen: boolean }>`
-    font-size: 12px;
-    margin-left: 3px;
-    ${(props) =>
-        props.isOpen &&
-        `
-        transform: rotate(180deg);
-        padding-top: 1px;
-    `}
-`;
-
-interface Props {
-    upstreamSummary: UpstreamSummary;
-}
-
-export default function FailingInputs({ upstreamSummary }: Props) {
-    const [areFailingDetailsVisible, setAreFailingDetailsVisible] = useState(false);
-
-    return (
-        <div>
-            <StyledWarning />
-            <TextWrapper>Some data inputs are not healthy</TextWrapper>
-            <FailingDetailsWrapper onClick={() => setAreFailingDetailsVisible(!areFailingDetailsVisible)}>
-                view details <StyledArrow isOpen={areFailingDetailsVisible} />
-            </FailingDetailsWrapper>
-            {areFailingDetailsVisible && <FailingAssertions upstreamSummary={upstreamSummary} />}
-        </div>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/UpstreamHealth.tsx b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/UpstreamHealth.tsx
deleted file mode 100644
index 90387b4c90b280..00000000000000
--- a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/UpstreamHealth.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { green } from '@ant-design/colors';
-import { CheckCircleFilled, LoadingOutlined } from '@ant-design/icons';
-import Icon from '@ant-design/icons/lib/components/Icon';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import FailingInputs from '@app/entity/shared/embed/UpstreamHealth/FailingInputs';
-import { extractUpstreamSummary } from '@app/entity/shared/embed/UpstreamHealth/utils';
-
-import { useSearchAcrossLineageQuery } from '@graphql/search.generated';
-import { Entity, EntityType, FilterOperator, LineageDirection } from '@types';
-
-import SubtractIcon from '@images/subtractIcon.svg?react';
-
-const LoadingWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 16px;
-`;
-
-const TextWrapper = styled.span`
-    font-size: 16px;
-    line-height: 24px;
-    margin-left: 8px;
-`;
-
-const UnknownText = styled.span`
-    font-size: 14px;
-    line-height: 20px;
-    margin-left: 8px;
-`;
-
-const StyledIcon = styled(Icon)`
-    color: ${ANTD_GRAY[7]};
-`;
-
-const StyledCheck = styled(CheckCircleFilled)`
-    color: ${green[6]};
-    font-size: 14px;
-`;
-
-export default function UpstreamHealth() {
-    const { entityData } = useEntityData();
-    const { data, loading } = useSearchAcrossLineageQuery({
-        variables: {
-            input: {
-                urn: entityData?.urn || '',
-                query: '*',
-                types: [EntityType.Dataset],
-                start: 0,
-                count: 1000,
-                direction: LineageDirection.Upstream,
-                orFilters: [{ and: [{ field: 'degree', condition: FilterOperator.Equal, values: ['1', '2', '3+'] }] }],
-            },
-            includeAssertions: true,
-        },
-    });
-
-    const upstreams: Entity[] | undefined = data?.searchAcrossLineage?.searchResults?.map((result) => result.entity);
-    const upstreamSummary = extractUpstreamSummary(upstreams || []);
-    const { passingUpstreams, failingUpstreams } = upstreamSummary;
-
-    if (loading) {
-        return (
-            <LoadingWrapper>
-                <LoadingOutlined />
-            </LoadingWrapper>
-        );
-    }
-
-    if (!data) return null;
-
-    if (failingUpstreams > 0) {
-        return <FailingInputs upstreamSummary={upstreamSummary} />;
-    }
-
-    if (passingUpstreams > 0) {
-        return (
-            <div>
-                <StyledCheck />
-                <TextWrapper>All data inputs are healthy</TextWrapper>
-            </div>
-        );
-    }
-
-    return (
-        <div>
-            <StyledIcon component={SubtractIcon} />
-            <UnknownText>Unknown data input health</UnknownText>
-        </div>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/__tests__/utils.test.tsx b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/__tests__/utils.test.tsx
deleted file mode 100644
index 887a2f9ec1402d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/__tests__/utils.test.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import * as utils from '@app/entity/shared/embed/UpstreamHealth/utils';
-import { dataset1, dataset2, dataset3 } from '@src/Mocks';
-
-import { Dataset } from '@types';
-
-// has 1 passing and 1 failing assertion
-const dataset1WithAssertions = {
-    ...dataset1,
-    assertions: {
-        count: 2,
-        total: 2,
-        start: 0,
-        assertions: [
-            {
-                runEvents: {
-                    total: 1,
-                    failed: 1,
-                    succeeded: 0,
-                },
-            },
-            {
-                runEvents: {
-                    total: 1,
-                    failed: 0,
-                    succeeded: 1,
-                },
-            },
-        ],
-    },
-};
-
-// 2 passing assertions
-const dataset2WithAssertions = {
-    ...dataset2,
-    assertions: {
-        count: 2,
-        total: 2,
-        start: 0,
-        assertions: [
-            {
-                runEvents: {
-                    total: 1,
-                    failed: 0,
-                    succeeded: 1,
-                },
-            },
-            {
-                runEvents: {
-                    total: 1,
-                    failed: 0,
-                    succeeded: 1,
-                },
-            },
-        ],
-    },
-};
-
-describe('utils', () => {
-    it('should extract an upstream summary with assertions properly', () => {
-        const upstreamSummary = utils.extractUpstreamSummary([
-            dataset1WithAssertions,
-            dataset2WithAssertions,
-            dataset3,
-        ]);
-
-        expect(upstreamSummary.passingUpstreams).toBe(1);
-        expect(upstreamSummary.failingUpstreams).toBe(1);
-        expect(upstreamSummary.datasetsWithFailingAssertions).toMatchObject([dataset1WithAssertions]);
-    });
-
-    it('should get the number of assertions failing with some passing and some failing', () => {
-        const numAssertionsFailing = utils.getNumAssertionsFailing(dataset1WithAssertions as any as Dataset);
-
-        expect(numAssertionsFailing).toBe(1);
-    });
-
-    it('should get the number of assertions failing with all passing', () => {
-        const numAssertionsFailing = utils.getNumAssertionsFailing(dataset2WithAssertions as any as Dataset);
-
-        expect(numAssertionsFailing).toBe(0);
-    });
-
-    it('should get the number of assertions failing with no assertions', () => {
-        const numAssertionsFailing = utils.getNumAssertionsFailing(dataset3 as any as Dataset);
-
-        expect(numAssertionsFailing).toBe(0);
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/utils.ts b/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/utils.ts
deleted file mode 100644
index a3b22bedd4bc9c..00000000000000
--- a/datahub-web-react/src/app/entity/shared/embed/UpstreamHealth/utils.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Dataset, Entity, EntityType } from '@types';
-
-function getAssertionsSummary(dataset: Dataset) {
-    let numAssertionsFailing = 0;
-    let numAssertionsPassing = 0;
-
-    dataset.assertions?.assertions?.forEach((assertion) => {
-        const totalRunEvents = assertion.runEvents?.total;
-        if (totalRunEvents) {
-            const failingForDataset = assertion.runEvents?.failed;
-            if (failingForDataset) {
-                numAssertionsFailing += 1;
-            } else {
-                numAssertionsPassing += 1;
-            }
-        }
-    });
-
-    return { numAssertionsPassing, numAssertionsFailing };
-}
-
-export interface UpstreamSummary {
-    passingUpstreams: number;
-    failingUpstreams: number;
-    datasetsWithFailingAssertions: Dataset[];
-}
-
-export function extractUpstreamSummary(upstreams: Entity[]) {
-    let passingUpstreams = 0;
-    let failingUpstreams = 0;
-    const datasetsWithFailingAssertions = new Set<Dataset>();
-
-    upstreams.forEach((entity) => {
-        if (entity.type === EntityType.Dataset) {
-            const { numAssertionsPassing, numAssertionsFailing } = getAssertionsSummary(entity as Dataset);
-
-            if (numAssertionsFailing) {
-                failingUpstreams += 1;
-                datasetsWithFailingAssertions.add(entity as Dataset);
-            } else if (numAssertionsPassing) {
-                passingUpstreams += 1;
-            }
-        }
-    });
-
-    return {
-        failingUpstreams,
-        passingUpstreams,
-        datasetsWithFailingAssertions: Array.from(datasetsWithFailingAssertions),
-    };
-}
-
-export function getNumAssertionsFailing(dataset: Dataset) {
-    let numFailing = 0;
-
-    dataset.assertions?.assertions?.forEach((assertion) => {
-        if (assertion.runEvents?.failed) {
-            numFailing += 1;
-        }
-    });
-
-    return numFailing;
-}
diff --git a/datahub-web-react/src/app/entity/shared/entity/EntityActions.tsx b/datahub-web-react/src/app/entity/shared/entity/EntityActions.tsx
deleted file mode 100644
index 7a57663bd28ad0..00000000000000
--- a/datahub-web-react/src/app/entity/shared/entity/EntityActions.tsx
+++ /dev/null
@@ -1,216 +0,0 @@
-import { LinkOutlined } from '@ant-design/icons';
-import { Button, message } from 'antd';
-import React, { useState } from 'react';
-
-import { EntityCapabilityType } from '@app/entity/Entity';
-import { useEntityContext } from '@app/entity/shared/EntityContext';
-import { SearchSelectModal } from '@app/entity/shared/components/styled/search/SearchSelectModal';
-import { handleBatchError } from '@app/entity/shared/utils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useBatchSetDataProductMutation } from '@graphql/dataProduct.generated';
-import { useBatchAddTermsMutation, useBatchSetDomainMutation } from '@graphql/mutations.generated';
-
-export enum EntityActionItem {
-    /**
-     * Batch add a Glossary Term to a set of assets
-     */
-    BATCH_ADD_GLOSSARY_TERM,
-    /**
-     * Batch add a Domain to a set of assets
-     */
-    BATCH_ADD_DOMAIN,
-    /**
-     * Batch add a Data Product to a set of assets
-     */
-    BATCH_ADD_DATA_PRODUCT,
-    /**
-     * Batch add an Application to a set of assets
-     */
-    BATCH_ADD_APPLICATION,
-}
-
-interface Props {
-    urn: string;
-    actionItems: Set<EntityActionItem>;
-    refetchForEntity?: () => void;
-}
-
-function EntityActions(props: Props) {
-    // eslint ignore react/no-unused-prop-types
-    const entityRegistry = useEntityRegistry();
-    const { urn, actionItems, refetchForEntity } = props;
-    const { setShouldRefetchEmbeddedListSearch } = useEntityContext();
-    const [isBatchAddGlossaryTermModalVisible, setIsBatchAddGlossaryTermModalVisible] = useState(false);
-    const [isBatchSetDomainModalVisible, setIsBatchSetDomainModalVisible] = useState(false);
-    const [isBatchSetDataProductModalVisible, setIsBatchSetDataProductModalVisible] = useState(false);
-    const [batchAddTermsMutation] = useBatchAddTermsMutation();
-    const [batchSetDomainMutation] = useBatchSetDomainMutation();
-    const [batchSetDataProductMutation] = useBatchSetDataProductMutation();
-
-    // eslint-disable-next-line
-    const batchAddGlossaryTerms = (entityUrns: Array<string>) => {
-        batchAddTermsMutation({
-            variables: {
-                input: {
-                    termUrns: [urn],
-                    resources: entityUrns.map((entityUrn) => ({
-                        resourceUrn: entityUrn,
-                    })),
-                },
-            },
-        })
-            .then(({ errors }) => {
-                if (!errors) {
-                    setIsBatchAddGlossaryTermModalVisible(false);
-                    message.loading({ content: 'Updating...', duration: 3 });
-                    setTimeout(() => {
-                        message.success({
-                            content: `Added Glossary Term to entities!`,
-                            duration: 2,
-                        });
-                        refetchForEntity?.();
-                        setShouldRefetchEmbeddedListSearch?.(true);
-                    }, 3000);
-                }
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error(
-                    handleBatchError(entityUrns, e, {
-                        content: `Failed to add glossary term: \n ${e.message || ''}`,
-                        duration: 3,
-                    }),
-                );
-            });
-    };
-
-    // eslint-disable-next-line
-    const batchSetDomain = (entityUrns: Array<string>) => {
-        batchSetDomainMutation({
-            variables: {
-                input: {
-                    domainUrn: urn,
-                    resources: entityUrns.map((entityUrn) => ({
-                        resourceUrn: entityUrn,
-                    })),
-                },
-            },
-        })
-            .then(({ errors }) => {
-                if (!errors) {
-                    setIsBatchSetDomainModalVisible(false);
-                    message.loading({ content: 'Updating...', duration: 3 });
-                    setTimeout(() => {
-                        message.success({
-                            content: `Added assets to Domain!`,
-                            duration: 3,
-                        });
-                        refetchForEntity?.();
-                        setShouldRefetchEmbeddedListSearch?.(true);
-                    }, 3000);
-                }
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error(
-                    handleBatchError(entityUrns, e, {
-                        content: `Failed to add assets to Domain: \n ${e.message || ''}`,
-                        duration: 3,
-                    }),
-                );
-            });
-    };
-
-    // eslint-disable-next-line
-    const batchSetDataProduct = (entityUrns: Array<string>) => {
-        batchSetDataProductMutation({
-            variables: {
-                input: {
-                    dataProductUrn: urn,
-                    resourceUrns: entityUrns,
-                },
-            },
-        })
-            .then(({ errors }) => {
-                if (!errors) {
-                    setIsBatchSetDataProductModalVisible(false);
-                    message.loading({ content: 'Updating...', duration: 3 });
-                    setTimeout(() => {
-                        message.success({
-                            content: `Added assets to Data Product!`,
-                            duration: 3,
-                        });
-                        refetchForEntity?.();
-                        setShouldRefetchEmbeddedListSearch?.(true);
-                    }, 3000);
-                }
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error(
-                    handleBatchError(entityUrns, e, {
-                        content: `Failed to add assets to Data Product. An unknown error occurred.`,
-                        duration: 3,
-                    }),
-                );
-            });
-    };
-
-    return (
-        <>
-            <div style={{ marginRight: 12 }}>
-                {actionItems.has(EntityActionItem.BATCH_ADD_GLOSSARY_TERM) && (
-                    <Button onClick={() => setIsBatchAddGlossaryTermModalVisible(true)}>
-                        <LinkOutlined /> Add to assets
-                    </Button>
-                )}
-                {actionItems.has(EntityActionItem.BATCH_ADD_DOMAIN) && (
-                    <Button onClick={() => setIsBatchSetDomainModalVisible(true)}>
-                        <LinkOutlined /> Add assets
-                    </Button>
-                )}
-                {actionItems.has(EntityActionItem.BATCH_ADD_DATA_PRODUCT) && (
-                    <Button onClick={() => setIsBatchSetDataProductModalVisible(true)}>
-                        <LinkOutlined /> Add assets
-                    </Button>
-                )}
-            </div>
-            {isBatchAddGlossaryTermModalVisible && (
-                <SearchSelectModal
-                    titleText="Add Glossary Term to assets"
-                    continueText="Add"
-                    onContinue={batchAddGlossaryTerms}
-                    onCancel={() => setIsBatchAddGlossaryTermModalVisible(false)}
-                    fixedEntityTypes={Array.from(
-                        entityRegistry.getTypesWithSupportedCapabilities(EntityCapabilityType.GLOSSARY_TERMS),
-                    )}
-                />
-            )}
-            {isBatchSetDomainModalVisible && (
-                <SearchSelectModal
-                    titleText="Add assets to Domain"
-                    continueText="Add"
-                    onContinue={batchSetDomain}
-                    onCancel={() => setIsBatchSetDomainModalVisible(false)}
-                    fixedEntityTypes={Array.from(
-                        entityRegistry.getTypesWithSupportedCapabilities(EntityCapabilityType.DOMAINS),
-                    )}
-                />
-            )}
-            {isBatchSetDataProductModalVisible && (
-                <SearchSelectModal
-                    titleText="Add assets to Data Product"
-                    continueText="Add"
-                    onContinue={batchSetDataProduct}
-                    onCancel={() => setIsBatchSetDataProductModalVisible(false)}
-                    fixedEntityTypes={Array.from(
-                        entityRegistry.getTypesWithSupportedCapabilities(EntityCapabilityType.DATA_PRODUCTS),
-                    )}
-                />
-            )}
-        </>
-    );
-}
-
-export default EntityActions;
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/EntityForm.tsx b/datahub-web-react/src/app/entity/shared/entityForm/EntityForm.tsx
deleted file mode 100644
index b2ee5a81a6d934..00000000000000
--- a/datahub-web-react/src/app/entity/shared/entityForm/EntityForm.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-
-import { FormView, useEntityFormContext } from '@app/entity/shared/entityForm/EntityFormContext';
-import FormByEntity from '@app/entity/shared/entityForm/FormByEntity';
-
-interface Props {
-    formUrn: string;
-}
-
-export default function EntityForm({ formUrn }: Props) {
-    const { formView } = useEntityFormContext();
-
-    if (formView === FormView.BY_ENTITY) return <FormByEntity formUrn={formUrn} />;
-
-    return null;
-}
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContext.tsx b/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContext.tsx
index d8d43fe0ec76eb..6c0b39ac75dd49 100644
--- a/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContext.tsx
+++ b/datahub-web-react/src/app/entity/shared/entityForm/EntityFormContext.tsx
@@ -8,7 +8,7 @@ export enum FormView {
     BY_ENTITY,
 }
 
-export type EntityFormContextType = {
+type EntityFormContextType = {
     formUrn: string;
     isInFormContext: boolean;
     entityData: GenericEntityProperties | undefined;
@@ -27,7 +27,7 @@ export type EntityFormContextType = {
     isVerificationType: boolean;
 };
 
-export const DEFAULT_CONTEXT = {
+const DEFAULT_CONTEXT = {
     formUrn: '',
     isInFormContext: false,
     entityData: undefined,
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/EntityFormModal.tsx b/datahub-web-react/src/app/entity/shared/entityForm/EntityFormModal.tsx
deleted file mode 100644
index 0f7797ccb431c1..00000000000000
--- a/datahub-web-react/src/app/entity/shared/entityForm/EntityFormModal.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import { CloseOutlined } from '@ant-design/icons';
-import { Modal } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import EntityForm from '@app/entity/shared/entityForm/EntityForm';
-import EntityFormContextProvider from '@app/entity/shared/entityForm/EntityFormContextProvider';
-import FormPageHeader from '@app/entity/shared/entityForm/FormHeader/FormPageHeader';
-
-const StyledModal = styled(Modal)`
-    &&& .ant-modal-content {
-        display: flex;
-        flex-direction: column;
-        height: calc(100vh);
-    }
-
-    .ant-modal-header {
-        padding: 0;
-    }
-
-    .ant-modal-body {
-        flex: 1;
-        max-height: 100%;
-        overflow: hidden;
-        padding: 0;
-        display: flex;
-    }
-`;
-
-const StyledClose = styled(CloseOutlined)`
-    && {
-        color: white;
-        font-size: 24px;
-        margin: 18px 12px 0 0;
-    }
-`;
-
-interface Props {
-    selectedFormUrn: string | null;
-    isFormVisible: boolean;
-    hideFormModal: () => void;
-}
-
-export default function EntityFormModal({ selectedFormUrn, isFormVisible, hideFormModal }: Props) {
-    return (
-        <EntityFormContextProvider formUrn={selectedFormUrn || ''}>
-            <StyledModal
-                open={isFormVisible}
-                onCancel={hideFormModal}
-                footer={null}
-                title={<FormPageHeader />}
-                closeIcon={<StyledClose />}
-                style={{ top: 0, height: '100vh', minWidth: '100vw' }}
-                destroyOnClose
-            >
-                <EntityForm formUrn={selectedFormUrn || ''} />
-            </StyledModal>
-        </EntityFormContextProvider>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx b/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
index 3cdbdf298eef6b..24fd4ce825c862 100644
--- a/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
+++ b/datahub-web-react/src/app/entity/shared/entityForm/FormByEntity.tsx
@@ -9,7 +9,6 @@ import { useEntityFormContext } from '@app/entity/shared/entityForm/EntityFormCo
 import Form from '@app/entity/shared/entityForm/Form';
 import ProgressBar from '@app/entity/shared/entityForm/ProgressBar';
 import { useEntityRegistry } from '@app/useEntityRegistry';
-import { useIsThemeV2 } from '@app/useIsThemeV2';
 
 const ContentWrapper = styled.div`
     background-color: ${ANTD_GRAY_V2[1]};
@@ -36,15 +35,9 @@ export default function FormByEntity({ formUrn }: Props) {
     const { entityType } = useEntityContext();
     const entityRegistry = useEntityRegistry();
     const sidebarSections = entityRegistry.getSidebarSections(selectedEntity?.type || entityType);
-    const isV2 = useIsThemeV2();
 
-    // Used for v2 - removes repeated entity header (we use EntityInfo in this component)
-    // SidebarEntityHeader is always the first index in sidebarSections, so remove it here
-    // TODO (OBS-677): remove this logic once we get form info into V2 sidebar
     const cleanedSidebarSections = sidebarSections.slice(1);
-
-    // Conditional sections based on theme version
-    const sections = isV2 ? cleanedSidebarSections : sidebarSections;
+    const sections = cleanedSidebarSections;
 
     return (
         <EntityContext.Provider
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/FormHeader/components.ts b/datahub-web-react/src/app/entity/shared/entityForm/FormHeader/components.ts
deleted file mode 100644
index 9d2b386ab9afef..00000000000000
--- a/datahub-web-react/src/app/entity/shared/entityForm/FormHeader/components.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { ArrowLeftOutlined, ArrowRightOutlined } from '@ant-design/icons';
-import styled from 'styled-components';
-
-import { ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-
-import BackgroundDots from '@images/background_dots.svg';
-
-export const BulkNavigationWrapper = styled.div<{ $hideBackground?: boolean }>`
-    padding: 16px 68px 16px 24px;
-    background-color: ${ANTD_GRAY_V2[10]};
-    display: flex;
-    justify-content: flex-end;
-    ${(props) =>
-        !props.$hideBackground &&
-        `
-        background-image: url(${BackgroundDots});
-        background-position: right;
-        background-repeat: no-repeat;
-    `}
-`;
-
-export const NavigationWrapper = styled.div<{ isHidden: boolean }>`
-    font-size: 20px;
-    color: white;
-    display: flex;
-    flex-wrap: nowrap;
-    ${(props) => props.isHidden && 'opacity: 0;'}
-`;
-
-export const ArrowLeft = styled(ArrowLeftOutlined)`
-    margin-right: 24px;
-    cursor: pointer;
-`;
-
-export const ArrowRight = styled(ArrowRightOutlined)`
-    margin-left: 24px;
-    cursor: pointer;
-`;
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx b/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx
deleted file mode 100644
index d5551fb37ab3cf..00000000000000
--- a/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { render, waitFor } from '@testing-library/react';
-import React from 'react';
-
-import { EntityContext } from '@app/entity/shared/EntityContext';
-import Form from '@app/entity/shared/entityForm/Form';
-import { mockEntityData, mockEntityDataWithFieldPrompts } from '@app/entity/shared/entityForm/mocks';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-import { EntityType } from '@types';
-
-beforeEach(() => {
-    // IntersectionObserver isn't available in test environment
-    const mockIntersectionObserver = vi.fn();
-    mockIntersectionObserver.mockReturnValue({
-        observe: () => null,
-        unobserve: () => null,
-        disconnect: () => null,
-    });
-    window.IntersectionObserver = mockIntersectionObserver;
-});
-
-describe('Form', () => {
-    it('should show field-level header if there are schema field prompts', async () => {
-        const { getByTestId, findByTestId } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <EntityContext.Provider
-                        value={{
-                            urn: '',
-                            entityType: EntityType.Dataset,
-                            entityData: mockEntityDataWithFieldPrompts,
-                            baseEntity: {},
-                            routeToTab: vi.fn(),
-                            refetch: vi.fn(),
-                            loading: true,
-                            lineage: undefined,
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <Form formUrn="urn:li:form:1" />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        // DeferredRenderComponent defers rendering for a short period, wait for that
-        await waitFor(() => findByTestId('field-level-requirements'));
-        expect(getByTestId('field-level-requirements')).toBeInTheDocument();
-    });
-
-    it('should not show field-level header if there are no schema field prompts', () => {
-        const { queryByTestId } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer>
-                    <EntityContext.Provider
-                        value={{
-                            urn: '',
-                            entityType: EntityType.Dataset,
-                            entityData: mockEntityData,
-                            baseEntity: {},
-                            routeToTab: vi.fn(),
-                            refetch: vi.fn(),
-                            loading: true,
-                            lineage: undefined,
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <Form formUrn="urn:li:form:3" />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(queryByTestId('field-level-requirements')).not.toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/__tests__/useShouldShowVerificationPrompt.test.ts b/datahub-web-react/src/app/entity/shared/entityForm/__tests__/useShouldShowVerificationPrompt.test.ts
deleted file mode 100644
index 7b6d8880c8c395..00000000000000
--- a/datahub-web-react/src/app/entity/shared/entityForm/__tests__/useShouldShowVerificationPrompt.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { shouldShowVerificationPrompt } from '@app/entity/shared/entityForm/useShouldShowVerificationPrompt';
-
-import { FormType, FormVerificationAssociation } from '@types';
-
-describe('shouldShowVerificationPrompt', () => {
-    const formVerification = {
-        form: { urn: 'urn:li:form:1' },
-        lastModified: { time: 100 },
-    } as FormVerificationAssociation;
-
-    it('should return true if the form is verification, there are no prompts remaining, and no verification', () => {
-        const shouldShow = shouldShowVerificationPrompt({
-            formType: FormType.Verification,
-            numRequiredPromptsRemaining: 0,
-        });
-
-        expect(shouldShow).toBe(true);
-    });
-
-    it('should return false if the form was verified', () => {
-        const shouldShow = shouldShowVerificationPrompt({
-            formType: FormType.Verification,
-            numRequiredPromptsRemaining: 0,
-            formVerification,
-        });
-
-        expect(shouldShow).toBe(false);
-    });
-
-    it('should return false if the form is not of type verification', () => {
-        const shouldShow = shouldShowVerificationPrompt({
-            formType: FormType.Completion,
-            numRequiredPromptsRemaining: 0,
-            formVerification,
-        });
-
-        expect(shouldShow).toBe(false);
-    });
-
-    it('should return false if the form has prompts remaining', () => {
-        const shouldShow = shouldShowVerificationPrompt({
-            formType: FormType.Verification,
-            numRequiredPromptsRemaining: 1,
-            formVerification,
-        });
-
-        expect(shouldShow).toBe(false);
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/mocks.ts b/datahub-web-react/src/app/entity/shared/entityForm/mocks.ts
deleted file mode 100644
index 546f7175231271..00000000000000
--- a/datahub-web-react/src/app/entity/shared/entityForm/mocks.ts
+++ /dev/null
@@ -1,222 +0,0 @@
-import { GenericEntityProperties } from '@app/entity/shared/types';
-
-import { EntityType, FormPromptType, FormType } from '@types';
-
-const form1 = {
-    urn: 'urn:li:form:1',
-    type: EntityType.Form,
-    info: {
-        name: '',
-        type: FormType.Verification,
-        prompts: [
-            {
-                id: '1',
-                type: FormPromptType.FieldsStructuredProperty,
-                title: '',
-                formUrn: 'urn:li:form:1',
-                required: false,
-            },
-            {
-                id: '2',
-                type: FormPromptType.FieldsStructuredProperty,
-                title: '',
-                formUrn: 'urn:li:form:1',
-                required: false,
-            },
-        ],
-        actors: {
-            owners: true,
-            users: null,
-            groups: null,
-            isAssignedToMe: false,
-        },
-    },
-};
-
-const form2 = {
-    urn: 'urn:li:form:2',
-    type: EntityType.Form,
-    info: {
-        name: '',
-        prompts: [
-            {
-                id: '3',
-                type: FormPromptType.StructuredProperty,
-                title: '',
-                formUrn: 'urn:li:form:2',
-                required: true,
-            },
-            {
-                id: '4',
-                type: FormPromptType.FieldsStructuredProperty,
-                title: '',
-                formUrn: 'urn:li:form:2',
-                required: false,
-            },
-            {
-                id: '5',
-                type: FormPromptType.StructuredProperty,
-                title: '',
-                formUrn: 'urn:li:form:2',
-                required: false,
-            },
-        ],
-        type: FormType.Verification,
-        actors: {
-            owners: false,
-            users: null,
-            groups: null,
-            isAssignedToMe: true,
-        },
-    },
-};
-
-export const mockEntityData = {
-    schemaMetadata: { fields: [{ fieldPath: 'test' }] },
-    forms: {
-        verifications: [
-            {
-                form: form2,
-                lastModified: {
-                    actor: {
-                        urn: 'urn:li:corpuser:test',
-                    },
-                    time: 100,
-                },
-            },
-            {
-                form: form2,
-                lastModified: {
-                    actor: {
-                        urn: 'urn:li:corpuser:test',
-                    },
-                    time: 101,
-                },
-            },
-        ],
-        incompleteForms: [
-            {
-                completedPrompts: [
-                    {
-                        id: '1',
-                        lastModified: { time: 123 },
-                        fieldAssociations: {
-                            completedFieldPrompts: [
-                                { fieldPath: 'test3', lastModified: { time: 123 } },
-                                { fieldPath: 'test4', lastModified: { time: 123 } },
-                            ],
-                        },
-                    },
-                ],
-                incompletePrompts: [
-                    {
-                        id: '2',
-                        lastModified: { time: 1234 },
-                        fieldAssociations: {
-                            completedFieldPrompts: [
-                                { fieldPath: 'test1', lastModified: { time: 123 } },
-                                { fieldPath: 'test2', lastModified: { time: 123 } },
-                                { fieldPath: 'test3', lastModified: { time: 123 } },
-                            ],
-                        },
-                    },
-                ],
-                associatedUrn: '',
-                form: form1,
-            },
-        ],
-        completedForms: [
-            {
-                completedPrompts: [{ id: '3', lastModified: { time: 1234 } }],
-                incompletePrompts: [
-                    { id: '4', lastModified: { time: 123 } },
-                    { id: '5', lastModified: { time: 123 } },
-                ],
-                associatedUrn: '',
-                form: form2,
-            },
-            {
-                completedPrompts: [{ id: '6', lastModified: { time: 1234 } }],
-                associatedUrn: '',
-                form: {
-                    urn: 'urn:li:form:3',
-                    type: EntityType.Form,
-                    info: {
-                        name: '',
-                        prompts: [
-                            {
-                                id: '6',
-                                type: FormPromptType.StructuredProperty,
-                                title: '',
-                                formUrn: 'urn:li:form:3',
-                                required: true,
-                            },
-                        ],
-                        type: FormType.Completion,
-                        actors: {
-                            owners: true,
-                            users: null,
-                            groups: null,
-                            isAssignedToMe: false,
-                        },
-                    },
-                },
-            },
-        ],
-    },
-} as GenericEntityProperties;
-
-export const mockEntityDataAllVerified = {
-    ...mockEntityData,
-    forms: {
-        ...mockEntityData.forms,
-        verifications: [
-            {
-                form: form2,
-                lastModified: {
-                    actor: {
-                        urn: 'urn:li:corpuser:test',
-                    },
-                    time: 100,
-                },
-            },
-            {
-                form: form1,
-                lastModified: {
-                    actor: {
-                        urn: 'urn:li:corpuser:test',
-                    },
-                    time: 101,
-                },
-            },
-        ],
-    },
-} as GenericEntityProperties;
-
-export const mockEntityDataWithFieldPrompts = {
-    ...mockEntityData,
-    forms: {
-        ...mockEntityData.forms,
-        incompleteForms: [
-            {
-                ...(mockEntityData as any).forms.incompleteForms[0],
-                form: {
-                    urn: 'urn:li:form:1',
-                    type: EntityType.Form,
-                    info: {
-                        name: '',
-                        prompts: [
-                            {
-                                id: '1',
-                                type: FormPromptType.FieldsStructuredProperty,
-                                title: '',
-                                formUrn: 'urn:li:form:1',
-                                required: false,
-                            },
-                        ],
-                    },
-                },
-            },
-        ],
-    },
-} as GenericEntityProperties;
diff --git a/datahub-web-react/src/app/entity/shared/entityForm/useShouldShowVerificationPrompt.ts b/datahub-web-react/src/app/entity/shared/entityForm/useShouldShowVerificationPrompt.ts
index 47af14dcfeb1a7..05625943e37a16 100644
--- a/datahub-web-react/src/app/entity/shared/entityForm/useShouldShowVerificationPrompt.ts
+++ b/datahub-web-react/src/app/entity/shared/entityForm/useShouldShowVerificationPrompt.ts
@@ -10,7 +10,7 @@ interface ShowVerificationPromptProps {
     formVerification?: FormVerificationAssociation;
 }
 
-export function shouldShowVerificationPrompt({
+function shouldShowVerificationPrompt({
     formType,
     numRequiredPromptsRemaining,
     formVerification,
diff --git a/datahub-web-react/src/app/entity/shared/siblingUtils.ts b/datahub-web-react/src/app/entity/shared/siblingUtils.ts
index bb385b6fb3a897..6a3a66f5d0b0c0 100644
--- a/datahub-web-react/src/app/entity/shared/siblingUtils.ts
+++ b/datahub-web-react/src/app/entity/shared/siblingUtils.ts
@@ -29,7 +29,7 @@ export function stripSiblingsFromEntity(entity: any) {
     };
 }
 
-export function cleanHelper(obj, visited) {
+function cleanHelper(obj, visited) {
     if (visited.has(obj)) return obj;
     visited.add(obj);
 
@@ -125,7 +125,7 @@ const mergeStructuredProperties = (destinationArray, sourceArray, _options) => {
     return unionBy(sourceArray, destinationArray, 'structuredProperty.urn');
 };
 
-export const mergeOwners = (destinationArray, sourceArray, _options) => {
+const mergeOwners = (destinationArray, sourceArray, _options) => {
     return uniqWith([...destinationArray, ...sourceArray], (ownerA, ownerB) => {
         if (!ownerA.ownershipType?.urn && !ownerB.ownershipType?.urn) {
             return ownerA.owner?.urn === ownerB.owner?.urn && ownerA.type === ownerB.type;
@@ -369,17 +369,6 @@ function customMerge(isPrimary, key) {
     };
 }
 
-export const getEntitySiblingData = <T>(baseEntity: T): Maybe<SiblingProperties> => {
-    if (!baseEntity) {
-        return null;
-    }
-    const baseEntityKey = Object.keys(baseEntity)[0];
-    const extractedBaseEntity = baseEntity[baseEntityKey];
-
-    // eslint-disable-next-line @typescript-eslint/dot-notation
-    return extractedBaseEntity?.['siblings'];
-};
-
 // should the entity's metadata win out against its siblings?
 export const shouldEntityBeTreatedAsPrimary = (extractedBaseEntity: {
     siblings?: SiblingProperties | null;
@@ -436,16 +425,6 @@ const combineEntityWithSiblings = (entity: GenericEntityProperties) => {
     return combinedBaseEntity;
 };
 
-export function combineEntityData<T>(entityValue: T, siblingValue: T, isPrimary: boolean) {
-    if (!entityValue) return siblingValue;
-    if (!siblingValue) return entityValue;
-
-    return merge(clean(isPrimary ? siblingValue : entityValue), clean(isPrimary ? entityValue : siblingValue), {
-        arrayMerge: combineMerge,
-        customMerge: customMerge.bind({}, isPrimary),
-    });
-}
-
 export const combineEntityDataWithSiblings = <T>(baseEntity: T): T => {
     if (!baseEntity) {
         return baseEntity;
@@ -476,7 +455,7 @@ type CombinedEntityResult =
           combinedEntity: CombinedEntity;
       };
 
-export function combineSiblingsForEntity(entity: Entity, visitedSiblingUrns: Set<string>): CombinedEntityResult {
+function combineSiblingsForEntity(entity: Entity, visitedSiblingUrns: Set<string>): CombinedEntityResult {
     if (visitedSiblingUrns.has(entity.urn)) return { skipped: true };
 
     const combinedEntity: CombinedEntity = { entity: combineEntityWithSiblings({ ...entity }) };
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessButtonHelpers.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessButtonHelpers.tsx
index 196f2f1a3da0ba..9d327aa17e8f0c 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessButtonHelpers.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessButtonHelpers.tsx
@@ -7,13 +7,13 @@ import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entity/shared/constants';
 /**
  * Tooltip message for when user already has access
  */
-export const ACCESS_GRANTED_TOOLTIP = 'You already have access to this role';
+const ACCESS_GRANTED_TOOLTIP = 'You already have access to this role';
 
 /**
  * Styled button component for access management actions.
  * Supports both enabled (request) and disabled (granted) states.
  */
-export const AccessButton = styled(Button)`
+const AccessButton = styled(Button)`
     background-color: ${REDESIGN_COLORS.BLUE};
     color: ${ANTD_GRAY[1]};
     width: 80px;
@@ -56,7 +56,7 @@ export interface RoleAccessData {
  * Handles the click event for access request buttons.
  * Only opens the URL if the user doesn't already have access.
  */
-export const handleAccessButtonClick = (hasAccess: boolean, url?: string) => (e: React.MouseEvent) => {
+const handleAccessButtonClick = (hasAccess: boolean, url?: string) => (e: React.MouseEvent) => {
     if (!hasAccess && url) {
         e.preventDefault();
         window.open(url);
@@ -94,13 +94,3 @@ export const renderAccessButton = (roleData: RoleAccessData): React.ReactElement
         button
     );
 };
-
-/**
- * Determines the button text based on access status
- */
-export const getAccessButtonText = (hasAccess: boolean): string => (hasAccess ? 'Granted' : 'Request');
-
-/**
- * Determines if the button should be disabled
- */
-export const isAccessButtonDisabled = (hasAccess: boolean): boolean => hasAccess;
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx
index 06b55b67c6ee79..527a97ce5ef41c 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx
@@ -2,7 +2,7 @@ import { Typography } from 'antd';
 import React, { useState } from 'react';
 import styled from 'styled-components';
 
-export type Props = {
+type Props = {
     description: any;
 };
 
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/__tests__/AccessButtonHelpers.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/__tests__/AccessButtonHelpers.test.tsx
deleted file mode 100644
index 74f7c77771a177..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/__tests__/AccessButtonHelpers.test.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createAccessButtonHelpersTestSuite } from '@utils/test-utils/createAccessButtonHelpersTestSuite';
-
-/**
- * Tests for Entity (v1) AccessButtonHelpers
- * Uses shared test suite to ensure consistency across implementations
- */
-createAccessButtonHelpersTestSuite('Entity', async () => {
-    const module = await import('@app/entity/shared/tabs/Dataset/AccessManagement/AccessButtonHelpers');
-    return module;
-});
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts
deleted file mode 100644
index 1781b8170214ed..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import { handleAccessRoles } from '@app/entity/shared/tabs/Dataset/AccessManagement/utils';
-
-import { GetExternalRolesQuery } from '@graphql/dataset.generated';
-
-describe('handleAccessRoles', () => {
-    it('should properly map the externalroles', () => {
-        const externalRolesQuery: GetExternalRolesQuery = {
-            dataset: {
-                access: {
-                    roles: [
-                        {
-                            role: {
-                                id: 'test-role-1',
-                                properties: {
-                                    name: 'Test Role 1',
-                                    description:
-                                        'This role access is required by the developers to test and deploy the code also adding few more details to check the description length for the given data and hence check the condition of read more and read less ',
-                                    type: 'READ',
-                                    requestUrl: 'https://www.google.com/role-1',
-                                },
-                                urn: 'urn:li:role:test-role-1',
-                                isAssignedToMe: true,
-                            },
-                        },
-                        {
-                            role: {
-                                id: 'test-role-2',
-                                properties: {
-                                    name: 'Test Role 2',
-                                    description:
-                                        'This role access is required by the developers to test and deploy the code also adding few more details to check the description length for the given data and hence check the condition of read more and read less ',
-                                    type: 'READ',
-                                    requestUrl: 'https://www.google.com/role-2',
-                                },
-                                urn: 'urn:li:role:test-role-2',
-                                isAssignedToMe: false,
-                            },
-                        },
-                    ],
-                },
-                __typename: 'Dataset',
-            },
-        };
-
-        const externalRole = handleAccessRoles(externalRolesQuery);
-        expect(externalRole).toMatchObject([
-            {
-                name: 'Test Role 1',
-                description:
-                    'This role access is required by the developers to test and deploy the code also adding few more details to check the description length for the given data and hence check the condition of read more and read less ',
-                accessType: 'READ',
-                hasAccess: true,
-                url: 'https://www.google.com/role-1',
-            },
-            {
-                name: 'Test Role 2',
-                description:
-                    'This role access is required by the developers to test and deploy the code also adding few more details to check the description length for the given data and hence check the condition of read more and read less ',
-                accessType: 'READ',
-                hasAccess: false,
-                url: 'https://www.google.com/role-2',
-            },
-        ]);
-    });
-    it('should return empty array when no access data is provided', () => {
-        const externalRolesQuery: GetExternalRolesQuery = {
-            dataset: {
-                access: null,
-                __typename: 'Dataset',
-            },
-        };
-
-        const externalRole = handleAccessRoles(externalRolesQuery);
-        expect(externalRole).toHaveLength(0);
-        expect(externalRole).toEqual([]);
-    });
-
-    it('should handle roles without isAssignedToMe field gracefully', () => {
-        const externalRolesQuery: GetExternalRolesQuery = {
-            dataset: {
-                access: {
-                    roles: [
-                        {
-                            role: {
-                                id: 'test-role-without-assignment',
-                                properties: {
-                                    name: 'Test Role Without Assignment',
-                                    description: 'A role without isAssignedToMe field',
-                                    type: 'READ',
-                                    requestUrl: 'https://www.example.com/role',
-                                },
-                                urn: 'urn:li:role:test-role-without-assignment',
-                                // Note: isAssignedToMe is intentionally missing
-                            } as any,
-                        },
-                    ],
-                },
-                __typename: 'Dataset',
-            },
-        };
-
-        const externalRole = handleAccessRoles(externalRolesQuery);
-        expect(externalRole).toHaveLength(1);
-        expect(externalRole[0]).toMatchObject({
-            name: 'Test Role Without Assignment',
-            description: 'A role without isAssignedToMe field',
-            accessType: 'READ',
-            hasAccess: undefined, // Should be undefined when isAssignedToMe is not present
-            url: 'https://www.example.com/role',
-        });
-    });
-
-    it('should handle roles with missing properties gracefully', () => {
-        const externalRolesQuery: GetExternalRolesQuery = {
-            dataset: {
-                access: {
-                    roles: [
-                        {
-                            role: {
-                                id: 'minimal-role',
-                                properties: {
-                                    name: 'Minimal Role',
-                                    description: null,
-                                    type: null,
-                                    requestUrl: null,
-                                } as any,
-                                urn: 'urn:li:role:minimal-role',
-                                isAssignedToMe: false,
-                            },
-                        },
-                    ],
-                },
-                __typename: 'Dataset',
-            },
-        };
-
-        const externalRole = handleAccessRoles(externalRolesQuery);
-        expect(externalRole).toHaveLength(1);
-        expect(externalRole[0]).toMatchObject({
-            name: 'Minimal Role',
-            description: ' ', // Should fallback to space
-            accessType: ' ', // Should fallback to space
-            hasAccess: false,
-            url: undefined, // Should be undefined when requestUrl is null
-        });
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsSummary.tsx
index 2403755f23338f..7cdf79bb79de95 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsSummary.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Governance/TestResultsSummary.tsx
@@ -29,7 +29,7 @@ const SummaryTitle = styled(Typography.Title)`
     }
 `;
 
-export type TestsSummary = {
+type TestsSummary = {
     failing: number;
     passing: number;
     total: number;
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/CopyQuery.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/CopyQuery.tsx
index 76d3b4ad4fab03..e8e1f967a66f74 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/CopyQuery.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/CopyQuery.tsx
@@ -2,7 +2,7 @@ import { CheckOutlined, CopyOutlined } from '@ant-design/icons';
 import { Button, Tooltip } from 'antd';
 import React, { useState } from 'react';
 
-export type Props = {
+type Props = {
     query: string;
     showCopyText?: boolean;
     style?: any;
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/EmptyQueries.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/EmptyQueries.tsx
deleted file mode 100644
index d2abc190b38b33..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/EmptyQueries.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React from 'react';
-
-import { EmptyTab } from '@app/entity/shared/components/styled/EmptyTab';
-
-export type Props = {
-    message?: string;
-    readOnly?: boolean;
-    onClickAddQuery: () => void;
-};
-
-export default function EmptyQueries({ message, readOnly = false, onClickAddQuery }: Props) {
-    return (
-        <EmptyTab tab="queries">
-            {!readOnly && !message && (
-                <Button onClick={onClickAddQuery}>
-                    <PlusOutlined /> Add Query
-                </Button>
-            )}
-        </EmptyTab>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesList.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesList.tsx
deleted file mode 100644
index 59468845e3305c..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesList.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import Query from '@app/entity/shared/tabs/Dataset/Queries/Query';
-import { Query as QueryType } from '@app/entity/shared/tabs/Dataset/Queries/types';
-
-const List = styled.div`
-    margin-bottom: 28px;
-    display: flex;
-    align-items: center;
-    justify-content: left;
-    flex-wrap: wrap;
-`;
-
-type Props = {
-    queries: QueryType[];
-    showDetails?: boolean;
-    showEdit?: boolean;
-    showDelete?: boolean;
-    onDeleted?: (query) => void;
-    onEdited?: (newQuery) => void;
-};
-
-export default function QueriesList({
-    queries,
-    showEdit = true,
-    showDelete = true,
-    showDetails = true,
-    onDeleted,
-    onEdited,
-}: Props) {
-    return (
-        <List>
-            {queries.map((query, idx) => (
-                <Query
-                    urn={query.urn}
-                    title={query.title || undefined}
-                    description={query.description || undefined}
-                    query={query.query}
-                    createdAtMs={query.createdTime}
-                    showDelete={showDelete}
-                    showEdit={showEdit}
-                    showDetails={showDetails}
-                    onDeleted={() => onDeleted?.(query)}
-                    onEdited={(newQuery) => onEdited?.(newQuery)}
-                    index={idx}
-                />
-            ))}
-        </List>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesListSection.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesListSection.tsx
deleted file mode 100644
index e3a199b762c594..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesListSection.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import { InfoCircleOutlined } from '@ant-design/icons';
-import { Pagination, Tooltip, Typography } from 'antd';
-import React, { useEffect, useRef, useState } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import QueriesList from '@app/entity/shared/tabs/Dataset/Queries/QueriesList';
-import { Query } from '@app/entity/shared/tabs/Dataset/Queries/types';
-import { DEFAULT_PAGE_SIZE } from '@app/entity/shared/tabs/Dataset/Queries/utils/constants';
-import { getQueriesForPage } from '@app/entity/shared/tabs/Dataset/Queries/utils/getCurrentPage';
-
-const QueriesTitleSection = styled.div`
-    display: flex;
-    align-items: center;
-    margin-bottom: 20px;
-`;
-
-const QueriesTitle = styled(Typography.Title)`
-    && {
-        margin: 0px;
-    }
-`;
-
-const StyledPagination = styled(Pagination)`
-    padding: 0px 24px 24px 24px;
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-`;
-
-const StyledInfoOutlined = styled(InfoCircleOutlined)`
-    margin-left: 8px;
-    font-size: 12px;
-    color: ${ANTD_GRAY[7]};
-`;
-
-type Props = {
-    title: string;
-    queries: Query[];
-    tooltip?: string;
-    initialPage?: number;
-    initialPageSize?: number;
-    showDetails?: boolean;
-    showEdit?: boolean;
-    showDelete?: boolean;
-    onDeleted?: (query) => void;
-    onEdited?: (query) => void;
-};
-
-export default function QueriesListSection({
-    title,
-    tooltip,
-    queries,
-    initialPage = 1,
-    initialPageSize = DEFAULT_PAGE_SIZE,
-    showDetails,
-    showEdit,
-    showDelete,
-    onDeleted,
-    onEdited,
-}: Props) {
-    /**
-     * Pagination State
-     */
-    const [page, setPage] = useState(initialPage);
-    const [pageSize, setPageSize] = useState(initialPageSize);
-    const paginatedQueries = getQueriesForPage(queries, page, pageSize);
-
-    /**
-     * For scrolling to top of section on page change.
-     */
-    const headerRef = useRef(null);
-    useEffect(() => {
-        if (page !== 1) {
-            (headerRef?.current as any)?.scrollIntoView({
-                behavior: 'smooth',
-                block: 'start',
-                inline: 'nearest',
-            });
-        }
-    }, [page]);
-
-    return (
-        <>
-            <QueriesTitleSection>
-                <QueriesTitle ref={headerRef} level={4}>
-                    {title}
-                </QueriesTitle>
-                {tooltip && (
-                    <Tooltip title={tooltip}>
-                        <StyledInfoOutlined />
-                    </Tooltip>
-                )}
-            </QueriesTitleSection>
-            <QueriesList
-                queries={paginatedQueries}
-                showDelete={showDelete}
-                showEdit={showEdit}
-                showDetails={showDetails}
-                onDeleted={onDeleted}
-                onEdited={onEdited}
-            />
-            {queries.length > pageSize && (
-                <StyledPagination
-                    current={page}
-                    pageSize={pageSize}
-                    total={queries.length}
-                    showLessItems
-                    onChange={(newPage) => {
-                        setPage(newPage);
-                    }}
-                    onShowSizeChange={(_currSize, newSize) => setPageSize(newSize)}
-                    showSizeChanger={false}
-                />
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesTab.tsx
deleted file mode 100644
index b21ab0bf175fbb..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesTab.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-import { debounce } from 'lodash';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import EmptyQueries from '@app/entity/shared/tabs/Dataset/Queries/EmptyQueries';
-import QueriesListSection from '@app/entity/shared/tabs/Dataset/Queries/QueriesListSection';
-import QueriesTabToolbar from '@app/entity/shared/tabs/Dataset/Queries/QueriesTabToolbar';
-import QueryBuilderModal from '@app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal';
-import {
-    addQueryToListQueriesCache,
-    removeQueryFromListQueriesCache,
-    updateListQueriesCache,
-} from '@app/entity/shared/tabs/Dataset/Queries/cacheUtils';
-import {
-    DEFAULT_MAX_RECENT_QUERIES,
-    HALF_SECOND_IN_MS,
-    MAX_QUERIES_COUNT,
-    MAX_ROWS_BEFORE_DEBOUNCE,
-} from '@app/entity/shared/tabs/Dataset/Queries/utils/constants';
-import { filterQueries } from '@app/entity/shared/tabs/Dataset/Queries/utils/filterQueries';
-import getTopNQueries from '@app/entity/shared/tabs/Dataset/Queries/utils/getTopNQueries';
-import { useAppConfig } from '@app/useAppConfig';
-
-import { GetDatasetQuery, useGetRecentQueriesQuery } from '@graphql/dataset.generated';
-import { useListQueriesQuery } from '@graphql/query.generated';
-
-const Content = styled.div`
-    padding: 24px;
-    height: 100%;
-    overflow: scroll;
-`;
-
-export default function QueriesTab() {
-    const appConfig = useAppConfig();
-    const baseEntity = useBaseEntity<GetDatasetQuery>();
-    const canEditQueries = baseEntity?.dataset?.privileges?.canEditQueries || false;
-
-    const [showQueryBuilder, setShowQueryBuilder] = useState(false);
-    const [filterText, setFilterText] = useState('');
-
-    /**
-     * Fetch the List of Custom (Highlighted) Queries
-     */
-    const { data: highlightedQueriesData, client } = useListQueriesQuery({
-        variables: { input: { datasetUrn: baseEntity?.dataset?.urn, start: 0, count: MAX_QUERIES_COUNT } },
-        skip: !baseEntity?.dataset?.urn,
-        fetchPolicy: 'cache-first',
-    });
-
-    const highlightedQueries = filterQueries(
-        filterText,
-        (highlightedQueriesData?.listQueries?.queries || []).map((queryEntity) => ({
-            urn: queryEntity.urn,
-            title: queryEntity.properties?.name || undefined,
-            description: queryEntity.properties?.description || undefined,
-            query: queryEntity.properties?.statement?.value || '',
-            createdTime: queryEntity?.properties?.created?.time,
-        })),
-    );
-
-    /**
-     * Fetch the List of Recent (auto-extracted) Queries
-     */
-    const { data: recentQueriesData } = useGetRecentQueriesQuery({
-        variables: { urn: baseEntity?.dataset?.urn as string },
-        skip: !baseEntity?.dataset?.urn,
-        fetchPolicy: 'cache-first',
-    });
-
-    const recentQueries = filterQueries(
-        filterText,
-        (
-            getTopNQueries(
-                appConfig?.config?.visualConfig?.queriesTab?.queriesTabResultSize || DEFAULT_MAX_RECENT_QUERIES,
-                recentQueriesData?.dataset?.usageStats?.buckets,
-            ) || []
-        ).map((recentQuery) => ({ query: recentQuery.query })),
-    );
-
-    const debouncedSetFilterText = debounce(
-        (e: React.ChangeEvent<HTMLInputElement>) => setFilterText(e.target.value),
-        highlightedQueries.length > MAX_ROWS_BEFORE_DEBOUNCE ? HALF_SECOND_IN_MS : 0,
-    );
-
-    const onQueryCreated = (newQuery) => {
-        addQueryToListQueriesCache(newQuery, client, MAX_QUERIES_COUNT, baseEntity?.dataset?.urn);
-        setShowQueryBuilder(false);
-    };
-
-    const onQueryDeleted = (query) => {
-        removeQueryFromListQueriesCache(query.urn, client, 1, MAX_QUERIES_COUNT, baseEntity?.dataset?.urn);
-    };
-
-    const onQueryEdited = (query) => {
-        updateListQueriesCache(query.urn, query, client, 1, MAX_QUERIES_COUNT, baseEntity?.dataset?.urn);
-    };
-
-    const showEmptyView = !recentQueries.length && !highlightedQueries.length;
-
-    return (
-        <>
-            <QueriesTabToolbar
-                addQueryDisabled={!canEditQueries}
-                onAddQuery={() => setShowQueryBuilder(true)}
-                onChangeSearch={debouncedSetFilterText}
-            />
-            <Content>
-                {showEmptyView && (
-                    <EmptyQueries readOnly={!canEditQueries} onClickAddQuery={() => setShowQueryBuilder(true)} />
-                )}
-                {highlightedQueries.length > 0 && (
-                    <QueriesListSection
-                        title="Highlighted Queries"
-                        tooltip="Shared queries relevant to this dataset"
-                        queries={highlightedQueries}
-                        showEdit
-                        showDelete
-                        onDeleted={onQueryDeleted}
-                        onEdited={onQueryEdited}
-                    />
-                )}
-                {recentQueries.length > 0 && (
-                    <QueriesListSection
-                        title="Recent Queries"
-                        tooltip="Queries that have been recently run against this dataset"
-                        queries={recentQueries}
-                        showDetails={false}
-                        showDelete={false}
-                        showEdit={false}
-                    />
-                )}
-            </Content>
-            {showQueryBuilder && (
-                <QueryBuilderModal
-                    datasetUrn={baseEntity.dataset?.urn}
-                    onClose={() => setShowQueryBuilder(false)}
-                    onSubmit={onQueryCreated}
-                />
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesTabToolbar.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesTabToolbar.tsx
deleted file mode 100644
index 5ef4c8486e1a88..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueriesTabToolbar.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Icon } from '@components';
-import { Button, Input, Tooltip } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import { ADD_UNAUTHORIZED_MESSAGE } from '@app/entity/shared/tabs/Dataset/Queries/utils/constants';
-
-const StyledInput = styled(Input)`
-    border-radius: 70px;
-    max-width: 300px;
-`;
-
-type Props = {
-    addQueryDisabled: boolean;
-    onAddQuery: () => void;
-    onChangeSearch: (text: any) => void;
-};
-
-export default function QueriesTabToolbar({ addQueryDisabled, onAddQuery, onChangeSearch }: Props) {
-    return (
-        <TabToolbar>
-            <Tooltip
-                placement="right"
-                title={(addQueryDisabled && ADD_UNAUTHORIZED_MESSAGE) || 'Add a highlighted query'}
-            >
-                <Button disabled={addQueryDisabled} type="text" onClick={onAddQuery} data-testid="add-query-button">
-                    <PlusOutlined /> Add Query
-                </Button>
-            </Tooltip>
-            <StyledInput
-                placeholder="Search in queries..."
-                onChange={onChangeSearch}
-                allowClear
-                prefix={<Icon icon="MagnifyingGlass" source="phosphor" />}
-                data-testid="search-query-input"
-            />
-        </TabToolbar>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/Query.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/Query.tsx
deleted file mode 100644
index d83d3940f4bcc1..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/Query.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import React, { useState } from 'react';
-
-import QueryBuilderModal from '@app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal';
-import QueryCard from '@app/entity/shared/tabs/Dataset/Queries/QueryCard';
-import QueryModal from '@app/entity/shared/tabs/Dataset/Queries/QueryModal';
-
-export type Props = {
-    urn?: string;
-    query: string;
-    title?: string;
-    description?: string;
-    createdAtMs?: number;
-    showDelete?: boolean;
-    showEdit?: boolean;
-    showDetails?: boolean;
-    onDeleted?: () => void;
-    onEdited?: (query) => void;
-    index?: number;
-};
-
-export default function Query({
-    urn,
-    query,
-    title,
-    description,
-    createdAtMs,
-    showDelete,
-    showEdit,
-    showDetails = true,
-    onDeleted,
-    onEdited,
-    index,
-}: Props) {
-    const [showQueryModal, setShowQueryModal] = useState(false);
-    const [showEditQueryModal, setShowEditQueryModal] = useState(false);
-
-    const onEditSubmitted = (newQuery) => {
-        setShowEditQueryModal(false);
-        onEdited?.(newQuery);
-    };
-
-    return (
-        <>
-            <QueryCard
-                urn={urn}
-                query={query}
-                title={title}
-                description={description}
-                createdAtMs={createdAtMs}
-                showEdit={showEdit}
-                showDelete={showDelete}
-                showDetails={showDetails}
-                onClickEdit={() => setShowEditQueryModal(true)}
-                onClickExpand={() => setShowQueryModal(true)}
-                onDeleted={onDeleted}
-                index={index}
-            />
-            {showQueryModal && (
-                <QueryModal
-                    query={query}
-                    title={title}
-                    description={description}
-                    onClose={() => setShowQueryModal(false)}
-                    showDetails={showDetails}
-                />
-            )}
-            {showEditQueryModal && (
-                <QueryBuilderModal
-                    initialState={{ urn: urn as string, title, description, query }}
-                    onSubmit={onEditSubmitted}
-                    onClose={() => setShowEditQueryModal(false)}
-                />
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx
deleted file mode 100644
index f2536e6986e37a..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderForm.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import Editor from '@monaco-editor/react';
-import { Form, Input, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { QueryBuilderState } from '@app/entity/shared/tabs/Dataset/Queries/types';
-import { Editor as MarkdownEditor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor';
-
-const EditorWrapper = styled.div`
-    border: 1px solid ${ANTD_GRAY[5]};
-    border-radius: 1px;
-    background-color: ${ANTD_GRAY[2]};
-`;
-
-const StyledEditor = styled(MarkdownEditor)`
-    border: 1px solid ${ANTD_GRAY[4.5]};
-`;
-
-const QUERY_EDITOR_HEIGHT = '240px';
-
-const QUERY_EDITOR_OPTIONS = {
-    minimap: { enabled: false },
-    scrollbar: {
-        vertical: 'hidden',
-        horizontal: 'hidden',
-    },
-} as any;
-
-type Props = {
-    state: QueryBuilderState;
-    updateState: (newState: QueryBuilderState) => void;
-};
-
-export default function QueryBuilderForm({ state, updateState }: Props) {
-    const updateQuery = (query) => {
-        updateState({
-            ...state,
-            query,
-        });
-    };
-
-    const updateTitle = (title) => {
-        updateState({
-            ...state,
-            title,
-        });
-    };
-
-    const updateDescription = (description) => {
-        updateState({
-            ...state,
-            description,
-        });
-    };
-
-    return (
-        <Form layout="vertical">
-            <Form.Item required label={<Typography.Text strong>Query</Typography.Text>}>
-                <EditorWrapper>
-                    <Editor
-                        options={QUERY_EDITOR_OPTIONS}
-                        height={QUERY_EDITOR_HEIGHT}
-                        defaultLanguage="sql"
-                        value={state.query}
-                        onChange={updateQuery}
-                        className="query-builder-editor-input"
-                    />
-                </EditorWrapper>
-            </Form.Item>
-            <Form.Item
-                rules={[{ min: 1, max: 500 }]}
-                hasFeedback
-                label={<Typography.Text strong>Title</Typography.Text>}
-            >
-                <Input
-                    data-testid="query-builder-title-input"
-                    autoFocus
-                    value={state.title}
-                    onChange={(newTitle) => updateTitle(newTitle.target.value)}
-                    placeholder="ERModelRelationship Transactions and Users Tables"
-                />
-            </Form.Item>
-            <Form.Item label={<Typography.Text strong>Description</Typography.Text>}>
-                <StyledEditor
-                    data-testid="query-builder-description-input"
-                    doNotFocus
-                    content={state.description}
-                    onChange={updateDescription}
-                />
-            </Form.Item>
-        </Form>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx
deleted file mode 100644
index b3ee589ee9c90f..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryBuilderModal.tsx
+++ /dev/null
@@ -1,175 +0,0 @@
-import { Button, Modal, Typography, message } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import analytics, { EventType } from '@app/analytics';
-import QueryBuilderForm from '@app/entity/shared/tabs/Dataset/Queries/QueryBuilderForm';
-import { QueryBuilderState } from '@app/entity/shared/tabs/Dataset/Queries/types';
-import ClickOutside from '@app/shared/ClickOutside';
-
-import { useCreateQueryMutation, useUpdateQueryMutation } from '@graphql/query.generated';
-import { QueryLanguage } from '@types';
-
-const StyledModal = styled(Modal)`
-    top: 4vh;
-    max-width: 1200px;
-`;
-
-const MODAL_WIDTH = '80vw';
-
-const MODAL_BODY_STYLE = {
-    height: '74vh',
-    overflow: 'auto',
-};
-
-const PLACEHOLDER_QUERY = `-- SELECT sum(price)
--- FROM transactions
--- WHERE user_id = "john_smith"
---  AND product_id IN [1, 2, 3]`;
-
-const DEFAULT_STATE = {
-    query: PLACEHOLDER_QUERY,
-};
-
-type Props = {
-    initialState?: QueryBuilderState;
-    datasetUrn?: string;
-    onClose?: () => void;
-    onSubmit?: (newQuery: any) => void;
-};
-
-export default function QueryBuilderModal({ initialState, datasetUrn, onClose, onSubmit }: Props) {
-    const isUpdating = initialState?.urn !== undefined;
-
-    const [builderState, setBuilderState] = useState<QueryBuilderState>(initialState || DEFAULT_STATE);
-    const [createQueryMutation] = useCreateQueryMutation();
-    const [updateQueryMutation] = useUpdateQueryMutation();
-
-    const createQuery = () => {
-        if (datasetUrn) {
-            createQueryMutation({
-                variables: {
-                    input: {
-                        properties: {
-                            name: builderState.title,
-                            description: builderState.description,
-                            statement: {
-                                value: builderState.query as string,
-                                language: QueryLanguage.Sql,
-                            },
-                        },
-                        subjects: [{ datasetUrn }],
-                    },
-                },
-            })
-                .then(({ data, errors }) => {
-                    if (!errors) {
-                        analytics.event({
-                            type: EventType.CreateQueryEvent,
-                        });
-                        message.success({
-                            content: `Created Query!`,
-                            duration: 3,
-                        });
-                        onSubmit?.(data?.createQuery);
-                        setBuilderState(DEFAULT_STATE);
-                    }
-                })
-                .catch(() => {
-                    message.destroy();
-                    message.error({ content: 'Failed to create Query! An unexpected error occurred' });
-                });
-        }
-    };
-
-    const updateQuery = () => {
-        if (initialState) {
-            updateQueryMutation({
-                variables: {
-                    urn: initialState?.urn as string,
-                    input: {
-                        properties: {
-                            name: builderState.title,
-                            description: builderState.description,
-                            statement: {
-                                value: builderState.query as string,
-                                language: QueryLanguage.Sql,
-                            },
-                        },
-                    },
-                },
-            })
-                .then(({ data, errors }) => {
-                    if (!errors) {
-                        analytics.event({
-                            type: EventType.UpdateQueryEvent,
-                        });
-                        message.success({
-                            content: `Edited Query!`,
-                            duration: 3,
-                        });
-                        onSubmit?.(data?.updateQuery);
-                        setBuilderState(DEFAULT_STATE);
-                    }
-                })
-                .catch(() => {
-                    message.destroy();
-                    message.error({ content: 'Failed to edit Query! An unexpected error occurred' });
-                });
-        }
-    };
-
-    const saveQuery = () => {
-        if (isUpdating) {
-            updateQuery();
-        } else {
-            createQuery();
-        }
-    };
-
-    const confirmClose = () => {
-        Modal.confirm({
-            title: `Exit Query Editor`,
-            content: `Are you sure you want to exit the editor? Any unsaved changes will be lost.`,
-            onOk() {
-                setBuilderState(DEFAULT_STATE);
-                onClose?.();
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    return (
-        <ClickOutside onClickOutside={confirmClose} wrapperClassName="query-builder-modal">
-            <StyledModal
-                width={MODAL_WIDTH}
-                bodyStyle={MODAL_BODY_STYLE}
-                title={<Typography.Text>{isUpdating ? 'Edit' : 'New'} Query</Typography.Text>}
-                className="query-builder-modal"
-                open
-                onCancel={confirmClose}
-                footer={
-                    <>
-                        <Button onClick={onClose} data-testid="query-builder-cancel-button" type="text">
-                            Cancel
-                        </Button>
-                        <Button
-                            id="createQueryButton"
-                            data-testid="query-builder-save-button"
-                            onClick={saveQuery}
-                            type="primary"
-                        >
-                            Save
-                        </Button>
-                    </>
-                }
-                data-testid="query-builder-modal"
-            >
-                <QueryBuilderForm state={builderState} updateState={setBuilderState} />
-            </StyledModal>
-        </ClickOutside>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCard.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCard.tsx
deleted file mode 100644
index 3ed4ebf13d5a79..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCard.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import QueryCardDetails from '@app/entity/shared/tabs/Dataset/Queries/QueryCardDetails';
-import QueryCardHeader from '@app/entity/shared/tabs/Dataset/Queries/QueryCardHeader';
-import QueryCardQuery from '@app/entity/shared/tabs/Dataset/Queries/QueryCardQuery';
-
-const Card = styled.div`
-    border: 1px solid ${ANTD_GRAY[5]};
-    border-radius: 4px;
-    box-shadow: ${(props) => props.theme.styles['box-shadow']};
-    height: 380px;
-    width: 32%;
-    margin-right: 6px;
-    margin-left: 6px;
-    margin-bottom: 20px;
-`;
-
-export type Props = {
-    urn?: string;
-    query: string;
-    title?: string;
-    description?: string;
-    createdAtMs?: number;
-    showDelete?: boolean;
-    showEdit?: boolean;
-    showDetails?: boolean;
-    onDeleted?: () => void;
-    onClickExpand?: () => void;
-    onClickEdit?: () => void;
-    index?: number;
-};
-
-export default function QueryCard({
-    urn,
-    query,
-    title,
-    description,
-    createdAtMs,
-    showDelete,
-    showEdit,
-    showDetails = true,
-    onDeleted,
-    onClickExpand,
-    onClickEdit,
-    index,
-}: Props) {
-    const [focused, setFocused] = useState(false);
-
-    return (
-        <Card onMouseEnter={() => setFocused(true)} onMouseLeave={() => setFocused(false)}>
-            <QueryCardHeader query={query} focused={focused} onClickExpand={onClickExpand} />
-            <QueryCardQuery query={query} showDetails={showDetails} onClickExpand={onClickExpand} index={index} />
-            {showDetails && (
-                <QueryCardDetails
-                    urn={urn}
-                    title={title}
-                    description={description}
-                    createdAtMs={createdAtMs}
-                    showEdit={showEdit}
-                    showDelete={showDelete}
-                    onDeleted={onDeleted}
-                    onClickEdit={onClickEdit}
-                    onClickExpand={onClickExpand}
-                    index={index}
-                />
-            )}
-        </Card>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetails.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetails.tsx
deleted file mode 100644
index d4d492433c5782..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetails.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import NoMarkdownViewer from '@app/entity/shared/components/styled/StripMarkdownText';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import QueryCardDetailsMenu from '@app/entity/shared/tabs/Dataset/Queries/QueryCardDetailsMenu';
-import QueryCardEditButton from '@app/entity/shared/tabs/Dataset/Queries/QueryCardEditButton';
-import { toLocalDateString } from '@app/shared/time/timeUtils';
-
-const Title = styled(Typography.Title)<{ secondary?: boolean }>`
-    && {
-        margin: 0px;
-        padding: 0px;
-        color: ${(props) => (props.secondary && ANTD_GRAY[6]) || ANTD_GRAY[9]};
-    }
-    max-height: 40px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-`;
-
-const Details = styled.div`
-    padding: 0px 20px 0px 20px;
-`;
-
-const Header = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    white-space: nowrap;
-`;
-
-const Actions = styled.div`
-    flex-wrap: nowrap;
-`;
-
-const EditQueryAction = styled.span`
-    && {
-        margin: 0px;
-        padding: 0px;
-        margin-left: 4px;
-    }
-`;
-
-const Description = styled.div`
-    margin-bottom: 16px;
-    height: 52px;
-    overflow: auto;
-`;
-
-const MoreButton = styled.span`
-    :hover {
-        cursor: pointer;
-    }
-    font-weight: bold;
-`;
-
-const Date = styled.div`
-    display: flex;
-    justify-content: right;
-    align-items: center;
-`;
-
-const EmptyText = styled.div`
-    && {
-        color: ${ANTD_GRAY[6]};
-    }
-`;
-
-export type Props = {
-    urn?: string;
-    title?: string;
-    description?: string;
-    createdAtMs?: number;
-    showDelete?: boolean;
-    showEdit?: boolean;
-    onDeleted?: (urn) => void;
-    onClickExpand?: () => void;
-    onClickEdit?: () => void;
-    index?: number;
-};
-
-export default function QueryCardDetails({
-    urn,
-    title,
-    description,
-    createdAtMs,
-    showDelete,
-    showEdit,
-    onClickExpand,
-    onClickEdit,
-    onDeleted,
-    index,
-}: Props) {
-    return (
-        <Details>
-            <Header>
-                <Title secondary={!title} level={5}>
-                    {title || 'No title'}
-                </Title>
-                <Actions>
-                    {showEdit && (
-                        <EditQueryAction>
-                            <QueryCardEditButton onClickEdit={onClickEdit} index={index} />
-                        </EditQueryAction>
-                    )}
-                    {showDelete && urn && (
-                        <EditQueryAction>
-                            <QueryCardDetailsMenu urn={urn} onDeleted={onDeleted} index={index} />
-                        </EditQueryAction>
-                    )}
-                </Actions>
-            </Header>
-            <Description>
-                {(description && (
-                    <NoMarkdownViewer
-                        shouldWrap
-                        limit={200}
-                        readMore={<MoreButton onClick={onClickExpand}>more</MoreButton>}
-                    >
-                        {description}
-                    </NoMarkdownViewer>
-                )) || <EmptyText>No description</EmptyText>}
-            </Description>
-            <Date>
-                {(createdAtMs && (
-                    <Typography.Text type="secondary">Created on {toLocalDateString(createdAtMs)}</Typography.Text>
-                )) ||
-                    undefined}
-            </Date>
-        </Details>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx
deleted file mode 100644
index 64280a3451a2bb..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { DeleteOutlined, MoreOutlined } from '@ant-design/icons';
-import { Dropdown, Modal, message } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent';
-import handleGraphQLError from '@app/shared/handleGraphQLError';
-
-import { useDeleteQueryMutation } from '@graphql/query.generated';
-
-const StyledMoreOutlined = styled(MoreOutlined)`
-    font-size: 14px;
-`;
-
-export type Props = {
-    urn: string;
-    onDeleted?: (urn: string) => void;
-    index?: number;
-};
-
-export default function QueryCardDetailsMenu({ urn, onDeleted, index }: Props) {
-    const [deleteQueryMutation] = useDeleteQueryMutation();
-
-    const deleteQuery = () => {
-        deleteQueryMutation({ variables: { urn } })
-            .then(({ errors }) => {
-                if (!errors) {
-                    message.success({
-                        content: `Deleted Query!`,
-                        duration: 3,
-                    });
-                    onDeleted?.(urn);
-                }
-            })
-            .catch((error) => {
-                handleGraphQLError({
-                    error,
-                    defaultMessage: 'Failed to delete Query! An unexpected error occurred',
-                    permissionMessage: 'Unauthorized to delete Query. Please contact your DataHub administrator.',
-                });
-            });
-    };
-
-    const confirmDeleteQuery = () => {
-        Modal.confirm({
-            title: `Delete Query`,
-            content: `Are you sure you want to delete this query?`,
-            onOk() {
-                deleteQuery();
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    const items = [
-        {
-            key: 0,
-            label: (
-                <MenuItemStyle onClick={confirmDeleteQuery} data-testid={`query-delete-button-${index}`}>
-                    <DeleteOutlined /> &nbsp; Delete
-                </MenuItemStyle>
-            ),
-        },
-    ];
-
-    return (
-        <Dropdown menu={{ items }} trigger={['click']}>
-            <StyledMoreOutlined data-testid={`query-more-button-${index}`} />
-        </Dropdown>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx
deleted file mode 100644
index 79451ec9ebf064..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { EditOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const EditQueryActionButton = styled(Button)`
-    && {
-        margin: 0px;
-        padding: 0px 4px 0px 4px;
-    }
-`;
-
-export type Props = {
-    onClickEdit?: () => void;
-    index?: number;
-};
-
-export default function QueryCardEditButton({ onClickEdit, index }: Props) {
-    return (
-        <EditQueryActionButton type="text" onClick={onClickEdit} data-testid={`query-edit-button-${index}`}>
-            <EditOutlined />
-        </EditQueryActionButton>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardHeader.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardHeader.tsx
deleted file mode 100644
index 4e8ee364b63e32..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardHeader.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { ExpandOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import CopyQuery from '@app/entity/shared/tabs/Dataset/Queries/CopyQuery';
-
-const Header = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: right;
-`;
-
-const Actions = styled.div<{ opacity?: number }>`
-    padding: 0px;
-    height: 0px;
-    transform: translate(-12px, 12px);
-    opacity: ${(props) => props.opacity || 1.0};
-`;
-
-const ExpandButton = styled(Button)`
-    margin-left: 8px;
-`;
-
-export type Props = {
-    query: string;
-    focused: boolean;
-    onClickExpand?: (newQuery) => void;
-};
-
-export default function QueryCardHeader({ query, focused, onClickExpand }: Props) {
-    return (
-        <Header>
-            <Actions opacity={(!focused && 0.3) || 1.0}>
-                <CopyQuery query={query} />
-                <ExpandButton onClick={onClickExpand}>
-                    <ExpandOutlined />
-                </ExpandButton>
-            </Actions>
-        </Header>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardQuery.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardQuery.tsx
deleted file mode 100644
index e89846dbd36459..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryCardQuery.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React from 'react';
-import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-const Statement = styled.div<{ fullHeight?: boolean }>`
-    background-color: ${ANTD_GRAY[2]};
-    height: ${(props) => (props.fullHeight && '378px') || '240px'};
-    margin: 0px 0px 4px 0px;
-    border-radius: 8px;
-    :hover {
-        cursor: pointer;
-    }
-`;
-
-const NestedSyntax = styled(SyntaxHighlighter)`
-    background-color: transparent !important;
-    border: none !important;
-    margin: 0px !important;
-    height: 100% !important;
-    overflow: auto !important;
-    ::-webkit-scrollbar {
-        display: none;
-    } !important;
-`;
-
-export type Props = {
-    query: string;
-    showDetails: boolean;
-    onClickExpand?: (newQuery) => void;
-    index?: number;
-};
-
-export default function QueryCardQuery({ query, showDetails, onClickExpand, index }: Props) {
-    return (
-        <Statement fullHeight={!showDetails} onClick={onClickExpand} data-testid={`query-content-${index}`}>
-            <NestedSyntax showLineNumbers language="sql">
-                {query}
-            </NestedSyntax>
-        </Statement>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryModal.tsx
deleted file mode 100644
index ae31c7d16564a8..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/QueryModal.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import { Button, Modal, Typography } from 'antd';
-import React from 'react';
-import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import CopyQuery from '@app/entity/shared/tabs/Dataset/Queries/CopyQuery';
-import { Editor as MarkdownEditor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor';
-
-const StyledModal = styled(Modal)`
-    top: 4vh;
-    max-width: 1200px;
-`;
-
-const MODAL_WIDTH = '80vw';
-
-const MODAL_BODY_STYLE = {
-    maxHeight: '84vh',
-    padding: 0,
-    overflow: 'auto',
-};
-
-const QueryActions = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: end;
-    width: 100%;
-    height: 0px;
-    transform: translate(-24px, 32px);
-`;
-
-const QueryDetails = styled.div`
-    padding: 28px 28px 28px 28px;
-`;
-
-const QueryTitle = styled(Typography.Title)<{ secondary?: boolean }>`
-    && {
-        margin-bottom: 16px;
-        color: ${(props) => (props.secondary && ANTD_GRAY[6]) || undefined};
-    }
-`;
-
-const StyledViewer = styled(MarkdownEditor)<{ secondary?: boolean }>`
-    .remirror-editor.ProseMirror {
-        padding: 0;
-        color: ${(props) => (props.secondary && ANTD_GRAY[6]) || undefined};
-    }
-`;
-
-const QueryContainer = styled.div`
-    height: 58vh;
-    overflow-y: scroll;
-    background-color: ${ANTD_GRAY[2]};
-    border-radius: 4px;
-`;
-
-const NestedSyntax = styled(SyntaxHighlighter)`
-    background-color: transparent !important;
-    border: none !important;
-    height: 100% !important;
-    margin: 0px !important;
-    padding: 12px !important;
-`;
-
-type Props = {
-    query: string;
-    title?: string;
-    description?: string;
-    onClose?: () => void;
-    showDetails?: boolean;
-};
-
-export default function QueryModal({ query, title, description, showDetails = true, onClose }: Props) {
-    return (
-        <StyledModal
-            open
-            width={MODAL_WIDTH}
-            title={null}
-            closable={false}
-            onCancel={onClose}
-            bodyStyle={MODAL_BODY_STYLE}
-            data-testid="query-modal"
-            footer={
-                <Button onClick={onClose} type="text" data-testid="query-modal-close-button">
-                    Close
-                </Button>
-            }
-        >
-            <QueryActions>
-                <CopyQuery query={query} showCopyText />
-            </QueryActions>
-            <QueryContainer>
-                <NestedSyntax data-testid="query-modal-query" showLineNumbers language="sql">
-                    {query}
-                </NestedSyntax>
-            </QueryContainer>
-            {showDetails && (
-                <QueryDetails>
-                    <QueryTitle level={4} secondary={!title}>
-                        {title || 'No title'}
-                    </QueryTitle>
-                    <StyledViewer readOnly secondary={!title} content={description || 'No description'} />
-                </QueryDetails>
-            )}
-        </StyledModal>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/cacheUtils.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/cacheUtils.ts
deleted file mode 100644
index d654dac7af213d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/cacheUtils.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { ListQueriesDocument, ListQueriesQuery } from '@graphql/query.generated';
-import { QueryEntity } from '@types';
-
-export const removeQueryFromListQueriesCache = (urn, client, page, pageSize, datasetUrn) => {
-    const currData: ListQueriesQuery | null = client.readQuery({
-        query: ListQueriesDocument,
-        variables: {
-            input: {
-                start: (page - 1) * pageSize,
-                count: pageSize,
-                datasetUrn,
-            },
-        },
-    });
-
-    const newQueries = [...(currData?.listQueries?.queries || []).filter((query) => query.urn !== urn)];
-
-    client.writeQuery({
-        query: ListQueriesDocument,
-        variables: {
-            input: {
-                start: (page - 1) * pageSize,
-                count: pageSize,
-                datasetUrn,
-            },
-        },
-        data: {
-            listQueries: {
-                start: currData?.listQueries?.start || 0,
-                count: (currData?.listQueries?.count || 1) - 1,
-                total: (currData?.listQueries?.total || 1) - 1,
-                queries: newQueries,
-            },
-        },
-    });
-};
-
-export const updateListQueriesCache = (urn: string, newQuery: QueryEntity, client, page, pageSize, datasetUrn) => {
-    // Read the data from our cache for this query.
-    const currData: ListQueriesQuery | null = client.readQuery({
-        query: ListQueriesDocument,
-        variables: {
-            input: {
-                start: (page - 1) * pageSize,
-                count: pageSize,
-                datasetUrn,
-            },
-        },
-    });
-
-    if (currData === null) {
-        // If there's no cached data, the first load has not occurred. Let it occur naturally.
-        return;
-    }
-
-    const existingQueries = currData?.listQueries?.queries || [];
-    const newQueries = [...existingQueries];
-    const updatedQueries = newQueries.map((query) => {
-        if (urn === query.urn) {
-            return newQuery;
-        }
-        return query;
-    });
-
-    const currCount = currData?.listQueries?.count || 0;
-    const currTotal = currData?.listQueries?.total || 0;
-    const didAdd = newQueries.length > existingQueries.length;
-
-    client.writeQuery({
-        query: ListQueriesDocument,
-        variables: {
-            input: {
-                start: 0,
-                count: pageSize,
-                datasetUrn,
-            },
-        },
-        data: {
-            listQueries: {
-                start: currData?.listQueries?.start || 0,
-                count: currCount + (didAdd ? 1 : 0),
-                total: currTotal + (didAdd ? 1 : 0),
-                queries: updatedQueries,
-            },
-        },
-    });
-};
-
-export const addQueryToListQueriesCache = (query, client, pageSize, datasetUrn) => {
-    const currData: ListQueriesQuery | null = client.readQuery({
-        query: ListQueriesDocument,
-        variables: {
-            input: {
-                start: 0,
-                count: pageSize,
-                datasetUrn,
-            },
-        },
-    });
-
-    const newQueries = [query, ...(currData?.listQueries?.queries || [])];
-
-    client.writeQuery({
-        query: ListQueriesDocument,
-        variables: {
-            input: {
-                start: 0,
-                count: pageSize,
-                datasetUrn,
-            },
-        },
-        data: {
-            listQueries: {
-                start: currData?.listQueries?.start || 0,
-                count: (currData?.listQueries?.count || 1) + 1,
-                total: (currData?.listQueries?.total || 1) + 1,
-                queries: newQueries,
-            },
-        },
-    });
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/types.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/types.ts
deleted file mode 100644
index 58a1b07484d362..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/types.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export type QueryBuilderState = {
-    urn?: string;
-    query: string;
-    title?: string;
-    description?: string;
-};
-
-export type Query = {
-    urn?: string;
-    query: string;
-    title?: string;
-    description?: string;
-    executedTime?: number;
-    createdTime?: number;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/constants.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/constants.ts
deleted file mode 100644
index 025705abc580ea..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/constants.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Max queries to fetch on the Queries Tab
- */
-export const MAX_QUERIES_COUNT = 1000;
-/**
- * Default page size for Queries Tab Section
- */
-export const DEFAULT_PAGE_SIZE = 6;
-/**
- * The Max number of "Recent Queries" to surface.
- */
-export const DEFAULT_MAX_RECENT_QUERIES = 9;
-
-/**
- * Searching Queries
- */
-export const MAX_ROWS_BEFORE_DEBOUNCE = 50;
-export const HALF_SECOND_IN_MS = 500;
-export const ONE_SECOND_IN_MS = 1000;
-
-export const ADD_UNAUTHORIZED_MESSAGE = 'You are not authorized to add Queries to this entity.';
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/filterQueries.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/filterQueries.ts
deleted file mode 100644
index 6f33d488854a70..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/filterQueries.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Query } from '@app/entity/shared/tabs/Dataset/Queries/types';
-
-/**
- * Filter queries by a search string. Compares name, description, and query statement.
- *
- * @param filterText the search text
- * @param queries the queries to filter
- */
-export const filterQueries = (filterText, queries: Query[]) => {
-    const lowerFilterText = filterText.toLowerCase();
-    return queries.filter((query) => {
-        return (
-            query.title?.toLowerCase()?.includes(lowerFilterText) ||
-            query.description?.toLowerCase()?.includes(lowerFilterText) ||
-            query.query?.toLowerCase()?.includes(lowerFilterText)
-        );
-    });
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/getCurrentPage.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/getCurrentPage.ts
deleted file mode 100644
index 2931de97e69aca..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/getCurrentPage.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Returns the queries for the current page
- */
-export const getQueriesForPage = (queries: any, page: number, pageSize: number) => {
-    const start = (page - 1) * pageSize;
-    const end = start + pageSize;
-    return queries.length >= end ? queries.slice(start, end) : queries.slice(start, queries.length);
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts
deleted file mode 100644
index 3cda40bc6db0d6..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Queries/utils/getTopNQueries.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Maybe, UsageAggregation } from '@types';
-
-type RecentQuery = {
-    query: string;
-    dateMs: number;
-};
-
-export default function getTopNQueries(n: number, buckets?: Maybe<UsageAggregation>[] | null): RecentQuery[] {
-    let response: RecentQuery[] = [];
-    const seenQueries = new Set<string>();
-
-    if (!buckets) {
-        return response;
-    }
-
-    for (let i = 0; i < buckets.length; i++) {
-        const bucket = buckets[i];
-        const newQueries: string[] =
-            (bucket?.metrics?.topSqlQueries?.filter(
-                (query) => query && bucket?.bucket && !seenQueries.has(query),
-            ) as string[]) || [];
-
-        // Mark each query as seen.
-        newQueries.forEach((query) => seenQueries.add(query as string));
-
-        response = [...response, ...newQueries.map((query) => ({ query, dateMs: bucket?.bucket as number }))];
-
-        if (response.length >= n) {
-            return response.slice(0, n);
-        }
-    }
-
-    return response;
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab.tsx
deleted file mode 100644
index e6494b012420b2..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab.tsx
+++ /dev/null
@@ -1,283 +0,0 @@
-import '@app/entity/shared/tabs/Dataset/Relationship/RelationshipsTab.less';
-
-import { ExclamationCircleFilled, LoadingOutlined, PlusOutlined } from '@ant-design/icons';
-import { Icon } from '@components';
-import { Button, Card, Divider, Empty, Input, Modal, Pagination } from 'antd';
-import React, { useCallback, useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { CreateERModelRelationModal } from '@app/entity/shared/components/styled/ERModelRelationship/CreateERModelRelationModal';
-import { ERModelRelationPreview } from '@app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview';
-import { SearchSelectModal } from '@app/entity/shared/components/styled/search/SearchSelectModal';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { useGetEntityWithSchema } from '@app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema';
-import { useEntityRegistry } from '@src/app/useEntityRegistry';
-
-import { GetDatasetQuery, useGetDatasetLazyQuery, useGetDatasetSchemaLazyQuery } from '@graphql/dataset.generated';
-import { useGetSearchResultsQuery } from '@graphql/search.generated';
-import { EntityType, ErModelRelationship } from '@types';
-
-import closeIcon from '@images/close_dark.svg';
-
-const StyledPagination = styled(Pagination)`
-    margin: 0px;
-    padding: 0px;
-    padding-left: 400px;
-`;
-const StyledInput = styled(Input)`
-    border-radius: 70px;
-    border: 1px solid rgba(0, 0, 0, 0.12);
-    max-width: 416px;
-    height: 40px !important;
-`;
-const ThinDivider = styled(Divider)`
-    height: 1px;
-    width: 520px !important;
-    background: #f0f0f0;
-    margin-left: -70px;
-    margin-bottom: 0px;
-`;
-const NoERModelRelations = styled(Empty)`
-    color: ${ANTD_GRAY[6]};
-    padding-top: 60px;
-`;
-export const RelationshipsTab = () => {
-    const [pageSize, setPageSize] = useState(10);
-    const [currentPage, setCurrentPage] = useState(0);
-    const [filterText, setFilterText] = useState('');
-    const baseEntity = useBaseEntity<GetDatasetQuery>();
-    // Dynamically load the schema + editable schema information.
-    const { entityWithSchema } = useGetEntityWithSchema();
-    const [modalVisible, setModalVisible] = useState(false);
-    const [ermodelrelationModalVisible, setermodelrelationModalVisible] = useState(false);
-    const entityRegistry = useEntityRegistry();
-    const entityName = entityRegistry.getEntityName(EntityType.ErModelRelationship);
-    const tabs = [
-        {
-            key: 'ermodelrelationsTab',
-            tab: entityRegistry.getCollectionName(EntityType.ErModelRelationship),
-        },
-    ];
-    const {
-        data: ermodelrelations,
-        loading: loadingERModelRelation,
-        error: errorERModelRelation,
-        refetch,
-    } = useGetSearchResultsQuery({
-        variables: {
-            input: {
-                type: EntityType.ErModelRelationship,
-                query: `${filterText ? `${filterText}` : ''}`,
-                orFilters: [
-                    {
-                        and: [
-                            {
-                                field: 'source',
-                                values: [baseEntity?.dataset?.urn || ''],
-                            },
-                        ],
-                    },
-                    {
-                        and: [
-                            {
-                                field: 'destination',
-                                values: [baseEntity?.dataset?.urn || ''],
-                            },
-                        ],
-                    },
-                ],
-                start: currentPage * pageSize,
-                count: pageSize, // all matched ermodelrelations
-            },
-        },
-    });
-    const totalResults = ermodelrelations?.search?.total || 0;
-    let ermodelrelationData: ErModelRelationship[] = [];
-    if (loadingERModelRelation) {
-        ermodelrelationData = [{}] as ErModelRelationship[];
-    }
-
-    if (
-        !loadingERModelRelation &&
-        ermodelrelations?.search &&
-        ermodelrelations?.search?.searchResults?.length > 0 &&
-        !errorERModelRelation
-    ) {
-        ermodelrelationData = ermodelrelations.search.searchResults.map((r) => r.entity as ErModelRelationship);
-    }
-
-    const contentListNoTitle: Record<string, React.ReactNode> = {
-        ermodelrelationsTab:
-            ermodelrelationData.length > 0 && !loadingERModelRelation ? (
-                ermodelrelationData.map((record) => {
-                    return (
-                        <>
-                            <div>
-                                <ERModelRelationPreview
-                                    ermodelrelationData={record}
-                                    baseEntityUrn={baseEntity?.dataset?.urn}
-                                    prePageType="Dataset"
-                                    refetch={refetch}
-                                />
-                                <Divider className="thin-divider" />
-                            </div>
-                        </>
-                    );
-                })
-            ) : (
-                <>
-                    {!loadingERModelRelation && (
-                        <div>
-                            <NoERModelRelations />
-                        </div>
-                    )}
-                    {loadingERModelRelation && (
-                        <div>
-                            {entityName} <LoadingOutlined />
-                        </div>
-                    )}
-                </>
-            ),
-    };
-    const [activeTabKey, setActiveTabKey] = useState<string>('ermodelrelationsTab');
-    const onTabChange = (key: string) => {
-        setActiveTabKey(key);
-    };
-    const [table2LazySchema, setTable2LazySchema] = useState(undefined as any);
-    const [getTable2LazySchema] = useGetDatasetSchemaLazyQuery({
-        onCompleted: (data) => {
-            setTable2LazySchema(data);
-        },
-    });
-    const [table2LazyDataset, setTable2LazyDataset] = useState(undefined as any);
-    const [getTable2LazyDataset] = useGetDatasetLazyQuery({
-        onCompleted: (data) => {
-            setTable2LazyDataset(data);
-        },
-    });
-
-    const schemaIssueModal = useCallback(() => {
-        Modal.error({
-            title: `Schema error`,
-            className: 'schema-modal',
-            content: (
-                <div>
-                    <ThinDivider />
-                    <p className="msg-div-inner">
-                        A schema was not ingested for the dataset selected. {entityName} cannot be created.
-                    </p>
-                    <ThinDivider />
-                </div>
-            ),
-            onOk() {},
-            okText: 'Ok',
-            icon: <ExclamationCircleFilled />,
-            closeIcon: <img src={closeIcon} alt="" />,
-            maskClosable: true,
-            closable: true,
-        });
-    }, [entityName]);
-    useEffect(() => {
-        if (
-            table2LazySchema?.dataset !== undefined &&
-            table2LazySchema?.dataset?.schemaMetadata?.fields === undefined
-        ) {
-            schemaIssueModal();
-        }
-        if (
-            table2LazySchema?.dataset !== undefined &&
-            table2LazySchema?.dataset?.schemaMetadata?.fields !== undefined
-        ) {
-            setermodelrelationModalVisible(false);
-            setModalVisible(true);
-        }
-    }, [table2LazySchema, schemaIssueModal]);
-    return (
-        <>
-            {ermodelrelationModalVisible && (
-                <SearchSelectModal
-                    titleText="Select Table 2"
-                    continueText="Submit"
-                    onContinue={async (selectedDataSet) => {
-                        await getTable2LazySchema({
-                            variables: {
-                                urn: selectedDataSet[0] || '',
-                            },
-                        });
-                        await getTable2LazyDataset({
-                            variables: {
-                                urn: selectedDataSet[0] || '',
-                            },
-                        });
-                    }}
-                    onCancel={() => setermodelrelationModalVisible(false)}
-                    fixedEntityTypes={[EntityType.Dataset]}
-                    singleSelect
-                    hideToolbar
-                />
-            )}
-            {baseEntity !== undefined && (
-                <CreateERModelRelationModal
-                    table1={baseEntity}
-                    table1Schema={entityWithSchema}
-                    table2={table2LazyDataset}
-                    table2Schema={table2LazySchema}
-                    open={modalVisible}
-                    setModalVisible={setModalVisible}
-                    onCancel={() => {
-                        setModalVisible(false);
-                    }}
-                    refetch={refetch}
-                    entityName={entityName}
-                />
-            )}
-            <Card
-                headStyle={{ border: '2px', fontSize: '16px' }}
-                className="RelationshipsTab"
-                tabList={tabs}
-                activeTabKey={activeTabKey}
-                onTabChange={(key) => {
-                    onTabChange(key);
-                }}
-            >
-                <div className="search-header-div">
-                    <StyledInput
-                        defaultValue={filterText}
-                        placeholder={`Find ${entityName}...`}
-                        onChange={(e) => setFilterText(e.target.value)}
-                        allowClear
-                        autoFocus
-                        prefix={<Icon icon="MagnifyingGlass" source="phosphor" />}
-                    />
-                    <Button
-                        type="link"
-                        className="add-btn-link"
-                        hidden={entityWithSchema?.schemaMetadata?.fields === undefined}
-                        onClick={() => {
-                            setermodelrelationModalVisible(true);
-                        }}
-                    >
-                        <PlusOutlined /> Add {entityName}
-                    </Button>
-                </div>{' '}
-                <br />
-                <br />
-                {contentListNoTitle[activeTabKey]}
-                {totalResults >= 1 && (
-                    <StyledPagination
-                        current={currentPage + 1}
-                        defaultCurrent={1}
-                        pageSize={pageSize}
-                        total={totalResults}
-                        showLessItems
-                        onChange={(page) => setCurrentPage(page - 1)}
-                        showSizeChanger={totalResults > 10}
-                        onShowSizeChange={(_currNum, newNum) => setPageSize(newNum)}
-                        pageSizeOptions={['10', '20', '50', '100']}
-                    />
-                )}
-            </Card>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaContext.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaContext.tsx
deleted file mode 100644
index 3fcc72f379ef12..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaContext.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React, { useContext } from 'react';
-
-import { SchemaContextType } from '@app/entity/shared/types';
-
-const SchemaContext = React.createContext<SchemaContextType>({
-    refetch: () => Promise.resolve({}),
-});
-
-export default SchemaContext;
-
-export const useSchemaRefetch = () => {
-    const { refetch } = useContext(SchemaContext);
-    return refetch;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTab.tsx
deleted file mode 100644
index 55fd065d2a2037..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTab.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import { LoadingOutlined } from '@ant-design/icons';
-import { Empty } from 'antd';
-import React, { useEffect, useMemo, useState } from 'react';
-import { useLocation } from 'react-router';
-import styled from 'styled-components';
-
-import SchemaHeader from '@app/entity/dataset/profile/schema/components/SchemaHeader';
-import SchemaRawView from '@app/entity/dataset/profile/schema/components/SchemaRawView';
-import { KEY_SCHEMA_PREFIX } from '@app/entity/dataset/profile/schema/utils/constants';
-import { groupByFieldPath } from '@app/entity/dataset/profile/schema/utils/utils';
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import SchemaContext from '@app/entity/shared/tabs/Dataset/Schema/SchemaContext';
-import SchemaTable from '@app/entity/shared/tabs/Dataset/Schema/SchemaTable';
-import { useGetEntityWithSchema } from '@app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema';
-import { filterSchemaRows } from '@app/entity/shared/tabs/Dataset/Schema/utils/filterSchemaRows';
-import getSchemaFilterFromQueryString from '@app/entity/shared/tabs/Dataset/Schema/utils/getSchemaFilterFromQueryString';
-import useUpdateSchemaFilterQueryString from '@app/entity/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString';
-import useGetSemanticVersionFromUrlParams from '@app/entity/shared/tabs/Dataset/Schema/utils/useGetSemanticVersionFromUrlParams';
-import SchemaEditableContext from '@app/shared/SchemaEditableContext';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { GetDatasetQuery } from '@graphql/dataset.generated';
-import { useGetSchemaBlameQuery, useGetSchemaVersionListQuery } from '@graphql/schemaBlame.generated';
-import { useGetVersionedDatasetQuery } from '@graphql/versionedDataset.generated';
-import { SchemaFieldBlame, SemanticVersionStruct } from '@types';
-
-const NoSchema = styled(Empty)`
-    color: ${ANTD_GRAY[6]};
-    padding-top: 60px;
-`;
-
-const SchemaTableContainer = styled.div`
-    overflow: auto;
-    height: 100%;
-`;
-
-const LoadingWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 350px;
-    font-size: 30px;
-`;
-
-export const SchemaTab = ({ properties }: { properties?: any }) => {
-    const entityRegistry = useEntityRegistry();
-    const baseEntity = useBaseEntity<GetDatasetQuery>();
-    // Dynamically load the schema + editable schema information.
-    const { entityWithSchema, loading, refetch } = useGetEntityWithSchema();
-    let schemaMetadata: any = entityWithSchema?.schemaMetadata || undefined;
-    let editableSchemaMetadata: any = entityWithSchema?.editableSchemaMetadata || undefined;
-    const datasetUrn: string = baseEntity?.dataset?.urn || '';
-    const usageStats = baseEntity?.dataset?.usageStats;
-    const [showRaw, setShowRaw] = useState(false);
-    const location = useLocation();
-    const schemaFilter = getSchemaFilterFromQueryString(location);
-    const [filterText, setFilterText] = useState(schemaFilter);
-    useUpdateSchemaFilterQueryString(filterText);
-
-    const hasRawSchema = useMemo(
-        () =>
-            schemaMetadata?.platformSchema?.__typename === 'TableSchema' &&
-            schemaMetadata?.platformSchema?.schema?.length > 0,
-        [schemaMetadata],
-    );
-    const hasKeySchema = useMemo(
-        () =>
-            (schemaMetadata?.fields?.length || 0) > 0 &&
-            schemaMetadata?.fields?.findIndex((field) => field.fieldPath.indexOf(KEY_SCHEMA_PREFIX) > -1) !== -1,
-        [schemaMetadata],
-    );
-
-    const hasValueSchema = useMemo(
-        () =>
-            (schemaMetadata?.fields?.length || 0) > 0 &&
-            schemaMetadata?.fields?.findIndex((field) => field.fieldPath.indexOf(KEY_SCHEMA_PREFIX) === -1) !== -1,
-        [schemaMetadata],
-    );
-
-    const hasProperties = useMemo(
-        () =>
-            entityWithSchema?.schemaMetadata?.fields?.some(
-                (schemaField) =>
-                    !!schemaField.schemaFieldEntity?.structuredProperties?.properties?.filter(
-                        (prop) => prop.structuredProperty.exists,
-                    )?.length,
-            ),
-        [entityWithSchema],
-    );
-
-    const [showKeySchema, setShowKeySchema] = useState(false);
-    const [showSchemaAuditView, setShowSchemaAuditView] = useState(false);
-
-    const { data: getSchemaVersionListData } = useGetSchemaVersionListQuery({
-        skip: !datasetUrn,
-        variables: {
-            input: {
-                datasetUrn,
-            },
-        },
-        fetchPolicy: 'cache-first',
-    });
-    const latestVersion: string = getSchemaVersionListData?.getSchemaVersionList?.latestVersion?.semanticVersion || '';
-
-    const versionList: Array<SemanticVersionStruct> =
-        getSchemaVersionListData?.getSchemaVersionList?.semanticVersionList || [];
-    const version = useGetSemanticVersionFromUrlParams();
-    const selectedVersion = version || latestVersion;
-
-    const selectedSemanticVersionStruct = versionList.find(
-        (semanticVersion) => semanticVersion.semanticVersion === selectedVersion,
-    );
-    const selectedVersionStamp: string = selectedSemanticVersionStruct?.versionStamp || '';
-    const isVersionLatest = selectedVersion === latestVersion;
-
-    let editMode = true;
-    if (!isVersionLatest) {
-        editMode = false;
-    } else if (properties && properties.hasOwnProperty('editMode')) {
-        editMode = properties.editMode;
-    }
-
-    const { data: getSchemaBlameData } = useGetSchemaBlameQuery({
-        skip: !datasetUrn || !selectedVersion,
-        variables: {
-            input: {
-                datasetUrn,
-                version: selectedVersion,
-            },
-        },
-        fetchPolicy: 'cache-first',
-    });
-
-    const versionedDatasetData = useGetVersionedDatasetQuery({
-        skip: !datasetUrn || !selectedVersionStamp,
-        variables: {
-            urn: datasetUrn,
-            versionStamp: selectedVersionStamp,
-        },
-        fetchPolicy: 'cache-first',
-    });
-
-    if (selectedVersion !== latestVersion) {
-        schemaMetadata = versionedDatasetData?.data?.versionedDataset?.schema || undefined;
-        editableSchemaMetadata = versionedDatasetData?.data?.versionedDataset?.editableSchemaMetadata || undefined;
-    }
-
-    // if there is no value schema, default the selected schema to Key
-    useEffect(() => {
-        if (!hasValueSchema && hasKeySchema) {
-            setShowKeySchema(true);
-        }
-    }, [hasValueSchema, hasKeySchema, setShowKeySchema]);
-
-    const sortedFields = schemaMetadata?.fields?.slice().sort((a, b) => {
-        if (a.isPartitioningKey === b.isPartitioningKey) {
-            return 0;
-        }
-        return a.isPartitioningKey ? -1 : 1;
-    });
-
-    const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-        sortedFields,
-        editableSchemaMetadata,
-        filterText,
-        entityRegistry,
-    );
-
-    const rows = useMemo(() => {
-        return groupByFieldPath(filteredRows, { showKeySchema });
-    }, [showKeySchema, filteredRows]);
-
-    const schemaFieldBlameList: Array<SchemaFieldBlame> =
-        (getSchemaBlameData?.getSchemaBlame?.schemaFieldBlameList as Array<SchemaFieldBlame>) || [];
-
-    return (
-        <SchemaContext.Provider value={{ refetch }}>
-            <SchemaHeader
-                editMode={editMode}
-                showRaw={showRaw}
-                setShowRaw={setShowRaw}
-                hasRaw={hasRawSchema}
-                hasKeySchema={hasKeySchema}
-                showKeySchema={showKeySchema}
-                setShowKeySchema={setShowKeySchema}
-                selectedVersion={selectedVersion}
-                versionList={versionList}
-                showSchemaAuditView={showSchemaAuditView}
-                setShowSchemaAuditView={setShowSchemaAuditView}
-                setFilterText={setFilterText}
-                numRows={rows.length}
-            />
-            {(loading && !schemaMetadata && (
-                <LoadingWrapper>
-                    <LoadingOutlined />
-                </LoadingWrapper>
-            )) || (
-                <SchemaTableContainer>
-                    {/* eslint-disable-next-line no-nested-ternary */}
-                    {showRaw ? (
-                        <SchemaRawView
-                            schemaDiff={{ current: schemaMetadata }}
-                            editMode={editMode}
-                            showKeySchema={showKeySchema}
-                        />
-                    ) : rows && rows.length > 0 ? (
-                        <>
-                            <SchemaEditableContext.Provider value={editMode}>
-                                <SchemaTable
-                                    schemaMetadata={schemaMetadata}
-                                    rows={rows}
-                                    editableSchemaMetadata={editableSchemaMetadata}
-                                    usageStats={usageStats}
-                                    schemaFieldBlameList={schemaFieldBlameList}
-                                    showSchemaAuditView={showSchemaAuditView}
-                                    expandedRowsFromFilter={expandedRowsFromFilter as any}
-                                    filterText={filterText as any}
-                                    hasProperties={hasProperties}
-                                />
-                            </SchemaEditableContext.Provider>
-                        </>
-                    ) : (
-                        <NoSchema />
-                    )}
-                </SchemaTableContainer>
-            )}
-        </SchemaContext.Provider>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx
deleted file mode 100644
index bf7db18c755afb..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx
+++ /dev/null
@@ -1,318 +0,0 @@
-import { ColumnsType } from 'antd/es/table';
-import ResizeObserver from 'rc-resize-observer';
-import React, { useEffect, useMemo, useState } from 'react';
-import styled from 'styled-components';
-import { useVT } from 'virtualizedtableforantd4';
-
-import useSchemaTitleRenderer from '@app/entity/dataset/profile/schema/utils/schemaTitleRenderer';
-import translateFieldPath from '@app/entity/dataset/profile/schema/utils/translateFieldPath';
-import { ExtendedSchemaFields } from '@app/entity/dataset/profile/schema/utils/types';
-import { StyledTable } from '@app/entity/shared/components/styled/StyledTable';
-import { ANTD_GRAY, ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-import ExpandIcon from '@app/entity/shared/tabs/Dataset/Schema/components/ExpandIcon';
-import PropertiesColumn from '@app/entity/shared/tabs/Dataset/Schema/components/PropertiesColumn';
-import SchemaFieldDrawer from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer';
-import { SchemaRow } from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaRow';
-import { useGetStructuredPropColumns } from '@app/entity/shared/tabs/Dataset/Schema/useGetStructuredPropColumns';
-import { useGetTableColumnProperties } from '@app/entity/shared/tabs/Dataset/Schema/useGetTableColumnProperties';
-import { FkContext } from '@app/entity/shared/tabs/Dataset/Schema/utils/selectedFkContext';
-import useBusinessAttributeRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useBusinessAttributeRenderer';
-import useDescriptionRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer';
-import useSchemaBlameRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useSchemaBlameRenderer';
-import useTagsAndTermsRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer';
-import useUsageStatsRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer';
-import { useBusinessAttributesFlag } from '@app/useAppConfig';
-
-import {
-    EditableSchemaMetadata,
-    ForeignKeyConstraint,
-    SchemaField,
-    SchemaFieldBlame,
-    SchemaMetadata,
-    UsageQueryResult,
-} from '@types';
-
-const TableContainer = styled.div`
-    overflow: inherit;
-    height: inherit;
-
-    &&& .ant-table-tbody > tr > .ant-table-cell-with-append {
-        border-right: none;
-        padding: 0px;
-    }
-
-    &&& .ant-table-tbody > tr > .ant-table-cell {
-        border-right: none;
-    }
-    &&& .open-fk-row > td {
-        padding-bottom: 600px;
-        vertical-align: top;
-    }
-
-    &&& .ant-table-cell {
-        background-color: inherit;
-        cursor: pointer;
-    }
-
-    &&& tbody > tr:hover > td {
-        background-color: ${ANTD_GRAY_V2[2]};
-    }
-
-    &&& .expanded-row {
-        background-color: ${(props) => props.theme.styles['highlight-color']} !important;
-
-        td {
-            background-color: ${(props) => props.theme.styles['highlight-color']} !important;
-        }
-    }
-`;
-
-export type Props = {
-    rows: Array<ExtendedSchemaFields>;
-    schemaMetadata: SchemaMetadata | undefined | null;
-    editableSchemaMetadata?: EditableSchemaMetadata | null;
-    usageStats?: UsageQueryResult | null;
-    schemaFieldBlameList?: Array<SchemaFieldBlame> | null;
-    showSchemaAuditView: boolean;
-    expandedRowsFromFilter?: Set<string>;
-    filterText?: string;
-    hasProperties?: boolean;
-    inputFields?: SchemaField[];
-};
-
-const EMPTY_SET: Set<string> = new Set();
-const TABLE_HEADER_HEIGHT = 52;
-
-export default function SchemaTable({
-    rows,
-    schemaMetadata,
-    editableSchemaMetadata,
-    usageStats,
-    schemaFieldBlameList,
-    showSchemaAuditView,
-    expandedRowsFromFilter = EMPTY_SET,
-    filterText = '',
-    hasProperties,
-    inputFields,
-}: Props): JSX.Element {
-    const businessAttributesFlag = useBusinessAttributesFlag();
-    const hasUsageStats = useMemo(() => (usageStats?.aggregations?.fields?.length || 0) > 0, [usageStats]);
-    const [tableHeight, setTableHeight] = useState(0);
-    const [selectedFkFieldPath, setSelectedFkFieldPath] = useState<null | {
-        fieldPath: string;
-        constraint?: ForeignKeyConstraint | null;
-    }>(null);
-    const [expandedDrawerFieldPath, setExpandedDrawerFieldPath] = useState<string | null>(null);
-
-    const schemaFields = schemaMetadata ? schemaMetadata.fields : inputFields;
-
-    const descriptionRender = useDescriptionRenderer(editableSchemaMetadata);
-    const usageStatsRenderer = useUsageStatsRenderer(usageStats);
-    const tagRenderer = useTagsAndTermsRenderer(
-        editableSchemaMetadata,
-        {
-            showTags: true,
-            showTerms: false,
-        },
-        filterText,
-        false,
-    );
-    const termRenderer = useTagsAndTermsRenderer(
-        editableSchemaMetadata,
-        {
-            showTags: false,
-            showTerms: true,
-        },
-        filterText,
-        false,
-    );
-    const businessAttributeRenderer = useBusinessAttributeRenderer(filterText, false);
-    const schemaTitleRenderer = useSchemaTitleRenderer(schemaMetadata, setSelectedFkFieldPath, filterText);
-    const schemaBlameRenderer = useSchemaBlameRenderer(schemaFieldBlameList);
-
-    const tableColumnStructuredProps = useGetTableColumnProperties();
-    const structuredPropColumns = useGetStructuredPropColumns(tableColumnStructuredProps);
-
-    const fieldColumn = {
-        width: '22%',
-        title: 'Field',
-        dataIndex: 'fieldPath',
-        key: 'fieldPath',
-        render: schemaTitleRenderer,
-        filtered: true,
-        sorter: (sourceA, sourceB) => {
-            return translateFieldPath(sourceA.fieldPath).localeCompare(translateFieldPath(sourceB.fieldPath));
-        },
-    };
-
-    const descriptionColumn = {
-        width: '22%',
-        title: 'Description',
-        dataIndex: 'description',
-        key: 'description',
-        render: descriptionRender,
-    };
-
-    const tagColumn = {
-        width: '13%',
-        title: 'Tags',
-        dataIndex: 'globalTags',
-        key: 'tag',
-        render: tagRenderer,
-    };
-
-    const termColumn = {
-        width: '13%',
-        title: 'Glossary Terms',
-        dataIndex: 'globalTags',
-        key: 'tag',
-        render: termRenderer,
-    };
-
-    const businessAttributeColumn = {
-        width: '18%',
-        title: 'Business Attribute',
-        dataIndex: 'businessAttribute',
-        key: 'businessAttribute',
-        render: businessAttributeRenderer,
-    };
-
-    const blameColumn = {
-        width: '10%',
-        dataIndex: 'fieldPath',
-        key: 'fieldPath',
-        render(record: SchemaField) {
-            return {
-                props: {
-                    style: { backgroundColor: ANTD_GRAY[2.5] },
-                },
-                children: schemaBlameRenderer(record),
-            };
-        },
-    };
-
-    // Function to get the count of each usageStats fieldPath
-    function getCount(fieldPath: any) {
-        const data: any =
-            usageStats?.aggregations?.fields &&
-            usageStats?.aggregations?.fields?.find((field) => {
-                return field?.fieldName === fieldPath;
-            });
-        return data && data.count;
-    }
-
-    const usageColumn = {
-        width: '10%',
-        title: 'Usage',
-        dataIndex: 'fieldPath',
-        key: 'usage',
-        render: usageStatsRenderer,
-        sorter: (sourceA, sourceB) => getCount(sourceA.fieldPath) - getCount(sourceB.fieldPath),
-    };
-
-    const propertiesColumn = {
-        width: '13%',
-        title: 'Properties',
-        dataIndex: '',
-        key: 'menu',
-        render: (field: SchemaField) => <PropertiesColumn field={field} />,
-    };
-
-    let allColumns: ColumnsType<ExtendedSchemaFields> = [fieldColumn, descriptionColumn, tagColumn, termColumn];
-
-    if (businessAttributesFlag) {
-        allColumns = [...allColumns, businessAttributeColumn];
-    }
-
-    if (hasProperties) {
-        allColumns = [...allColumns, propertiesColumn];
-    }
-
-    if (structuredPropColumns) {
-        allColumns = [...allColumns, ...structuredPropColumns];
-    }
-
-    if (hasUsageStats) {
-        allColumns = [...allColumns, usageColumn];
-    }
-
-    if (showSchemaAuditView) {
-        allColumns = [...allColumns, blameColumn];
-    }
-
-    const [expandedRows, setExpandedRows] = useState<Set<string>>(new Set());
-
-    useEffect(() => {
-        setExpandedRows((previousRows) => {
-            const finalRowsSet = new Set();
-            expandedRowsFromFilter.forEach((row) => finalRowsSet.add(row));
-            previousRows.forEach((row) => finalRowsSet.add(row));
-            return finalRowsSet as Set<string>;
-        });
-    }, [expandedRowsFromFilter]);
-
-    const [VT, setVT] = useVT(() => ({ scroll: { y: tableHeight } }), [tableHeight]);
-
-    useMemo(() => setVT({ body: { row: SchemaRow } }), [setVT]);
-
-    return (
-        <FkContext.Provider value={selectedFkFieldPath}>
-            <TableContainer>
-                <ResizeObserver onResize={(dimensions) => setTableHeight(dimensions.height - TABLE_HEADER_HEIGHT)}>
-                    <StyledTable
-                        rowClassName={(record) => {
-                            if (record.fieldPath === selectedFkFieldPath?.fieldPath) {
-                                return 'open-fk-row';
-                            }
-                            if (expandedDrawerFieldPath === record.fieldPath) {
-                                return 'expanded-row';
-                            }
-                            return '';
-                        }}
-                        columns={allColumns}
-                        dataSource={rows}
-                        rowKey="fieldPath"
-                        scroll={{ y: tableHeight }}
-                        components={VT}
-                        expandable={{
-                            expandedRowKeys: [...Array.from(expandedRows)],
-                            defaultExpandAllRows: false,
-                            expandRowByClick: false,
-                            expandIcon: ExpandIcon,
-                            onExpand: (expanded, record) => {
-                                if (expanded) {
-                                    setExpandedRows((previousRows) => new Set(previousRows.add(record.fieldPath)));
-                                } else {
-                                    setExpandedRows((previousRows) => {
-                                        previousRows.delete(record.fieldPath);
-                                        return new Set(previousRows);
-                                    });
-                                }
-                            },
-                            indentSize: 0,
-                        }}
-                        pagination={false}
-                        onRow={(record) => ({
-                            onClick: () => {
-                                setExpandedDrawerFieldPath(
-                                    expandedDrawerFieldPath === record.fieldPath ? null : record.fieldPath,
-                                );
-                            },
-                            style: {
-                                backgroundColor: expandedDrawerFieldPath === record.fieldPath ? `` : 'white',
-                            },
-                        })}
-                    />
-                </ResizeObserver>
-            </TableContainer>
-            {!!schemaFields && (
-                <SchemaFieldDrawer
-                    schemaFields={schemaFields}
-                    expandedDrawerFieldPath={expandedDrawerFieldPath}
-                    editableSchemaMetadata={editableSchemaMetadata}
-                    setExpandedDrawerFieldPath={setExpandedDrawerFieldPath}
-                />
-            )}
-        </FkContext.Provider>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts
deleted file mode 100644
index 97819919b14c6b..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/__tests__/filterSchemaRows.test.ts
+++ /dev/null
@@ -1,335 +0,0 @@
-import { filterSchemaRows } from '@app/entity/shared/tabs/Dataset/Schema/utils/filterSchemaRows';
-import { glossaryTerm1, sampleTag } from '@src/Mocks';
-import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer';
-
-import { SchemaField } from '@types';
-
-describe('filterSchemaRows', () => {
-    const testEntityRegistry = getTestEntityRegistry();
-    const rows = [
-        { fieldPath: 'customer', description: 'customer description' },
-        { fieldPath: 'testing', description: 'testing description' },
-        { fieldPath: 'shipment', description: 'shipment description' },
-    ] as SchemaField[];
-
-    it('should properly filter schema rows based on field name', () => {
-        const filterText = 'test';
-        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
-        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-            rows,
-            editableSchemaMetadata,
-            filterText,
-            testEntityRegistry,
-        );
-
-        expect(filteredRows).toMatchObject([{ fieldPath: 'testing' }]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set());
-    });
-
-    it('should properly filter schema rows based on field name regardless of capitalization', () => {
-        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
-        const filterText = 'TeSt';
-        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-            rows,
-            editableSchemaMetadata,
-            filterText,
-            testEntityRegistry,
-        );
-
-        expect(filteredRows).toMatchObject([{ fieldPath: 'testing' }]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set());
-    });
-
-    it('should properly filter schema rows based on description', () => {
-        const filterText = 'testing description';
-        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
-        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-            rows,
-            editableSchemaMetadata,
-            filterText,
-            testEntityRegistry,
-        );
-
-        expect(filteredRows).toMatchObject([{ fieldPath: 'testing' }]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set());
-    });
-
-    it('should properly filter schema rows based on description regardless of capitalization', () => {
-        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
-        const filterText = 'TeSting DesCriptioN';
-        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-            rows,
-            editableSchemaMetadata,
-            filterText,
-            testEntityRegistry,
-        );
-
-        expect(filteredRows).toMatchObject([{ fieldPath: 'testing' }]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set());
-    });
-
-    it('should properly filter schema rows based on editable description', () => {
-        const editableSchemaMetadata = {
-            editableSchemaFieldInfo: [
-                {
-                    fieldPath: 'customer',
-                    description: 'editable customer description',
-                    globalTags: null,
-                    glossaryTerms: null,
-                },
-            ],
-        };
-        const filterText = 'editable customer description';
-        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-            rows,
-            editableSchemaMetadata,
-            filterText,
-            testEntityRegistry,
-        );
-
-        expect(filteredRows).toMatchObject([{ fieldPath: 'customer' }]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set());
-    });
-
-    it('should properly filter schema rows based on editable description regardless of capitalization', () => {
-        const editableSchemaMetadata = {
-            editableSchemaFieldInfo: [
-                {
-                    fieldPath: 'customer',
-                    description: 'editable customer description',
-                    globalTags: null,
-                    glossaryTerms: null,
-                },
-            ],
-        };
-        const filterText = 'EdiTable CuStoMer DesCriptioN';
-        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-            rows,
-            editableSchemaMetadata,
-            filterText,
-            testEntityRegistry,
-        );
-
-        expect(filteredRows).toMatchObject([{ fieldPath: 'customer' }]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set());
-    });
-
-    it('should properly filter schema rows based on editable tags', () => {
-        const editableSchemaMetadata = {
-            editableSchemaFieldInfo: [
-                { fieldPath: 'customer', globalTags: { tags: [{ tag: sampleTag }] }, glossaryTerms: null },
-            ],
-        };
-        const filterText = sampleTag.properties.name;
-        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-            rows,
-            editableSchemaMetadata,
-            filterText,
-            testEntityRegistry,
-        );
-
-        expect(filteredRows).toMatchObject([{ fieldPath: 'customer' }]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set());
-    });
-
-    it('should properly filter schema rows based on editable glossary terms', () => {
-        const editableSchemaMetadata = {
-            editableSchemaFieldInfo: [
-                { fieldPath: 'shipment', globalTags: null, glossaryTerms: { terms: [{ term: glossaryTerm1 }] } },
-            ],
-        };
-        const filterText = glossaryTerm1.properties?.name as string;
-        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-            rows,
-            editableSchemaMetadata,
-            filterText,
-            testEntityRegistry,
-        );
-
-        expect(filteredRows).toMatchObject([{ fieldPath: 'shipment' }]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set());
-    });
-
-    it('should properly filter and find children fields', () => {
-        const rowsWithChildren = [
-            { fieldPath: 'customer' },
-            { fieldPath: 'testing' },
-            { fieldPath: 'customer.child1' },
-            { fieldPath: 'customer.child2' },
-        ] as SchemaField[];
-        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
-        const filterText = 'child';
-        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-            rowsWithChildren,
-            editableSchemaMetadata,
-            filterText,
-            testEntityRegistry,
-        );
-
-        expect(filteredRows).toMatchObject([
-            { fieldPath: 'customer' },
-            { fieldPath: 'customer.child1' },
-            { fieldPath: 'customer.child2' },
-        ]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set(['customer']));
-    });
-
-    it('should properly filter and find children fields multiple levels down', () => {
-        const rowsWithChildren = [
-            { fieldPath: 'customer' },
-            { fieldPath: 'testing' },
-            { fieldPath: 'customer.child1' },
-            { fieldPath: 'customer.child1.findMe' },
-            { fieldPath: 'customer.child2' },
-        ] as SchemaField[];
-        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
-        const filterText = 'find';
-        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-            rowsWithChildren,
-            editableSchemaMetadata,
-            filterText,
-            testEntityRegistry,
-        );
-
-        expect(filteredRows).toMatchObject([
-            { fieldPath: 'customer' },
-            { fieldPath: 'customer.child1' },
-            { fieldPath: 'customer.child1.findMe' },
-        ]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set(['customer', 'customer.child1']));
-    });
-
-    it('should properly filter schema rows based on non-editable tags', () => {
-        const rowsWithTags = [
-            { fieldPath: 'customer' },
-            { fieldPath: 'testing', globalTags: { tags: [{ tag: sampleTag }] } },
-            { fieldPath: 'shipment' },
-        ] as SchemaField[];
-        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
-        const filterText = sampleTag.properties.name;
-        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-            rowsWithTags,
-            editableSchemaMetadata,
-            filterText,
-            testEntityRegistry,
-        );
-
-        expect(filteredRows).toMatchObject([{ fieldPath: 'testing' }]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set());
-    });
-
-    it('should properly filter schema rows based on non-editable glossary terms', () => {
-        const rowsWithTerms = [
-            { fieldPath: 'customer' },
-            { fieldPath: 'testing' },
-            { fieldPath: 'shipment', glossaryTerms: { terms: [{ term: glossaryTerm1 }] } },
-        ] as SchemaField[];
-        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
-        const filterText = glossaryTerm1.properties?.name as string;
-        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-            rowsWithTerms,
-            editableSchemaMetadata,
-            filterText,
-            testEntityRegistry,
-        );
-
-        expect(filteredRows).toMatchObject([{ fieldPath: 'shipment' }]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set());
-    });
-
-    it('should properly filter schema rows based on business attribute properties description', () => {
-        const rowsWithSchemaFieldEntity = [
-            {
-                fieldPath: 'customer',
-                schemaFieldEntity: {
-                    businessAttributes: {
-                        businessAttribute: {
-                            businessAttribute: { properties: { description: 'customer description' } },
-                        },
-                    },
-                },
-            },
-            {
-                fieldPath: 'testing',
-                schemaFieldEntity: {
-                    businessAttributes: {
-                        businessAttribute: {
-                            businessAttribute: { properties: { description: 'testing description' } },
-                        },
-                    },
-                },
-            },
-            {
-                fieldPath: 'shipment',
-                schemaFieldEntity: {
-                    businessAttributes: {
-                        businessAttribute: {
-                            businessAttribute: { properties: { description: 'shipment description' } },
-                        },
-                    },
-                },
-            },
-        ] as SchemaField[];
-        const filterText = 'testing description';
-        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
-        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-            rowsWithSchemaFieldEntity,
-            editableSchemaMetadata,
-            filterText,
-            testEntityRegistry,
-        );
-
-        expect(filteredRows).toMatchObject([{ fieldPath: 'testing' }]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set());
-    });
-
-    it('should properly filter schema rows based on business attribute properties tags', () => {
-        const rowsWithSchemaFieldEntity = [
-            {
-                fieldPath: 'customer',
-                schemaFieldEntity: {
-                    businessAttributes: {
-                        businessAttribute: {
-                            businessAttribute: { properties: { tags: { tags: [{ tag: sampleTag }] } } },
-                        },
-                    },
-                },
-            },
-            {
-                fieldPath: 'testing',
-                schemaFieldEntity: {
-                    businessAttributes: {
-                        businessAttribute: {
-                            businessAttribute: {
-                                properties: { tags: { tags: [{ tag: { properties: { name: 'otherTag' } } }] } },
-                            },
-                        },
-                    },
-                },
-            },
-            {
-                fieldPath: 'shipment',
-                schemaFieldEntity: {
-                    businessAttributes: {
-                        businessAttribute: {
-                            businessAttribute: {
-                                properties: { tags: { tags: [{ tag: { properties: { name: 'anotherTag' } } }] } },
-                            },
-                        },
-                    },
-                },
-            },
-        ] as SchemaField[];
-        const filterText = sampleTag.properties.name;
-        const editableSchemaMetadata = { editableSchemaFieldInfo: [] };
-        const { filteredRows, expandedRowsFromFilter } = filterSchemaRows(
-            rowsWithSchemaFieldEntity,
-            editableSchemaMetadata,
-            filterText,
-            testEntityRegistry,
-        );
-
-        expect(filteredRows).toMatchObject([{ fieldPath: 'customer' }]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set());
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ChildCountLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ChildCountLabel.tsx
deleted file mode 100644
index 420f9550dce62d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ChildCountLabel.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Badge } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-
-type Props = {
-    count: number;
-};
-
-const ChildCountBadge = styled(Badge)`
-    margin-left: 10px;
-    margin-top: 16px;
-    margin-bottom: 16px;
-    &&& .ant-badge-count {
-        background-color: ${ANTD_GRAY_V2[1]};
-        color: ${ANTD_GRAY_V2[8]};
-        box-shadow: 0 2px 1px -1px ${ANTD_GRAY_V2[6]};
-        border-radius: 4px 4px 4px 4px;
-        font-size: 12px;
-        font-weight: 500;
-        height: 22px;
-        font-family: 'Manrope';
-    }
-`;
-
-export default function ChildCountLabel({ count }: Props) {
-    const propertyString = count > 1 ? ' properties' : ' property';
-
-    // eslint-disable-next-line
-    return <ChildCountBadge count={count.toString() + propertyString} />;
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx
deleted file mode 100644
index 4f71d662927a4d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ExpandIcon.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { DownOutlined, RightOutlined } from '@ant-design/icons';
-import { RenderExpandIconProps } from 'rc-table/lib/interface';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-const Prefix = styled.div<{ padding: number }>`
-    padding-left: ${(props) => props.padding}px;
-    position: absolute;
-    min-height: 100%;
-    border-right: 2px solid ${ANTD_GRAY[4]};
-    border-top: 1px solid white;
-    border-bottom: 1px solid white;
-    margin-bottom: -1px;
-    top: -1px;
-`;
-
-const Padding = styled.span<{ padding: number }>`
-    margin-left: ${(props) => props.padding}px;
-`;
-
-const Down = styled(DownOutlined)`
-    color: ${ANTD_GRAY[7]};
-    padding-right: 5px;
-    padding-top: 21px;
-    vertical-align: top;
-`;
-
-const Right = styled(RightOutlined)`
-    color: ${ANTD_GRAY[7]};
-    padding-right: 5px;
-    padding-top: 21px;
-    vertical-align: top;
-`;
-
-const DEPTH_PADDING = 15;
-
-export default function ExpandIcon({ expanded, onExpand, expandable, record }: RenderExpandIconProps<any>) {
-    return (
-        <>
-            {Array.from({ length: record.depth }, (_, k) => (
-                <Prefix padding={5 + DEPTH_PADDING * (k + 1)} />
-            ))}
-            <Padding padding={DEPTH_PADDING * (record.depth + 1)} />
-            {expandable &&
-                record.children !== undefined &&
-                (expanded ? (
-                    <Down onClick={(e) => onExpand(record, e)} width={12} height={12} />
-                ) : (
-                    <Right onClick={(e) => onExpand(record, e)} width={12} height={12} />
-                ))}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx
deleted file mode 100644
index ea22e36fab4157..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { green } from '@ant-design/colors';
-import { Badge } from 'antd';
-import React, { useContext } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { FkContext } from '@app/entity/shared/tabs/Dataset/Schema/utils/selectedFkContext';
-
-import { ForeignKeyConstraint } from '@types';
-
-const ForeignKeyBadge = styled(Badge)<{ $highlight: boolean }>`
-    margin-left: 4px;
-    &&& .ant-badge-count {
-        background-color: ${(props) => (props.$highlight ? green[1] : ANTD_GRAY[1])};
-        color: ${green[5]};
-        border: 1px solid ${green[2]};
-        font-size: 12px;
-        font-weight: 400;
-        height: 22px;
-        cursor: pointer;
-    }
-`;
-
-type Props = {
-    highlight: boolean;
-    fieldPath: string;
-    constraint?: ForeignKeyConstraint | null;
-    setHighlightedConstraint: (newActiveConstraint: string | null) => void;
-    onClick: (params: { fieldPath: string; constraint?: ForeignKeyConstraint | null } | null) => void;
-};
-
-export default function ForeignKeyLabel({
-    fieldPath,
-    constraint,
-    highlight,
-    setHighlightedConstraint,
-    onClick,
-}: Props) {
-    const selectedFk = useContext(FkContext);
-
-    const onOpenFk = () => {
-        if (selectedFk?.fieldPath?.trim() === fieldPath.trim() && selectedFk?.constraint?.name === constraint?.name) {
-            onClick(null);
-        } else {
-            onClick({ fieldPath, constraint });
-        }
-    };
-
-    return (
-        <>
-            <span
-                role="button"
-                tabIndex={0}
-                onKeyPress={(e) => (e.key === 'Enter' ? onOpenFk() : null)}
-                onClick={onOpenFk}
-                onMouseEnter={() => setHighlightedConstraint(constraint?.name || null)}
-                onMouseLeave={() => setHighlightedConstraint(null)}
-            >
-                <ForeignKeyBadge $highlight={highlight || selectedFk?.fieldPath === fieldPath} count="Foreign Key" />
-            </span>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/MenuColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/MenuColumn.tsx
deleted file mode 100644
index 1d231386645afc..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/MenuColumn.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { CopyOutlined } from '@ant-design/icons';
-import { Dropdown } from 'antd';
-import React from 'react';
-import { VscGraphLeft } from 'react-icons/vsc';
-import styled from 'styled-components/macro';
-
-import { useEntityData, useRouteToTab } from '@app/entity/shared/EntityContext';
-import { MenuIcon } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { generateSchemaFieldUrn } from '@app/entity/shared/tabs/Lineage/utils';
-import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent';
-
-import { SchemaField } from '@types';
-
-export const ImpactAnalysisIcon = styled(VscGraphLeft)`
-    transform: scaleX(-1);
-    font-size: 18px;
-`;
-
-export const CopyOutlinedIcon = styled(CopyOutlined)`
-    transform: scaleX(-1);
-    font-size: 16px;
-`;
-
-interface Props {
-    field: SchemaField;
-}
-
-export default function MenuColumn({ field }: Props) {
-    const routeToTab = useRouteToTab();
-    const { urn } = useEntityData();
-    const selectedColumnUrn = generateSchemaFieldUrn(field.fieldPath, urn);
-
-    const items = [
-        {
-            key: 0,
-            label: (
-                <MenuItemStyle
-                    onClick={() => routeToTab({ tabName: 'Lineage', tabParams: { column: field.fieldPath } })}
-                >
-                    <ImpactAnalysisIcon /> &nbsp; See Column Lineage
-                </MenuItemStyle>
-            ),
-        },
-        navigator.clipboard
-            ? {
-                  key: 1,
-                  label: (
-                      <MenuItemStyle
-                          onClick={() => {
-                              navigator.clipboard.writeText(field.fieldPath);
-                          }}
-                      >
-                          <CopyOutlinedIcon /> &nbsp; Copy Column Field Path
-                      </MenuItemStyle>
-                  ),
-              }
-            : null,
-        navigator.clipboard
-            ? {
-                  key: 2,
-                  label: (
-                      <MenuItemStyle
-                          onClick={() => {
-                              navigator.clipboard.writeText(selectedColumnUrn || '');
-                          }}
-                      >
-                          <CopyOutlinedIcon /> &nbsp; Copy Column Urn
-                      </MenuItemStyle>
-                  ),
-              }
-            : null,
-    ];
-
-    return (
-        <Dropdown menu={{ items }} trigger={['click']}>
-            <MenuIcon fontSize={16} />
-        </Dropdown>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/NullableLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/NullableLabel.tsx
deleted file mode 100644
index 03220ae8ed1c5e..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/NullableLabel.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { blue } from '@ant-design/colors';
-import { Badge } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-const NullableBadge = styled(Badge)`
-    margin-left: 4px;
-    &&& .ant-badge-count {
-        background-color: ${ANTD_GRAY[1]};
-        color: ${blue[5]};
-        border: 1px solid ${blue[3]};
-        font-size: 12px;
-        font-weight: 400;
-        height: 22px;
-    }
-`;
-
-export default function NullableLabel() {
-    return <NullableBadge count="Nullable" />;
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PartitioningKeyLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PartitioningKeyLabel.tsx
deleted file mode 100644
index ef1bfb1648320a..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PartitioningKeyLabel.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { blue } from '@ant-design/colors';
-import { Badge } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-const PartitioningKeyBadge = styled(Badge)`
-    margin-left: 4px;
-    &&& .ant-badge-count {
-        background-color: ${ANTD_GRAY[1]};
-        color: ${blue[5]};
-        border: 1px solid ${blue[2]};
-        font-size: 12px;
-        font-weight: 400;
-        height: 22px;
-    }
-`;
-
-export default function PartitioningKeyLabel() {
-    return <PartitioningKeyBadge count="Partition Key" />;
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PrimaryKeyLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PrimaryKeyLabel.tsx
deleted file mode 100644
index 0e9d7b21fcb48b..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PrimaryKeyLabel.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { blue } from '@ant-design/colors';
-import { Badge } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-const PrimaryKeyBadge = styled(Badge)`
-    margin-left: 4px;
-    &&& .ant-badge-count {
-        background-color: ${ANTD_GRAY[1]};
-        color: ${blue[5]};
-        border: 1px solid ${blue[2]};
-        font-size: 12px;
-        font-weight: 400;
-        height: 22px;
-    }
-`;
-
-export default function PrimaryKeyLabel() {
-    return <PrimaryKeyBadge count="Primary Key" />;
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertiesColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertiesColumn.tsx
deleted file mode 100644
index a6d59725f1dd0c..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/PropertiesColumn.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { ControlOutlined } from '@ant-design/icons';
-import React from 'react';
-import styled from 'styled-components';
-
-import { SchemaField } from '@types';
-
-const ColumnWrapper = styled.div`
-    font-size: 14px;
-`;
-
-const StyledIcon = styled(ControlOutlined)`
-    margin-right: 4px;
-`;
-
-interface Props {
-    field: SchemaField;
-}
-
-export default function PropertiesColumn({ field }: Props) {
-    const { schemaFieldEntity } = field;
-    const numProperties = schemaFieldEntity?.structuredProperties?.properties?.filter(
-        (prop) => !prop.structuredProperty.settings?.isHidden,
-    )?.length;
-
-    if (!schemaFieldEntity || !numProperties) return null;
-
-    return (
-        <ColumnWrapper>
-            <StyledIcon />
-            {numProperties} {numProperties === 1 ? 'property' : 'properties'}
-        </ColumnWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerHeader.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerHeader.tsx
deleted file mode 100644
index bfa04f4a092d3b..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerHeader.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import { CaretLeftOutlined, CaretRightOutlined, CloseOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React, { useEffect } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-import { pluralize } from '@app/shared/textUtil';
-
-import { SchemaField } from '@types';
-
-const HeaderWrapper = styled.div`
-    border-bottom: 1px solid ${ANTD_GRAY_V2[4]};
-    display: flex;
-    justify-content: space-between;
-    padding: 8px 16px;
-`;
-
-const StyledButton = styled(Button)`
-    font-size: 12px;
-    padding: 0;
-    height: 26px;
-    width: 26px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    svg {
-        height: 10px;
-        width: 10px;
-    }
-`;
-
-const FieldIndexText = styled.span`
-    font-size: 14px;
-    color: ${ANTD_GRAY_V2[8]};
-    margin: 0 8px;
-`;
-
-const ButtonsWrapper = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-interface Props {
-    schemaFields?: SchemaField[];
-    expandedFieldIndex?: number;
-    setExpandedDrawerFieldPath: (fieldPath: string | null) => void;
-}
-
-export default function DrawerHeader({ schemaFields = [], expandedFieldIndex = 0, setExpandedDrawerFieldPath }: Props) {
-    function showNextField() {
-        if (expandedFieldIndex !== undefined && expandedFieldIndex !== -1) {
-            if (expandedFieldIndex === schemaFields.length - 1) {
-                const newField = schemaFields[0];
-                setExpandedDrawerFieldPath(newField.fieldPath);
-            } else {
-                const newField = schemaFields[expandedFieldIndex + 1];
-                const { fieldPath } = newField;
-                setExpandedDrawerFieldPath(fieldPath);
-            }
-        }
-    }
-
-    function showPreviousField() {
-        if (expandedFieldIndex !== undefined && expandedFieldIndex !== -1) {
-            if (expandedFieldIndex === 0) {
-                const newField = schemaFields[schemaFields.length - 1];
-                setExpandedDrawerFieldPath(newField.fieldPath);
-            } else {
-                const newField = schemaFields[expandedFieldIndex - 1];
-                setExpandedDrawerFieldPath(newField.fieldPath);
-            }
-        }
-    }
-
-    function handleArrowKeys(event: KeyboardEvent) {
-        if (event.code === 'ArrowUp' || event.code === 'ArrowLeft') {
-            showPreviousField();
-        } else if (event.code === 'ArrowDown' || event.code === 'ArrowRight') {
-            showNextField();
-        }
-    }
-
-    useEffect(() => {
-        document.addEventListener('keydown', handleArrowKeys);
-
-        return () => document.removeEventListener('keydown', handleArrowKeys);
-    });
-
-    return (
-        <HeaderWrapper>
-            <ButtonsWrapper>
-                <StyledButton onClick={showPreviousField}>
-                    <CaretLeftOutlined />
-                </StyledButton>
-                <FieldIndexText>
-                    {expandedFieldIndex + 1} of {schemaFields.length} {pluralize(schemaFields.length, 'field')}
-                </FieldIndexText>
-                <StyledButton onClick={showNextField}>
-                    <CaretRightOutlined />
-                </StyledButton>
-            </ButtonsWrapper>
-            <StyledButton onClick={() => setExpandedDrawerFieldPath(null)}>
-                <CloseOutlined />
-            </StyledButton>
-        </HeaderWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldAttribute.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldAttribute.tsx
deleted file mode 100644
index bcc45e7f0839b2..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldAttribute.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-
-import {
-    SectionHeader,
-    StyledDivider,
-} from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components';
-import useBusinessAttributeRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useBusinessAttributeRenderer';
-import SchemaEditableContext from '@app/shared/SchemaEditableContext';
-import { useBusinessAttributesFlag } from '@app/useAppConfig';
-
-import { SchemaField } from '@types';
-
-interface Props {
-    expandedField: SchemaField;
-}
-
-export default function FieldAttribute({ expandedField }: Props) {
-    const isSchemaEditable = React.useContext(SchemaEditableContext);
-    const attributeRenderer = useBusinessAttributeRenderer('', isSchemaEditable);
-
-    const businessAttributesFlag = useBusinessAttributesFlag();
-
-    return businessAttributesFlag ? (
-        <>
-            <SectionHeader>Business Attribute</SectionHeader>
-            {/* pass in globalTags since this is a shared component, tags will not be shown or used */}
-            <div data-testid={`schema-field-${expandedField.fieldPath}-businessAttribute`}>
-                {attributeRenderer('', expandedField)}
-            </div>
-            <StyledDivider />
-        </>
-    ) : null;
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx
deleted file mode 100644
index 391b86331e9a25..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-import { EditOutlined } from '@ant-design/icons';
-import { Button, message } from 'antd';
-import DOMPurify from 'dompurify';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import analytics, { EntityActionType, EventType } from '@app/analytics';
-import { useEntityData, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext';
-import UpdateDescriptionModal from '@app/entity/shared/components/legacy/DescriptionModal';
-import DescriptionSection from '@app/entity/shared/containers/profile/sidebar/AboutSection/DescriptionSection';
-import PropagationDetails from '@app/entity/shared/propagation/PropagationDetails';
-import { useSchemaRefetch } from '@app/entity/shared/tabs/Dataset/Schema/SchemaContext';
-import {
-    SectionHeader,
-    StyledDivider,
-} from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components';
-import { getFieldDescriptionDetails } from '@app/entity/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails';
-import SchemaEditableContext from '@app/shared/SchemaEditableContext';
-
-import { useUpdateDescriptionMutation } from '@graphql/mutations.generated';
-import { EditableSchemaFieldInfo, SchemaField, SubResourceType } from '@types';
-
-const EditIcon = styled(Button)`
-    border: none;
-    box-shadow: none;
-    height: 20px;
-    width: 20px;
-`;
-
-const DescriptionWrapper = styled.div`
-    display: flex;
-    gap: 4px;
-    align-items: center;
-    justify-content: space-between;
-`;
-
-interface Props {
-    expandedField: SchemaField;
-    editableFieldInfo?: EditableSchemaFieldInfo;
-}
-
-export default function FieldDescription({ expandedField, editableFieldInfo }: Props) {
-    const isSchemaEditable = React.useContext(SchemaEditableContext);
-    const urn = useMutationUrn();
-    const refetch = useRefetch();
-    const schemaRefetch = useSchemaRefetch();
-    const [updateDescription] = useUpdateDescriptionMutation();
-    const [isModalVisible, setIsModalVisible] = useState(false);
-    const { entityType } = useEntityData();
-
-    const sendAnalytics = () => {
-        analytics.event({
-            type: EventType.EntityActionEvent,
-            actionType: EntityActionType.UpdateSchemaDescription,
-            entityType,
-            entityUrn: urn,
-        });
-    };
-
-    const refresh: any = () => {
-        refetch?.();
-        schemaRefetch?.();
-    };
-
-    const onSuccessfulMutation = () => {
-        refresh();
-        sendAnalytics();
-        message.destroy();
-        message.success({ content: 'Updated!', duration: 2 });
-    };
-
-    const onFailMutation = (e) => {
-        message.destroy();
-        if (e instanceof Error) message.error({ content: `Proposal Failed! \n ${e.message || ''}`, duration: 2 });
-    };
-
-    const generateMutationVariables = (updatedDescription: string) => ({
-        variables: {
-            input: {
-                description: DOMPurify.sanitize(updatedDescription),
-                resourceUrn: urn,
-                subResource: expandedField.fieldPath,
-                subResourceType: SubResourceType.DatasetField,
-            },
-        },
-    });
-
-    const { schemaFieldEntity, description } = expandedField;
-    const { displayedDescription, isPropagated, sourceDetail, propagatedDescription } = getFieldDescriptionDetails({
-        schemaFieldEntity,
-        editableFieldInfo,
-        defaultDescription: description,
-    });
-
-    const baDescription =
-        expandedField?.schemaFieldEntity?.businessAttributes?.businessAttribute?.businessAttribute?.properties
-            ?.description;
-    const baUrn = expandedField?.schemaFieldEntity?.businessAttributes?.businessAttribute?.businessAttribute?.urn;
-
-    return (
-        <>
-            <DescriptionWrapper>
-                <div>
-                    <SectionHeader>Description</SectionHeader>
-                    <DescriptionWrapper>
-                        {isPropagated && <PropagationDetails sourceDetail={sourceDetail} />}
-                        {!!displayedDescription && (
-                            <DescriptionSection
-                                description={displayedDescription || ''}
-                                baDescription={baDescription || ''}
-                                baUrn={baUrn || ''}
-                                isExpandable
-                            />
-                        )}
-                    </DescriptionWrapper>
-                </div>
-                {isSchemaEditable && (
-                    <EditIcon
-                        data-testid="edit-field-description"
-                        onClick={() => setIsModalVisible(true)}
-                        icon={<EditOutlined />}
-                    />
-                )}
-                {isModalVisible && (
-                    <UpdateDescriptionModal
-                        title={displayedDescription ? 'Update description' : 'Add description'}
-                        description={displayedDescription || ''}
-                        original={expandedField.description || ''}
-                        onClose={() => setIsModalVisible(false)}
-                        onSubmit={(updatedDescription: string) => {
-                            message.loading({ content: 'Updating...' });
-                            updateDescription(generateMutationVariables(updatedDescription))
-                                .then(onSuccessfulMutation)
-                                .catch(onFailMutation);
-                            setIsModalVisible(false);
-                        }}
-                        propagatedDescription={propagatedDescription || ''}
-                        isAddDesc={!displayedDescription}
-                    />
-                )}
-            </DescriptionWrapper>
-            <StyledDivider />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx
deleted file mode 100644
index 2649085c62d23d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import translateFieldPath from '@app/entity/dataset/profile/schema/utils/translateFieldPath';
-import { ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-import MenuColumn from '@app/entity/shared/tabs/Dataset/Schema/components/MenuColumn';
-import NullableLabel from '@app/entity/shared/tabs/Dataset/Schema/components/NullableLabel';
-import PartitioningKeyLabel from '@app/entity/shared/tabs/Dataset/Schema/components/PartitioningKeyLabel';
-import PrimaryKeyLabel from '@app/entity/shared/tabs/Dataset/Schema/components/PrimaryKeyLabel';
-import TypeLabel from '@app/entity/shared/tabs/Dataset/Schema/components/TypeLabel';
-
-import { SchemaField } from '@types';
-
-const FieldHeaderWrapper = styled.div`
-    padding: 16px;
-    display: flex;
-    justify-content: space-between;
-    border-bottom: 1px solid ${ANTD_GRAY_V2[4]};
-`;
-
-const FieldName = styled(Typography.Text)`
-    font-size: 16px;
-    font-family: 'Roboto Mono', monospace;
-`;
-
-const TypesSection = styled.div`
-    margin-left: -4px;
-    margin-top: 8px;
-`;
-
-const NameTypesWrapper = styled.div`
-    overflow: hidden;
-`;
-
-const MenuWrapper = styled.div`
-    margin-right: 5px;
-`;
-
-interface Props {
-    expandedField: SchemaField;
-}
-
-export default function FieldHeader({ expandedField }: Props) {
-    const displayName = translateFieldPath(expandedField.fieldPath || '');
-    return (
-        <FieldHeaderWrapper>
-            <NameTypesWrapper>
-                <FieldName>{displayName}</FieldName>
-                <TypesSection>
-                    <TypeLabel type={expandedField.type} nativeDataType={expandedField.nativeDataType} />
-                    {expandedField.isPartOfKey && <PrimaryKeyLabel />}
-                    {expandedField.isPartitioningKey && <PartitioningKeyLabel />}
-                    {expandedField.nullable && <NullableLabel />}
-                </TypesSection>
-            </NameTypesWrapper>
-            <MenuWrapper>
-                <MenuColumn field={expandedField} />
-            </MenuWrapper>
-        </FieldHeaderWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx
deleted file mode 100644
index 83db77a094f85c..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { StyledDivider } from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components';
-import { useGetEntityWithSchema } from '@app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema';
-import AddPropertyButton from '@app/entity/shared/tabs/Properties/AddPropertyButton';
-import { EditColumn } from '@app/entity/shared/tabs/Properties/Edit/EditColumn';
-import StructuredPropertyValue from '@app/entity/shared/tabs/Properties/StructuredPropertyValue';
-import { mapStructuredPropertyValues } from '@app/entity/shared/tabs/Properties/useStructuredProperties';
-import { useEntityData } from '@src/app/entity/shared/EntityContext';
-
-import { SchemaField, SearchResult, StdDataType } from '@types';
-
-export const PropertyTitle = styled.div`
-    font-size: 14px;
-    font-weight: 700;
-    margin-bottom: 4px;
-`;
-
-export const PropertyWrapper = styled.div`
-    margin-bottom: 12px;
-    display: flex;
-    justify-content: space-between;
-`;
-
-export const PropertiesWrapper = styled.div`
-    padding-left: 16px;
-`;
-
-export const StyledList = styled.ul`
-    padding-left: 24px;
-`;
-
-export const Header = styled.div`
-    font-size: 16px;
-    font-weight: 600;
-    margin-bottom: 16px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-`;
-
-interface Props {
-    expandedField: SchemaField;
-    schemaColumnProperties?: SearchResult[];
-}
-
-export default function FieldProperties({ expandedField, schemaColumnProperties }: Props) {
-    const { schemaFieldEntity } = expandedField;
-    const { refetch } = useGetEntityWithSchema(true);
-    const { entityData } = useEntityData();
-    const properties =
-        schemaFieldEntity?.structuredProperties?.properties?.filter(
-            (prop) =>
-                prop.structuredProperty.exists &&
-                !prop.structuredProperty.settings?.isHidden &&
-                !schemaColumnProperties?.find((p) => p.entity.urn === prop.structuredProperty.urn),
-        ) || [];
-
-    const canEditProperties =
-        entityData?.parent?.privileges?.canEditProperties || entityData?.privileges?.canEditProperties;
-
-    if (!schemaFieldEntity) return null;
-
-    return (
-        <>
-            <Header>
-                Properties
-                <AddPropertyButton
-                    fieldUrn={schemaFieldEntity?.urn}
-                    fieldProperties={schemaFieldEntity.structuredProperties}
-                    refetch={refetch}
-                    isV1Drawer
-                />
-            </Header>
-            <PropertiesWrapper>
-                {properties.map((structuredProp) => {
-                    const isRichText =
-                        structuredProp.structuredProperty.definition.valueType?.info?.type === StdDataType.RichText;
-                    const valuesData = mapStructuredPropertyValues(structuredProp);
-                    const hasMultipleValues = valuesData.length > 1;
-
-                    return (
-                        <PropertyWrapper key={structuredProp.structuredProperty.urn}>
-                            <div>
-                                <PropertyTitle>
-                                    {structuredProp.structuredProperty.definition.displayName}
-                                </PropertyTitle>
-                                {hasMultipleValues ? (
-                                    <StyledList>
-                                        {valuesData.map((value) => (
-                                            <li>
-                                                <StructuredPropertyValue value={value} isRichText={isRichText} />
-                                            </li>
-                                        ))}
-                                    </StyledList>
-                                ) : (
-                                    <>
-                                        {valuesData.map((value) => (
-                                            <StructuredPropertyValue value={value} isRichText={isRichText} />
-                                        ))}
-                                    </>
-                                )}
-                            </div>
-                            {canEditProperties && (
-                                <EditColumn
-                                    structuredProperty={structuredProp.structuredProperty}
-                                    associatedUrn={structuredProp.associatedUrn}
-                                    values={valuesData.map((v) => v.value) || []}
-                                    refetch={refetch}
-                                />
-                            )}
-                        </PropertyWrapper>
-                    );
-                })}
-            </PropertiesWrapper>
-            <StyledDivider />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx
deleted file mode 100644
index d9f102c2d46e28..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from 'react';
-
-import {
-    SectionHeader,
-    StyledDivider,
-} from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components';
-import useTagsAndTermsRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer';
-import SchemaEditableContext from '@app/shared/SchemaEditableContext';
-
-import { EditableSchemaMetadata, GlobalTags, SchemaField } from '@types';
-
-interface Props {
-    expandedField: SchemaField;
-    editableSchemaMetadata?: EditableSchemaMetadata | null;
-}
-
-export default function FieldTags({ expandedField, editableSchemaMetadata }: Props) {
-    const isSchemaEditable = React.useContext(SchemaEditableContext);
-    const tagRenderer = useTagsAndTermsRenderer(
-        editableSchemaMetadata,
-        {
-            showTags: true,
-            showTerms: false,
-        },
-        '',
-        isSchemaEditable,
-    );
-
-    return (
-        <>
-            <SectionHeader>Tags</SectionHeader>
-            <div data-testid={`schema-field-${expandedField.fieldPath}-tags`}>
-                {tagRenderer(expandedField.globalTags as GlobalTags, expandedField)}
-            </div>
-            <StyledDivider />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx
deleted file mode 100644
index 34d83898f14908..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-
-import {
-    SectionHeader,
-    StyledDivider,
-} from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components';
-import useTagsAndTermsRenderer from '@app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer';
-import SchemaEditableContext from '@app/shared/SchemaEditableContext';
-
-import { EditableSchemaMetadata, GlobalTags, SchemaField } from '@types';
-
-interface Props {
-    expandedField: SchemaField;
-    editableSchemaMetadata?: EditableSchemaMetadata | null;
-}
-
-export default function FieldTerms({ expandedField, editableSchemaMetadata }: Props) {
-    const isSchemaEditable = React.useContext(SchemaEditableContext);
-    const termRenderer = useTagsAndTermsRenderer(
-        editableSchemaMetadata,
-        {
-            showTags: false,
-            showTerms: true,
-        },
-        '',
-        isSchemaEditable,
-    );
-
-    return (
-        <>
-            <SectionHeader>Glossary Terms</SectionHeader>
-            {/* pass in globalTags since this is a shared component, tags will not be shown or used */}
-            <div data-testid={`schema-field-${expandedField.fieldPath}-terms`}>
-                {termRenderer(expandedField.globalTags as GlobalTags, expandedField)}
-            </div>
-            <StyledDivider />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx
deleted file mode 100644
index b2fd00982c4ecb..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import React, { useMemo } from 'react';
-import styled from 'styled-components';
-
-import { pathMatchesNewPath } from '@app/entity/dataset/profile/schema/utils/utils';
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-import {
-    SectionHeader,
-    StyledDivider,
-} from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components';
-import { UsageBar } from '@app/entity/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer';
-
-import { GetDatasetQuery } from '@graphql/dataset.generated';
-import { SchemaField } from '@types';
-
-const USAGE_BAR_MAX_WIDTH = 100;
-
-const UsageBarWrapper = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const UsageBarBackground = styled.div`
-    background-color: ${ANTD_GRAY_V2[3]};
-    border-radius: 2px;
-    height: 4px;
-    width: ${USAGE_BAR_MAX_WIDTH}px;
-`;
-
-const UsageTextWrapper = styled.span`
-    margin-left: 8px;
-`;
-
-interface Props {
-    expandedField: SchemaField;
-}
-
-export default function FieldUsageStats({ expandedField }: Props) {
-    const baseEntity = useBaseEntity<GetDatasetQuery>();
-    const usageStats = baseEntity?.dataset?.usageStats;
-    const hasUsageStats = useMemo(() => (usageStats?.aggregations?.fields?.length || 0) > 0, [usageStats]);
-    const maxFieldUsageCount = useMemo(
-        () => Math.max(...(usageStats?.aggregations?.fields?.map((field) => field?.count || 0) || [])),
-        [usageStats],
-    );
-    const relevantUsageStats = usageStats?.aggregations?.fields?.find((fieldStats) =>
-        pathMatchesNewPath(fieldStats?.fieldName, expandedField.fieldPath),
-    );
-
-    if (!hasUsageStats || !relevantUsageStats) return null;
-
-    return (
-        <>
-            <SectionHeader>Usage</SectionHeader>
-            <UsageBarWrapper>
-                <UsageBarBackground>
-                    <UsageBar
-                        width={Math.max(
-                            ((relevantUsageStats.count || 0) / maxFieldUsageCount) * USAGE_BAR_MAX_WIDTH,
-                            4,
-                        )}
-                    />
-                </UsageBarBackground>
-                <UsageTextWrapper>{relevantUsageStats.count || 0} queries / month</UsageTextWrapper>
-            </UsageBarWrapper>
-            <StyledDivider />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx
deleted file mode 100644
index 71a25aecd93578..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/SchemaFieldDrawer.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import { Drawer } from 'antd';
-import React, { useMemo } from 'react';
-import styled from 'styled-components';
-
-import { pathMatchesNewPath } from '@app/entity/dataset/profile/schema/utils/utils';
-import DrawerHeader from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/DrawerHeader';
-import FieldAttribute from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldAttribute';
-import FieldDescription from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldDescription';
-import FieldHeader from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldHeader';
-import FieldProperties from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldProperties';
-import FieldTags from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTags';
-import FieldTerms from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTerms';
-import FieldUsageStats from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats';
-import useGetSchemaColumnProperties from '@app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/useGetSchemaColumnProperties';
-import SidebarStructuredPropsSection from '@src/app/entity/shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
-
-import { EditableSchemaMetadata, SchemaField } from '@types';
-
-const StyledDrawer = styled(Drawer)`
-    position: absolute;
-
-    &&& .ant-drawer-body {
-        padding: 0;
-    }
-
-    &&& .ant-drawer-content-wrapper {
-        border-left: 3px solid ${(props) => props.theme.styles['primary-color']};
-    }
-`;
-
-const MetadataSections = styled.div`
-    padding: 16px 24px;
-`;
-
-interface Props {
-    schemaFields: SchemaField[];
-    editableSchemaMetadata?: EditableSchemaMetadata | null;
-    expandedDrawerFieldPath: string | null;
-    setExpandedDrawerFieldPath: (fieldPath: string | null) => void;
-}
-
-export default function SchemaFieldDrawer({
-    schemaFields,
-    editableSchemaMetadata,
-    expandedDrawerFieldPath,
-    setExpandedDrawerFieldPath,
-}: Props) {
-    const expandedFieldIndex = useMemo(
-        () => schemaFields.findIndex((row) => row.fieldPath === expandedDrawerFieldPath),
-        [expandedDrawerFieldPath, schemaFields],
-    );
-    const expandedField =
-        expandedFieldIndex !== undefined && expandedFieldIndex !== -1 ? schemaFields[expandedFieldIndex] : undefined;
-    const editableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo?.find((candidateEditableFieldInfo) =>
-        pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, expandedField?.fieldPath),
-    );
-    const schemaColumnProperties = useGetSchemaColumnProperties();
-
-    return (
-        <StyledDrawer
-            open={!!expandedDrawerFieldPath}
-            onClose={() => setExpandedDrawerFieldPath(null)}
-            getContainer={() => document.getElementById('entity-profile-sidebar') as HTMLElement}
-            contentWrapperStyle={{ width: '100%', boxShadow: 'none' }}
-            mask={false}
-            maskClosable={false}
-            placement="right"
-            closable={false}
-        >
-            <DrawerHeader
-                setExpandedDrawerFieldPath={setExpandedDrawerFieldPath}
-                schemaFields={schemaFields}
-                expandedFieldIndex={expandedFieldIndex}
-            />
-            {expandedField && (
-                <>
-                    <FieldHeader expandedField={expandedField} />
-                    <MetadataSections>
-                        <FieldDescription expandedField={expandedField} editableFieldInfo={editableFieldInfo} />
-                        <FieldUsageStats expandedField={expandedField} />
-                        <FieldTags expandedField={expandedField} editableSchemaMetadata={editableSchemaMetadata} />
-                        <FieldTerms expandedField={expandedField} editableSchemaMetadata={editableSchemaMetadata} />
-                        <SidebarStructuredPropsSection
-                            properties={{ schemaField: expandedField, schemaColumnProperties }}
-                        />
-                        <FieldProperties
-                            expandedField={expandedField}
-                            schemaColumnProperties={schemaColumnProperties}
-                        />
-                        <FieldAttribute expandedField={expandedField} />
-                    </MetadataSections>
-                </>
-            )}
-        </StyledDrawer>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts
deleted file mode 100644
index 0348336d649b56..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Divider } from 'antd';
-import styled from 'styled-components';
-
-export const SectionHeader = styled.div`
-    font-size: 16px;
-    font-weight: 600;
-    margin-bottom: 8px;
-`;
-
-export const StyledDivider = styled(Divider)`
-    margin: 12px 0;
-`;
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/useGetSchemaColumnProperties.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/useGetSchemaColumnProperties.ts
deleted file mode 100644
index ed5af588fa0363..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/useGetSchemaColumnProperties.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { getEntityTypesPropertyFilter, getNotHiddenPropertyFilter } from '@src/app/govern/structuredProperties/utils';
-import { SHOW_IN_COLUMNS_TABLE_PROPERTY_FILTER_NAME } from '@src/app/search/utils/constants';
-import { useEntityRegistry } from '@src/app/useEntityRegistry';
-import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated';
-import { EntityType, SearchResult } from '@src/types.generated';
-
-export default function useGetSchemaColumnProperties() {
-    const entityRegistry = useEntityRegistry();
-
-    const inputs = {
-        types: [EntityType.StructuredProperty],
-        query: '',
-        start: 0,
-        count: 50,
-        searchFlags: { skipCache: true },
-        orFilters: [
-            {
-                and: [
-                    getEntityTypesPropertyFilter(entityRegistry, true, EntityType.SchemaField),
-                    getNotHiddenPropertyFilter(),
-                    {
-                        field: SHOW_IN_COLUMNS_TABLE_PROPERTY_FILTER_NAME,
-                        values: ['true'],
-                    },
-                ],
-            },
-        ],
-    };
-
-    // Execute search
-    const { data } = useGetSearchResultsForMultipleQuery({
-        variables: {
-            input: inputs,
-        },
-        fetchPolicy: 'cache-first',
-    });
-
-    return data?.searchAcrossEntities?.searchResults || ([] as SearchResult[]);
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaRow.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaRow.tsx
deleted file mode 100644
index a72c218b876822..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaRow.tsx
+++ /dev/null
@@ -1,152 +0,0 @@
-import { Badge } from 'antd';
-import React, { useContext } from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { FkContext } from '@app/entity/shared/tabs/Dataset/Schema/utils/selectedFkContext';
-import { decodeSchemaField } from '@app/lineage/utils/columnLineageUtils';
-import CompactContext from '@app/shared/CompactContext';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { GetDatasetQuery } from '@graphql/dataset.generated';
-import { EntityType } from '@types';
-
-const ForeignKeyContent = styled.tr`
-    position: absolute;
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    margin-top: -587px;
-    box-shadow: inset 0 7px 16px -7px ${ANTD_GRAY[5]};
-`;
-
-const EntitySidePanel = styled.div`
-    overflow-y: scroll;
-    max-height: 545px;
-    padding: 8px;
-    width: 900px;
-    border-right: 1px solid ${ANTD_GRAY[4]};
-    background-color: white;
-`;
-
-const FieldBadge = styled(Badge)`
-    margin-left: 4px;
-    margin-top: 12px;
-    &&& .ant-badge-count {
-        background-color: ${ANTD_GRAY[1]};
-        color: ${ANTD_GRAY[9]};
-        border: 1px solid ${ANTD_GRAY[6]};
-        font-size: 12px;
-        font-weight: 400;
-        height: 22px;
-        cursor: pointer;
-    }
-`;
-
-const ConstraintSection = styled.div`
-    padding: 20px;
-    padding-top: 40px;
-    width: 100%;
-    min-height: 100%;
-    display: flex;
-    justify-content: space-between;
-    background-color: ${ANTD_GRAY[2]};
-`;
-
-const TableTitle = styled.span`
-    font-size: 14px;
-`;
-
-const BodyContent = styled.div`
-    display: flex;
-    flex-direction: row;
-    border-bottom: 1px solid ${ANTD_GRAY[4]};
-`;
-
-const HeaderContent = styled.div`
-    padding-top: 8px;
-    min-height: 40px;
-    font-size: 16px;
-    font-weight: 500;
-    padding-left: 12px;
-    border-bottom: 1px solid ${ANTD_GRAY[4]};
-`;
-
-const ForiegnKeyTd = styled.td`
-    &&& {
-        padding: 0;
-    }
-`;
-
-const DatasetLink = styled(Link)`
-    color: ${ANTD_GRAY[9]};
-    font-weight: 800;
-`;
-
-const ArrowContainer = styled.div`
-    margin-top: 40px;
-`;
-
-export const SchemaRow = React.forwardRef<HTMLTableRowElement>((props, ref) => {
-    /* eslint-disable react/prop-types */
-    const { children, ...rest } = props;
-    const selectedFk = useContext(FkContext);
-    const entityRegistry = useEntityRegistry();
-    const baseEntity = useBaseEntity<GetDatasetQuery>();
-
-    return (
-        <>
-            <tr {...rest} ref={ref}>
-                {children}
-            </tr>
-            {selectedFk?.fieldPath && props['data-row-key'] === selectedFk?.fieldPath && (
-                <ForeignKeyContent>
-                    <ForiegnKeyTd>
-                        <HeaderContent>
-                            Foreign Key to{' '}
-                            <DatasetLink
-                                to={entityRegistry.getEntityUrl(
-                                    EntityType.Dataset,
-                                    selectedFk?.constraint?.foreignDataset?.urn || '',
-                                )}
-                            >
-                                {selectedFk.constraint?.foreignDataset?.name}
-                            </DatasetLink>
-                        </HeaderContent>
-                        <BodyContent>
-                            <EntitySidePanel>
-                                <CompactContext.Provider value>
-                                    {entityRegistry.renderProfile(
-                                        EntityType.Dataset,
-                                        selectedFk?.constraint?.foreignDataset?.urn || '',
-                                    )}
-                                </CompactContext.Provider>
-                            </EntitySidePanel>
-                            <ConstraintSection>
-                                <div>
-                                    <TableTitle>{baseEntity.dataset?.name}</TableTitle>
-                                    {selectedFk?.constraint?.sourceFields?.map((field) => (
-                                        <div key={field?.fieldPath}>
-                                            <FieldBadge count={decodeSchemaField(field?.fieldPath || '')} />
-                                        </div>
-                                    ))}
-                                </div>
-                                <ArrowContainer>{'--->'}</ArrowContainer>
-                                <div>
-                                    <TableTitle>{selectedFk?.constraint?.foreignDataset?.name}</TableTitle>
-                                    {selectedFk?.constraint?.foreignFields?.map((field) => (
-                                        <div key={field?.fieldPath}>
-                                            <FieldBadge count={decodeSchemaField(field?.fieldPath || '')} />
-                                        </div>
-                                    ))}
-                                </div>
-                            </ConstraintSection>
-                        </BodyContent>
-                    </ForiegnKeyTd>
-                </ForeignKeyContent>
-            )}
-        </>
-    );
-});
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/TypeLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/TypeLabel.tsx
deleted file mode 100644
index 7917712dab22fb..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/TypeLabel.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Badge, Tooltip } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { truncate } from '@app/entity/shared/utils';
-import { capitalizeFirstLetter } from '@app/shared/textUtil';
-
-import { SchemaFieldDataType } from '@types';
-
-type Props = {
-    type: SchemaFieldDataType;
-    nativeDataType: string | null | undefined;
-};
-
-const TypeBadge = styled(Badge)`
-    margin-left: 4px;
-    &&& .ant-badge-count {
-        background-color: ${ANTD_GRAY[1]};
-        color: ${ANTD_GRAY[7]};
-        border: 1px solid ${ANTD_GRAY[5]};
-        font-size: 12px;
-        font-weight: 400;
-        height: 22px;
-    }
-`;
-
-export default function TypeLabel({ type, nativeDataType }: Props) {
-    // if unable to match type to DataHub, display native type info by default
-    const nativeFallback = type === SchemaFieldDataType.Null;
-
-    // eslint-disable-next-line react/prop-types
-    const NativeDataTypeTooltip = ({ children }) =>
-        nativeDataType ? (
-            <Tooltip placement="top" title={capitalizeFirstLetter(nativeDataType)}>
-                <span>{children}</span>
-            </Tooltip>
-        ) : (
-            <>{children}</>
-        );
-
-    return (
-        <NativeDataTypeTooltip>
-            <TypeBadge count={capitalizeFirstLetter(nativeFallback ? truncate(250, nativeDataType) : type)} />
-        </NativeDataTypeTooltip>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/useGetStructuredPropColumns.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/useGetStructuredPropColumns.tsx
deleted file mode 100644
index 3cec7c32163f6d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/useGetStructuredPropColumns.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React, { useMemo } from 'react';
-
-import StructuredPropValues from '@src/app/entity/dataset/profile/schema/components/StructuredPropValues';
-import { getDisplayName } from '@src/app/govern/structuredProperties/utils';
-import { SearchResult, StructuredPropertyEntity } from '@src/types.generated';
-
-export const useGetStructuredPropColumns = (properties: SearchResult[] | undefined) => {
-    const columns = useMemo(() => {
-        return properties?.map((prop) => {
-            const name = getDisplayName(prop.entity as StructuredPropertyEntity);
-            return {
-                width: 120,
-                title: name,
-                dataIndex: 'schemaFieldEntity',
-                key: prop.entity.urn,
-                render: (record) => <StructuredPropValues schemaFieldEntity={record} propColumn={prop} />,
-                ellipsis: true,
-            };
-        });
-    }, [properties]);
-
-    return columns;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/useGetTableColumnProperties.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/useGetTableColumnProperties.ts
deleted file mode 100644
index 96ff90921b9372..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/useGetTableColumnProperties.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import {
-    getEntityTypesPropertyFilter,
-    getNotHiddenPropertyFilter,
-    getShowInColumnsTablePropertyFilter,
-} from '@src/app/govern/structuredProperties/utils';
-import { useEntityRegistry } from '@src/app/useEntityRegistry';
-import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated';
-import { EntityType } from '@src/types.generated';
-
-export const useGetTableColumnProperties = () => {
-    const entityRegistry = useEntityRegistry();
-
-    const inputs = {
-        types: [EntityType.StructuredProperty],
-        query: '',
-        start: 0,
-        count: 50,
-        searchFlags: { skipCache: true },
-        orFilters: [
-            {
-                and: [
-                    getEntityTypesPropertyFilter(entityRegistry, true),
-                    getNotHiddenPropertyFilter(),
-                    getShowInColumnsTablePropertyFilter(),
-                ],
-            },
-        ],
-    };
-
-    // Execute search
-    const { data } = useGetSearchResultsForMultipleQuery({
-        variables: {
-            input: inputs,
-        },
-        fetchPolicy: 'cache-first',
-    });
-
-    return data?.searchAcrossEntities?.searchResults;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts
deleted file mode 100644
index cbfaca4e021aa6..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/filterSchemaRows.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import EntityRegistry from '@app/entity/EntityRegistry';
-
-import { EntityType, SchemaField } from '@types';
-
-function matchesTagsOrTermsOrDescription(field: SchemaField, filterText: string, entityRegistry: EntityRegistry) {
-    return (
-        field.globalTags?.tags?.find((tagAssociation) =>
-            entityRegistry.getDisplayName(EntityType.Tag, tagAssociation.tag).toLocaleLowerCase().includes(filterText),
-        ) ||
-        field.glossaryTerms?.terms?.find((termAssociation) =>
-            entityRegistry
-                .getDisplayName(EntityType.GlossaryTerm, termAssociation.term)
-                .toLocaleLowerCase()
-                .includes(filterText),
-        ) ||
-        field.description?.toLocaleLowerCase().includes(filterText)
-    );
-}
-
-function matchesBusinessAttributesProperties(field: SchemaField, filterText: string, entityRegistry: EntityRegistry) {
-    if (!field.schemaFieldEntity?.businessAttributes) return false;
-    const businessAttributeProperties =
-        field.schemaFieldEntity?.businessAttributes?.businessAttribute?.businessAttribute?.properties;
-    return (
-        businessAttributeProperties?.description?.toLocaleLowerCase().includes(filterText) ||
-        businessAttributeProperties?.name?.toLocaleLowerCase().includes(filterText) ||
-        businessAttributeProperties?.glossaryTerms?.terms?.find((termAssociation) =>
-            entityRegistry
-                .getDisplayName(EntityType.GlossaryTerm, termAssociation.term)
-                .toLocaleLowerCase()
-                .includes(filterText),
-        ) ||
-        businessAttributeProperties?.tags?.tags?.find((tagAssociation) =>
-            entityRegistry.getDisplayName(EntityType.Tag, tagAssociation.tag).toLocaleLowerCase().includes(filterText),
-        )
-    );
-}
-
-// returns list of fieldPaths for fields that have Terms or Tags or Descriptions matching the filterText
-function getFilteredFieldPathsByMetadata(editableSchemaMetadata: any, entityRegistry, filterText) {
-    return (
-        editableSchemaMetadata?.editableSchemaFieldInfo
-            .filter((fieldInfo) => matchesTagsOrTermsOrDescription(fieldInfo, filterText, entityRegistry))
-            .map((fieldInfo) => fieldInfo.fieldPath) || []
-    );
-}
-
-function matchesEditableTagsOrTermsOrDescription(field: SchemaField, filteredFieldPathsByEditableMetadata: any) {
-    return filteredFieldPathsByEditableMetadata.includes(field.fieldPath);
-}
-
-function matchesFieldName(fieldName: string, filterText: string) {
-    return fieldName.toLocaleLowerCase().includes(filterText);
-}
-
-export function filterSchemaRows(
-    rows: SchemaField[],
-    editableSchemaMetadata: any,
-    filterText: string,
-    entityRegistry: EntityRegistry,
-) {
-    if (!rows) return { filteredRows: [], expandedRowsFromFilter: new Set() };
-    if (!filterText) return { filteredRows: rows, expandedRowsFromFilter: new Set() };
-    const formattedFilterText = filterText.toLocaleLowerCase();
-
-    const filteredFieldPathsByEditableMetadata = getFilteredFieldPathsByMetadata(
-        editableSchemaMetadata,
-        entityRegistry,
-        formattedFilterText,
-    );
-
-    const finalFieldPaths = new Set();
-    const expandedRowsFromFilter = new Set();
-
-    rows.forEach((row) => {
-        if (
-            matchesFieldName(row.fieldPath, formattedFilterText) ||
-            matchesEditableTagsOrTermsOrDescription(row, filteredFieldPathsByEditableMetadata) ||
-            matchesTagsOrTermsOrDescription(row, formattedFilterText, entityRegistry) || // non-editable tags, terms and description
-            matchesBusinessAttributesProperties(row, formattedFilterText, entityRegistry)
-        ) {
-            finalFieldPaths.add(row.fieldPath);
-        }
-        const splitFieldPath = row.fieldPath.split('.');
-        const fieldName = splitFieldPath.slice(-1)[0];
-        if (
-            matchesFieldName(fieldName, formattedFilterText) ||
-            matchesEditableTagsOrTermsOrDescription(row, filteredFieldPathsByEditableMetadata) ||
-            matchesTagsOrTermsOrDescription(row, formattedFilterText, entityRegistry) || // non-editable tags, terms and description
-            matchesBusinessAttributesProperties(row, formattedFilterText, entityRegistry)
-        ) {
-            // if we match specifically on this field (not just its parent), add and expand all parents
-            splitFieldPath.reduce((previous, current) => {
-                finalFieldPaths.add(previous);
-                expandedRowsFromFilter.add(previous);
-                return `${previous}.${current}`;
-            });
-        }
-    });
-
-    const filteredRows = rows.filter((row) => finalFieldPaths.has(row.fieldPath));
-
-    return { filteredRows, expandedRowsFromFilter };
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts
deleted file mode 100644
index 9c3aebff990a91..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { DocumentationAssociation, EditableSchemaFieldInfo, SchemaFieldEntity } from '@types';
-
-interface Props {
-    schemaFieldEntity?: SchemaFieldEntity | null;
-    editableFieldInfo?: EditableSchemaFieldInfo;
-    defaultDescription?: string | null;
-}
-
-export function getFieldDescriptionDetails({ schemaFieldEntity, editableFieldInfo, defaultDescription }: Props) {
-    const documentations = schemaFieldEntity?.documentation?.documentations;
-    let latestDocumentation: DocumentationAssociation | undefined;
-
-    if (documentations && documentations.length > 0) {
-        latestDocumentation = documentations.reduce((latest, current) => {
-            const latestTime = latest.attribution?.time || 0;
-            const currentTime = current.attribution?.time || 0;
-            return currentTime > latestTime ? current : latest;
-        });
-    }
-
-    const isUsingDocumentationAspect = !editableFieldInfo?.description && !!latestDocumentation;
-    const isPropagated =
-        isUsingDocumentationAspect &&
-        !!latestDocumentation?.attribution?.sourceDetail?.find(
-            (mapEntry) => mapEntry.key === 'propagated' && mapEntry.value === 'true',
-        );
-
-    const displayedDescription =
-        editableFieldInfo?.description || latestDocumentation?.documentation || defaultDescription || '';
-
-    const sourceDetail = latestDocumentation?.attribution?.sourceDetail;
-    const propagatedDescription = latestDocumentation?.documentation;
-
-    return { displayedDescription, isPropagated, sourceDetail, propagatedDescription };
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/getSchemaFilterFromQueryString.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/getSchemaFilterFromQueryString.ts
deleted file mode 100644
index fd3112ca6a1fb8..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/getSchemaFilterFromQueryString.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import * as QueryString from 'query-string';
-
-export default function getSchemaFilterFromQueryString(location: any) {
-    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
-    return decodeURIComponent(params.schemaFilter ? (params.schemaFilter as string) : '');
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/navigateToVersionedDatasetUrl.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/navigateToVersionedDatasetUrl.ts
deleted file mode 100644
index 0ad89e5fd6230e..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/navigateToVersionedDatasetUrl.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import * as QueryString from 'query-string';
-import { RouteComponentProps } from 'react-router-dom';
-
-export const navigateToVersionedDatasetUrl = ({
-    location,
-    history,
-    datasetVersion,
-}: {
-    location: {
-        search: string;
-        pathname: string;
-    };
-    history: RouteComponentProps['history'];
-    datasetVersion: string;
-}) => {
-    const parsedSearch = QueryString.parse(location.search, { arrayFormat: 'comma' });
-    const newSearch = {
-        ...parsedSearch,
-        semantic_version: datasetVersion,
-    };
-    const newSearchStringified = QueryString.stringify(newSearch, { arrayFormat: 'comma' });
-
-    history.push({
-        pathname: location.pathname,
-        search: newSearchStringified,
-    });
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/selectedFkContext.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/selectedFkContext.ts
deleted file mode 100644
index 59ae72e5fd3804..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/selectedFkContext.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from 'react';
-
-import { ForeignKeyConstraint } from '@types';
-
-export const FkContext = React.createContext<{ fieldPath: string; constraint?: ForeignKeyConstraint | null } | null>(
-    null,
-);
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts
deleted file mode 100644
index 25855dbad7c9a5..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/updateSchemaFilterQueryString.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import * as QueryString from 'query-string';
-import { useEffect } from 'react';
-import { useHistory, useLocation } from 'react-router';
-
-export default function useUpdateSchemaFilterQueryString(filterText: string) {
-    const location = useLocation();
-    const history = useHistory();
-    const parsedParams = QueryString.parse(location.search, { arrayFormat: 'comma' });
-    const newParams = {
-        ...parsedParams,
-        schemaFilter: filterText,
-    };
-    const stringifiedParams = QueryString.stringify(newParams, { arrayFormat: 'comma' });
-
-    useEffect(() => {
-        history.replace({
-            pathname: location.pathname,
-            search: stringifiedParams,
-        });
-    }, [filterText, history, location.pathname, stringifiedParams]);
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useBusinessAttributeRenderer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useBusinessAttributeRenderer.tsx
deleted file mode 100644
index 7f884fd2bd9572..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useBusinessAttributeRenderer.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-
-import { useRefetch } from '@app/entity/shared/EntityContext';
-import { useSchemaRefetch } from '@app/entity/shared/tabs/Dataset/Schema/SchemaContext';
-import BusinessAttributeGroup from '@app/shared/businessAttribute/BusinessAttributeGroup';
-import { useBusinessAttributesFlag } from '@app/useAppConfig';
-
-import { EntityType, SchemaField } from '@types';
-
-export default function useBusinessAttributeRenderer(filterText: string, canEdit: boolean) {
-    const refetch = useRefetch();
-    const schemaRefetch = useSchemaRefetch();
-
-    const businessAttributesFlag = useBusinessAttributesFlag();
-
-    const refresh: any = () => {
-        refetch?.();
-        schemaRefetch?.();
-    };
-
-    return (businessAttribute: string, record: SchemaField): JSX.Element | null => {
-        return businessAttributesFlag ? (
-            <BusinessAttributeGroup
-                businessAttribute={record?.schemaFieldEntity?.businessAttributes?.businessAttribute || undefined}
-                canRemove={canEdit}
-                buttonProps={{ size: 'small' }}
-                canAddAttribute={canEdit}
-                entityUrn={record?.schemaFieldEntity?.urn}
-                entityType={EntityType.Dataset}
-                entitySubresource={record.fieldPath}
-                highlightText={filterText}
-                refetch={refresh}
-            />
-        ) : null;
-    };
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx
deleted file mode 100644
index 70c7d7ab98f12c..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useDescriptionRenderer.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import DOMPurify from 'dompurify';
-import React, { useState } from 'react';
-
-import DescriptionField from '@app/entity/dataset/profile/schema/components/SchemaDescriptionField';
-import { pathMatchesNewPath } from '@app/entity/dataset/profile/schema/utils/utils';
-import { useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext';
-import { useSchemaRefetch } from '@app/entity/shared/tabs/Dataset/Schema/SchemaContext';
-import { getFieldDescriptionDetails } from '@app/entity/shared/tabs/Dataset/Schema/utils/getFieldDescriptionDetails';
-
-import { useUpdateDescriptionMutation } from '@graphql/mutations.generated';
-import { EditableSchemaMetadata, SchemaField, SubResourceType } from '@types';
-
-export default function useDescriptionRenderer(editableSchemaMetadata: EditableSchemaMetadata | null | undefined) {
-    const urn = useMutationUrn();
-    const refetch = useRefetch();
-    const schemaRefetch = useSchemaRefetch();
-    const [updateDescription] = useUpdateDescriptionMutation();
-    const [expandedRows, setExpandedRows] = useState({});
-    const [expandedBARows, setExpandedBARows] = useState({});
-
-    const refresh: any = () => {
-        refetch?.();
-        schemaRefetch?.();
-    };
-
-    return (description: string, record: SchemaField, index: number): JSX.Element => {
-        const editableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo?.find((candidateEditableFieldInfo) =>
-            pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, record.fieldPath),
-        );
-        const { schemaFieldEntity } = record;
-        const { displayedDescription, isPropagated, sourceDetail } = getFieldDescriptionDetails({
-            schemaFieldEntity,
-            editableFieldInfo,
-            defaultDescription: description,
-        });
-
-        const sanitizedDescription = DOMPurify.sanitize(displayedDescription);
-        const original = record.description ? DOMPurify.sanitize(record.description) : undefined;
-        const businessAttributeDescription =
-            record?.schemaFieldEntity?.businessAttributes?.businessAttribute?.businessAttribute?.properties
-                ?.description || '';
-
-        const handleExpandedRows = (expanded) => setExpandedRows((prev) => ({ ...prev, [index]: expanded }));
-        const handleBAExpandedRows = (expanded) => setExpandedBARows((prev) => ({ ...prev, [index]: expanded }));
-
-        return (
-            <DescriptionField
-                businessAttributeDescription={businessAttributeDescription}
-                onExpanded={handleExpandedRows}
-                onBAExpanded={handleBAExpandedRows}
-                expanded={!!expandedRows[index]}
-                baExpanded={!!expandedBARows[index]}
-                description={sanitizedDescription}
-                original={original}
-                isEdited={!!editableFieldInfo?.description}
-                onUpdate={(updatedDescription) =>
-                    updateDescription({
-                        variables: {
-                            input: {
-                                description: DOMPurify.sanitize(updatedDescription),
-                                resourceUrn: urn,
-                                subResource: record.fieldPath,
-                                subResourceType: SubResourceType.DatasetField,
-                            },
-                        },
-                    }).then(refresh)
-                }
-                isPropagated={isPropagated}
-                sourceDetail={sourceDetail}
-                isReadOnly
-            />
-        );
-    };
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useGetSemanticVersionFromUrlParams.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useGetSemanticVersionFromUrlParams.tsx
deleted file mode 100644
index 3b8a13141b52de..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useGetSemanticVersionFromUrlParams.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import * as QueryString from 'query-string';
-import { useLocation } from 'react-router-dom';
-
-export default function useGetSemanticVersionFromUrlParams() {
-    const location = useLocation();
-    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
-    const semanticVersion: string = params.semantic_version as string;
-    return semanticVersion;
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useSchemaBlameRenderer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useSchemaBlameRenderer.tsx
deleted file mode 100644
index c8f3d9ea1388f3..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useSchemaBlameRenderer.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import { ScanOutlined } from '@ant-design/icons';
-import { Button, Tooltip, Typography } from 'antd';
-import React from 'react';
-import { useHistory, useLocation } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { pathMatchesNewPath } from '@app/entity/dataset/profile/schema/utils/utils';
-import { navigateToVersionedDatasetUrl } from '@app/entity/shared/tabs/Dataset/Schema/utils/navigateToVersionedDatasetUrl';
-import { toRelativeTimeString } from '@app/shared/time/timeUtils';
-
-import { SchemaField, SchemaFieldBlame } from '@types';
-
-const HeadingDiv = styled.div`
-    vertical-align: top;
-    display: flex;
-    flex-direction: column;
-    margin-top: 16px;
-`;
-
-const SubheadingDiv = styled.div`
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-`;
-
-const SchemaBlameText = styled(Typography.Text)`
-    font-size: 14x;
-    line-height: 22px;
-    font-family: 'Roboto Mono', monospace;
-    font-weight: 500;
-`;
-
-const SchemaBlameTimestampText = styled(Typography.Text)`
-    font-size: 8px;
-    line-height: 22px;
-    font-family: 'Roboto Mono', monospace;
-    font-weight: 500;
-`;
-
-const SchemaBlameBlameButton = styled(Button)`
-    display: inline-block;
-    width: 30px;
-`;
-
-export default function useSchemaBlameRenderer(schemaBlameList?: Array<SchemaFieldBlame> | null) {
-    const history = useHistory();
-    const location = useLocation();
-    const schemaBlameRenderer = (record: SchemaField) => {
-        const relevantSchemaFieldBlame = schemaBlameList?.find((candidateSchemaBlame) =>
-            pathMatchesNewPath(candidateSchemaBlame.fieldPath, String(record)),
-        );
-
-        if (!relevantSchemaFieldBlame || !relevantSchemaFieldBlame.schemaFieldChange) {
-            return null;
-        }
-
-        return (
-            <>
-                <HeadingDiv>
-                    <SchemaBlameText data-testid={`${relevantSchemaFieldBlame.fieldPath}-schema-blame-description`}>
-                        {relevantSchemaFieldBlame?.schemaFieldChange?.lastSchemaFieldChange}
-                    </SchemaBlameText>
-                    <SubheadingDiv>
-                        {relevantSchemaFieldBlame?.schemaFieldChange?.timestampMillis ? (
-                            <SchemaBlameTimestampText>
-                                {toRelativeTimeString(relevantSchemaFieldBlame?.schemaFieldChange?.timestampMillis)}
-                            </SchemaBlameTimestampText>
-                        ) : (
-                            'unknown'
-                        )}
-                        <span>
-                            <Tooltip title="View blame prior to this version">
-                                <SchemaBlameBlameButton
-                                    data-testid={`${relevantSchemaFieldBlame.fieldPath}-view-prior-blame-button`}
-                                    onClick={() => {
-                                        navigateToVersionedDatasetUrl({
-                                            location,
-                                            history,
-                                            datasetVersion:
-                                                relevantSchemaFieldBlame.schemaFieldChange.lastSemanticVersion,
-                                        });
-                                    }}
-                                    size="small"
-                                    type="text"
-                                >
-                                    <ScanOutlined style={{}} />
-                                </SchemaBlameBlameButton>
-                            </Tooltip>
-                        </span>
-                    </SubheadingDiv>
-                </HeadingDiv>
-            </>
-        );
-    };
-    return schemaBlameRenderer;
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx
deleted file mode 100644
index d10e52d642aadb..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRenderer.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React from 'react';
-
-import { pathMatchesNewPath } from '@app/entity/dataset/profile/schema/utils/utils';
-import { useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext';
-import { useSchemaRefetch } from '@app/entity/shared/tabs/Dataset/Schema/SchemaContext';
-import TagTermGroup from '@app/shared/tags/TagTermGroup';
-
-import { EditableSchemaMetadata, EntityType, GlobalTags, SchemaField } from '@types';
-
-export default function useTagsAndTermsRenderer(
-    editableSchemaMetadata: EditableSchemaMetadata | null | undefined,
-    options: { showTags: boolean; showTerms: boolean },
-    filterText: string,
-    canEdit: boolean,
-) {
-    const urn = useMutationUrn();
-    const refetch = useRefetch();
-    const schemaRefetch = useSchemaRefetch();
-
-    const refresh: any = () => {
-        refetch?.();
-        schemaRefetch?.();
-    };
-
-    const tagAndTermRender = (tags: GlobalTags, record: SchemaField) => {
-        const relevantEditableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo?.find(
-            (candidateEditableFieldInfo) => pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, record.fieldPath),
-        );
-
-        const businessAttributeTags =
-            record?.schemaFieldEntity?.businessAttributes?.businessAttribute?.businessAttribute?.properties?.tags
-                ?.tags || [];
-        const businessAttributeTerms =
-            record?.schemaFieldEntity?.businessAttributes?.businessAttribute?.businessAttribute?.properties
-                ?.glossaryTerms?.terms || [];
-
-        return (
-            <TagTermGroup
-                uneditableTags={options.showTags ? { tags: [...(tags?.tags || []), ...businessAttributeTags] } : null}
-                editableTags={options.showTags ? relevantEditableFieldInfo?.globalTags : null}
-                uneditableGlossaryTerms={
-                    options.showTerms
-                        ? { terms: [...(record?.glossaryTerms?.terms || []), ...businessAttributeTerms] }
-                        : null
-                }
-                editableGlossaryTerms={options.showTerms ? relevantEditableFieldInfo?.glossaryTerms : null}
-                canRemove={canEdit}
-                buttonProps={{ size: 'small' }}
-                canAddTag={canEdit && options.showTags}
-                canAddTerm={canEdit && options.showTerms}
-                entityUrn={urn}
-                entityType={EntityType.Dataset}
-                entitySubresource={record.fieldPath}
-                highlightText={filterText}
-                refetch={refresh}
-            />
-        );
-    };
-    return tagAndTermRender;
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx
deleted file mode 100644
index 20fdec4d03ff7f..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from 'react';
-
-import { pathMatchesNewPath } from '@app/entity/dataset/profile/schema/utils/utils';
-import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext';
-import TagTermGroup from '@app/shared/tags/TagTermGroup';
-
-import { EditableSchemaMetadata, EntityType, GlobalTags, SchemaField } from '@types';
-
-export default function useTagsAndTermsRendererFeatureTable(
-    editableSchemaMetadata: EditableSchemaMetadata | null | undefined,
-    tagHoveredIndex: string | undefined,
-    setTagHoveredIndex: (index: string | undefined) => void,
-    options: { showTags: boolean; showTerms: boolean },
-) {
-    const { urn } = useEntityData();
-    const refetch = useRefetch();
-
-    const tagAndTermRender = (tags: GlobalTags, record: SchemaField, rowIndex: number | undefined) => {
-        const relevantEditableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo?.find(
-            (candidateEditableFieldInfo) => pathMatchesNewPath(candidateEditableFieldInfo.fieldPath, record.fieldPath),
-        );
-
-        return (
-            <div data-testid={`schema-field-${record.fieldPath}-${options.showTags ? 'tags' : 'terms'}`}>
-                <TagTermGroup
-                    uneditableTags={options.showTags ? tags : null}
-                    editableTags={options.showTags ? relevantEditableFieldInfo?.globalTags : null}
-                    uneditableGlossaryTerms={options.showTerms ? record.glossaryTerms : null}
-                    editableGlossaryTerms={options.showTerms ? relevantEditableFieldInfo?.glossaryTerms : null}
-                    canRemove
-                    buttonProps={{ size: 'small' }}
-                    canAddTag={tagHoveredIndex === `${record.fieldPath}-${rowIndex}` && options.showTags}
-                    canAddTerm={tagHoveredIndex === `${record.fieldPath}-${rowIndex}` && options.showTerms}
-                    onOpenModal={() => setTagHoveredIndex(undefined)}
-                    entityUrn={urn}
-                    entityType={EntityType.Dataset}
-                    entitySubresource={record.fieldPath}
-                    refetch={refetch}
-                />
-            </div>
-        );
-    };
-    return tagAndTermRender;
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx
deleted file mode 100644
index 5595213b2c2a55..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { geekblue } from '@ant-design/colors';
-import { Tooltip } from 'antd';
-import React, { useMemo } from 'react';
-import styled from 'styled-components';
-
-import { pathMatchesNewPath } from '@app/entity/dataset/profile/schema/utils/utils';
-
-import { UsageQueryResult } from '@types';
-
-const USAGE_BAR_MAX_WIDTH = 50;
-
-export const UsageBar = styled.div<{ width: number }>`
-    width: ${(props) => props.width}px;
-    height: 4px;
-    background-color: ${geekblue[3]};
-    border-radius: 2px;
-`;
-
-const UsageBarContainer = styled.div`
-    width: 100%;
-    height: 100%;
-`;
-
-export default function useUsageStatsRenderer(usageStats?: UsageQueryResult | null) {
-    const maxFieldUsageCount = useMemo(
-        () => Math.max(...(usageStats?.aggregations?.fields?.map((field) => field?.count || 0) || [])),
-        [usageStats],
-    );
-
-    const usageStatsRenderer = (fieldPath: string) => {
-        const relevantUsageStats = usageStats?.aggregations?.fields?.find((fieldStats) =>
-            pathMatchesNewPath(fieldStats?.fieldName, fieldPath),
-        );
-
-        if (!relevantUsageStats) {
-            return null;
-        }
-
-        return (
-            <Tooltip placement="topLeft" title={`${relevantUsageStats.count} queries / month`}>
-                <UsageBarContainer>
-                    <UsageBar width={((relevantUsageStats.count || 0) / maxFieldUsageCount) * USAGE_BAR_MAX_WIDTH} />
-                </UsageBarContainer>
-            </Tooltip>
-        );
-    };
-    return usageStatsRenderer;
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsHeader.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsHeader.tsx
deleted file mode 100644
index 03cf364fdde055..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsHeader.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { ClockCircleOutlined, LineChartOutlined } from '@ant-design/icons';
-import { Button, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entity/shared/constants';
-import LookbackWindowSelect from '@app/entity/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect';
-import { LookbackWindow } from '@app/entity/shared/tabs/Dataset/Stats/lookbackWindows';
-import { ViewType } from '@app/entity/shared/tabs/Dataset/Stats/viewType';
-
-const StatsHeaderContainer = styled.div`
-    display: flex;
-    justify-content: flex-end;
-    padding: 0;
-    margin: 0;
-`;
-
-const ReportedAtLabel = styled.div`
-    padding: 0;
-    margin: 0;
-    display: flex;
-    align-items: center;
-    color: ${ANTD_GRAY[7]};
-`;
-
-type Props = {
-    viewType: ViewType;
-    setViewType: (type: ViewType) => void;
-    reportedAt: string;
-    lookbackWindow: LookbackWindow;
-    setLookbackWindow: (window: LookbackWindow) => void;
-};
-
-export default function StatsHeader({ viewType, setViewType, reportedAt, lookbackWindow, setLookbackWindow }: Props) {
-    const latestButtonColor = viewType === ViewType.LATEST ? REDESIGN_COLORS.BLUE : ANTD_GRAY[8];
-    const latestButton = (
-        <Button type="text" onClick={() => setViewType(ViewType.LATEST)}>
-            <LineChartOutlined style={{ color: latestButtonColor }} />
-            <Typography.Text style={{ color: latestButtonColor }}>Latest</Typography.Text>
-        </Button>
-    );
-
-    const historicalButtonColor = viewType === ViewType.HISTORICAL ? REDESIGN_COLORS.BLUE : ANTD_GRAY[8];
-    const historicalButton = (
-        <Button type="text" onClick={() => setViewType(ViewType.HISTORICAL)}>
-            <ClockCircleOutlined style={{ color: historicalButtonColor }} />
-            <Typography.Text style={{ color: historicalButtonColor }}>Historical</Typography.Text>
-        </Button>
-    );
-
-    const actionView =
-        viewType === ViewType.HISTORICAL ? (
-            <LookbackWindowSelect lookbackWindow={lookbackWindow} setLookbackWindow={setLookbackWindow} />
-        ) : (
-            <ReportedAtLabel>{reportedAt}</ReportedAtLabel>
-        );
-
-    return (
-        <TabToolbar>
-            <StatsHeaderContainer>
-                {latestButton}
-                {historicalButton}
-            </StatsHeaderContainer>
-            {actionView}
-        </TabToolbar>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsSection.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsSection.tsx
deleted file mode 100644
index 32244ee67cc374..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsSection.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Divider, Row, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const Section = styled.div`
-    padding-top: 24px;
-    padding-bottom: 40px;
-    margin-bottom: 20px;
-    width: 100%;
-`;
-
-const ThinDivider = styled(Divider)`
-    margin-top: 8px;
-    margin-bottom: 8px;
-`;
-
-export type Props = {
-    children: React.ReactNode;
-    title: string;
-    rightFloatView?: React.ReactNode;
-};
-
-export default function StatsSection({ children, title, rightFloatView }: Props) {
-    return (
-        <Section>
-            <Row justify="space-between">
-                <Typography.Title level={3}>{title}</Typography.Title>
-                {rightFloatView || <span />}
-            </Row>
-            <ThinDivider />
-            {children}
-        </Section>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsTab.tsx
deleted file mode 100644
index a7d9534fc8fea7..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/StatsTab.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import React, { useState } from 'react';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import StatsHeader from '@app/entity/shared/tabs/Dataset/Stats/StatsHeader';
-import HistoricalStats from '@app/entity/shared/tabs/Dataset/Stats/historical/HistoricalStats';
-import { LOOKBACK_WINDOWS } from '@app/entity/shared/tabs/Dataset/Stats/lookbackWindows';
-import ColumnStats from '@app/entity/shared/tabs/Dataset/Stats/snapshot/ColumnStats';
-import TableStats from '@app/entity/shared/tabs/Dataset/Stats/snapshot/TableStats';
-import { ViewType } from '@app/entity/shared/tabs/Dataset/Stats/viewType';
-import { toLocalDateString, toLocalDateTimeString, toLocalTimeString } from '@app/shared/time/timeUtils';
-
-import { GetDatasetQuery, useGetLastMonthUsageAggregationsQuery } from '@graphql/dataset.generated';
-import { DatasetProfile, Operation, UsageQueryResult } from '@types';
-
-export default function StatsTab() {
-    const baseEntity = useBaseEntity<GetDatasetQuery>();
-
-    const [viewType, setViewType] = useState(ViewType.LATEST);
-    const [lookbackWindow, setLookbackWindow] = useState(LOOKBACK_WINDOWS.QUARTER);
-
-    const { data: usageStatsData } = useGetLastMonthUsageAggregationsQuery({
-        variables: { urn: baseEntity?.dataset?.urn as string },
-        skip: !baseEntity?.dataset?.urn,
-    });
-
-    const hasUsageStats = usageStatsData?.dataset?.usageStats !== undefined;
-    const hasDatasetProfiles = baseEntity?.dataset?.datasetProfiles !== undefined;
-    const hasOperations = baseEntity?.dataset?.operations !== undefined;
-
-    const usageStats = (hasUsageStats && (usageStatsData?.dataset?.usageStats as UsageQueryResult)) || undefined;
-    const datasetProfiles =
-        (hasDatasetProfiles && (baseEntity?.dataset?.datasetProfiles as Array<DatasetProfile>)) || undefined;
-
-    // Used for rendering latest stats.
-    const latestProfile = datasetProfiles && datasetProfiles[0]; // This is required for showing latest stats.
-    const urn = baseEntity && baseEntity.dataset && baseEntity.dataset?.urn;
-
-    // Used for rendering operation info.
-    const operations = (hasOperations && (baseEntity?.dataset?.operations as Array<Operation>)) || undefined;
-    const latestOperation = operations && operations[0];
-    const lastUpdatedTime = latestOperation && toLocalDateTimeString(latestOperation?.lastUpdatedTimestamp);
-    const lastReportedTime = latestOperation && toLocalDateTimeString(latestOperation?.timestampMillis);
-    // Okay so if we are disabled, we don't have both or the other. Let's render
-
-    // const emptyView = <Empty description="TODO: Stats!" image={Empty.PRESENTED_IMAGE_SIMPLE} />;
-    // Action buttons.
-    // Table Stats.
-    // Column Stats
-
-    const reportedAt =
-        latestProfile &&
-        `Reported on ${toLocalDateString(latestProfile?.timestampMillis)} at ${toLocalTimeString(
-            latestProfile?.timestampMillis,
-        )}`;
-
-    const totalSqlQueries = usageStats?.aggregations?.totalSqlQueries;
-    const queryCountLast30Days = baseEntity.dataset?.statsSummary?.queryCountLast30Days;
-
-    const statsHeader = (
-        <StatsHeader
-            viewType={viewType}
-            setViewType={setViewType}
-            reportedAt={reportedAt || ''}
-            lookbackWindow={lookbackWindow}
-            setLookbackWindow={setLookbackWindow}
-        />
-    );
-
-    const latestStats = (
-        <>
-            <TableStats
-                rowCount={latestProfile?.rowCount || undefined}
-                columnCount={latestProfile?.columnCount || undefined}
-                queryCount={queryCountLast30Days || totalSqlQueries || undefined}
-                users={usageStats?.aggregations?.users || undefined}
-                lastUpdatedTime={lastUpdatedTime || undefined}
-                lastReportedTime={lastReportedTime || undefined}
-            />
-            {latestProfile?.fieldProfiles && latestProfile?.fieldProfiles?.length > 0 && (
-                <ColumnStats columnStats={(latestProfile && latestProfile.fieldProfiles) || []} />
-            )}
-        </>
-    );
-
-    const historicalStats = <HistoricalStats urn={urn || ''} lookbackWindow={lookbackWindow} />;
-
-    return (
-        <>
-            {statsHeader}
-            {viewType === ViewType.LATEST ? latestStats : historicalStats}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx
deleted file mode 100644
index 743b531b0de43c..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx
+++ /dev/null
@@ -1,293 +0,0 @@
-import { Divider, Typography } from 'antd';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import ProfilingRunsChart from '@app/entity/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart';
-import StatChart from '@app/entity/shared/tabs/Dataset/Stats/historical/charts/StatChart';
-import PrefixedSelect from '@app/entity/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect';
-import { LookbackWindow } from '@app/entity/shared/tabs/Dataset/Stats/lookbackWindows';
-import { Message } from '@app/shared/Message';
-import { formatBytes } from '@app/shared/formatNumber';
-import { TimeWindowSize, getFixedLookbackWindow } from '@app/shared/time/timeUtils';
-
-import { useGetDataProfilesLazyQuery } from '@graphql/dataset.generated';
-import { DatasetProfile, DateInterval } from '@types';
-
-// TODO: Reuse stat sections.
-const StatSection = styled.div`
-    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
-    padding: 16px 20px;
-    margin-top: 12px;
-`;
-
-const ColumnStatsHeader = styled.div`
-    display: flex;
-    justify-content: space-between;
-`;
-
-const ChartRow = styled.div`
-    display: flex;
-    justify-content: space-around;
-    padding: 24px;
-`;
-
-const ChartDivider = styled(Divider)<{ height: number; width: number }>`
-    background-color: ${ANTD_GRAY[0]};
-    height: ${(props) => props.height}px;
-    width: ${(props) => props.width}px;
-    margin: 20px;
-`;
-
-const isPresent = (val: any) => {
-    return val !== undefined && val !== null;
-};
-
-/**
- * Extracts a set of points used to render charts from a list of Dataset Profiles +
- * a particular numeric statistic name to extract. Note that the stat *must* be numeric for this utility to work.
- */
-const extractChartValuesFromTableProfiles = (profiles: Array<any>, statName: string) => {
-    return profiles
-        .filter((profile) => isPresent(profile[statName]))
-        .map((profile) => ({
-            timeMs: profile.timestampMillis,
-            value: profile[statName] as number,
-        }));
-};
-
-/**
- * Extracts a set of field-specific points used to render charts from a list of Dataset Profiles +
- * a particular numeric statistic name to extract. Note that the stat *must* be numeric for this utility to work.
- */
-const extractChartValuesFromFieldProfiles = (profiles: Array<any>, fieldPath: string, statName: string) => {
-    return profiles
-        .filter((profile) => profile.fieldProfiles)
-        .map((profile) => {
-            const fieldProfiles = profile.fieldProfiles
-                ?.filter((field) => field.fieldPath === fieldPath)
-                .filter((field) => field[statName] !== null && field[statName] !== undefined);
-
-            if (fieldProfiles?.length === 1) {
-                const fieldProfile = fieldProfiles[0];
-                return {
-                    timeMs: profile.timestampMillis,
-                    value: fieldProfile[statName],
-                };
-            }
-            return null;
-        })
-        .filter((value) => value !== null);
-};
-
-const computeChartTickInterval = (windowSize: TimeWindowSize): DateInterval => {
-    switch (windowSize.interval) {
-        case DateInterval.Day:
-            return DateInterval.Hour;
-        case DateInterval.Week:
-            return DateInterval.Day;
-        case DateInterval.Month:
-            return DateInterval.Week;
-        case DateInterval.Year:
-            return DateInterval.Month;
-        default:
-            throw new Error(`Unrecognized DateInterval provided ${windowSize.interval}`);
-    }
-};
-
-const computeAllFieldPaths = (profiles: Array<DatasetProfile>): Set<string> => {
-    const uniqueFieldPaths = new Set<string>();
-    profiles.forEach((profile) => {
-        const fieldProfiles = profile.fieldProfiles || [];
-        fieldProfiles.forEach((fieldProfile) => {
-            uniqueFieldPaths.add(fieldProfile.fieldPath);
-        });
-    });
-    return uniqueFieldPaths;
-};
-
-const getLookbackWindowSize = (window: LookbackWindow) => {
-    return window.windowSize;
-};
-
-export type Props = {
-    urn: string;
-    lookbackWindow: LookbackWindow;
-};
-
-export default function HistoricalStats({ urn, lookbackWindow }: Props) {
-    const [getDataProfiles, { data: profilesData, loading: profilesLoading }] = useGetDataProfilesLazyQuery();
-
-    /**
-     * Perform initial fetch of default lookback window stats.
-     */
-    useEffect(() => {
-        getDataProfiles({
-            variables: { urn, ...getFixedLookbackWindow(getLookbackWindowSize(lookbackWindow)) },
-        });
-    }, [urn, lookbackWindow, getDataProfiles]);
-
-    /**
-     * Determines which fixed lookback window is used to display historical statistics. See above for valid options.
-     */
-    const selectedWindowSize = getLookbackWindowSize(lookbackWindow);
-    const selectedWindow = getFixedLookbackWindow(selectedWindowSize);
-
-    /**
-     * Determines which field path is highlighted in column stats. Defaults to none.
-     */
-    const [selectedFieldPath, setSelectedFieldPath] = useState('');
-
-    const onChangeSelectedFieldPath = (value) => {
-        setSelectedFieldPath(value);
-    };
-
-    const graphTickInterval = computeChartTickInterval(selectedWindowSize);
-    const graphDateRange = {
-        start: selectedWindow.startTime.toString(),
-        end: selectedWindow.endTime.toString(),
-    };
-
-    const profiles = profilesData?.dataset?.datasetProfiles || [];
-    const allFieldPaths = Array.from(computeAllFieldPaths(profiles));
-
-    if (selectedFieldPath === '' && allFieldPaths.length > 0) {
-        // Set initially selected field path.
-        setSelectedFieldPath(allFieldPaths[0]);
-    }
-
-    const columnSelectView = (
-        <PrefixedSelect
-            prefixText="Stats for column "
-            values={allFieldPaths}
-            value={selectedFieldPath}
-            setValue={onChangeSelectedFieldPath}
-        />
-    );
-
-    /**
-     * Compute Table Stat chart data.
-     */
-    const rowCountChartValues = extractChartValuesFromTableProfiles(profiles, 'rowCount');
-    const columnCountChartValues = extractChartValuesFromTableProfiles(profiles, 'columnCount');
-    const sizeChartValues = extractChartValuesFromTableProfiles(profiles, 'sizeInBytes');
-
-    /**
-     * Compute Column Stat chart data.
-     */
-    const nullCountChartValues: Array<any> = extractChartValuesFromFieldProfiles(
-        profiles,
-        selectedFieldPath,
-        'nullCount',
-    );
-    const nullPercentageChartValues: Array<any> = extractChartValuesFromFieldProfiles(
-        profiles,
-        selectedFieldPath,
-        'nullProportion',
-    );
-    const distinctCountChartValues: Array<any> = extractChartValuesFromFieldProfiles(
-        profiles,
-        selectedFieldPath,
-        'uniqueCount',
-    );
-    const distinctPercentageChartValues: Array<any> = extractChartValuesFromFieldProfiles(
-        profiles,
-        selectedFieldPath,
-        'uniqueProportion',
-    );
-
-    const bytesFormatter = (num: number) => {
-        const formattedBytes = formatBytes(num);
-        return `${formattedBytes.number} ${formattedBytes.unit}`;
-    };
-
-    const placeholderChart = (
-        <StatChart
-            title="Placeholder"
-            tickInterval={graphTickInterval}
-            dateRange={{ start: '', end: '' }}
-            values={[]}
-            visible={false}
-        />
-    );
-    const placeholderVerticalDivider = (
-        <ChartDivider type="vertical" height={360} width={1} style={{ visibility: 'hidden' }} />
-    );
-
-    return (
-        <>
-            {profilesLoading && <Message type="loading" content="Loading..." style={{ marginTop: '10%' }} />}
-            <StatSection>
-                <Typography.Title level={5}>Profiling Runs</Typography.Title>
-                <ProfilingRunsChart profiles={profiles} />
-            </StatSection>
-            <StatSection>
-                <Typography.Title level={5}>Table Stats</Typography.Title>
-                <ChartRow>
-                    <StatChart
-                        title="Row Count Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={rowCountChartValues}
-                    />
-                    <ChartDivider type="vertical" height={360} width={1} />
-                    <StatChart
-                        title="Column Count Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={columnCountChartValues}
-                    />
-                </ChartRow>
-                <ChartDivider type="horizontal" height={1} width={400} />
-                <ChartRow>
-                    <StatChart
-                        title="Size Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={sizeChartValues}
-                        yAxis={{ formatter: bytesFormatter }}
-                    />
-                    {placeholderVerticalDivider}
-                    {placeholderChart}
-                </ChartRow>
-            </StatSection>
-            <StatSection>
-                <ColumnStatsHeader>
-                    <Typography.Title level={5}>Column Stats</Typography.Title>
-                    {columnSelectView}
-                </ColumnStatsHeader>
-                <ChartRow>
-                    <StatChart
-                        title="Null Count Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={nullCountChartValues}
-                    />
-                    <ChartDivider type="vertical" height={360} width={1} />
-                    <StatChart
-                        title="Null Percentage Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={nullPercentageChartValues}
-                    />
-                </ChartRow>
-                <ChartDivider type="horizontal" height={1} width={400} />
-                <ChartRow>
-                    <StatChart
-                        title="Distinct Count Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={distinctCountChartValues}
-                    />
-                    <ChartDivider type="vertical" height={360} width={1} />
-                    <StatChart
-                        title="Distinct Percentage Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={distinctPercentageChartValues}
-                    />
-                </ChartRow>
-            </StatSection>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx
deleted file mode 100644
index 294d3e9dc0a683..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/LookbackWindowSelect.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { SelectValue } from 'antd/lib/select';
-import React from 'react';
-
-import PrefixedSelect from '@app/entity/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect';
-import { LOOKBACK_WINDOWS, LookbackWindow } from '@app/entity/shared/tabs/Dataset/Stats/lookbackWindows';
-
-type Props = {
-    lookbackWindow: LookbackWindow;
-    setLookbackWindow: (window: LookbackWindow) => void;
-};
-
-export default function LookbackWindowSelect({ lookbackWindow, setLookbackWindow }: Props) {
-    const onChangeLookbackWindow = (value: SelectValue) => {
-        const newLookbackWindow = Object.values(LOOKBACK_WINDOWS).filter((window) => window.text === value?.valueOf());
-        setLookbackWindow(newLookbackWindow[0]);
-    };
-
-    return (
-        <PrefixedSelect
-            prefixText="Profiling history for past "
-            values={Object.values(LOOKBACK_WINDOWS).map((window) => window.text)}
-            value={lookbackWindow.text}
-            setValue={onChangeLookbackWindow}
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx
deleted file mode 100644
index 0cd9654e7e8b3e..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import { Button, Modal, Table, Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import ColumnStats from '@app/entity/shared/tabs/Dataset/Stats/snapshot/ColumnStats';
-import TableStats from '@app/entity/shared/tabs/Dataset/Stats/snapshot/TableStats';
-import { formatBytes, formatNumberWithoutAbbreviation } from '@app/shared/formatNumber';
-
-import { DatasetProfile } from '@types';
-
-export const ChartTable = styled(Table)`
-    margin-top: 16px;
-`;
-
-export type Props = {
-    profiles: Array<DatasetProfile>;
-};
-
-const bytesFormatter = (bytes: number) => {
-    const formattedBytes = formatBytes(bytes);
-    const fullBytes = formatNumberWithoutAbbreviation(bytes);
-    return `${formattedBytes.number} ${formattedBytes.unit} (${fullBytes} bytes)`;
-};
-
-export default function ProfilingRunsChart({ profiles }: Props) {
-    const [showModal, setShowModal] = useState(false);
-    const [selectedProfileIndex, setSelectedProfileIndex] = useState(-1);
-
-    const showProfileModal = (index: number) => {
-        setSelectedProfileIndex(index);
-        setShowModal(true);
-    };
-
-    const onClose = () => {
-        setShowModal(false);
-        setSelectedProfileIndex(-1);
-    };
-
-    const tableData = profiles.map((profile) => {
-        const profileDate = new Date(profile.timestampMillis);
-        return {
-            timestamp: `${profileDate.toLocaleDateString()} at ${profileDate.toLocaleTimeString()}`,
-            rowCount: profile.rowCount?.toString() || 'unknown',
-            columnCount: profile.columnCount?.toString() || 'unknown',
-            sizeInBytes: profile.sizeInBytes ? bytesFormatter(profile.sizeInBytes) : 'unknown',
-        };
-    });
-
-    const tableColumns = [
-        {
-            title: 'Date',
-            key: 'Date',
-            dataIndex: 'timestamp',
-            render: (title, record, index) => {
-                return (
-                    <Button type="text" onClick={() => showProfileModal(index)}>
-                        <Typography.Text underline>{title}</Typography.Text>
-                    </Button>
-                );
-            },
-        },
-        {
-            title: 'Row Count',
-            key: 'Row Count',
-            dataIndex: 'rowCount',
-        },
-        {
-            title: 'Column Count',
-            key: 'Column Count',
-            dataIndex: 'columnCount',
-        },
-        {
-            title: 'Size',
-            key: 'Size',
-            dataIndex: 'sizeInBytes',
-        },
-    ];
-
-    const selectedProfile = (selectedProfileIndex >= 0 && profiles[selectedProfileIndex]) || undefined;
-    const profileModalTitle =
-        selectedProfile &&
-        `Showing profile from ${new Date(selectedProfile?.timestampMillis).toLocaleDateString()} at ${new Date(
-            selectedProfile?.timestampMillis,
-        ).toLocaleTimeString()}`;
-
-    return (
-        <>
-            {selectedProfile && (
-                <Modal width="100%" footer={null} title={profileModalTitle} open={showModal} onCancel={onClose}>
-                    <TableStats
-                        rowCount={selectedProfile.rowCount || -1}
-                        columnCount={selectedProfile.columnCount || -1}
-                    />
-                    <ColumnStats columnStats={selectedProfile.fieldProfiles || []} />
-                </Modal>
-            )}
-            <ChartTable
-                scroll={{ y: 400 }}
-                bordered
-                style={{ width: '100%', maxHeight: 440 }}
-                columns={tableColumns}
-                dataSource={tableData}
-                pagination={false}
-                size="small"
-            />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx
deleted file mode 100644
index f4568bc344f50b..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { Card, Typography } from 'antd';
-import React, { useMemo } from 'react';
-import styled from 'styled-components';
-
-import { ChartContainer } from '@app/analyticsDashboard/components/ChartContainer';
-import { TimeSeriesChart } from '@app/analyticsDashboard/components/TimeSeriesChart';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-import { DateInterval, DateRange } from '@types';
-
-const ChartTitle = styled(Typography.Text)`
-    && {
-        text-align: left;
-        font-size: 14px;
-        color: ${ANTD_GRAY[8]};
-    }
-`;
-
-const ChartCard = styled(Card)<{ visible: boolean }>`
-    box-shadow: ${(props) => props.theme.styles['box-shadow']};
-    visibility: ${(props) => (props.visible ? 'visible' : 'hidden')};
-`;
-
-type Point = {
-    timeMs: number;
-    value: number;
-};
-
-type AxisConfig = {
-    formatter: (tick: number) => string;
-};
-
-export type Props = {
-    title: string;
-    values: Array<Point>;
-    tickInterval: DateInterval;
-    dateRange: DateRange;
-    yAxis?: AxisConfig;
-    visible?: boolean;
-};
-
-/**
- * Change these to change the chart axis & line colors
- * TODO: Add this to the theme config.
- */
-const DEFAULT_LINE_COLOR = '#20d3bd';
-const DEFAULT_AXIS_COLOR = '#D8D8D8';
-const DEFAULT_AXIS_WIDTH = 2;
-
-/**
- * Time Series Chart with a single line.
- */
-export default function StatChart({ title, values, tickInterval: interval, dateRange, yAxis, visible = true }: Props) {
-    const timeSeriesData = useMemo(
-        () =>
-            values
-                .sort((a, b) => a.timeMs - b.timeMs)
-                .map((value) => {
-                    const dateStr = new Date(value.timeMs).toISOString();
-                    return {
-                        x: dateStr,
-                        y: value.value,
-                    };
-                }),
-        [values],
-    );
-
-    return (
-        <ChartCard visible={visible}>
-            <ChartContainer>
-                <ChartTitle>{title}</ChartTitle>
-                <TimeSeriesChart
-                    style={{
-                        lineColor: DEFAULT_LINE_COLOR,
-                        axisColor: DEFAULT_AXIS_COLOR,
-                        axisWidth: DEFAULT_AXIS_WIDTH,
-                    }}
-                    hideLegend
-                    chartData={{
-                        title,
-                        lines: [
-                            {
-                                name: 'line_1',
-                                data: timeSeriesData,
-                            },
-                        ],
-                        interval,
-                        dateRange,
-                    }}
-                    width={360}
-                    height={300}
-                    yScale={{ type: 'linear', zero: false }}
-                    yAxis={yAxis}
-                />
-            </ChartContainer>
-        </ChartCard>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx
deleted file mode 100644
index 14fc690350f0b0..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Select, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-type Props = {
-    prefixText: string;
-    values: Array<string>;
-    value: string;
-    setValue: (value: string) => void;
-};
-
-const SubHeaderText = styled(Typography.Text)`
-    font-size: 14px;
-    color: ${ANTD_GRAY[8]};
-`;
-
-const EmbeddedSelect = styled(Select)`
-    padding-left: 8px;
-`;
-
-export default function PrefixedSelect({ prefixText, values, value, setValue }: Props): JSX.Element {
-    return (
-        <span>
-            <SubHeaderText>{prefixText}</SubHeaderText>
-            <EmbeddedSelect value={value} onChange={(val) => setValue(val as string)}>
-                {values.map((val) => (
-                    <Select.Option value={val}>{val}</Select.Option>
-                ))}
-            </EmbeddedSelect>
-        </span>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/lookbackWindows.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/lookbackWindows.ts
deleted file mode 100644
index 98c6888851fec0..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/lookbackWindows.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { DateInterval } from '@types';
-
-/**
- * Change this to add or modify the lookback windows that are selectable via the UI.
- */
-export const LOOKBACK_WINDOWS = {
-    DAY: { text: '1 day', windowSize: { interval: DateInterval.Day, count: 1 } },
-    WEEK: { text: '1 week', windowSize: { interval: DateInterval.Week, count: 1 } },
-    MONTH: { text: '1 month', windowSize: { interval: DateInterval.Month, count: 1 } },
-    QUARTER: { text: '3 months', windowSize: { interval: DateInterval.Month, count: 3 } },
-    YEAR: { text: '1 year', windowSize: { interval: DateInterval.Year, count: 1 } },
-};
-
-export type LookbackWindow = {
-    text: string;
-    windowSize: {
-        interval: DateInterval;
-        count: number;
-    };
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx
deleted file mode 100644
index 65ebb30d5fd711..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/ColumnStats.tsx
+++ /dev/null
@@ -1,170 +0,0 @@
-import { Typography } from 'antd';
-import { ColumnType, ColumnsType } from 'antd/lib/table';
-import React, { useMemo } from 'react';
-import styled from 'styled-components';
-
-import { StyledTable } from '@app/entity/shared/components/styled/StyledTable';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import SampleValueTag from '@app/entity/shared/tabs/Dataset/Stats/snapshot/SampleValueTag';
-import { downgradeV2FieldPath } from '@src/app/entity/dataset/profile/schema/utils/utils';
-
-import { DatasetFieldProfile } from '@types';
-
-type Props = {
-    columnStats: Array<DatasetFieldProfile>;
-};
-
-const StatSection = styled.div`
-    padding: 20px 20px;
-`;
-
-const NameText = styled(Typography.Text)`
-    font-family: 'Roboto Mono', monospace;
-    font-weight: 600;
-    font-size: 12px;
-    color: ${ANTD_GRAY[9]};
-`;
-
-const isPresent = (val?: string | number | null): val is string | number => {
-    return val !== undefined && val !== null;
-};
-
-const decimalToPercentStr = (decimal: number, precision: number): string => {
-    return `${(decimal * 100).toFixed(precision)}%`;
-};
-
-export default function ColumnStats({ columnStats }: Props) {
-    const columnStatsTableData = useMemo(
-        () =>
-            columnStats.map((doc) => ({
-                name: downgradeV2FieldPath(doc.fieldPath),
-                min: doc.min,
-                max: doc.max,
-                mean: doc.mean,
-                median: doc.median,
-                stdev: doc.stdev,
-                nullCount: isPresent(doc.nullCount) && doc.nullCount.toString(),
-                nullPercentage: isPresent(doc.nullProportion) && decimalToPercentStr(doc.nullProportion, 2),
-                distinctCount: isPresent(doc.uniqueCount) && doc.uniqueCount.toString(),
-                distinctPercentage: isPresent(doc.uniqueProportion) && decimalToPercentStr(doc.uniqueProportion, 2),
-                sampleValues: doc.sampleValues,
-            })) || [],
-        [columnStats],
-    );
-
-    /**
-     * Returns a placeholder value to show in the column data table when data is null.
-     */
-    const unknownValue = () => {
-        return <Typography.Text style={{ color: '#B8B8B8' }}>unknown</Typography.Text>;
-    };
-
-    /**
-     * Computes a set of the object keys across all items in a given array.
-     */
-    const getItemKeySet = (items: Array<any>) => {
-        const keySet = new Set<string>();
-        items.forEach((item) => {
-            Object.keys(item).forEach((key) => {
-                keySet.add(key);
-            });
-        });
-        return keySet;
-    };
-
-    /**
-     * Dynamically builds column stat table columns based on the fields present in the dataset profile data.
-     */
-    const buildColumnStatsColumns = (tableData: Array<any>) => {
-        // Optional columns. Defines how to render a column given a value exists somewhere in the profile.
-        const optionalColumns: ColumnsType<any> = [
-            {
-                title: 'Min',
-                dataIndex: 'min',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Max',
-                dataIndex: 'max',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Mean',
-                dataIndex: 'mean',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Median',
-                dataIndex: 'median',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Null Count',
-                dataIndex: 'nullCount',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Null %',
-                dataIndex: 'nullPercentage',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Distinct Count',
-                dataIndex: 'distinctCount',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Distinct %',
-                dataIndex: 'distinctPercentage',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Std. Dev',
-                dataIndex: 'stdev',
-                render: (value) => value || unknownValue(),
-            },
-            {
-                title: 'Sample Values',
-                dataIndex: 'sampleValues',
-                render: (sampleValues: Array<string>) => {
-                    return (
-                        (sampleValues &&
-                            sampleValues
-                                .slice(0, sampleValues.length < 3 ? sampleValues?.length : 3)
-                                .map((value) => <SampleValueTag value={value} />)) ||
-                        unknownValue()
-                    );
-                },
-            },
-        ];
-
-        // Name column always required.
-        const requiredColumns: ColumnsType<any> = [
-            {
-                title: 'Name',
-                dataIndex: 'name',
-                render: (value) => <NameText>{value}</NameText>,
-            },
-        ];
-
-        // Retrieves a set of names of columns that should be shown based on their presence in the data profile.
-        const columnsPresent: Set<string> = getItemKeySet(tableData);
-
-        // Compute the final columns to render.
-        const columns = [
-            ...requiredColumns,
-            ...optionalColumns.filter((column: ColumnType<any>) => columnsPresent.has(column.dataIndex as string)),
-        ];
-
-        return columns;
-    };
-
-    const columnStatsColumns = buildColumnStatsColumns(columnStatsTableData);
-
-    return (
-        <StatSection>
-            <Typography.Title level={5}>Column Stats</Typography.Title>
-            <StyledTable pagination={false} columns={columnStatsColumns} dataSource={columnStatsTableData} sticky />
-        </StatSection>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx
deleted file mode 100644
index 216fed66c90135..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/SampleValueTag.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Tag, Tooltip } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-const StyledTag = styled(Tag)`
-    cursor: pointer;
-    max-width: 250px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-
-    &&:hover {
-        color: ${(props) => props.theme.styles['primary-color']};
-        border-color: ${(props) => props.theme.styles['primary-color']};
-    }
-`;
-
-type Props = {
-    value: string;
-};
-
-export default function SampleValueTag({ value }: Props) {
-    const [copied, setCopied] = useState(false);
-
-    const onClick = () => {
-        setCopied(true);
-        navigator.clipboard.writeText(value);
-        setTimeout(() => setCopied(false), 2000);
-    };
-
-    return (
-        <Tooltip title={copied ? 'Copied' : 'Click to copy'}>
-            <StyledTag onClick={onClick}>{value}</StyledTag>
-        </Tooltip>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx
deleted file mode 100644
index 3df53e8dd4f140..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/snapshot/TableStats.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { Tooltip, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ExpandedActorGroup } from '@app/entity/shared/components/styled/ExpandedActorGroup';
-import { InfoItem } from '@app/entity/shared/components/styled/InfoItem';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber';
-import { countFormatter } from '@utils/formatter/index';
-
-import { CorpUser, Maybe, UserUsageCounts } from '@types';
-
-type Props = {
-    rowCount?: number;
-    columnCount?: number;
-    queryCount?: number;
-    users?: Array<Maybe<UserUsageCounts>>;
-    lastUpdatedTime?: string;
-    lastReportedTime?: string;
-};
-
-const StatSection = styled.div`
-    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
-    padding: 16px 20px;
-`;
-
-const StatContainer = styled.div<{ justifyContent }>`
-    display: flex;
-    position: relative;
-    z-index: 1;
-    justify-content: ${(props) => props.justifyContent};
-    padding: 12px 2px;
-`;
-
-export default function TableStats({
-    rowCount,
-    columnCount,
-    queryCount,
-    users,
-    lastUpdatedTime,
-    lastReportedTime,
-}: Props) {
-    // If there are less than 4 items, simply stack the stat views.
-    const justifyContent = !queryCount && !users ? 'default' : 'space-between';
-    const lastReportedTimeString = lastReportedTime || 'unknown';
-    if (
-        !rowCount &&
-        !columnCount &&
-        !queryCount &&
-        !(users && users.length > 0) &&
-        !lastUpdatedTime &&
-        !lastReportedTime
-    ) {
-        return null;
-    }
-    const sortedUsers = users?.slice().sort((a, b) => (b?.count || 0) - (a?.count || 0));
-    return (
-        <StatSection>
-            <Typography.Title level={5}>Table Stats</Typography.Title>
-            <StatContainer justifyContent={justifyContent}>
-                {rowCount && (
-                    <InfoItem title="Rows">
-                        <Tooltip title={formatNumberWithoutAbbreviation(rowCount)} placement="right">
-                            <Typography.Text strong style={{ fontSize: 24 }} data-testid="table-stats-rowcount">
-                                {countFormatter(rowCount)}
-                            </Typography.Text>
-                        </Tooltip>
-                    </InfoItem>
-                )}
-                {columnCount && (
-                    <InfoItem title="Columns">
-                        <Typography.Text strong style={{ fontSize: 24 }}>
-                            {columnCount}
-                        </Typography.Text>
-                    </InfoItem>
-                )}
-                {queryCount && (
-                    <InfoItem title="Monthly Queries">
-                        <Typography.Text strong style={{ fontSize: 24 }}>
-                            {queryCount}
-                        </Typography.Text>
-                    </InfoItem>
-                )}
-                {sortedUsers && sortedUsers.length > 0 && (
-                    <InfoItem title="Top Users">
-                        <div style={{ paddingTop: 8 }}>
-                            <ExpandedActorGroup
-                                containerStyle={{
-                                    justifyContent: 'left',
-                                }}
-                                actors={
-                                    sortedUsers
-                                        .filter((user) => user && user?.user !== undefined && user?.user !== null)
-                                        .map((user) => user?.user as CorpUser) || []
-                                }
-                                max={4}
-                            />
-                        </div>
-                    </InfoItem>
-                )}
-                {lastUpdatedTime && (
-                    <InfoItem title="Last Updated" width="220px">
-                        <Tooltip title={`Last reported at ${lastReportedTimeString}`}>
-                            <Typography.Text strong style={{ fontSize: 16 }}>
-                                {lastUpdatedTime}
-                            </Typography.Text>
-                        </Tooltip>
-                    </InfoItem>
-                )}
-            </StatContainer>
-        </StatSection>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/viewType.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/viewType.ts
deleted file mode 100644
index bfcba17422bccd..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Stats/viewType.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum ViewType {
-    LATEST,
-    HISTORICAL,
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/Assertions.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/Assertions.tsx
deleted file mode 100644
index a07bfe74c78daf..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/Assertions.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import React, { useState } from 'react';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { combineEntityDataWithSiblings, useIsSeparateSiblingsMode } from '@app/entity/shared/siblingUtils';
-import { DatasetAssertionsList } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList';
-import { DatasetAssertionsSummary } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsSummary';
-import { sortAssertions } from '@app/entity/shared/tabs/Dataset/Validations/assertionUtils';
-
-import { useGetDatasetContractQuery } from '@graphql/contract.generated';
-import { useGetDatasetAssertionsQuery } from '@graphql/dataset.generated';
-import { Assertion, AssertionResultType } from '@types';
-
-/**
- * Returns a status summary for the assertions associated with a Dataset.
- */
-const getAssertionsStatusSummary = (assertions: Array<Assertion>) => {
-    const summary = {
-        failedRuns: 0,
-        succeededRuns: 0,
-        totalRuns: 0,
-        erroredRuns: 0,
-        totalAssertions: assertions.length,
-    };
-    assertions.forEach((assertion) => {
-        if ((assertion.runEvents?.runEvents?.length || 0) > 0) {
-            const mostRecentRun = assertion.runEvents?.runEvents?.[0];
-            const resultType = mostRecentRun?.result?.type;
-            if (AssertionResultType.Success === resultType) {
-                summary.succeededRuns++;
-            }
-            if (AssertionResultType.Failure === resultType) {
-                summary.failedRuns++;
-            }
-            if (AssertionResultType.Error === resultType) {
-                summary.erroredRuns++;
-            }
-            if (AssertionResultType.Init !== resultType) {
-                summary.totalRuns++; // only count assertions for which there is one completed run event, ignoring INIT statuses!
-            }
-        }
-    });
-    return summary;
-};
-
-/**
- * Component used for rendering the Validations Tab on the Dataset Page.
- *
- * TODO: Note that only the legacy DATASET assertions are supported for viewing as of today.
- */
-export const Assertions = () => {
-    const { urn, entityData } = useEntityData();
-    const { data, refetch } = useGetDatasetAssertionsQuery({ variables: { urn }, fetchPolicy: 'cache-first' });
-    const isHideSiblingMode = useIsSeparateSiblingsMode();
-
-    const combinedData = isHideSiblingMode ? data : combineEntityDataWithSiblings(data);
-    const [removedUrns, setRemovedUrns] = useState<string[]>([]);
-
-    const { data: contractData } = useGetDatasetContractQuery({
-        variables: { urn },
-        fetchPolicy: 'cache-first',
-    });
-    const contract = contractData?.dataset?.contract as any;
-    const assertions =
-        (combinedData && combinedData.dataset?.assertions?.assertions?.map((assertion) => assertion as Assertion)) ||
-        [];
-    const filteredAssertions = assertions.filter((assertion) => !removedUrns.includes(assertion.urn));
-
-    // Pre-sort the list of assertions based on which has been most recently executed.
-    assertions.sort(sortAssertions);
-
-    return (
-        <>
-            <DatasetAssertionsSummary summary={getAssertionsStatusSummary(filteredAssertions)} />
-            {entityData && (
-                <DatasetAssertionsList
-                    assertions={filteredAssertions}
-                    onDelete={(assertionUrn) => {
-                        // Hack to deal with eventual consistency.
-                        setRemovedUrns([...removedUrns, assertionUrn]);
-                        setTimeout(() => refetch(), 3000);
-                    }}
-                    contract={contract}
-                />
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/BooleanTimeline.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/BooleanTimeline.tsx
deleted file mode 100644
index a5ff0c66e8cf0f..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/BooleanTimeline.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import { AxisBottom } from '@visx/axis';
-import { Group } from '@visx/group';
-import { scaleUtc } from '@visx/scale';
-import { Bar } from '@visx/shape';
-import { Popover } from 'antd';
-import React, { useMemo } from 'react';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-export type BooleanResult = {
-    result: boolean;
-    title: React.ReactNode;
-    content: React.ReactNode;
-};
-
-export type BooleanDataPoint = {
-    time: number;
-    result: BooleanResult;
-};
-
-export type TimeRange = {
-    startMs: number;
-    endMs: number;
-};
-
-type Props = {
-    data: Array<BooleanDataPoint>;
-    timeRange: TimeRange;
-    width: number;
-};
-
-const SUCCESS_COLOR_HEX = '#52C41A';
-const FAILURE_COLOR_HEX = '#F5222D';
-
-/**
- * True / false results displayed on a horizontal timeline.
- */
-export const BooleanTimeline = ({ data, timeRange, width }: Props) => {
-    const yMax = 60;
-    const left = 0;
-
-    const xScale = useMemo(
-        () =>
-            scaleUtc({
-                domain: [new Date(timeRange.startMs), new Date(timeRange.endMs + 600000)],
-                range: [0, width],
-            }),
-        [timeRange, width],
-    );
-
-    const transformedData = data.map((result, i) => {
-        return {
-            index: i,
-            title: result.result.title,
-            content: result.result.content,
-            result: result.result.result,
-            time: result.time,
-        };
-    });
-
-    return (
-        <>
-            <svg width={width} height={88}>
-                <Group>
-                    {transformedData.map((d) => {
-                        const barWidth = 8;
-                        const barHeight = 18;
-                        const barX = xScale(new Date(d.time));
-                        const barY = yMax - barHeight;
-                        const fillColor = d.result ? SUCCESS_COLOR_HEX : FAILURE_COLOR_HEX;
-                        return (
-                            <Popover
-                                key={d.time}
-                                title={d.title}
-                                overlayStyle={{
-                                    maxWidth: 440,
-                                    wordWrap: 'break-word',
-                                }}
-                                content={d.content}
-                            >
-                                <Bar
-                                    key={`bar-${d.time}`}
-                                    x={barX}
-                                    y={barY}
-                                    stroke="white"
-                                    width={barWidth}
-                                    height={barHeight}
-                                    fill={fillColor}
-                                />
-                            </Popover>
-                        );
-                    })}
-                </Group>
-                <AxisBottom
-                    top={yMax}
-                    left={left}
-                    scale={xScale}
-                    numTicks={7}
-                    stroke={ANTD_GRAY[5]}
-                    tickFormat={(v: any) => v.toLocaleDateString('en-us', { month: 'short', day: 'numeric' })}
-                    tickLabelProps={(_) => ({
-                        fontSize: 11,
-                        angle: 0,
-                        textAnchor: 'middle',
-                    })}
-                />
-            </svg>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx
deleted file mode 100644
index 47f6910901ea24..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx
+++ /dev/null
@@ -1,372 +0,0 @@
-import { Button, Popover, Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { DatasetAssertionLogicModal } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal';
-import { getFormattedParameterValue } from '@app/entity/shared/tabs/Dataset/Validations/assertionUtils';
-import { decodeSchemaField } from '@app/lineage/utils/columnLineageUtils';
-
-import {
-    AssertionStdAggregation,
-    AssertionStdOperator,
-    AssertionStdParameters,
-    DatasetAssertionInfo,
-    DatasetAssertionScope,
-    SchemaFieldRef,
-} from '@types';
-
-const ViewLogicButton = styled(Button)`
-    padding: 0px;
-    margin: 0px;
-`;
-
-type Props = {
-    description?: string;
-    assertionInfo: DatasetAssertionInfo;
-};
-
-/**
- * Returns the React Component to render for the aggregation portion of the Assertion Description
- * for Assertions on Dataset Schemas.
- *
- * Schema assertions require an aggregation.
- */
-const getSchemaAggregationText = (
-    aggregation: AssertionStdAggregation | undefined | null,
-    fields: Array<SchemaFieldRef> | undefined | null,
-) => {
-    switch (aggregation) {
-        case AssertionStdAggregation.ColumnCount:
-            return <Typography.Text>Dataset column count is</Typography.Text>;
-        case AssertionStdAggregation.Columns:
-            return <Typography.Text>Dataset columns are</Typography.Text>;
-        case AssertionStdAggregation.Native: {
-            const fieldNames = fields?.map((field) => decodeSchemaField(field.path)) || [];
-            return (
-                <Typography.Text>
-                    Dataset columns <Typography.Text strong>{JSON.stringify(fieldNames)}</Typography.Text> are
-                </Typography.Text>
-            );
-        }
-        default:
-            console.error(`Unsupported schema aggregation assertion ${aggregation} provided.`);
-            return <Typography.Text>Dataset columns are</Typography.Text>;
-    }
-};
-
-/**
- * Returns the React Component to render for the aggregation portion of the Assertion Description
- * for Assertions on Dataset Rows
- *
- * Row assertions require an aggregation.
- */
-const getRowsAggregationText = (aggregation: AssertionStdAggregation | undefined | null) => {
-    switch (aggregation) {
-        case AssertionStdAggregation.RowCount:
-            return <Typography.Text>Dataset row count is</Typography.Text>;
-        case AssertionStdAggregation.Native:
-            return <Typography.Text>Dataset rows are</Typography.Text>;
-        default:
-            console.error(`Unsupported Dataset Rows Aggregation ${aggregation} provided`);
-            return <Typography.Text>Dataset rows are</Typography.Text>;
-    }
-};
-
-/**
- * Returns the React Component to render for the aggregation portion of the Assertion Description
- * for Assertions on Dataset Columns
- */
-const getColumnAggregationText = (
-    aggregation: AssertionStdAggregation | undefined | null,
-    field: SchemaFieldRef | undefined,
-) => {
-    let columnText = decodeSchemaField(field?.path || '');
-    if (field === undefined) {
-        columnText = 'undefined';
-        console.error(`Invalid field provided for Dataset Assertion with scope Column ${JSON.stringify(field)}`);
-    }
-    switch (aggregation) {
-        // Hybrid Aggregations
-        case AssertionStdAggregation.UniqueCount: {
-            return (
-                <Typography.Text>
-                    Unique value count for column <Typography.Text strong>{columnText}</Typography.Text> is
-                </Typography.Text>
-            );
-        }
-        case AssertionStdAggregation.UniquePropotion: {
-            return (
-                <Typography.Text>
-                    Unique value proportion for column <Typography.Text strong>{columnText}</Typography.Text> is
-                </Typography.Text>
-            );
-        }
-        case AssertionStdAggregation.NullCount: {
-            return (
-                <Typography.Text>
-                    Null count for column <Typography.Text strong>{columnText}</Typography.Text> is
-                </Typography.Text>
-            );
-        }
-        case AssertionStdAggregation.NullProportion: {
-            return (
-                <Typography.Text>
-                    Null proportion for column <Typography.Text strong>{columnText}</Typography.Text> is
-                </Typography.Text>
-            );
-        }
-        // Numeric Aggregations
-        case AssertionStdAggregation.Min: {
-            return (
-                <Typography.Text>
-                    Minimum value for column <Typography.Text strong>{columnText}</Typography.Text> is
-                </Typography.Text>
-            );
-        }
-        case AssertionStdAggregation.Max: {
-            return (
-                <Typography.Text>
-                    Maximum value for column <Typography.Text strong>{columnText}</Typography.Text> is
-                </Typography.Text>
-            );
-        }
-        case AssertionStdAggregation.Mean: {
-            return (
-                <Typography.Text>
-                    Mean value for column <Typography.Text strong>{columnText}</Typography.Text> is
-                </Typography.Text>
-            );
-        }
-        case AssertionStdAggregation.Median: {
-            return (
-                <Typography.Text>
-                    Median value for column <Typography.Text strong>{columnText}</Typography.Text> is
-                </Typography.Text>
-            );
-        }
-        case AssertionStdAggregation.Stddev: {
-            return (
-                <Typography.Text>
-                    Standard deviation for column <Typography.Text strong>{columnText}</Typography.Text> is
-                </Typography.Text>
-            );
-        }
-        // Native Aggregations
-        case AssertionStdAggregation.Native: {
-            return (
-                <Typography.Text>
-                    Column <Typography.Text strong>{columnText}</Typography.Text> values are
-                </Typography.Text>
-            );
-        }
-        default:
-            // No aggregation on the column at hand. Treat the column as a set of values.
-            return (
-                <Typography.Text>
-                    Column <Typography.Text strong>{columnText}</Typography.Text> values are
-                </Typography.Text>
-            );
-    }
-};
-
-/**
- * Returns the React Component to render for the aggregation portion of the Assertion Description
- */
-const getAggregationText = (
-    scope: DatasetAssertionScope,
-    aggregation: AssertionStdAggregation | undefined | null,
-    fields: Array<SchemaFieldRef> | undefined | null,
-) => {
-    switch (scope) {
-        case DatasetAssertionScope.DatasetSchema:
-            return getSchemaAggregationText(aggregation, fields);
-        case DatasetAssertionScope.DatasetRows:
-            return getRowsAggregationText(aggregation);
-        case DatasetAssertionScope.DatasetColumn:
-            return getColumnAggregationText(aggregation, fields?.length === 1 ? fields[0] : undefined);
-        default:
-            console.error(`Unsupported Dataset Assertion scope ${scope} provided`);
-            return 'Dataset is';
-    }
-};
-
-/**
- * Returns the React Component to render for the operator portion of the Assertion Description
- */
-const getOperatorText = (
-    op: AssertionStdOperator,
-    parameters: AssertionStdParameters | undefined,
-    nativeType: string | undefined,
-) => {
-    switch (op) {
-        // Hybrid Operators
-        case AssertionStdOperator.Between: {
-            return (
-                <Typography.Text>
-                    between{' '}
-                    <Typography.Text strong>{getFormattedParameterValue(parameters?.minValue)} </Typography.Text>
-                    and <Typography.Text strong>{getFormattedParameterValue(parameters?.maxValue)}</Typography.Text>
-                </Typography.Text>
-            );
-        }
-        case AssertionStdOperator.EqualTo: {
-            const operatorText = 'equal to';
-            return (
-                <Typography.Text>
-                    {operatorText}{' '}
-                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)}</Typography.Text>
-                </Typography.Text>
-            );
-        }
-        case AssertionStdOperator.Contain: {
-            const operatorText = 'contains';
-            return (
-                <Typography.Text>
-                    {operatorText}{' '}
-                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)} </Typography.Text>
-                </Typography.Text>
-            );
-        }
-        case AssertionStdOperator.In: {
-            const operatorText = 'in';
-            return (
-                <Typography.Text>
-                    {operatorText}{' '}
-                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)} </Typography.Text>
-                </Typography.Text>
-            );
-        }
-        case AssertionStdOperator.NotNull: {
-            const operatorText = 'not null';
-            return <Typography.Text strong>{operatorText}</Typography.Text>;
-        }
-        // Numeric Operators
-        case AssertionStdOperator.GreaterThan: {
-            const operatorText = 'greater than';
-            return (
-                <Typography.Text>
-                    {operatorText}{' '}
-                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)} </Typography.Text>
-                </Typography.Text>
-            );
-        }
-        case AssertionStdOperator.GreaterThanOrEqualTo: {
-            const operatorText = 'greater than or equal to';
-            return (
-                <Typography.Text>
-                    {operatorText}{' '}
-                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)} </Typography.Text>
-                </Typography.Text>
-            );
-        }
-        case AssertionStdOperator.LessThan: {
-            const operatorText = 'less than';
-            return (
-                <Typography.Text>
-                    {operatorText}{' '}
-                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)} </Typography.Text>
-                </Typography.Text>
-            );
-        }
-        case AssertionStdOperator.LessThanOrEqualTo: {
-            const operatorText = 'less than or equal to';
-            return (
-                <Typography.Text>
-                    {operatorText}{' '}
-                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)} </Typography.Text>
-                </Typography.Text>
-            );
-        }
-        // String Operators
-        case AssertionStdOperator.StartWith: {
-            const operatorText = 'starts with';
-            return (
-                <Typography.Text>
-                    {operatorText}{' '}
-                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)}</Typography.Text>
-                </Typography.Text>
-            );
-        }
-        case AssertionStdOperator.EndWith: {
-            const operatorText = 'ends with';
-            return (
-                <Typography.Text>
-                    {operatorText}{' '}
-                    <Typography.Text strong>{getFormattedParameterValue(parameters?.value)} </Typography.Text>
-                </Typography.Text>
-            );
-        }
-        case AssertionStdOperator.Native: {
-            return (
-                <Typography.Text>
-                    passing assertion <Typography.Text strong>{nativeType}</Typography.Text>
-                </Typography.Text>
-            );
-        }
-        default:
-            return (
-                <Typography.Text>
-                    passing operator{' '}
-                    <Typography.Text strong>
-                        {op} with value ${getFormattedParameterValue(parameters?.value)}
-                    </Typography.Text>
-                </Typography.Text>
-            );
-    }
-};
-
-const TOOLTIP_MAX_WIDTH = 440;
-
-/**
- * A human-readable description of an Assertion.
- *
- * For example, Column 'X' values are in [1, 2, 3]
- */
-export const DatasetAssertionDescription = ({ description, assertionInfo }: Props) => {
-    const { scope, aggregation, fields, operator, parameters, nativeType, nativeParameters, logic } = assertionInfo;
-    const [isLogicVisible, setIsLogicVisible] = useState(false);
-    /**
-     * Build a description component from a) input (aggregation, inputs) b) the operator text
-     */
-    const descriptionFragment = (
-        <>
-            {description || (
-                <Typography.Text>
-                    {getAggregationText(scope, aggregation, fields)}{' '}
-                    {getOperatorText(operator, parameters || undefined, nativeType || undefined)}
-                </Typography.Text>
-            )}
-        </>
-    );
-
-    return (
-        <Popover
-            overlayStyle={{ maxWidth: TOOLTIP_MAX_WIDTH }}
-            title={<Typography.Text strong>Details</Typography.Text>}
-            content={
-                <>
-                    <Typography.Text strong>type</Typography.Text>: {nativeType || 'N/A'}
-                    {nativeParameters?.map((parameter) => (
-                        <div>
-                            <Typography.Text strong>{parameter.key}</Typography.Text>: {parameter.value}
-                        </div>
-                    ))}
-                </>
-            }
-        >
-            <div>{descriptionFragment}</div>
-            {logic && (
-                <div>
-                    <ViewLogicButton onClick={() => setIsLogicVisible(true)} type="link">
-                        View Logic
-                    </ViewLogicButton>
-                </div>
-            )}
-            <DatasetAssertionLogicModal
-                logic={logic || 'N/A'}
-                open={isLogicVisible}
-                onClose={() => setIsLogicVisible(false)}
-            />
-        </Popover>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx
deleted file mode 100644
index 885147b434fe65..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx
+++ /dev/null
@@ -1,231 +0,0 @@
-import { Tooltip, Typography } from 'antd';
-import { SelectValue } from 'antd/lib/select';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import PrefixedSelect from '@app/entity/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect';
-import { LOOKBACK_WINDOWS } from '@app/entity/shared/tabs/Dataset/Stats/lookbackWindows';
-import { BooleanTimeline } from '@app/entity/shared/tabs/Dataset/Validations/BooleanTimeline';
-import { DatasetAssertionResultDetails } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails';
-import {
-    getResultColor,
-    getResultIcon,
-    getResultText,
-} from '@app/entity/shared/tabs/Dataset/Validations/assertionUtils';
-import { formatNumber } from '@app/shared/formatNumber';
-import { getFixedLookbackWindow, getLocaleTimezone } from '@app/shared/time/timeUtils';
-
-import { useGetAssertionRunsLazyQuery } from '@graphql/assertion.generated';
-import { AssertionResultType, AssertionRunStatus } from '@types';
-
-const RESULT_CHART_WIDTH_PX = 800;
-
-const LastEvaluatedAtLabel = styled.div`
-    padding: 0;
-    margin: 0;
-    display: flex;
-    align-items: center;
-    color: ${ANTD_GRAY[7]};
-`;
-
-const AssertionResultIcon = styled.span`
-    margin-right: 8px;
-`;
-
-const AssertionResultDetailsContainer = styled.div`
-    margin-bottom: 4px;
-`;
-
-const ContentContainer = styled.div`
-    width: 100%;
-    padding-left: 52px;
-`;
-
-const EvaluationsDetails = styled.div`
-    width: ${RESULT_CHART_WIDTH_PX}px;
-    padding-top: 12px;
-`;
-
-const EvaluationsHeader = styled.div`
-    display: flex;
-    justify-content: space-between;
-`;
-
-const EvaluationsSummary = styled.div`
-    width: 260px;
-    display: flex;
-    align-items: center;
-    justify-content: left;
-`;
-
-const EvaluationDateRange = styled(Typography.Text)`
-    margin-right: 20px;
-`;
-
-const SucceededEvaluationsCount = styled.span`
-    margin-right: 12px;
-`;
-
-const FailedEvaluationsCount = styled.span`
-    margin-right: 12px;
-`;
-
-type Props = {
-    urn: string;
-    lastEvaluatedAtMillis?: number | undefined;
-};
-
-export const DatasetAssertionDetails = ({ urn, lastEvaluatedAtMillis }: Props) => {
-    const [getAssertionRuns, { data }] = useGetAssertionRunsLazyQuery({ fetchPolicy: 'cache-first' });
-
-    /**
-     * Set default window for fetching assertion history.
-     */
-    const [lookbackWindow, setLookbackWindow] = useState(LOOKBACK_WINDOWS.WEEK);
-    useEffect(() => {
-        getAssertionRuns({
-            variables: { assertionUrn: urn, ...getFixedLookbackWindow(lookbackWindow.windowSize) },
-        });
-    }, [urn, lookbackWindow, getAssertionRuns]);
-
-    /**
-     * Invoked when user selects new lookback window (e.g. 1 year)
-     */
-    const onChangeLookbackWindow = (value: SelectValue) => {
-        const newLookbackWindow = Object.values(LOOKBACK_WINDOWS).filter((window) => window.text === value?.valueOf());
-        setLookbackWindow(newLookbackWindow[0]);
-    };
-    const selectedWindow = getFixedLookbackWindow(lookbackWindow.windowSize);
-    const selectedWindowTimeRange = {
-        startMs: selectedWindow.startTime,
-        endMs: selectedWindow.endTime,
-    };
-
-    const completeAssertionRunEvents =
-        data?.assertion?.runEvents?.runEvents?.filter((runEvent) => runEvent.status === AssertionRunStatus.Complete) ||
-        [];
-
-    /**
-     * Last evaluated timestamp
-     */
-    const lastEvaluatedAt = lastEvaluatedAtMillis
-        ? new Date(lastEvaluatedAtMillis)
-        : completeAssertionRunEvents.length > 0 && new Date(completeAssertionRunEvents[0].timestampMillis);
-    const localeTimezone = getLocaleTimezone();
-    const lastEvaluatedTimeLocal =
-        (lastEvaluatedAt &&
-            `Last evaluated on ${lastEvaluatedAt.toLocaleDateString()} at ${lastEvaluatedAt.toLocaleTimeString()} (${localeTimezone})`) ||
-        'No evaluations found';
-    const lastEvaluatedTimeGMT = lastEvaluatedAt && lastEvaluatedAt.toUTCString();
-
-    /**
-     * Start and end date bounds for Chart
-     */
-    const startDate = new Date(selectedWindowTimeRange.startMs).toLocaleDateString('en-us', {
-        month: 'short',
-        day: 'numeric',
-    });
-    const endDate = new Date(selectedWindowTimeRange.endMs).toLocaleDateString('en-us', {
-        month: 'short',
-        day: 'numeric',
-    });
-
-    /**
-     * Success / Failure summary
-     */
-    const succeededCount = data?.assertion?.runEvents?.succeeded;
-    const failedCount = data?.assertion?.runEvents?.failed;
-
-    /**
-     * Data for the chart of assertion results.
-     */
-    const assertionResultsChartData =
-        completeAssertionRunEvents.map((runEvent) => {
-            const { result } = runEvent;
-            const resultTime = new Date(runEvent.timestampMillis);
-            const localTime = resultTime.toLocaleString();
-            const gmtTime = resultTime.toUTCString();
-
-            /**
-             * Create a "result" to render in the timeline chart.
-             */
-            return {
-                time: runEvent.timestampMillis,
-                result: {
-                    result: result?.type !== AssertionResultType.Failure,
-                    title: (
-                        <>
-                            {/* eslint-disable-next-line @typescript-eslint/no-non-null-assertion */}
-                            <AssertionResultIcon>{getResultIcon(result!.type)}</AssertionResultIcon>
-                            {/* eslint-disable-next-line @typescript-eslint/no-non-null-assertion */}
-                            <Typography.Text strong>{getResultText(result!.type)}</Typography.Text>
-                        </>
-                    ),
-                    content: (
-                        <>
-                            {result && (
-                                <AssertionResultDetailsContainer>
-                                    <DatasetAssertionResultDetails result={result} />
-                                </AssertionResultDetailsContainer>
-                            )}
-                            <div>
-                                <Tooltip title={`${gmtTime}`}>
-                                    <Typography.Text type="secondary">{localTime}</Typography.Text>
-                                </Tooltip>
-                            </div>
-                        </>
-                    ),
-                },
-            };
-        }) || [];
-
-    return (
-        <ContentContainer>
-            <div>
-                <Typography.Title level={5}>Evaluations</Typography.Title>
-                <Tooltip placement="topLeft" title={lastEvaluatedTimeGMT}>
-                    <LastEvaluatedAtLabel>{lastEvaluatedTimeLocal}</LastEvaluatedAtLabel>
-                </Tooltip>
-                <EvaluationsDetails>
-                    <EvaluationsHeader>
-                        <EvaluationsSummary>
-                            <EvaluationDateRange strong>
-                                {startDate} - {endDate}
-                            </EvaluationDateRange>
-                            <div>
-                                <SucceededEvaluationsCount>
-                                    <Typography.Text
-                                        style={{ color: getResultColor(AssertionResultType.Success), fontWeight: 600 }}
-                                    >
-                                        {formatNumber(succeededCount)}
-                                    </Typography.Text>{' '}
-                                    passed
-                                </SucceededEvaluationsCount>
-                                <FailedEvaluationsCount>
-                                    <Typography.Text
-                                        style={{ color: getResultColor(AssertionResultType.Failure), fontWeight: 600 }}
-                                    >
-                                        {formatNumber(failedCount)}
-                                    </Typography.Text>{' '}
-                                    failed
-                                </FailedEvaluationsCount>
-                            </div>
-                        </EvaluationsSummary>
-                        <PrefixedSelect
-                            prefixText="Show "
-                            values={Object.values(LOOKBACK_WINDOWS).map((window) => window.text)}
-                            value={lookbackWindow.text}
-                            setValue={onChangeLookbackWindow}
-                        />
-                    </EvaluationsHeader>
-                    <BooleanTimeline
-                        width={RESULT_CHART_WIDTH_PX}
-                        data={assertionResultsChartData}
-                        timeRange={selectedWindowTimeRange}
-                    />
-                </EvaluationsDetails>
-            </div>
-        </ContentContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx
deleted file mode 100644
index fc783468dfa831..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Button, Modal } from 'antd';
-import React from 'react';
-
-import Query from '@app/entity/shared/tabs/Dataset/Queries/Query';
-
-export type AssertionsSummary = {
-    totalAssertions: number;
-    totalRuns: number;
-    failedRuns: number;
-    succeededRuns: number;
-};
-
-type Props = {
-    logic: string;
-    open: boolean;
-    onClose: () => void;
-};
-
-export const DatasetAssertionLogicModal = ({ logic, open, onClose }: Props) => {
-    return (
-        <Modal open={open} onCancel={onClose} footer={<Button onClick={onClose}>Close</Button>}>
-            <Query query={logic} />
-        </Modal>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx
deleted file mode 100644
index 1edde5647f9d2f..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-
-import { AssertionResult } from '@types';
-
-type Props = {
-    result: AssertionResult;
-};
-
-export const DatasetAssertionResultDetails = ({ result }: Props) => {
-    const maybeActualValue = result.actualAggValue;
-    const maybeUnexpectedCount = result.unexpectedCount;
-    const maybeRowCount = result.rowCount;
-    const maybeNativeResults = result.nativeResults;
-    return (
-        <>
-            {maybeActualValue !== null && maybeActualValue !== undefined && (
-                <div>
-                    <Typography.Text strong>Actual</Typography.Text>: {maybeActualValue}
-                </div>
-            )}
-            {maybeUnexpectedCount !== null && maybeUnexpectedCount !== undefined && (
-                <div>
-                    <Typography.Text strong>Invalid Count</Typography.Text>: {maybeUnexpectedCount}
-                </div>
-            )}
-            {maybeRowCount !== null && maybeRowCount !== undefined && (
-                <div>
-                    <Typography.Text strong>Row Count</Typography.Text>: {maybeRowCount}
-                </div>
-            )}
-            {maybeNativeResults && (
-                <div>
-                    {maybeNativeResults.map((entry) => (
-                        <div>
-                            <Typography.Text strong>{entry.key}</Typography.Text>: {entry.value}
-                        </div>
-                    ))}
-                </div>
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx
deleted file mode 100644
index f230591069cc0f..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx
+++ /dev/null
@@ -1,316 +0,0 @@
-import {
-    AuditOutlined,
-    DeleteOutlined,
-    DownOutlined,
-    MoreOutlined,
-    RightOutlined,
-    StopOutlined,
-} from '@ant-design/icons';
-import { Button, Checkbox, Dropdown, Empty, Image, Modal, Tag, Tooltip, Typography, message } from 'antd';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { StyledTable } from '@app/entity/shared/components/styled/StyledTable';
-import { REDESIGN_COLORS } from '@app/entity/shared/constants';
-import { DatasetAssertionDescription } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription';
-import { DatasetAssertionDetails } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDetails';
-import {
-    getResultColor,
-    getResultIcon,
-    getResultText,
-} from '@app/entity/shared/tabs/Dataset/Validations/assertionUtils';
-import { isAssertionPartOfContract } from '@app/entity/shared/tabs/Dataset/Validations/contract/utils';
-import CopyUrnMenuItem from '@app/shared/share/items/CopyUrnMenuItem';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useDeleteAssertionMutation } from '@graphql/assertion.generated';
-import { Assertion, AssertionRunStatus, DataContract, EntityType } from '@types';
-
-const ResultContainer = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: left;
-`;
-
-const ResultTypeText = styled(Typography.Text)`
-    margin-left: 8px;
-`;
-
-const ActionButtonContainer = styled.div`
-    display: flex;
-    justify-content: right;
-    align-items: center;
-`;
-
-const PlatformContainer = styled.div`
-    margin-right: 8px;
-`;
-
-const StyledMoreOutlined = styled(MoreOutlined)`
-    font-size: 18px;
-`;
-
-const AssertionSelectCheckbox = styled(Checkbox)`
-    margin-right: 12px;
-`;
-
-const DataContractLogo = styled(AuditOutlined)`
-    margin-left: 8px;
-    font-size: 16px;
-    color: ${REDESIGN_COLORS.BLUE};
-`;
-
-const AssertionDescriptionContainer = styled.div`
-    display: flex;
-    justify-content: right;
-    align-items: center;
-`;
-
-type Props = {
-    assertions: Array<Assertion>;
-    onDelete?: (urn: string) => void;
-    contract?: DataContract;
-    // required for enabling menu/actions
-    showMenu?: boolean;
-    onSelect?: (assertionUrn: string) => void;
-    // required for enabling selection logic
-    showSelect?: boolean;
-    selectedUrns?: string[];
-};
-
-/**
- * A list of assertions displaying their most recent run status, their human-readable
- * description, and platform.
- *
- * Currently this component supports rendering Dataset Assertions only.
- */
-export const DatasetAssertionsList = ({
-    assertions,
-    onDelete,
-    showMenu = true,
-    showSelect,
-    onSelect,
-    selectedUrns,
-    contract,
-}: Props) => {
-    const entityData = useEntityData();
-    const [deleteAssertionMutation] = useDeleteAssertionMutation();
-    const entityRegistry = useEntityRegistry();
-
-    const deleteAssertion = async (urn: string) => {
-        try {
-            await deleteAssertionMutation({
-                variables: { urn },
-            });
-            message.success({ content: 'Removed assertion.', duration: 2 });
-        } catch (e: unknown) {
-            message.destroy();
-            if (e instanceof Error) {
-                message.error({ content: `Failed to remove assertion: \n ${e.message || ''}`, duration: 3 });
-            }
-        }
-        onDelete?.(urn);
-    };
-
-    const onDeleteAssertion = (urn: string) => {
-        Modal.confirm({
-            title: `Confirm Assertion Removal`,
-            content: `Are you sure you want to remove this assertion from the dataset?`,
-            onOk() {
-                deleteAssertion(urn);
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    const assertionsTableData = assertions.map((assertion) => ({
-        urn: assertion.urn,
-        type: assertion.info?.type,
-        platform: assertion.platform,
-        datasetAssertionInfo: assertion.info?.datasetAssertion,
-        description: assertion.info?.description,
-        lastExecTime: assertion.runEvents?.runEvents?.length && assertion.runEvents.runEvents[0].timestampMillis,
-        lastExecResult:
-            assertion.runEvents?.runEvents?.length &&
-            assertion.runEvents.runEvents[0].status === AssertionRunStatus.Complete &&
-            assertion.runEvents.runEvents[0].result?.type,
-    }));
-
-    const assertionMenuItems = (urn: string) => {
-        return [
-            {
-                key: 1,
-                label: <CopyUrnMenuItem key="1" urn={urn} type="Assertion" />,
-            },
-        ];
-    };
-
-    const assertionsTableCols = [
-        {
-            title: '',
-            dataIndex: '',
-            key: '',
-            render: (_, record: any) => {
-                const executionDate = record.lastExecTime && new Date(record.lastExecTime);
-                const localTime = executionDate && `${executionDate.toLocaleDateString()}`;
-                const resultColor = (record.lastExecResult && getResultColor(record.lastExecResult)) || 'default';
-                const resultText = (record.lastExecResult && getResultText(record.lastExecResult)) || 'No Evaluations';
-                const resultIcon = (record.lastExecResult && getResultIcon(record.lastExecResult)) || <StopOutlined />;
-                const selected = selectedUrns?.some((selectedUrn) => selectedUrn === record.urn);
-                const isPartOfContract = contract && isAssertionPartOfContract(record, contract);
-
-                const { description } = record;
-                return (
-                    <ResultContainer>
-                        {showSelect ? (
-                            <AssertionSelectCheckbox
-                                checked={selected}
-                                onClick={(e) => e.stopPropagation()}
-                                onChange={() => onSelect?.(record.urn as string)}
-                            />
-                        ) : undefined}
-                        <div>
-                            <Tooltip title={(localTime && `Last evaluated on ${localTime}`) || 'No Evaluations'}>
-                                <Tag style={{ borderColor: resultColor }}>
-                                    {resultIcon}
-                                    <ResultTypeText style={{ color: resultColor }}>{resultText}</ResultTypeText>
-                                </Tag>
-                            </Tooltip>
-                        </div>
-                        {record.datasetAssertionInfo ? (
-                            <DatasetAssertionDescription
-                                description={description}
-                                assertionInfo={record.datasetAssertionInfo}
-                            />
-                        ) : (
-                            <AssertionDescriptionContainer>
-                                {description ?? 'No description provided'}
-                            </AssertionDescriptionContainer>
-                        )}
-
-                        {(isPartOfContract && entityData?.urn && (
-                            <Tooltip
-                                title={
-                                    <>
-                                        Part of Data Contract{' '}
-                                        <Link
-                                            to={`${entityRegistry.getEntityUrl(
-                                                EntityType.Dataset,
-                                                entityData.urn,
-                                            )}/Quality/Data Contract`}
-                                        >
-                                            View
-                                        </Link>
-                                    </>
-                                }
-                            >
-                                <Link
-                                    to={`${entityRegistry.getEntityUrl(
-                                        EntityType.Dataset,
-                                        entityData.urn,
-                                    )}/Quality/Data Contract`}
-                                >
-                                    <DataContractLogo />
-                                </Link>
-                            </Tooltip>
-                        )) ||
-                            undefined}
-                    </ResultContainer>
-                );
-            },
-        },
-        {
-            title: '',
-            dataIndex: '',
-            key: '',
-            render: (_, record: any) => {
-                return (
-                    showMenu && (
-                        <ActionButtonContainer>
-                            <Tooltip
-                                title={
-                                    record.platform.properties?.displayName ||
-                                    capitalizeFirstLetterOnly(record.platform.name)
-                                }
-                            >
-                                <PlatformContainer>
-                                    {(record.platform.properties?.logoUrl && (
-                                        <Image
-                                            preview={false}
-                                            height={20}
-                                            width={20}
-                                            src={record.platform.properties?.logoUrl}
-                                        />
-                                    )) || (
-                                        <Typography.Text>
-                                            {record.platform.properties?.displayName ||
-                                                capitalizeFirstLetterOnly(record.platform.name)}
-                                        </Typography.Text>
-                                    )}
-                                </PlatformContainer>
-                            </Tooltip>
-                            <Button onClick={() => onDeleteAssertion(record.urn)} type="text" shape="circle" danger>
-                                <DeleteOutlined />
-                            </Button>
-                            <Dropdown menu={{ items: assertionMenuItems(record.urn) }} trigger={['click']}>
-                                <StyledMoreOutlined />
-                            </Dropdown>
-                        </ActionButtonContainer>
-                    )
-                );
-            },
-        },
-    ];
-
-    return (
-        <>
-            <StyledTable
-                columns={assertionsTableCols}
-                dataSource={assertionsTableData}
-                rowKey="urn"
-                locale={{
-                    emptyText: <Empty description="No Assertions Found :(" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
-                }}
-                expandable={
-                    showSelect
-                        ? {}
-                        : {
-                              defaultExpandAllRows: false,
-                              expandRowByClick: true,
-                              expandedRowRender: (record) => {
-                                  return (
-                                      <DatasetAssertionDetails
-                                          urn={record.urn}
-                                          lastEvaluatedAtMillis={record.lastExecTime}
-                                      />
-                                  );
-                              },
-                              expandIcon: ({ expanded, onExpand, record }: any) =>
-                                  expanded ? (
-                                      <DownOutlined style={{ fontSize: 8 }} onClick={(e) => onExpand(record, e)} />
-                                  ) : (
-                                      <RightOutlined style={{ fontSize: 8 }} onClick={(e) => onExpand(record, e)} />
-                                  ),
-                          }
-                }
-                onRow={(record) => {
-                    return {
-                        onClick: (_) => {
-                            if (showSelect) {
-                                onSelect?.(record.urn as string);
-                            }
-                        },
-                    };
-                }}
-                showHeader={false}
-                pagination={false}
-            />
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx
deleted file mode 100644
index 81e07d4225f576..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import { CheckCircleFilled, CloseCircleFilled, StopOutlined } from '@ant-design/icons';
-import { Tooltip, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-const SummaryHeader = styled.div`
-    width: 100%;
-    padding-left: 40px;
-    padding-top: 20px;
-    padding-bottom: 20px;
-    display: flex;
-    align-items: center;
-    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
-`;
-
-const SummaryContainer = styled.div``;
-
-const SummaryMessage = styled.div`
-    display: inline-block;
-    margin-left: 20px;
-`;
-
-const SummaryTitle = styled(Typography.Title)`
-    && {
-        padding-bottom: 0px;
-        margin-bottom: 0px;
-    }
-`;
-
-export type AssertionsSummary = {
-    totalAssertions: number;
-    totalRuns: number;
-    failedRuns: number;
-    succeededRuns: number;
-};
-
-type Props = {
-    summary: AssertionsSummary;
-};
-
-const SUCCESS_COLOR_HEX = '#52C41A';
-const FAILURE_COLOR_HEX = '#F5222D';
-
-const getSummaryIcon = (summary: AssertionsSummary) => {
-    if (summary.totalRuns === 0) {
-        return <StopOutlined style={{ color: ANTD_GRAY[6], fontSize: 28 }} />;
-    }
-    if (summary.succeededRuns === summary.totalRuns) {
-        return <CheckCircleFilled style={{ color: SUCCESS_COLOR_HEX, fontSize: 28 }} />;
-    }
-    return <CloseCircleFilled style={{ color: FAILURE_COLOR_HEX, fontSize: 28 }} />;
-};
-
-const getSummaryMessage = (summary: AssertionsSummary) => {
-    if (summary.totalRuns === 0) {
-        return 'No assertions have run';
-    }
-    if (summary.succeededRuns === summary.totalRuns) {
-        return 'All assertions have passed';
-    }
-    if (summary.failedRuns === summary.totalRuns) {
-        return 'All assertions have failed';
-    }
-    return 'Some assertions have failed';
-};
-
-export const DatasetAssertionsSummary = ({ summary }: Props) => {
-    const summaryIcon = getSummaryIcon(summary);
-    const summaryMessage = getSummaryMessage(summary);
-    const subtitleMessage = `${summary.succeededRuns} successful assertions, ${summary.failedRuns} failed assertions`;
-    return (
-        <SummaryHeader>
-            <SummaryContainer>
-                <Tooltip title="This status is based on the most recent run of each assertion.">
-                    <div style={{ display: 'flex', alignItems: 'center' }}>
-                        {summaryIcon}
-                        <SummaryMessage>
-                            <SummaryTitle level={5}>{summaryMessage}</SummaryTitle>
-                            <Typography.Text type="secondary">{subtitleMessage}</Typography.Text>
-                        </SummaryMessage>
-                    </div>
-                </Tooltip>
-            </SummaryContainer>
-        </SummaryHeader>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx
deleted file mode 100644
index 65ec918895634f..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/FieldAssertionDescription.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-
-import {
-    getFieldDescription,
-    getFieldOperatorDescription,
-    getFieldParametersDescription,
-    getFieldTransformDescription,
-} from '@app/entity/shared/tabs/Dataset/Validations/fieldDescriptionUtils';
-
-import { FieldAssertionInfo } from '@types';
-
-type Props = {
-    assertionInfo: FieldAssertionInfo;
-};
-
-/**
- * A human-readable description of a Field Assertion.
- */
-export const FieldAssertionDescription = ({ assertionInfo }: Props) => {
-    const field = getFieldDescription(assertionInfo);
-    const operator = getFieldOperatorDescription(assertionInfo);
-    const transform = getFieldTransformDescription(assertionInfo);
-    const parameters = getFieldParametersDescription(assertionInfo);
-
-    return (
-        <Typography.Text>
-            {transform}
-            {transform ? ' of ' : ''}
-            <Typography.Text code>{field}</Typography.Text> {operator} {parameters}
-        </Typography.Text>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx
deleted file mode 100644
index 4eb652aa904df4..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/SqlAssertionDescription.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-
-import { AssertionInfo } from '@types';
-
-type Props = {
-    assertionInfo: AssertionInfo;
-};
-
-/**
- * A human-readable description of a SQL Assertion.
- */
-export const SqlAssertionDescription = ({ assertionInfo }: Props) => {
-    const { description } = assertionInfo;
-
-    return <Typography.Text>{description}</Typography.Text>;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/ValidationsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/ValidationsTab.tsx
deleted file mode 100644
index ae1a3148cf7d7b..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/ValidationsTab.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import { AuditOutlined, FileProtectOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React, { useEffect } from 'react';
-import { useHistory, useLocation } from 'react-router';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { Assertions } from '@app/entity/shared/tabs/Dataset/Validations/Assertions';
-import { DataContractTab } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractTab';
-import { useGetValidationsTab } from '@app/entity/shared/tabs/Dataset/Validations/useGetValidationsTab';
-import { useAppConfig } from '@app/useAppConfig';
-
-const TabTitle = styled.span`
-    margin-left: 4px;
-`;
-
-const TabButton = styled(Button)<{ selected: boolean }>`
-    background-color: ${(props) => (props.selected && ANTD_GRAY[3]) || 'none'};
-    margin-left: 4px;
-`;
-
-enum TabPaths {
-    ASSERTIONS = 'List',
-    DATA_CONTRACT = 'Data Contract',
-}
-
-const DEFAULT_TAB = TabPaths.ASSERTIONS;
-
-/**
- * Component used for rendering the Entity Validations Tab.
- */
-export const ValidationsTab = () => {
-    const { entityData } = useEntityData();
-    const history = useHistory();
-    const { pathname } = useLocation();
-    const appConfig = useAppConfig();
-
-    const totalAssertions = (entityData as any)?.assertions?.total;
-
-    const { selectedTab, basePath } = useGetValidationsTab(pathname, Object.values(TabPaths));
-
-    // If no tab was selected, select a default tab.
-    useEffect(() => {
-        if (!selectedTab) {
-            // Route to the default tab.
-            history.replace(`${basePath}/${DEFAULT_TAB}`);
-        }
-    }, [selectedTab, basePath, history]);
-
-    /**
-     * The top-level Toolbar tabs to display.
-     */
-    const tabs = [
-        {
-            title: (
-                <>
-                    <FileProtectOutlined />
-                    <TabTitle>Assertions ({totalAssertions})</TabTitle>
-                </>
-            ),
-            path: TabPaths.ASSERTIONS,
-            disabled: totalAssertions === 0,
-            content: <Assertions />,
-        },
-    ];
-
-    if (appConfig.config.featureFlags?.dataContractsEnabled) {
-        // If contracts feature is enabled, add to list.
-        tabs.push({
-            title: (
-                <>
-                    <AuditOutlined />
-
-                    <TabTitle>Data Contract</TabTitle>
-                </>
-            ),
-            path: TabPaths.DATA_CONTRACT,
-            content: <DataContractTab />,
-            disabled: false,
-        });
-    }
-
-    return (
-        <>
-            <TabToolbar>
-                <div>
-                    {tabs.map((tab) => (
-                        <TabButton
-                            type="text"
-                            disabled={tab.disabled}
-                            selected={selectedTab === tab.path}
-                            onClick={() => history.replace(`${basePath}/${tab.path}`)}
-                        >
-                            {tab.title}
-                        </TabButton>
-                    ))}
-                </div>
-            </TabToolbar>
-            {tabs.filter((tab) => tab.path === selectedTab).map((tab) => tab.content)}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx
deleted file mode 100644
index 093a817c38ed91..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/VolumeAssertionDescription.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-
-import {
-    getIsRowCountChange,
-    getOperatorDescription,
-    getParameterDescription,
-    getValueChangeTypeDescription,
-    getVolumeTypeDescription,
-    getVolumeTypeInfo,
-} from '@app/entity/shared/tabs/Dataset/Validations/utils';
-
-import { IncrementingSegmentRowCountChange, RowCountChange, VolumeAssertionInfo } from '@types';
-
-type Props = {
-    assertionInfo: VolumeAssertionInfo;
-};
-
-/**
- * A human-readable description of a Volume Assertion.
- */
-export const VolumeAssertionDescription = ({ assertionInfo }: Props) => {
-    const volumeType = assertionInfo.type;
-    const volumeTypeInfo = getVolumeTypeInfo(assertionInfo);
-    const volumeTypeDescription = getVolumeTypeDescription(volumeType);
-    const operatorDescription = volumeTypeInfo ? getOperatorDescription(volumeTypeInfo.operator) : '';
-    const parameterDescription = volumeTypeInfo ? getParameterDescription(volumeTypeInfo.parameters) : '';
-    const valueChangeTypeDescription = getIsRowCountChange(volumeType)
-        ? getValueChangeTypeDescription((volumeTypeInfo as RowCountChange | IncrementingSegmentRowCountChange).type)
-        : 'rows';
-
-    return (
-        <div>
-            <Typography.Text>
-                Table {volumeTypeDescription} {operatorDescription} {parameterDescription} {valueChangeTypeDescription}
-            </Typography.Text>
-        </div>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts
deleted file mode 100644
index 053a73aaa99f13..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/__tests__/useGetValidationsTab.test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { useGetValidationsTab } from '@app/entity/shared/tabs/Dataset/Validations/useGetValidationsTab';
-
-describe('useGetValidationsTab', () => {
-    it('should correctly extract valid tab', () => {
-        const pathname = '/dataset/urn:li:abc/Quality/List';
-        const tabNames = ['List'];
-        const res = useGetValidationsTab(pathname, tabNames);
-        expect(res.selectedTab).toEqual('List');
-        expect(res.basePath).toEqual('/dataset/urn:li:abc/Quality');
-    });
-    it('should extract undefined for invalid tab', () => {
-        const pathname = '/dataset/urn:li:abc/Quality/Assertions';
-        const tabNames = ['Tests'];
-        const res = useGetValidationsTab(pathname, tabNames);
-        expect(res.selectedTab).toBeUndefined();
-        expect(res.basePath).toEqual('/dataset/urn:li:abc/Quality');
-    });
-    it('should extract undefined for missing tab', () => {
-        const pathname = '/dataset/urn:li:abc/Quality';
-        const tabNames = ['Tests'];
-        const res = useGetValidationsTab(pathname, tabNames);
-        expect(res.selectedTab).toBeUndefined();
-        expect(res.basePath).toEqual('/dataset/urn:li:abc/Quality');
-    });
-    it('should handle trailing slashes', () => {
-        let pathname = '/dataset/urn:li:abc/Quality/Assertions/';
-        let tabNames = ['Assertions'];
-        let res = useGetValidationsTab(pathname, tabNames);
-        expect(res.selectedTab).toEqual('Assertions');
-        expect(res.basePath).toEqual('/dataset/urn:li:abc/Quality');
-
-        pathname = '/dataset/urn:li:abc/Quality/';
-        tabNames = ['Assertions'];
-        res = useGetValidationsTab(pathname, tabNames);
-        expect(res.selectedTab).toBeUndefined();
-        expect(res.basePath).toEqual('/dataset/urn:li:abc/Quality');
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/acrylTypes.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/acrylTypes.tsx
index abb91d7de12040..ed2bcf907c1912 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/acrylTypes.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/acrylTypes.tsx
@@ -1,6 +1,6 @@
 import { Assertion, AssertionType } from '@types';
 
-export type AssertionStatusSummary = {
+type AssertionStatusSummary = {
     passing: number;
     failing: number;
     erroring: number;
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/assertionUtils.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/assertionUtils.tsx
deleted file mode 100644
index 55d693a2ed52a5..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/assertionUtils.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons';
-import React from 'react';
-
-import {
-    AssertionResultType,
-    AssertionStdParameter,
-    AssertionStdParameterType,
-    DatasetAssertionInfo,
-    StringMapEntry,
-} from '@types';
-
-/**
- * Utility methods
- */
-export const sortAssertions = (a, b) => {
-    if (!a.runEvents?.runEvents?.length) {
-        return 1;
-    }
-    if (!b.runEvents?.runEvents?.length) {
-        return -1;
-    }
-    return b.runEvents?.runEvents[0]?.timestampMillis - a.runEvents?.runEvents[0]?.timestampMillis;
-};
-
-/**
- * Returns the display text assoociated with an AssertionResultType
- */
-export const getResultText = (result: AssertionResultType) => {
-    switch (result) {
-        case AssertionResultType.Success:
-            return 'Passed';
-        case AssertionResultType.Failure:
-            return 'Failed';
-        default:
-            throw new Error(`Unsupported Assertion Result Type ${result} provided.`);
-    }
-};
-
-/**
- * Returns the display color assoociated with an AssertionResultType
- */
-const SUCCESS_COLOR_HEX = '#4db31b';
-const FAILURE_COLOR_HEX = '#F5222D';
-export const getResultColor = (result: AssertionResultType) => {
-    switch (result) {
-        case AssertionResultType.Success:
-            return SUCCESS_COLOR_HEX;
-        case AssertionResultType.Failure:
-            return FAILURE_COLOR_HEX;
-        default:
-            throw new Error(`Unsupported Assertion Result Type ${result} provided.`);
-    }
-};
-
-/**
- * Returns the display icon assoociated with an AssertionResultType
- */
-export const getResultIcon = (result: AssertionResultType) => {
-    const resultColor = getResultColor(result);
-    switch (result) {
-        case AssertionResultType.Success:
-            return <CheckCircleOutlined style={{ color: resultColor }} />;
-        case AssertionResultType.Failure:
-            return <CloseCircleOutlined style={{ color: resultColor }} />;
-        default:
-            throw new Error(`Unsupported Assertion Result Type ${result} provided.`);
-    }
-};
-
-/**
- * Convert an array of StringMapEntry into a map, for easy retrieval.
- */
-export const convertNativeParametersArrayToMap = (nativeParameters: Array<StringMapEntry> | undefined) => {
-    if (nativeParameters) {
-        const map = new Map();
-        nativeParameters.forEach((parameter) => {
-            map.set(parameter.key, parameter.value);
-        });
-        return map;
-    }
-    return undefined;
-};
-
-/**
- * Returns the value of an AssertionStdParameter suitable for display
- */
-const MISSING_PARAMETER_VALUE = '?';
-export const getFormattedParameterValue = (parameter: AssertionStdParameter | undefined | null): React.ReactNode => {
-    if (parameter === null || parameter === undefined) {
-        return MISSING_PARAMETER_VALUE;
-    }
-    switch (parameter.type) {
-        case AssertionStdParameterType.Number:
-            return parseFloat(parameter.value as string).toLocaleString();
-        case AssertionStdParameterType.String:
-            return parameter.value;
-        case AssertionStdParameterType.Set:
-            return parameter.value;
-        default:
-            return Number.isNaN(Number(parameter.value as any))
-                ? parameter.value
-                : parseFloat(parameter.value as string).toLocaleString();
-    }
-};
-
-/**
- * Throws if an assertion has no input fields
- */
-export const validateAssertionsHasInputFields = (info: DatasetAssertionInfo) => {
-    if (info.fields && info.fields.length === 1) {
-        return info.fields[0].path;
-    }
-    throw new Error('Failed to find field path(s) for column assertion.');
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx
deleted file mode 100644
index 7377d45acdf404..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { StopOutlined } from '@ant-design/icons';
-import { Tooltip } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import {
-    StyledCheckOutlined,
-    StyledClockCircleOutlined,
-    StyledCloseOutlined,
-    StyledExclamationOutlined,
-} from '@app/entity/shared/tabs/Dataset/Validations/shared/styledComponents';
-
-import { Assertion, AssertionResultType } from '@types';
-
-const StatusContainer = styled.div`
-    width: 100%;
-    display: flex;
-    justify-content: center;
-`;
-
-type Props = {
-    assertion: Assertion;
-};
-
-export const DataContractAssertionStatus = ({ assertion }: Props) => {
-    const latestRun = (assertion.runEvents?.runEvents?.length && assertion.runEvents?.runEvents[0]) || undefined;
-    const latestResultType = latestRun?.result?.type || undefined;
-
-    return (
-        <StatusContainer>
-            {latestResultType === undefined && <StopOutlined />}
-            <Tooltip title="Assertion is passing">
-                {latestResultType === AssertionResultType.Success && <StyledCheckOutlined />}
-            </Tooltip>
-            <Tooltip title="Assertion is failing">
-                {latestResultType === AssertionResultType.Failure && <StyledCloseOutlined />}
-            </Tooltip>
-            <Tooltip title="Assertion has completed with errors">
-                {latestResultType === AssertionResultType.Error && <StyledExclamationOutlined />}
-            </Tooltip>
-            <Tooltip title="Assertion is initializing">
-                {latestResultType === AssertionResultType.Init && <StyledClockCircleOutlined />}
-            </Tooltip>
-        </StatusContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx
deleted file mode 100644
index a2191975533b88..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummary.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import { EditFilled } from '@ant-design/icons';
-import { Button, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import {
-    getContractSummaryIcon,
-    getContractSummaryMessage,
-    getContractSummaryTitle,
-} from '@app/entity/shared/tabs/Dataset/Validations/contract/utils';
-import { AssertionStatusSummary } from '@app/entity/shared/tabs/Dataset/Validations/types';
-
-import { DataContractState } from '@types';
-
-const SummaryHeader = styled.div`
-    width: 100%;
-    padding-left: 40px;
-    padding-top: 20px;
-    padding-bottom: 20px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
-`;
-
-const SummaryContainer = styled.div``;
-
-const SummaryDescription = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const SummaryMessage = styled.div`
-    display: inline-block;
-    margin-left: 20px;
-`;
-
-const SummaryTitle = styled(Typography.Title)`
-    && {
-        padding-bottom: 0px;
-        margin-bottom: 0px;
-    }
-`;
-
-const Actions = styled.div`
-    margin: 12px;
-    margin-right: 20px;
-`;
-
-const CreateButton = styled(Button)`
-    display: flex;
-    align-items: center;
-    gap: 0.3rem;
-    margin-right: 12px;
-    border-color: ${(props) => props.theme.styles['primary-color']};
-    color: ${(props) => props.theme.styles['primary-color']};
-    letter-spacing: 2px;
-    &&:hover {
-        color: white;
-        background-color: ${(props) => props.theme.styles['primary-color']};
-        border-color: ${(props) => props.theme.styles['primary-color']};
-    }
-`;
-
-const EditIconStyle = styled(EditFilled)`
-    && {
-        font-size: 12px;
-    }
-`;
-
-type Props = {
-    state: DataContractState;
-    summary: AssertionStatusSummary;
-    showContractBuilder: () => void;
-};
-
-export const DataContractSummary = ({ state, summary, showContractBuilder }: Props) => {
-    const summaryIcon = getContractSummaryIcon(state, summary);
-    const summaryTitle = getContractSummaryTitle(state, summary);
-    const summaryMessage = getContractSummaryMessage(state, summary);
-    return (
-        <SummaryHeader>
-            <SummaryContainer>
-                <SummaryDescription>
-                    {summaryIcon}
-                    <SummaryMessage>
-                        <SummaryTitle level={5}>{summaryTitle}</SummaryTitle>
-                        <Typography.Text type="secondary">{summaryMessage}</Typography.Text>
-                    </SummaryMessage>
-                </SummaryDescription>
-            </SummaryContainer>
-            <Actions>
-                <CreateButton onClick={showContractBuilder}>
-                    <EditIconStyle />
-                    EDIT
-                </CreateButton>
-            </Actions>
-        </SummaryHeader>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx
deleted file mode 100644
index f6ad73fcc1bc36..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { ArrowRightOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entity/shared/constants';
-import {
-    StyledCheckOutlined,
-    StyledCloseOutlined,
-    StyledExclamationOutlined,
-} from '@app/entity/shared/tabs/Dataset/Validations/shared/styledComponents';
-import { getAssertionsSummary } from '@app/entity/shared/tabs/Dataset/Validations/utils';
-
-import { Assertion } from '@types';
-
-const Container = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-`;
-
-const StatusContainer = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const StatusText = styled.div`
-    color: ${ANTD_GRAY[8]};
-    margin-left: 4px;
-`;
-
-const ActionButton = styled(Button)`
-    color: ${REDESIGN_COLORS.BLUE};
-`;
-
-const StyledArrowRightOutlined = styled(ArrowRightOutlined)`
-    font-size: 8px;
-`;
-
-type Props = {
-    assertions: Assertion[];
-    passingText: string;
-    failingText: string;
-    errorText: string;
-    actionText?: string;
-    showAction?: boolean;
-};
-
-export const DataContractSummaryFooter = ({
-    assertions,
-    actionText,
-    passingText,
-    errorText,
-    failingText,
-    showAction = true,
-}: Props) => {
-    const summary = getAssertionsSummary(assertions);
-    const isFailing = summary.failing > 0;
-    const isPassing = summary.passing && summary.passing === summary.total;
-    const isErroring = summary.erroring > 0;
-    return (
-        <Container>
-            <StatusContainer>
-                {(isFailing && <StyledCloseOutlined />) || undefined}
-                {(isPassing && <StyledCheckOutlined />) || undefined}
-                {(isErroring && !isFailing && <StyledExclamationOutlined />) || undefined}
-                <StatusText>
-                    {(isFailing && failingText) || undefined}
-                    {(isPassing && passingText) || undefined}
-                    {(isErroring && errorText) || undefined}
-                </StatusText>
-            </StatusContainer>
-            {showAction && (
-                <ActionButton type="text">
-                    {actionText}
-                    <StyledArrowRightOutlined />
-                </ActionButton>
-            )}
-        </Container>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx
deleted file mode 100644
index 4f934faf355393..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataContractTab.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { DataContractEmptyState } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractEmptyState';
-import { DataContractSummary } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummary';
-import { DataQualityContractSummary } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary';
-import { FreshnessContractSummary } from '@app/entity/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary';
-import { SchemaContractSummary } from '@app/entity/shared/tabs/Dataset/Validations/contract/SchemaContractSummary';
-import { DataContractBuilderModal } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal';
-import { createBuilderState } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/utils';
-import { getAssertionsSummary } from '@app/entity/shared/tabs/Dataset/Validations/utils';
-
-import { useGetDatasetContractQuery } from '@graphql/contract.generated';
-import { DataContractState } from '@types';
-
-const Container = styled.div`
-    display: flex;
-`;
-
-const LeftColumn = styled.div`
-    width: 50%;
-`;
-
-const RightColumn = styled.div`
-    width: 50%;
-`;
-
-/**
- * Component used for rendering the Data Contract Tab on the Assertions parent tab.
- */
-export const DataContractTab = () => {
-    const { urn } = useEntityData();
-
-    const { data, refetch } = useGetDatasetContractQuery({
-        variables: {
-            urn,
-        },
-    });
-    const [showContractBuilder, setShowContractBuilder] = useState(false);
-
-    const contract = data?.dataset?.contract;
-    const schemaContracts = data?.dataset?.contract?.properties?.schema || [];
-    const freshnessContracts = data?.dataset?.contract?.properties?.freshness || [];
-    const dataQualityContracts = data?.dataset?.contract?.properties?.dataQuality || [];
-    const schemaAssertions = schemaContracts.map((c) => c.assertion);
-    const freshnessAssertions = freshnessContracts.map((c) => c.assertion);
-    const dataQualityAssertions = dataQualityContracts.map((c) => c.assertion);
-    const assertionsSummary = getAssertionsSummary([
-        ...schemaAssertions,
-        ...freshnessAssertions,
-        ...dataQualityAssertions,
-    ] as any);
-    const contractState = data?.dataset?.contract?.status?.state || DataContractState.Active;
-    const hasFreshnessContract = freshnessContracts && freshnessContracts?.length;
-    const hasSchemaContract = schemaContracts && schemaContracts?.length;
-    const hasDataQualityContract = dataQualityContracts && dataQualityContracts?.length;
-    const showLeftColumn = hasFreshnessContract || hasSchemaContract || undefined;
-
-    const onContractUpdate = () => {
-        if (contract) {
-            // Contract exists, just refetch.
-            refetch();
-        } else {
-            // no contract yet, wait for indxing,
-            setTimeout(() => refetch(), 3000);
-        }
-        setShowContractBuilder(false);
-    };
-
-    return (
-        <>
-            {data?.dataset?.contract ? (
-                <>
-                    <DataContractSummary
-                        state={contractState}
-                        summary={assertionsSummary}
-                        showContractBuilder={() => setShowContractBuilder(true)}
-                    />
-                    <Container>
-                        {showLeftColumn && (
-                            <LeftColumn>
-                                {(hasFreshnessContract && (
-                                    <FreshnessContractSummary
-                                        contracts={freshnessContracts as any}
-                                        showAction={false}
-                                    />
-                                )) ||
-                                    undefined}
-                                {(hasSchemaContract && (
-                                    <SchemaContractSummary contracts={schemaContracts as any} showAction={false} />
-                                )) ||
-                                    undefined}
-                            </LeftColumn>
-                        )}
-                        <RightColumn>
-                            {hasDataQualityContract ? (
-                                <DataQualityContractSummary
-                                    contracts={dataQualityContracts as any}
-                                    showAction={false}
-                                />
-                            ) : undefined}
-                        </RightColumn>
-                    </Container>
-                </>
-            ) : (
-                <DataContractEmptyState showContractBuilder={() => setShowContractBuilder(true)} />
-            )}
-            {showContractBuilder && (
-                <DataContractBuilderModal
-                    initialState={createBuilderState(data?.dataset?.contract as any)}
-                    entityUrn={urn}
-                    onCancel={() => setShowContractBuilder(false)}
-                    onSubmit={onContractUpdate}
-                />
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx
deleted file mode 100644
index 536612ae166906..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/DataQualityContractSummary.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { Table, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { DatasetAssertionDescription } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription';
-import { FieldAssertionDescription } from '@app/entity/shared/tabs/Dataset/Validations/FieldAssertionDescription';
-import { SqlAssertionDescription } from '@app/entity/shared/tabs/Dataset/Validations/SqlAssertionDescription';
-import { VolumeAssertionDescription } from '@app/entity/shared/tabs/Dataset/Validations/VolumeAssertionDescription';
-import { DataContractAssertionStatus } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractAssertionStatus';
-import { DataContractSummaryFooter } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter';
-
-import { Assertion, AssertionType, DataQualityContract, DatasetAssertionInfo } from '@types';
-
-const TitleText = styled.div`
-    color: ${ANTD_GRAY[7]};
-    margin-bottom: 20px;
-    letter-spacing: 1px;
-`;
-
-const ColumnHeader = styled.div`
-    color: ${ANTD_GRAY[8]};
-`;
-
-const Container = styled.div`
-    padding: 28px;
-`;
-
-const SummaryContainer = styled.div`
-    width: 100%;
-    display: flex;
-    align-items: center;
-`;
-
-const StyledTable = styled(Table)`
-    width: 100%;
-    border-radius: 8px;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
-`;
-
-type Props = {
-    contracts: DataQualityContract[];
-    showAction?: boolean;
-};
-
-export const DataQualityContractSummary = ({ contracts, showAction = false }: Props) => {
-    const assertions: Assertion[] = contracts?.map((contract) => contract.assertion);
-
-    const columns = [
-        {
-            title: () => <ColumnHeader>ASSERTION</ColumnHeader>,
-            render: (assertion: Assertion) => (
-                <>
-                    {assertion.info?.datasetAssertion && (
-                        <DatasetAssertionDescription
-                            assertionInfo={assertion.info?.datasetAssertion as DatasetAssertionInfo}
-                        />
-                    )}
-                    {assertion.info?.volumeAssertion && (
-                        <VolumeAssertionDescription assertionInfo={assertion.info?.volumeAssertion} />
-                    )}
-                    {assertion.info?.fieldAssertion && (
-                        <FieldAssertionDescription assertionInfo={assertion.info?.fieldAssertion} />
-                    )}
-                    {assertion.info?.sqlAssertion && <SqlAssertionDescription assertionInfo={assertion.info} />}
-                    {assertion.info?.type === AssertionType.Custom && (
-                        <Typography.Text>{assertion.info?.description}</Typography.Text>
-                    )}
-                </>
-            ),
-        },
-        {
-            title: () => <ColumnHeader style={{ display: 'flex', justifyContent: 'center' }}>STATUS</ColumnHeader>,
-            render: (assertion: Assertion) => <DataContractAssertionStatus assertion={assertion} />,
-        },
-    ];
-
-    const data = (assertions || []).map((assertion) => ({
-        ...assertion,
-        key: assertion.urn,
-    }));
-
-    return (
-        <Container>
-            <TitleText>DATA QUALITY</TitleText>
-            <SummaryContainer>
-                <StyledTable
-                    pagination={false}
-                    columns={columns}
-                    dataSource={data}
-                    footer={() => (
-                        <DataContractSummaryFooter
-                            assertions={assertions}
-                            passingText="Meeting data quality contract"
-                            failingText="Violating data quality contract"
-                            errorText="Data quality contract assertions are completing with errors"
-                            actionText="view data quality assertions"
-                            showAction={showAction}
-                        />
-                    )}
-                />
-            </SummaryContainer>
-        </Container>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx
deleted file mode 100644
index d9780856dad84f..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessContractSummary.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { ClockCircleOutlined } from '@ant-design/icons';
-import { Divider } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { DataContractSummaryFooter } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter';
-import { FreshnessScheduleSummary } from '@app/entity/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary';
-
-import { FreshnessContract } from '@types';
-
-const Container = styled.div`
-    padding: 28px;
-`;
-
-const TitleText = styled.div`
-    color: ${ANTD_GRAY[7]};
-    margin-bottom: 20px;
-    letter-spacing: 1px;
-`;
-
-const ThinDivider = styled(Divider)`
-    && {
-        padding: 0px;
-        margin: 0px;
-    }
-`;
-
-const Header = styled.div`
-    color: ${ANTD_GRAY[8]};
-    letter-spacing; 4px;
-    padding-top: 8px;
-    padding: 12px;
-    background-color: ${ANTD_GRAY[2]};
-`;
-
-const Body = styled.div`
-    padding: 12px;
-`;
-
-const Footer = styled.div`
-    padding-top: 8px;
-    padding: 12px;
-    background-color: ${ANTD_GRAY[2]};
-`;
-
-const SummaryContainer = styled.div`
-    width: 100%;
-    border-radius: 8px;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
-`;
-
-type Props = {
-    contracts: FreshnessContract[];
-    showAction?: boolean;
-};
-
-export const FreshnessContractSummary = ({ contracts, showAction = false }: Props) => {
-    // TODO: Support multiple per-asset contracts.
-    const firstContract = (contracts.length && contracts[0]) || undefined;
-    const assertionDefinition = firstContract?.assertion?.info?.freshnessAssertion?.schedule;
-    const evaluationSchedule = (firstContract?.assertion as any)?.monitor?.relationships[0]?.entity?.info
-        ?.assertionMonitor?.assertions[0]?.schedule;
-
-    return (
-        <Container>
-            <TitleText>FRESHNESS</TitleText>
-            <SummaryContainer>
-                <Header>
-                    <ClockCircleOutlined style={{ marginRight: 8 }} />
-                    UPDATE FREQUENCY
-                </Header>
-                <Body>
-                    {!assertionDefinition && <>No contract found :(</>}
-                    <b>
-                        {assertionDefinition && (
-                            <FreshnessScheduleSummary
-                                definition={assertionDefinition}
-                                evaluationSchedule={evaluationSchedule}
-                            />
-                        )}
-                    </b>
-                </Body>
-                <ThinDivider />
-                <Footer>
-                    <DataContractSummaryFooter
-                        assertions={(firstContract && [firstContract?.assertion]) || []}
-                        passingText="Meeting freshness contract"
-                        failingText="Violating freshness contract"
-                        errorText="Freshness contract assertions are completing with errors"
-                        actionText="view freshness assertions"
-                        showAction={showAction}
-                    />
-                </Footer>
-            </SummaryContainer>
-        </Container>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx
deleted file mode 100644
index e51918a95ee7d9..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/FreshnessScheduleSummary.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import cronstrue from 'cronstrue';
-import React from 'react';
-
-import { capitalizeFirstLetter } from '@app/shared/textUtil';
-
-import { CronSchedule, FreshnessAssertionSchedule, FreshnessAssertionScheduleType } from '@types';
-
-type Props = {
-    definition: FreshnessAssertionSchedule;
-    evaluationSchedule?: CronSchedule; // When the assertion is run.
-};
-
-export const FreshnessScheduleSummary = ({ definition, evaluationSchedule }: Props) => {
-    let scheduleText = '';
-    const cronStr = definition.cron?.cron ?? evaluationSchedule?.cron;
-    switch (definition.type) {
-        case FreshnessAssertionScheduleType.Cron:
-            scheduleText = cronStr
-                ? `${capitalizeFirstLetter(cronstrue.toString(cronStr))}.`
-                : `Unknown freshness schedule.`;
-            break;
-        case FreshnessAssertionScheduleType.SinceTheLastCheck:
-            scheduleText = cronStr
-                ? `Since the previous check, as of ${cronstrue.toString(cronStr).toLowerCase()}`
-                : 'Since the previous check';
-            break;
-        case FreshnessAssertionScheduleType.FixedInterval:
-            scheduleText = `In the past ${
-                definition.fixedInterval?.multiple
-            } ${definition.fixedInterval?.unit?.toLocaleLowerCase()}s${
-                cronStr ? `, as of ${cronstrue.toString(cronStr).toLowerCase()}` : ''
-            }`;
-            break;
-        default:
-            break;
-    }
-
-    return <>{scheduleText}</>;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx
deleted file mode 100644
index 3f8315b4a30fc6..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/SchemaContractSummary.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import { Table } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { DataContractSummaryFooter } from '@app/entity/shared/tabs/Dataset/Validations/contract/DataContractSummaryFooter';
-
-import { SchemaContract } from '@types';
-
-const TitleText = styled.div`
-    color: ${ANTD_GRAY[7]};
-    margin-bottom: 20px;
-    letter-spacing: 1px;
-`;
-
-const ColumnHeader = styled.div`
-    color: ${ANTD_GRAY[8]};
-`;
-
-const Container = styled.div`
-    padding: 28px;
-`;
-
-const SummaryContainer = styled.div`
-    width: 100%;
-    display: flex;
-    align-items: center;
-`;
-
-const StyledTable = styled(Table)`
-    width: 100%;
-    border-radius: 8px;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
-    height: 100%;
-`;
-
-type Props = {
-    contracts: SchemaContract[];
-    showAction?: boolean;
-};
-
-export const SchemaContractSummary = ({ contracts, showAction = false }: Props) => {
-    const firstContract = (contracts.length && contracts[0]) || undefined;
-    const schemaMetadata = firstContract?.assertion?.info?.schemaAssertion?.schema;
-
-    const columns = [
-        {
-            title: () => <ColumnHeader>NAME</ColumnHeader>,
-            render: (field) => <>{field.fieldPath}</>,
-        },
-        {
-            title: () => <ColumnHeader>TYPE</ColumnHeader>,
-            render: (field) => <>{field.type}</>,
-        },
-    ];
-
-    const data = (schemaMetadata?.fields || []).map((field) => ({
-        ...field,
-        key: field.fieldPath,
-    }));
-
-    return (
-        <Container>
-            <TitleText>SCHEMA</TitleText>
-            <SummaryContainer>
-                <StyledTable
-                    pagination={false}
-                    columns={columns}
-                    dataSource={data}
-                    footer={() => (
-                        <DataContractSummaryFooter
-                            assertions={(firstContract && [firstContract?.assertion]) || []}
-                            passingText="Meeting schema contract"
-                            failingText="Violating schema contract"
-                            errorText="Schema contract assertions are completing with errors"
-                            actionText="view schema assertions"
-                            showAction={showAction}
-                        />
-                    )}
-                />
-            </SummaryContainer>
-        </Container>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx
deleted file mode 100644
index 8e4a3d8e3564f5..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { DatasetAssertionsList } from '@app/entity/shared/tabs/Dataset/Validations/DatasetAssertionsList';
-import { DataContractCategoryType } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/types';
-
-import { Assertion } from '@types';
-
-const Category = styled.div`
-    padding: 20px;
-    font-weight: bold;
-    font-size: 14px;
-    background-color: ${ANTD_GRAY[3]};
-    border-radius: 4px;
-`;
-
-const Hint = styled.span`
-    font-weight: normal;
-    font-size: 14px;
-    color: ${ANTD_GRAY[8]};
-`;
-
-type Props = {
-    category: DataContractCategoryType;
-    multiple?: boolean;
-    assertions: Assertion[];
-    selectedUrns: string[];
-    onSelect: (assertionUrn: string) => void;
-};
-
-/**
- * Used for selecting the assertions that are part of a data contract
- */
-export const DataContractAssertionGroupSelect = ({
-    category,
-    assertions,
-    multiple = true,
-    selectedUrns,
-    onSelect,
-}: Props) => {
-    return (
-        <>
-            <Category>
-                {category} <Hint> {!multiple ? `(Choose 1)` : ''}</Hint>
-            </Category>
-            <DatasetAssertionsList
-                assertions={assertions}
-                showMenu={false}
-                showSelect
-                selectedUrns={selectedUrns}
-                onSelect={onSelect}
-            />
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx
deleted file mode 100644
index f29a33b1605947..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder.tsx
+++ /dev/null
@@ -1,182 +0,0 @@
-import { Button, message } from 'antd';
-import lodash from 'lodash';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { DataContractAssertionGroupSelect } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractAssertionGroupSelect';
-import {
-    DEFAULT_BUILDER_STATE,
-    DataContractBuilderState,
-    DataContractCategoryType,
-} from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/types';
-import { buildUpsertDataContractMutationVariables } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/utils';
-import { DATA_QUALITY_ASSERTION_TYPES } from '@app/entity/shared/tabs/Dataset/Validations/contract/utils';
-import { createAssertionGroups } from '@app/entity/shared/tabs/Dataset/Validations/utils';
-
-import { useUpsertDataContractMutation } from '@graphql/contract.generated';
-import { useGetDatasetAssertionsQuery } from '@graphql/dataset.generated';
-import { Assertion, AssertionType, DataContract } from '@types';
-
-const AssertionsSection = styled.div`
-    border: 0.5px solid ${ANTD_GRAY[4]};
-`;
-
-const HeaderText = styled.div`
-    padding: 16px 20px;
-    color: ${ANTD_GRAY[7]};
-    font-size: 16px;
-`;
-
-const ActionContainer = styled.div`
-    display: flex;
-    justify-content: space-between;
-    margin-top: 16px;
-`;
-
-const CancelButton = styled(Button)`
-    margin-left: 12px;
-`;
-
-const SaveButton = styled(Button)`
-    margin-right: 20px;
-`;
-
-type Props = {
-    entityUrn: string;
-    initialState?: DataContractBuilderState;
-    onSubmit?: (contract: DataContract) => void;
-    onCancel?: () => void;
-};
-
-/**
- * This component is a modal used for constructing new Data Contracts
- *
- * In order to build a data contract, we simply list all dataset assertions and allow the user to choose.
- */
-export const DataContractBuilder = ({ entityUrn, initialState, onSubmit, onCancel }: Props) => {
-    const isEdit = !!initialState;
-    const [builderState, setBuilderState] = useState(initialState || DEFAULT_BUILDER_STATE);
-    const [upsertDataContractMutation] = useUpsertDataContractMutation();
-
-    // note that for contracts, we do not allow the use of sibling node assertions, for clarity.
-    const { data } = useGetDatasetAssertionsQuery({
-        variables: { urn: entityUrn },
-        fetchPolicy: 'cache-first',
-    });
-    const assertionData = data?.dataset?.assertions?.assertions ?? [];
-
-    const assertionGroups = createAssertionGroups(assertionData as Array<Assertion>);
-    const freshnessAssertions =
-        assertionGroups.find((group) => group.type === AssertionType.Freshness)?.assertions || [];
-    const schemaAssertions = assertionGroups.find((group) => group.type === AssertionType.DataSchema)?.assertions || [];
-    const dataQualityAssertions = assertionGroups
-        .filter((group) => DATA_QUALITY_ASSERTION_TYPES.has(group.type))
-        .flatMap((group) => group.assertions || []);
-
-    /**
-     * Upserts the Data Contract for an entity
-     */
-    const upsertDataContract = () => {
-        return upsertDataContractMutation({
-            variables: buildUpsertDataContractMutationVariables(entityUrn, builderState),
-        })
-            .then(({ data: dataContract, errors }) => {
-                if (!errors) {
-                    message.success({
-                        content: isEdit ? `Edited Data Contract` : `Created Data Contract!`,
-                        duration: 3,
-                    });
-                    onSubmit?.(dataContract?.upsertDataContract as DataContract);
-                }
-            })
-            .catch(() => {
-                message.destroy();
-                message.error({ content: 'Failed to create Data Contract! An unexpected error occurred' });
-            });
-    };
-
-    const onSelectDataAssertion = (assertionUrn: string, type: string) => {
-        const selected = builderState[type]?.some((c) => c.assertionUrn === assertionUrn);
-        if (selected) {
-            setBuilderState({
-                ...builderState,
-                [type]: builderState[type]?.filter((c) => c.assertionUrn !== assertionUrn),
-            });
-        } else {
-            setBuilderState({
-                ...builderState,
-                [type]: [...(builderState[type] || []), { assertionUrn }],
-            });
-        }
-    };
-
-    const editDisabled =
-        lodash.isEqual(builderState, initialState) || lodash.isEqual(builderState, DEFAULT_BUILDER_STATE);
-
-    const hasAssertions = freshnessAssertions.length || schemaAssertions.length || dataQualityAssertions.length;
-
-    const onSelectFreshnessOrSchemaAssertion = (assertionUrn: string, type: string) => {
-        const selected = builderState[type]?.assertionUrn === assertionUrn;
-        if (selected) {
-            setBuilderState({
-                ...builderState,
-                [type]: undefined,
-            });
-        } else {
-            setBuilderState({
-                ...builderState,
-                [type]: { assertionUrn },
-            });
-        }
-    };
-
-    return (
-        <>
-            {(hasAssertions && <HeaderText>Select the assertions that will make up your contract.</HeaderText>) || (
-                <HeaderText>Add a few assertions on this entity to create a data contract out of them.</HeaderText>
-            )}
-            <AssertionsSection>
-                {(freshnessAssertions.length && (
-                    <DataContractAssertionGroupSelect
-                        category={DataContractCategoryType.FRESHNESS}
-                        assertions={freshnessAssertions}
-                        multiple={false}
-                        selectedUrns={
-                            (builderState.freshness?.assertionUrn && [builderState.freshness?.assertionUrn]) || []
-                        }
-                        onSelect={(selectedUrn: string) => onSelectFreshnessOrSchemaAssertion(selectedUrn, 'freshness')}
-                    />
-                )) ||
-                    undefined}
-                {(schemaAssertions.length && (
-                    <DataContractAssertionGroupSelect
-                        category={DataContractCategoryType.SCHEMA}
-                        assertions={schemaAssertions}
-                        multiple={false}
-                        selectedUrns={(builderState.schema?.assertionUrn && [builderState.schema?.assertionUrn]) || []}
-                        onSelect={(selectedUrn: string) => onSelectFreshnessOrSchemaAssertion(selectedUrn, 'schema')}
-                    />
-                )) ||
-                    undefined}
-                {(dataQualityAssertions.length && (
-                    <DataContractAssertionGroupSelect
-                        category={DataContractCategoryType.DATA_QUALITY}
-                        assertions={dataQualityAssertions}
-                        selectedUrns={builderState.dataQuality?.map((c) => c.assertionUrn) || []}
-                        onSelect={(selectedUrn: string) => onSelectDataAssertion(selectedUrn, 'dataQuality')}
-                    />
-                )) ||
-                    undefined}
-            </AssertionsSection>
-            <ActionContainer>
-                <CancelButton onClick={onCancel}>Cancel</CancelButton>
-                <div>
-                    <SaveButton disabled={editDisabled} type="primary" onClick={upsertDataContract}>
-                        Save
-                    </SaveButton>
-                </div>
-            </ActionContainer>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx
deleted file mode 100644
index 44c1ba8afc74bc..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilderModal.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Modal, Typography } from 'antd';
-import React from 'react';
-
-import { DataContractBuilder } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/DataContractBuilder';
-import { DataContractBuilderState } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/types';
-import ClickOutside from '@app/shared/ClickOutside';
-
-import { DataContract } from '@types';
-
-const modalStyle = {};
-const modalBodyStyle = {
-    paddingRight: 0,
-    paddingLeft: 0,
-    paddingBottom: 20,
-    paddingTop: 0,
-    maxHeight: '70vh',
-    'overflow-x': 'auto',
-};
-
-type Props = {
-    entityUrn: string;
-    initialState?: DataContractBuilderState;
-    onSubmit?: (contract: DataContract) => void;
-    onCancel?: () => void;
-};
-
-/**
- * This component is a modal used for constructing new Data Contracts
- */
-export const DataContractBuilderModal = ({ entityUrn, initialState, onSubmit, onCancel }: Props) => {
-    const isEditing = initialState !== undefined;
-    const titleText = isEditing ? 'Edit Data Contract' : 'New Data Contract';
-
-    const modalClosePopup = () => {
-        Modal.confirm({
-            title: 'Exit Editor',
-            content: `Are you sure you want to exit the editor? All changes will be lost`,
-            onOk() {
-                onCancel?.();
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    return (
-        <ClickOutside onClickOutside={modalClosePopup} wrapperClassName="data-contract-builder-modal">
-            <Modal
-                wrapClassName="data-contract-builder-modal"
-                width={800}
-                footer={null}
-                title={<Typography.Text>{titleText}</Typography.Text>}
-                style={modalStyle}
-                bodyStyle={modalBodyStyle}
-                open
-                onCancel={onCancel}
-            >
-                <DataContractBuilder
-                    entityUrn={entityUrn}
-                    initialState={initialState}
-                    onSubmit={onSubmit}
-                    onCancel={onCancel}
-                />
-            </Modal>
-        </ClickOutside>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/types.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/types.ts
deleted file mode 100644
index d527837efd72ef..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/types.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * The Data Contract Builder state
- */
-export type DataContractBuilderState = {
-    /**
-     * The schema contract. In the UI, we only support defining a single schema contract.
-     */
-    schema?: {
-        assertionUrn: string;
-    };
-
-    /**
-     * The freshness contract. In the UI, we only support defining a single freshness contract.
-     */
-    freshness?: {
-        assertionUrn: string;
-    };
-
-    /**
-     * Data Quality contract. We cane define multiple data quality rules as part of the contract.
-     */
-    dataQuality?: {
-        assertionUrn: string;
-    }[];
-};
-
-export const DEFAULT_BUILDER_STATE = {
-    dataQuality: undefined,
-    schema: undefined,
-    freshness: undefined,
-};
-
-export enum DataContractCategoryType {
-    FRESHNESS = 'Freshness',
-    SCHEMA = 'Schema',
-    DATA_QUALITY = 'Data Quality',
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/utils.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/utils.ts
deleted file mode 100644
index 1cbe574ec18ceb..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/builder/utils.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import {
-    DataContractBuilderState,
-    DataContractCategoryType,
-} from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/types';
-
-import { DataContract } from '@types';
-
-/**
- * Creates a builder state instance from a Data Contract object.
- */
-export const createBuilderState = (contract?: DataContract | null): DataContractBuilderState | undefined => {
-    if (contract) {
-        return {
-            schema:
-                (contract?.properties?.schema?.length && {
-                    assertionUrn: contract?.properties?.schema[0]?.assertion?.urn,
-                }) ||
-                undefined,
-            freshness:
-                (contract?.properties?.freshness?.length && {
-                    assertionUrn: contract?.properties?.freshness[0]?.assertion?.urn,
-                }) ||
-                undefined,
-            dataQuality:
-                contract?.properties?.dataQuality?.map((c) => ({ assertionUrn: c.assertion.urn })) || undefined,
-        };
-    }
-    return undefined;
-};
-
-/**
- * Constructs the input variables required for upserting a data contract using graphql
- */
-export const buildUpsertDataContractMutationVariables = (entityUrn: string, state: DataContractBuilderState) => {
-    return {
-        input: {
-            entityUrn,
-            freshness: (state.freshness && [state.freshness]) || [],
-            schema: (state.schema && [state.schema]) || [],
-            dataQuality: state.dataQuality || [],
-        },
-    };
-};
-
-/**
- * Constructs the input variables required for removing an assertion from a data contract using graphql.
- */
-export const buildRemoveAssertionFromContractMutationVariables = (
-    entityUrn: string,
-    assertionUrn: string,
-    contract?: DataContract,
-) => {
-    return {
-        input: {
-            entityUrn,
-            freshness: contract?.properties?.freshness
-                ?.filter((c) => c.assertion.urn !== assertionUrn)
-                ?.map((c) => ({
-                    assertionUrn: c.assertion.urn,
-                })),
-            schema: contract?.properties?.schema
-                ?.filter((c) => c.assertion.urn !== assertionUrn)
-                ?.map((c) => ({
-                    assertionUrn: c.assertion.urn,
-                })),
-            dataQuality: contract?.properties?.dataQuality
-                ?.filter((c) => c.assertion.urn !== assertionUrn)
-                ?.map((c) => ({
-                    assertionUrn: c.assertion.urn,
-                })),
-        },
-    };
-};
-
-/**
- * Constructs the input variables required for adding an assertion to a data contract using graphql.
- */
-export const buildAddAssertionToContractMutationVariables = (
-    category: DataContractCategoryType,
-    entityUrn: string,
-    assertionUrn: string,
-    contract?: DataContract,
-) => {
-    const baseInput = {
-        entityUrn,
-        freshness: contract?.properties?.freshness?.map((c) => ({
-            assertionUrn: c.assertion.urn,
-        })),
-        schema: contract?.properties?.schema?.map((c) => ({
-            assertionUrn: c.assertion.urn,
-        })),
-        dataQuality: contract?.properties?.dataQuality?.map((c) => ({
-            assertionUrn: c.assertion.urn,
-        })),
-    };
-
-    switch (category) {
-        case DataContractCategoryType.SCHEMA:
-            // Replace schema assertion. We only support 1 schema assertion at a time (currently).
-            return {
-                input: {
-                    ...baseInput,
-                    schema: [{ assertionUrn }],
-                },
-            };
-        case DataContractCategoryType.FRESHNESS:
-            // Replace freshness assertion. We only support 1 freshness assertion at a time (currently).
-            return {
-                input: {
-                    ...baseInput,
-                    freshness: [{ assertionUrn }],
-                },
-            };
-        case DataContractCategoryType.DATA_QUALITY:
-            return {
-                input: {
-                    ...baseInput,
-                    dataQuality: [...(baseInput.dataQuality || []), { assertionUrn }],
-                },
-            };
-        default:
-            throw new Error(`Unrecognized category type ${category} provided.`);
-    }
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/utils.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/utils.tsx
deleted file mode 100644
index efa53dc33da9a6..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/contract/utils.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import {
-    CheckOutlined,
-    ClockCircleOutlined,
-    CloseOutlined,
-    ExclamationCircleFilled,
-    StopOutlined,
-} from '@ant-design/icons';
-import React from 'react';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { DataContractCategoryType } from '@app/entity/shared/tabs/Dataset/Validations/contract/builder/types';
-import { AssertionStatusSummary } from '@app/entity/shared/tabs/Dataset/Validations/types';
-import {
-    FAILURE_COLOR_HEX,
-    SUCCESS_COLOR_HEX,
-    WARNING_COLOR_HEX,
-} from '@app/entity/shared/tabs/Dataset/Validations/utils';
-
-import { Assertion, AssertionType, DataContract, DataContractState } from '@types';
-
-export const getContractSummaryIcon = (state: DataContractState, summary: AssertionStatusSummary) => {
-    if (state === DataContractState.Pending) {
-        return <ClockCircleOutlined style={{ color: ANTD_GRAY[6], fontSize: 28 }} />;
-    }
-    if (summary.total === 0) {
-        return <StopOutlined style={{ color: ANTD_GRAY[6], fontSize: 28 }} />;
-    }
-    if (summary.passing === summary.total) {
-        return <CheckOutlined style={{ color: SUCCESS_COLOR_HEX, fontSize: 28 }} />;
-    }
-    if (summary.failing > 0) {
-        return <CloseOutlined style={{ color: FAILURE_COLOR_HEX, fontSize: 28 }} />;
-    }
-    if (summary.erroring > 0) {
-        return <ExclamationCircleFilled style={{ color: WARNING_COLOR_HEX, fontSize: 28 }} />;
-    }
-    return <StopOutlined style={{ color: ANTD_GRAY[6], fontSize: 28 }} />;
-};
-
-export const getContractSummaryTitle = (state: DataContractState, summary: AssertionStatusSummary) => {
-    if (state === DataContractState.Pending) {
-        return 'This contract is pending implementation';
-    }
-    if (summary.total === 0) {
-        return 'This contract has not yet been validated';
-    }
-    if (summary.passing === summary.total) {
-        return 'This dataset is meeting its contract';
-    }
-    if (summary.failing > 0) {
-        return 'This dataset is not meeting its contract';
-    }
-    if (summary.erroring > 0) {
-        return 'Unable to determine contract status';
-    }
-    return 'This contract has not yet been validated';
-};
-
-export const getContractSummaryMessage = (state: DataContractState, summary: AssertionStatusSummary) => {
-    if (state === DataContractState.Pending) {
-        return 'This may take some time. Come back later!';
-    }
-    if (summary.total === 0) {
-        return 'No contract assertions have been run yet';
-    }
-    if (summary.passing === summary.total) {
-        return 'All contract assertions are passing';
-    }
-    if (summary.failing > 0) {
-        return 'Some contract assertions are failing';
-    }
-    if (summary.erroring > 0) {
-        return 'Some contract assertions are completing with errors';
-    }
-    return 'No contract assertions have been run yet';
-};
-
-/**
- * Returns true if a given assertion is part of a given contract, false otherwise.
- */
-export const isAssertionPartOfContract = (assertion: Assertion, contract: DataContract) => {
-    if (contract.properties?.dataQuality?.some((c) => c.assertion.urn === assertion.urn)) {
-        return true;
-    }
-    if (contract.properties?.schema?.some((c) => c.assertion.urn === assertion.urn)) {
-        return true;
-    }
-    if (contract.properties?.freshness?.some((c) => c.assertion.urn === assertion.urn)) {
-        return true;
-    }
-    return false;
-};
-
-/**
- * Retrieves the high level contract category - schema, freshness, or data quality - given an assertion
- */
-export const getDataContractCategoryFromAssertion = (assertion: Assertion) => {
-    if (
-        assertion.info?.type === AssertionType.Dataset ||
-        assertion.info?.type === AssertionType.Volume ||
-        assertion.info?.type === AssertionType.Field ||
-        assertion.info?.type === AssertionType.Sql
-    ) {
-        return DataContractCategoryType.DATA_QUALITY;
-    }
-    if (assertion.info?.type === AssertionType.Freshness) {
-        return DataContractCategoryType.FRESHNESS;
-    }
-    if (assertion.info?.type === AssertionType.DataSchema) {
-        return DataContractCategoryType.SCHEMA;
-    }
-    return DataContractCategoryType.DATA_QUALITY;
-};
-
-export const DATA_QUALITY_ASSERTION_TYPES = new Set([
-    AssertionType.Volume,
-    AssertionType.Sql,
-    AssertionType.Field,
-    AssertionType.Dataset,
-    AssertionType.Custom,
-]);
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts
deleted file mode 100644
index cd6039a8494f97..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/fieldDescriptionUtils.ts
+++ /dev/null
@@ -1,180 +0,0 @@
-import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber';
-import { parseMaybeStringAsFloatOrDefault } from '@app/shared/numberUtil';
-
-import {
-    AssertionStdOperator,
-    AssertionStdParameters,
-    FieldAssertionInfo,
-    FieldAssertionType,
-    FieldMetricType,
-    FieldTransformType,
-} from '@types';
-
-const ASSERTION_OPERATOR_TO_DESCRIPTION: Record<AssertionStdOperator, string | undefined> = {
-    [AssertionStdOperator.EqualTo]: 'Is equal to',
-    [AssertionStdOperator.NotEqualTo]: 'Is not equal to',
-    [AssertionStdOperator.Contain]: 'Contains',
-    [AssertionStdOperator.RegexMatch]: 'Matches',
-    [AssertionStdOperator.StartWith]: 'Starts with',
-    [AssertionStdOperator.EndWith]: 'Ends with',
-    [AssertionStdOperator.In]: 'Is in',
-    [AssertionStdOperator.NotIn]: 'Is not in',
-
-    [AssertionStdOperator.IsFalse]: 'Is False',
-    [AssertionStdOperator.IsTrue]: 'Is True',
-    [AssertionStdOperator.Null]: 'Is NULL',
-    [AssertionStdOperator.NotNull]: 'Is not NULL',
-
-    [AssertionStdOperator.GreaterThan]: 'Is greater than',
-    [AssertionStdOperator.GreaterThanOrEqualTo]: 'Is greater than or equal to',
-    [AssertionStdOperator.LessThan]: 'Is less than',
-    [AssertionStdOperator.LessThanOrEqualTo]: 'Is less than or equal to',
-    [AssertionStdOperator.Between]: 'Is within a range',
-
-    [AssertionStdOperator.Native]: undefined,
-};
-
-const SUPPORTED_OPERATORS_FOR_FIELD_DESCRIPTION = [
-    AssertionStdOperator.EqualTo,
-    AssertionStdOperator.Null,
-    AssertionStdOperator.NotNull,
-    AssertionStdOperator.NotEqualTo,
-    AssertionStdOperator.NotIn,
-    AssertionStdOperator.RegexMatch,
-    AssertionStdOperator.GreaterThan,
-    AssertionStdOperator.LessThan,
-    AssertionStdOperator.GreaterThanOrEqualTo,
-    AssertionStdOperator.LessThanOrEqualTo,
-    AssertionStdOperator.In,
-    AssertionStdOperator.Between,
-    AssertionStdOperator.Contain,
-    AssertionStdOperator.IsTrue,
-    AssertionStdOperator.IsFalse,
-];
-
-const getAssertionStdOperator = (operator: AssertionStdOperator) => {
-    if (!ASSERTION_OPERATOR_TO_DESCRIPTION[operator] || !SUPPORTED_OPERATORS_FOR_FIELD_DESCRIPTION.includes(operator)) {
-        throw new Error(`Unknown operator ${operator}`);
-    }
-    return ASSERTION_OPERATOR_TO_DESCRIPTION[operator]?.toLowerCase();
-};
-
-export const getFieldMetricTypeReadableLabel = (metric: FieldMetricType) => {
-    switch (metric) {
-        case FieldMetricType.NullCount:
-            return 'Null count';
-        case FieldMetricType.NullPercentage:
-            return 'Null percentage';
-        case FieldMetricType.UniqueCount:
-            return 'Unique count';
-        case FieldMetricType.UniquePercentage:
-            return 'Unique percentage';
-        case FieldMetricType.MaxLength:
-            return 'Max length';
-        case FieldMetricType.MinLength:
-            return 'Min length';
-        case FieldMetricType.EmptyCount:
-            return 'Empty count';
-        case FieldMetricType.EmptyPercentage:
-            return 'Empty percentage';
-        case FieldMetricType.Max:
-            return 'Max';
-        case FieldMetricType.Min:
-            return 'Min';
-        case FieldMetricType.Mean:
-            return 'Average';
-        case FieldMetricType.Median:
-            return 'Median';
-        case FieldMetricType.NegativeCount:
-            return 'Negative count';
-        case FieldMetricType.NegativePercentage:
-            return 'Negative percentage';
-        case FieldMetricType.Stddev:
-            return 'Standard deviation';
-        case FieldMetricType.ZeroCount:
-            return 'Zero count';
-        case FieldMetricType.ZeroPercentage:
-            return 'Zero percentage';
-        default:
-            throw new Error(`Unknown field metric type ${metric}`);
-    }
-};
-
-const getFieldTransformType = (transform: FieldTransformType) => {
-    switch (transform) {
-        case FieldTransformType.Length:
-            return 'Length';
-        default:
-            throw new Error(`Unknown field transform type ${transform}`);
-    }
-};
-
-const getAssertionStdParameters = (parameters: AssertionStdParameters) => {
-    if (parameters.value) {
-        return formatNumberWithoutAbbreviation(
-            parseMaybeStringAsFloatOrDefault(parameters.value.value, parameters.value.value),
-        );
-    }
-    if (parameters.minValue && parameters.maxValue) {
-        return `${formatNumberWithoutAbbreviation(
-            parseMaybeStringAsFloatOrDefault(parameters.minValue.value, parameters.minValue.value),
-        )} and ${formatNumberWithoutAbbreviation(
-            parseMaybeStringAsFloatOrDefault(parameters.maxValue.value, parameters.maxValue.value),
-        )}`;
-    }
-    return '';
-};
-
-export const getFieldDescription = (assertionInfo: FieldAssertionInfo) => {
-    const { type, fieldValuesAssertion, fieldMetricAssertion } = assertionInfo;
-    switch (type) {
-        case FieldAssertionType.FieldValues:
-            return fieldValuesAssertion?.field?.path;
-        case FieldAssertionType.FieldMetric:
-            return fieldMetricAssertion?.field?.path;
-        default:
-            throw new Error(`Unknown field assertion type ${type}`);
-    }
-};
-
-export const getFieldOperatorDescription = (assertionInfo: FieldAssertionInfo) => {
-    const { type, fieldValuesAssertion, fieldMetricAssertion } = assertionInfo;
-    switch (type) {
-        case FieldAssertionType.FieldValues:
-            if (!fieldValuesAssertion?.operator) return '';
-            return getAssertionStdOperator(fieldValuesAssertion.operator);
-        case FieldAssertionType.FieldMetric:
-            if (!fieldMetricAssertion?.operator) return '';
-            return getAssertionStdOperator(fieldMetricAssertion.operator);
-        default:
-            throw new Error(`Unknown field assertion type ${type}`);
-    }
-};
-
-export const getFieldTransformDescription = (assertionInfo: FieldAssertionInfo) => {
-    const { type, fieldValuesAssertion, fieldMetricAssertion } = assertionInfo;
-    switch (type) {
-        case FieldAssertionType.FieldValues:
-            if (!fieldValuesAssertion?.transform?.type) return '';
-            return getFieldTransformType(fieldValuesAssertion.transform.type);
-        case FieldAssertionType.FieldMetric:
-            if (!fieldMetricAssertion?.metric) return '';
-            return getFieldMetricTypeReadableLabel(fieldMetricAssertion.metric);
-        default:
-            throw new Error(`Unknown field assertion type ${type}`);
-    }
-};
-
-export const getFieldParametersDescription = (assertionInfo: FieldAssertionInfo) => {
-    const { type, fieldValuesAssertion, fieldMetricAssertion } = assertionInfo;
-    switch (type) {
-        case FieldAssertionType.FieldValues:
-            if (!fieldValuesAssertion?.parameters) return '';
-            return getAssertionStdParameters(fieldValuesAssertion.parameters);
-        case FieldAssertionType.FieldMetric:
-            if (!fieldMetricAssertion?.parameters) return '';
-            return getAssertionStdParameters(fieldMetricAssertion.parameters);
-        default:
-            throw new Error(`Unknown field assertion type ${type}`);
-    }
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/shared/styledComponents.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/shared/styledComponents.tsx
deleted file mode 100644
index 66661f224b7188..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/shared/styledComponents.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { CheckOutlined, ClockCircleOutlined, CloseOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import {
-    FAILURE_COLOR_HEX,
-    SUCCESS_COLOR_HEX,
-    WARNING_COLOR_HEX,
-} from '@app/entity/shared/tabs/Dataset/Validations/utils';
-
-export const StyledCheckOutlined = styled(CheckOutlined)`
-    color: ${SUCCESS_COLOR_HEX};
-    font-size: 16px;
-    margin-right: 4px;
-    margin-left: 4px;
-`;
-
-export const StyledCloseOutlined = styled(CloseOutlined)`
-    color: ${FAILURE_COLOR_HEX};
-    font-size: 16px;
-    margin-right: 4px;
-    margin-left: 4px;
-`;
-
-export const StyledExclamationOutlined = styled(ExclamationCircleOutlined)`
-    color: ${WARNING_COLOR_HEX};
-    font-size: 16px;
-    margin-right: 4px;
-    margin-left: 4px;
-`;
-
-export const StyledClockCircleOutlined = styled(ClockCircleOutlined)`
-    color: ${ANTD_GRAY[6]};
-    font-size: 16px;
-    margin-right: 4px;
-    margin-left: 4px;
-`;
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/types.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/types.tsx
deleted file mode 100644
index abb91d7de12040..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/types.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Assertion, AssertionType } from '@types';
-
-export type AssertionStatusSummary = {
-    passing: number;
-    failing: number;
-    erroring: number;
-    total: number; // Total assertions with at least 1 run.
-    totalAssertions: number;
-};
-
-/**
- * A group of assertions related by their logical type or category.
- */
-export type AssertionGroup = {
-    name: string;
-    icon: React.ReactNode;
-    description?: string;
-    assertions: Assertion[];
-    summary: AssertionStatusSummary;
-    type: AssertionType;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/useGetValidationsTab.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/useGetValidationsTab.ts
deleted file mode 100644
index 164e8e489e3465..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/useGetValidationsTab.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * The structure of our path will be
- *
- * /<entity-name>/<entity-urn>/Validation/<tab-name>
- */
-const VALIDATION_TAB_NAME_REGEX_PATTERN = '^/[^/]+/[^/]+/[^/]+/([^/]+).*';
-
-export type SelectedTab = {
-    basePath: string;
-    selectedTab: string | undefined;
-};
-
-/**
- * Returns information about the currently selected Validations Tab path.
- *
- * This is determined by parsing the current URL path and attempting to match against a set of
- * valid path names. If a matching tab cannot be found, then the selected tab will be returned as undefined.
- */
-export const useGetValidationsTab = (pathname: string, tabNames: string[]): SelectedTab => {
-    const trimmedPathName = pathname.endsWith('/') ? pathname.slice(0, pathname.length - 1) : pathname;
-    const match = trimmedPathName.match(VALIDATION_TAB_NAME_REGEX_PATTERN);
-    if (match && match[1]) {
-        const selectedTabPath = match[1];
-        const routedTab = tabNames.find((tab) => tab === selectedTabPath);
-        return {
-            basePath: trimmedPathName.substring(0, trimmedPathName.lastIndexOf('/')),
-            selectedTab: routedTab,
-        };
-    }
-    // No match found!
-    return {
-        basePath: trimmedPathName,
-        selectedTab: undefined,
-    };
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/utils.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/utils.tsx
deleted file mode 100644
index 060fed7c19dde7..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Validations/utils.tsx
+++ /dev/null
@@ -1,380 +0,0 @@
-import {
-    ApiOutlined,
-    CheckOutlined,
-    ClockCircleOutlined,
-    CloseOutlined,
-    CodeOutlined,
-    ConsoleSqlOutlined,
-    ExclamationCircleOutlined,
-    ProjectOutlined,
-    TableOutlined,
-} from '@ant-design/icons';
-import React from 'react';
-import styled from 'styled-components';
-
-import { sortAssertions } from '@app/entity/shared/tabs/Dataset/Validations/assertionUtils';
-import { AssertionGroup, AssertionStatusSummary } from '@app/entity/shared/tabs/Dataset/Validations/types';
-import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber';
-import { parseMaybeStringAsFloatOrDefault } from '@app/shared/numberUtil';
-
-import {
-    Assertion,
-    AssertionResultType,
-    AssertionStdOperator,
-    AssertionStdParameters,
-    AssertionType,
-    AssertionValueChangeType,
-    EntityType,
-    VolumeAssertionInfo,
-    VolumeAssertionType,
-} from '@types';
-
-export const SUCCESS_COLOR_HEX = '#52C41A';
-export const FAILURE_COLOR_HEX = '#F5222D';
-export const WARNING_COLOR_HEX = '#FA8C16';
-
-const StyledClockCircleOutlined = styled(ClockCircleOutlined)`
-    && {
-        margin: 0px;
-        padding: 0px;
-        margin-right: 8px;
-        font-size: 14px;
-    }
-`;
-
-const StyledTableOutlined = styled(TableOutlined)`
-    && {
-        margin: 0px;
-        padding: 0px;
-        margin-right: 8px;
-        font-size: 18px;
-    }
-`;
-
-const StyledProjectOutlined = styled(ProjectOutlined)`
-    && {
-        margin: 0px;
-        padding: 0px;
-        margin-right: 8px;
-        font-size: 18px;
-    }
-`;
-
-const StyledConsoleSqlOutlined = styled(ConsoleSqlOutlined)`
-    && {
-        margin: 0px;
-        padding: 0px;
-        margin-right: 8px;
-        font-size: 18px;
-    }
-`;
-
-const StyledApiOutlined = styled(ApiOutlined)`
-    && {
-        margin: 0px;
-        padding: 0px;
-        margin-right: 8px;
-        font-size: 18px;
-    }
-`;
-
-const StyledCheckOutlined = styled(CheckOutlined)`
-    && {
-        color: ${SUCCESS_COLOR_HEX};
-        font-size: 14px;
-        padding: 0px;
-        margin: 0px;
-    }
-`;
-
-const StyledCloseOutlined = styled(CloseOutlined)`
-    && {
-        color: ${FAILURE_COLOR_HEX};
-        font-size: 14px;
-        padding: 0px;
-        margin: 0px;
-    }
-`;
-
-const StyledExclamationOutlined = styled(ExclamationCircleOutlined)`
-    && {
-        color: ${WARNING_COLOR_HEX};
-        font-size: 14px;
-        padding: 0px;
-        margin: 0px;
-    }
-`;
-
-const StyledCodeOutlined = styled(CodeOutlined)`
-    && {
-        margin: 0px;
-        padding: 0px;
-        margin-right: 8px;
-        font-size: 18px;
-    }
-`;
-
-export const ASSERTION_INFO = [
-    {
-        name: 'Freshness',
-        description: 'Define & monitor your expectations about when this dataset should be updated',
-        icon: <StyledClockCircleOutlined />,
-        type: AssertionType.Freshness,
-        entityTypes: [EntityType.Dataset],
-        enabled: true,
-        visible: true,
-    },
-    {
-        name: 'Volume',
-        description: 'Define & monitor your expectations about the size of this dataset',
-        icon: <StyledTableOutlined />,
-        type: AssertionType.Volume,
-        entityTypes: [EntityType.Dataset],
-        enabled: true,
-        visible: true,
-    },
-    {
-        name: 'Column',
-        description: 'Define & monitor your expectations about the values in a column',
-        icon: <StyledProjectOutlined />,
-        type: AssertionType.Field,
-        entityTypes: [EntityType.Dataset],
-        enabled: true,
-        visible: true,
-        requiresConnectionSupportedByMonitors: false,
-    },
-    {
-        name: 'Schema',
-        description: "Define & monitor your expectations about the table's columns and their types",
-        icon: <StyledCodeOutlined />,
-        type: AssertionType.DataSchema,
-        entityTypes: [EntityType.Dataset],
-        enabled: true,
-        visible: true,
-    },
-    {
-        name: 'Custom',
-        description: 'Define & monitor your expectations using custom SQL rules',
-        icon: <StyledConsoleSqlOutlined />,
-        type: AssertionType.Sql,
-        entityTypes: [EntityType.Dataset],
-        enabled: true,
-        visible: true,
-        requiresConnectionSupportedByMonitors: true,
-    },
-    {
-        name: 'Other',
-        description: 'Assertions that are defined and maintained outside of DataHub.',
-        icon: <StyledApiOutlined />,
-        type: AssertionType.Dataset,
-        entityTypes: [EntityType.Dataset],
-        enabled: false,
-        visible: false,
-    },
-];
-
-const ASSERTION_TYPE_TO_INFO = new Map();
-ASSERTION_INFO.forEach((info) => {
-    ASSERTION_TYPE_TO_INFO.set(info.type, info);
-});
-
-const getAssertionGroupName = (type: AssertionType): string => {
-    return ASSERTION_TYPE_TO_INFO.has(type) ? ASSERTION_TYPE_TO_INFO.get(type).name : 'Unknown';
-};
-
-const getAssertionGroupTypeIcon = (type: AssertionType) => {
-    return ASSERTION_TYPE_TO_INFO.has(type) ? ASSERTION_TYPE_TO_INFO.get(type).icon : undefined;
-};
-
-/**
- * Returns a status summary for the assertions associated with a Dataset.
- *
- * @param assertions The assertions to extract the summary for
- */
-export const getAssertionsSummary = (assertions: Assertion[]): AssertionStatusSummary => {
-    const summary = {
-        passing: 0,
-        failing: 0,
-        erroring: 0,
-        total: 0,
-        totalAssertions: assertions.length,
-    };
-    assertions.forEach((assertion) => {
-        if ((assertion.runEvents?.runEvents?.length || 0) > 0) {
-            const mostRecentRun = assertion.runEvents?.runEvents?.[0];
-            const resultType = mostRecentRun?.result?.type;
-            if (AssertionResultType.Success === resultType) {
-                summary.passing++;
-            }
-            if (AssertionResultType.Failure === resultType) {
-                summary.failing++;
-            }
-            if (AssertionResultType.Error === resultType) {
-                summary.erroring++;
-            }
-            if (AssertionResultType.Init !== resultType) {
-                summary.total++; // only count assertions for which there is one completed run event, ignoring INIT statuses!
-            }
-        }
-    });
-    return summary;
-};
-
-// /**
-//  * Returns a list of assertion groups, where assertions are grouped
-//  * by their "type" or "category". Each group includes the assertions inside, along with
-//  * a summary of passing and failing assertions for the group.
-//  *
-//  * @param assertions The assertions to group
-//  */
-export const createAssertionGroups = (assertions: Array<Assertion>): AssertionGroup[] => {
-    // Pre-sort the list of assertions based on which has been most recently executed.
-    const newAssertions = [...assertions].sort(sortAssertions);
-
-    const typeToAssertions = new Map();
-    newAssertions
-        .filter((assertion) => assertion.info?.type)
-        .forEach((assertion) => {
-            const groupType = assertion.info?.type;
-            const groupedAssertions = typeToAssertions.get(groupType) || [];
-            groupedAssertions.push(assertion);
-            typeToAssertions.set(groupType, groupedAssertions);
-        });
-
-    // Now, create summary for each type and build the AssertionGroup object
-    const assertionGroups: AssertionGroup[] = [];
-    typeToAssertions.forEach((groupedAssertions, type) => {
-        const newGroup: AssertionGroup = {
-            name: getAssertionGroupName(type),
-            icon: getAssertionGroupTypeIcon(type),
-            assertions: groupedAssertions,
-            summary: getAssertionsSummary(groupedAssertions),
-            type,
-        };
-        assertionGroups.push(newGroup);
-    });
-
-    return assertionGroups;
-};
-
-export const getAssertionGroupSummaryIcon = (summary: AssertionStatusSummary) => {
-    if (summary.total === 0) {
-        return null;
-    }
-    if (summary.passing === summary.total) {
-        return <StyledCheckOutlined />;
-    }
-    if (summary.erroring > 0) {
-        return <StyledExclamationOutlined />;
-    }
-    return <StyledCloseOutlined />;
-};
-
-export const getAssertionGroupSummaryMessage = (summary: AssertionStatusSummary) => {
-    if (summary.total === 0) {
-        return 'No assertions have run';
-    }
-    if (summary.passing === summary.total) {
-        return 'All assertions are passing';
-    }
-    if (summary.erroring > 0) {
-        return 'An error is preventing some assertions from running';
-    }
-    if (summary.failing === summary.total) {
-        return 'All assertions are failing';
-    }
-    return 'Some assertions are failing';
-};
-
-export const getAssertionTypesForEntityType = (entityType: EntityType, monitorsConnectionForEntityExists: boolean) => {
-    return ASSERTION_INFO.filter((type) => type.entityTypes.includes(entityType)).map((type) => ({
-        ...type,
-        enabled: type.enabled && (!type.requiresConnectionSupportedByMonitors || monitorsConnectionForEntityExists),
-    }));
-};
-
-type VolumeTypeField =
-    | 'rowCountTotal'
-    | 'rowCountChange'
-    | 'incrementingSegmentRowCountTotal'
-    | 'incrementingSegmentRowCountChange';
-
-export const getPropertyFromVolumeType = (type: VolumeAssertionType) => {
-    switch (type) {
-        case VolumeAssertionType.RowCountTotal:
-            return 'rowCountTotal' as VolumeTypeField;
-        case VolumeAssertionType.RowCountChange:
-            return 'rowCountChange' as VolumeTypeField;
-        case VolumeAssertionType.IncrementingSegmentRowCountTotal:
-            return 'incrementingSegmentRowCountTotal' as VolumeTypeField;
-        case VolumeAssertionType.IncrementingSegmentRowCountChange:
-            return 'incrementingSegmentRowCountChange' as VolumeTypeField;
-        default:
-            throw new Error(`Unknown volume assertion type: ${type}`);
-    }
-};
-
-export const getVolumeTypeInfo = (volumeAssertion: VolumeAssertionInfo) => {
-    const result = volumeAssertion[getPropertyFromVolumeType(volumeAssertion.type)];
-    if (!result) {
-        return undefined;
-    }
-    return result;
-};
-
-export const getIsRowCountChange = (type: VolumeAssertionType) => {
-    return [VolumeAssertionType.RowCountChange, VolumeAssertionType.IncrementingSegmentRowCountChange].includes(type);
-};
-
-export const getVolumeTypeDescription = (volumeType: VolumeAssertionType) => {
-    switch (volumeType) {
-        case VolumeAssertionType.RowCountTotal:
-        case VolumeAssertionType.IncrementingSegmentRowCountTotal:
-            return 'has';
-        case VolumeAssertionType.RowCountChange:
-        case VolumeAssertionType.IncrementingSegmentRowCountChange:
-            return 'should grow by';
-        default:
-            throw new Error(`Unknown volume type ${volumeType}`);
-    }
-};
-
-export const getOperatorDescription = (operator: AssertionStdOperator) => {
-    switch (operator) {
-        case AssertionStdOperator.GreaterThanOrEqualTo:
-            return 'at least';
-        case AssertionStdOperator.LessThanOrEqualTo:
-            return 'at most';
-        case AssertionStdOperator.Between:
-            return 'between';
-        default:
-            throw new Error(`Unknown operator ${operator}`);
-    }
-};
-
-export const getValueChangeTypeDescription = (valueChangeType: AssertionValueChangeType) => {
-    switch (valueChangeType) {
-        case AssertionValueChangeType.Absolute:
-            return 'rows';
-        case AssertionValueChangeType.Percentage:
-            return '%';
-        default:
-            throw new Error(`Unknown value change type ${valueChangeType}`);
-    }
-};
-
-export const getParameterDescription = (parameters: AssertionStdParameters) => {
-    if (parameters.value) {
-        return formatNumberWithoutAbbreviation(
-            parseMaybeStringAsFloatOrDefault(parameters.value.value, parameters.value.value),
-        );
-    }
-    if (parameters.minValue && parameters.maxValue) {
-        return `${formatNumberWithoutAbbreviation(
-            parseMaybeStringAsFloatOrDefault(parameters.minValue.value, parameters.minValue.value),
-        )} and ${formatNumberWithoutAbbreviation(
-            parseMaybeStringAsFloatOrDefault(parameters.maxValue.value, parameters.maxValue.value),
-        )}`;
-    }
-    throw new Error('Invalid assertion parameters provided');
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/View/ViewDefinitionTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/View/ViewDefinitionTab.tsx
deleted file mode 100644
index 39ede18bd27c42..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/View/ViewDefinitionTab.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { Radio, Typography } from 'antd';
-import React, { useState } from 'react';
-import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
-import styled from 'styled-components';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { InfoItem } from '@app/entity/shared/components/styled/InfoItem';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { DBT_URN } from '@app/ingest/source/builder/constants';
-
-import { GetDatasetQuery } from '@graphql/dataset.generated';
-
-const InfoSection = styled.div`
-    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
-    padding: 16px 20px;
-`;
-
-const InfoItemContainer = styled.div<{ justifyContent }>`
-    display: flex;
-    position: relative;
-    justify-content: ${(props) => props.justifyContent};
-    padding: 12px 2px;
-`;
-
-const InfoItemContent = styled.div`
-    padding-top: 8px;
-`;
-
-const FormattingSelector = styled.div`
-    margin-top: 10px;
-`;
-
-const QueryText = styled(Typography.Paragraph)`
-    margin-top: 15px;
-    background-color: ${ANTD_GRAY[2]};
-    border-radius: 5px;
-`;
-
-// NOTE: Yes, using `!important` is a shame. However, the SyntaxHighlighter is applying styles directly
-// to the component, so there's no way around this
-const NestedSyntax = styled(SyntaxHighlighter)`
-    background-color: transparent !important;
-    border: none !important;
-`;
-
-export default function ViewDefinitionTab() {
-    const baseEntity = useBaseEntity<GetDatasetQuery>();
-    const logic = baseEntity?.dataset?.viewProperties?.logic || 'UNKNOWN';
-    const formattedLogic = baseEntity?.dataset?.viewProperties?.formattedLogic;
-    const materialized = (baseEntity?.dataset?.viewProperties?.materialized && true) || false;
-    const language = baseEntity?.dataset?.viewProperties?.language || 'UNKNOWN';
-
-    const isDbt = baseEntity?.dataset?.platform?.urn === DBT_URN;
-    const formatOptions = isDbt ? ['Source', 'Compiled'] : ['Raw', 'Formatted'];
-
-    const canShowFormatted = !!formattedLogic;
-    const [showFormatted, setShowFormatted] = useState(false);
-
-    return (
-        <>
-            <InfoSection>
-                <Typography.Title level={5}>Details</Typography.Title>
-                <InfoItemContainer justifyContent="left">
-                    <InfoItem title="Materialized">
-                        <InfoItemContent>{materialized ? 'True' : 'False'}</InfoItemContent>
-                    </InfoItem>
-                    <InfoItem title="Language">
-                        <InfoItemContent>{language.toUpperCase()}</InfoItemContent>
-                    </InfoItem>
-                </InfoItemContainer>
-            </InfoSection>
-            <InfoSection>
-                <Typography.Title level={5}>Logic</Typography.Title>
-                {canShowFormatted && (
-                    <FormattingSelector>
-                        <Radio.Group
-                            options={[
-                                { label: formatOptions[0], value: false },
-                                { label: formatOptions[1], value: true },
-                            ]}
-                            onChange={(e) => setShowFormatted(e.target.value)}
-                            value={showFormatted}
-                            optionType="button"
-                        />
-                    </FormattingSelector>
-                )}
-                <QueryText>
-                    <NestedSyntax language="sql">{showFormatted ? formattedLogic : logic}</NestedSyntax>
-                </QueryText>
-            </InfoSection>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/DocumentationTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/DocumentationTab.tsx
deleted file mode 100644
index dbea1ecff0138c..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/DocumentationTab.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import { EditOutlined, ExpandAltOutlined } from '@ant-design/icons';
-import { Button, Divider, Typography } from 'antd';
-import queryString from 'query-string';
-import React, { useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { useEntityData, useRefetch, useRouteToTab } from '@app/entity/shared/EntityContext';
-import { AddLinkModal } from '@app/entity/shared/components/styled/AddLinkModal';
-import { EmptyTab } from '@app/entity/shared/components/styled/EmptyTab';
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import { DescriptionEditor } from '@app/entity/shared/tabs/Documentation/components/DescriptionEditor';
-import { DescriptionPreviewModal } from '@app/entity/shared/tabs/Documentation/components/DescriptionPreviewModal';
-import { LinkList } from '@app/entity/shared/tabs/Documentation/components/LinkList';
-import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor';
-import { EDITED_DESCRIPTIONS_CACHE_NAME } from '@app/entity/shared/utils';
-
-const DocumentationContainer = styled.div`
-    margin: 0 32px;
-    padding: 40px 0;
-    max-width: calc(100% - 10px);
-`;
-
-interface Props {
-    hideLinksButton?: boolean;
-}
-
-export const DocumentationTab = ({ properties }: { properties?: Props }) => {
-    const hideLinksButton = properties?.hideLinksButton;
-    const { urn, entityData } = useEntityData();
-    const refetch = useRefetch();
-    const description = entityData?.editableProperties?.description || entityData?.properties?.description || '';
-    const links = entityData?.institutionalMemory?.elements || [];
-    const localStorageDictionary = localStorage.getItem(EDITED_DESCRIPTIONS_CACHE_NAME);
-
-    const routeToTab = useRouteToTab();
-    const isEditing = queryString.parse(useLocation().search, { parseBooleans: true }).editing;
-    const showModal = queryString.parse(useLocation().search, { parseBooleans: true }).modal;
-
-    useEffect(() => {
-        const editedDescriptions = (localStorageDictionary && JSON.parse(localStorageDictionary)) || {};
-        if (editedDescriptions.hasOwnProperty(urn)) {
-            routeToTab({
-                tabName: 'Documentation',
-                tabParams: { editing: true, modal: !!showModal },
-            });
-        }
-    }, [urn, routeToTab, showModal, localStorageDictionary]);
-
-    return isEditing && !showModal ? (
-        <>
-            <DescriptionEditor onComplete={() => routeToTab({ tabName: 'Documentation' })} />
-        </>
-    ) : (
-        <>
-            {description || links.length ? (
-                <>
-                    <TabToolbar>
-                        <div>
-                            <Button
-                                data-testid="edit-documentation-button"
-                                type="text"
-                                onClick={() => routeToTab({ tabName: 'Documentation', tabParams: { editing: true } })}
-                            >
-                                <EditOutlined /> Edit
-                            </Button>
-                            {!hideLinksButton && <AddLinkModal buttonProps={{ type: 'text' }} refetch={refetch} />}
-                        </div>
-                        <div>
-                            <Button
-                                type="text"
-                                onClick={() =>
-                                    routeToTab({
-                                        tabName: 'Documentation',
-                                        tabParams: { modal: true },
-                                    })
-                                }
-                            >
-                                <ExpandAltOutlined />
-                            </Button>
-                        </div>
-                    </TabToolbar>
-                    <div>
-                        {description ? (
-                            <Editor content={description} readOnly />
-                        ) : (
-                            <DocumentationContainer>
-                                <Typography.Text type="secondary">No documentation added yet.</Typography.Text>
-                            </DocumentationContainer>
-                        )}
-                        <Divider />
-                        <DocumentationContainer>
-                            {!hideLinksButton && <LinkList refetch={refetch} />}
-                        </DocumentationContainer>
-                    </div>
-                </>
-            ) : (
-                <EmptyTab tab="documentation">
-                    <Button onClick={() => routeToTab({ tabName: 'Documentation', tabParams: { editing: true } })}>
-                        <EditOutlined /> Add Documentation
-                    </Button>
-                    {!hideLinksButton && <AddLinkModal refetch={refetch} />}
-                </EmptyTab>
-            )}
-            {showModal && (
-                <DescriptionPreviewModal
-                    editMode={(isEditing && true) || false}
-                    description={description}
-                    onClose={() => {
-                        routeToTab({ tabName: 'Documentation', tabParams: { editing: false } });
-                    }}
-                />
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx
deleted file mode 100644
index 172e6ed4f109d7..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { render } from '@testing-library/react';
-import DOMPurify from 'dompurify';
-import React from 'react';
-
-import { EntityContext } from '@app/entity/shared/EntityContext';
-import { DocumentationTab } from '@app/entity/shared/tabs/Documentation/DocumentationTab';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-import { EntityType } from '@types';
-
-describe('SchemaDescriptionField', () => {
-    it('renders original description', async () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
-                    <EntityContext.Provider
-                        value={{
-                            urn: 'urn:li:dataset:123',
-                            entityType: EntityType.Dataset,
-                            entityData: {
-                                properties: {
-                                    description: 'This is a description',
-                                },
-                            },
-                            baseEntity: {},
-                            updateEntity: vi.fn(),
-                            routeToTab: vi.fn(),
-                            loading: true,
-                            lineage: undefined,
-                            refetch: vi.fn(),
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <DocumentationTab />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('This is a description')).toBeInTheDocument();
-    });
-
-    it('if editable is present, renders edited description', async () => {
-        const { getByText, queryByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
-                    <EntityContext.Provider
-                        value={{
-                            urn: 'urn:li:dataset:123',
-                            entityType: EntityType.Dataset,
-                            entityData: {
-                                properties: {
-                                    description: 'This is a description',
-                                },
-                                editableProperties: {
-                                    description: 'Edited description',
-                                },
-                            },
-                            baseEntity: {},
-                            updateEntity: vi.fn(),
-                            routeToTab: vi.fn(),
-                            loading: true,
-                            lineage: undefined,
-                            refetch: vi.fn(),
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <DocumentationTab />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('Edited description')).toBeInTheDocument();
-        expect(queryByText('This is a description')).not.toBeInTheDocument();
-    });
-});
-
-describe('markdown sanitization', () => {
-    it('should remove malicious tags like <script> from text', () => {
-        const text = 'Testing this out<script>console.log("testing")</script>';
-        const sanitizedText = DOMPurify.sanitize(text);
-
-        expect(sanitizedText).toBe('Testing this out');
-    });
-
-    it('should allow acceptable html', () => {
-        const text = '<strong>Testing</strong> this <p>out</p> <span>for</span> <div>safety</div>';
-        const sanitizedText = DOMPurify.sanitize(text);
-
-        expect(sanitizedText).toBe(text);
-    });
-
-    it('should allow acceptable markdown', () => {
-        const text =
-            '~~Testing~~ **this** *out* \n\n> for\n\n- safety\n\n1. ordered list\n\n[ test link](https://www.google.com/)\n';
-        const sanitizedText = DOMPurify.sanitize(text);
-
-        expect(sanitizedText).toBe(text);
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx
deleted file mode 100644
index 939c88a178dd7c..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/components/editor/extensions/htmlToMarkdown.test.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { htmlToMarkdown } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/htmlToMarkdown';
-
-const cases = [
-    ['strike', '<strike>Lorem ipsum</strike>', '~Lorem ipsum~'],
-    ['s', '<s>Lorem ipsum</s>', '~Lorem ipsum~'],
-    ['del', '<del>Lorem ipsum</del>', '~Lorem ipsum~'],
-    [
-        'should replace blank nodes in table',
-        '<table><thead><tr><th>Lorem ipsum</th></tr></thead><tbody><tr><td><p>Lorem</p><p>ipsum</p></td></tr></tbody></table>',
-        '| Lorem ipsum |\n| --- |\n| Lorem<br />ipsum |',
-    ],
-    ['should replace empty p tags to line breaks', '<p>Lorem</p><p></p><p>ipsum</p>', 'Lorem\n\n&nbsp;\n\nipsum'],
-    [
-        'should parse image if it does not have a width attribute',
-        '<img src="/my-image.png" style="width: 100%; min-width: 50px; object-fit: contain;" alt="my image">',
-        '![my image](/my-image.png)',
-    ],
-
-    [
-        'should highlight code block with html',
-        '<pre><code class="language language-html">&lt;<span class="pl-ent">p</span>&gt;Hello world&lt;/<span class="pl-ent">p</span>&gt;</code></pre>',
-        '```html\n<p>Hello world</p>\n```',
-    ],
-    [
-        'should highlight code block with js',
-        '<pre><code class="lang lang-js">;(<span class="pl-k">function</span> () {})()</code></pre>',
-        '```js\n;(function () {})()\n```',
-    ],
-    [
-        'should highlighted remirror code block',
-        '<pre><code data-code-block-language="ts">;(<span class="pl-k">function</span> () {})()</code></pre>',
-        '```ts\n;(function () {})()\n```',
-    ],
-    [
-        'should parse without language code block',
-        '<pre><code>;(<span class="pl-k">function</span> () {})()</code></pre>',
-        '```\n;(function () {})()\n```',
-    ],
-    [
-        'should parse datahub mention',
-        '<span class="mentions" data-datahub-mention-urn="urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)">@SampleHiveDataset</span>',
-        '[@SampleHiveDataset](urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD))',
-    ],
-];
-
-const skipParseCases = [
-    [
-        'table if ul or li is present',
-        '<table><thead><tr><th>Lorem ipsum</th></tr></thead><tbody><tr><td><ul><li>Lorem</li><li>ipsum</li></ul></td></tr></tbody></table>',
-    ],
-    [
-        'table if  present',
-        '<table><thead><tr><th>Lorem ipsum</th></tr></thead><tbody><tr><td><ul><li>Lorem</li><li>ipsum</li></ul></td></tr></tbody></table>',
-    ],
-    [
-        'image if it has a width attribute',
-        '<img src="/my-image.png" style="width: 100%; min-width: 50px; object-fit: contain;" alt="my image" width="200">',
-    ],
-];
-
-describe('htmlToMarkdown', () => {
-    it.each(cases)('%s', (_, input, expected) => {
-        expect(htmlToMarkdown(input)).toBe(expected);
-    });
-
-    it.each(skipParseCases)('should skip parsing %s', (_, input) => {
-        expect(htmlToMarkdown(input)).toBe(input);
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx
deleted file mode 100644
index c10e8c82b96727..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/components/editor/extensions/markdownToHtml.test.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { markdownToHtml } from '@app/entity/shared/tabs/Documentation/components/editor/extensions/markdownToHtml';
-
-const cases = [
-    [
-        'should parse datahub mentions',
-        'Lorem [@SampleHiveDataset](urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)) ipsum',
-        '<p>Lorem <span data-datahub-mention-urn="urn:li:dataset:(urn:li:dataPlatform:hive,SampleHiveDataset,PROD)">@SampleHiveDataset</span> ipsum</p>\n',
-    ],
-    ['should not parse github mentions', 'Lorem @githubuser ipsum', '<p>Lorem @githubuser ipsum</p>\n'],
-    [
-        'should parse invalid mentions as links',
-        'Lorem [@Some link](/lorem-ipsum) ipsum',
-        '<p>Lorem <a href="/lorem-ipsum">@Some link</a> ipsum</p>\n',
-    ],
-];
-
-describe('markdownToHtml', () => {
-    it.each(cases)('%s', (_, input, expected) => {
-        expect(markdownToHtml(input)).toBe(expected);
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx
deleted file mode 100644
index 8f056ae79824c8..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx
+++ /dev/null
@@ -1,168 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor';
-import { Button } from '@src/alchemy-components';
-
-const LINE_HEIGHT = 1.5;
-
-const ShowMoreWrapper = styled.div`
-    align-items: start;
-    display: flex;
-    flex-direction: column;
-`;
-
-const MarkdownContainer = styled.div<{ lineLimit?: number | null }>`
-    max-width: 100%;
-    position: relative;
-    ${(props) =>
-        props.lineLimit &&
-        props.lineLimit <= 1 &&
-        ` 
-        display: flex;
-        align-items: center;
-        gap: 4px;
-        ${ShowMoreWrapper}{
-            flex-direction: row;
-            align-items: center;
-            gap: 4px;
-        }
-    `}
-`;
-
-const CustomButton = styled(Button)`
-    padding: 8px 0px;
-`;
-
-const MarkdownViewContainer = styled.div<{ scrollableY: boolean }>`
-    display: block;
-    overflow-wrap: break-word;
-    word-wrap: break-word;
-    overflow-x: hidden;
-    overflow-y: ${(props) => (props.scrollableY ? 'auto' : 'hidden')};
-`;
-
-const CompactEditor = styled(Editor)<{ limit: number | null; customStyle?: React.CSSProperties }>`
-    .remirror-editor.ProseMirror {
-        ${({ limit }) => limit && `max-height: ${limit * LINE_HEIGHT}em;`}
-        h1 {
-            font-size: 1.4em;
-        }
-
-        h2 {
-            font-size: 1.3em;
-        }
-
-        h3 {
-            font-size: 1.2em;
-        }
-
-        h4 {
-            font-size: 1.1em;
-        }
-
-        h5,
-        h6 {
-            font-size: 1em;
-        }
-
-        p {
-            ${(props) => props?.customStyle?.fontSize && `font-size: ${props?.customStyle?.fontSize}`};
-            margin-bottom: 0;
-        }
-
-        padding: 0;
-    }
-`;
-
-const FixedLineHeightEditor = styled(CompactEditor)<{ customStyle?: React.CSSProperties }>`
-    .remirror-editor.ProseMirror {
-        * {
-            line-height: ${LINE_HEIGHT};
-            font-size: 1em !important;
-            margin-top: 0;
-            margin-bottom: 0;
-        }
-        p {
-            font-size: ${(props) => (props?.customStyle?.fontSize ? props?.customStyle?.fontSize : '1em')} !important;
-        }
-    }
-`;
-
-export type Props = {
-    content: string;
-    lineLimit?: number | null;
-    fixedLineHeight?: boolean;
-    isShowMoreEnabled?: boolean;
-    customStyle?: React.CSSProperties;
-    scrollableY?: boolean; // Whether the viewer is vertically scrollable.
-    handleShowMore?: () => void;
-    hideShowMore?: boolean;
-};
-
-export default function CompactMarkdownViewer({
-    content,
-    lineLimit = 4,
-    fixedLineHeight = false,
-    isShowMoreEnabled = false,
-    customStyle = {},
-    scrollableY = true,
-    handleShowMore,
-    hideShowMore,
-}: Props) {
-    const [isShowingMore, setIsShowingMore] = useState(false);
-    const [isTruncated, setIsTruncated] = useState(false);
-
-    useEffect(() => {
-        if (isShowMoreEnabled) {
-            setIsShowingMore(isShowMoreEnabled);
-        }
-        return () => {
-            setIsShowingMore(false);
-        };
-    }, [isShowMoreEnabled]);
-
-    const measuredRef = useCallback((node: HTMLDivElement | null) => {
-        if (node !== null) {
-            const resizeObserver = new ResizeObserver(() => {
-                setIsTruncated(node.scrollHeight > node.clientHeight + 1);
-            });
-            resizeObserver.observe(node);
-        }
-    }, []);
-
-    const StyledEditor = fixedLineHeight ? FixedLineHeightEditor : CompactEditor;
-
-    return (
-        <MarkdownContainer lineLimit={lineLimit}>
-            <MarkdownViewContainer scrollableY={scrollableY} ref={measuredRef}>
-                <StyledEditor
-                    customStyle={customStyle}
-                    limit={isShowingMore ? null : lineLimit}
-                    content={content}
-                    readOnly
-                />
-            </MarkdownViewContainer>
-            {hideShowMore && <>...</>}
-
-            {!hideShowMore &&
-                (isShowingMore || isTruncated) && ( // "show more" when isTruncated, "show less" when isShowingMore
-                    <ShowMoreWrapper>
-                        <CustomButton
-                            variant="text"
-                            onClick={(e) => {
-                                if (handleShowMore) {
-                                    handleShowMore();
-                                } else {
-                                    setIsShowingMore(!isShowingMore);
-                                }
-                                e.stopPropagation();
-                            }}
-                        >
-                            {isShowingMore ? 'show less' : 'show more'}
-                        </CustomButton>
-                    </ShowMoreWrapper>
-                )}
-        </MarkdownContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionEditor.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionEditor.tsx
deleted file mode 100644
index 5ff348a363cdf0..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionEditor.tsx
+++ /dev/null
@@ -1,165 +0,0 @@
-import { message } from 'antd';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components/macro';
-
-import analytics, { EntityActionType, EventType } from '@app/analytics';
-import { useEntityData, useEntityUpdate, useMutationUrn, useRefetch } from '@app/entity/shared/EntityContext';
-import { DescriptionEditorToolbar } from '@app/entity/shared/tabs/Documentation/components/DescriptionEditorToolbar';
-import { DiscardDescriptionModal } from '@app/entity/shared/tabs/Documentation/components/DiscardDescriptionModal';
-import SourceDescription from '@app/entity/shared/tabs/Documentation/components/SourceDesription';
-import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor';
-import { GenericEntityUpdate } from '@app/entity/shared/types';
-import { EDITED_DESCRIPTIONS_CACHE_NAME } from '@app/entity/shared/utils';
-
-import { useUpdateDescriptionMutation } from '@graphql/mutations.generated';
-
-const EditorContainer = styled.div`
-    flex: 1;
-`;
-
-const EditorSourceWrapper = styled.div`
-    overflow: auto;
-    display: flex;
-    flex-direction: column;
-    flex: 1;
-`;
-
-type DescriptionEditorProps = {
-    onComplete?: () => void;
-};
-
-export const DescriptionEditor = ({ onComplete }: DescriptionEditorProps) => {
-    const mutationUrn = useMutationUrn();
-    const { entityType, entityData } = useEntityData();
-    const refetch = useRefetch();
-    const updateEntity = useEntityUpdate<GenericEntityUpdate>();
-    const [updateDescriptionMutation] = useUpdateDescriptionMutation();
-
-    const localStorageDictionary = localStorage.getItem(EDITED_DESCRIPTIONS_CACHE_NAME);
-    const editedDescriptions = (localStorageDictionary && JSON.parse(localStorageDictionary)) || {};
-    const description = editedDescriptions.hasOwnProperty(mutationUrn)
-        ? editedDescriptions[mutationUrn]
-        : entityData?.editableProperties?.description || entityData?.properties?.description || '';
-
-    const [updatedDescription, setUpdatedDescription] = useState(description);
-    const [isDescriptionUpdated, setIsDescriptionUpdated] = useState(editedDescriptions.hasOwnProperty(mutationUrn));
-    const [confirmCloseModalVisible, setConfirmCloseModalVisible] = useState(false);
-
-    /**
-     * Auto-Save the description edits to local storage every 5 seconds.
-     */
-    useEffect(() => {
-        let delayDebounceFn: ReturnType<typeof setTimeout>;
-        const editedDescriptionsLocal = (localStorageDictionary && JSON.parse(localStorageDictionary)) || {};
-
-        if (isDescriptionUpdated) {
-            delayDebounceFn = setTimeout(() => {
-                editedDescriptionsLocal[mutationUrn] = updatedDescription;
-                localStorage.setItem(EDITED_DESCRIPTIONS_CACHE_NAME, JSON.stringify(editedDescriptionsLocal));
-            }, 5000);
-        }
-        return () => clearTimeout(delayDebounceFn);
-    }, [mutationUrn, isDescriptionUpdated, updatedDescription, localStorageDictionary]);
-
-    const updateDescriptionLegacy = () => {
-        return updateEntity?.({
-            variables: { urn: mutationUrn, input: { editableProperties: { description: updatedDescription || '' } } },
-        });
-    };
-
-    const updateDescription = () => {
-        return updateDescriptionMutation({
-            variables: {
-                input: {
-                    description: updatedDescription,
-                    resourceUrn: mutationUrn,
-                },
-            },
-        });
-    };
-
-    const handleSave = async () => {
-        message.loading({ content: 'Saving...' });
-        try {
-            if (updateEntity) {
-                // Use the legacy update description path.
-                await updateDescriptionLegacy();
-            } else {
-                // Use the new update description path.
-                await updateDescription();
-            }
-            message.destroy();
-            analytics.event({
-                type: EventType.EntityActionEvent,
-                actionType: EntityActionType.UpdateDescription,
-                entityType,
-                entityUrn: mutationUrn,
-            });
-            message.success({ content: 'Description Updated', duration: 2 });
-            // Updating the localStorage after save
-            delete editedDescriptions[mutationUrn];
-            if (Object.keys(editedDescriptions).length === 0) {
-                localStorage.removeItem(EDITED_DESCRIPTIONS_CACHE_NAME);
-            } else {
-                localStorage.setItem(EDITED_DESCRIPTIONS_CACHE_NAME, JSON.stringify(editedDescriptions));
-            }
-            if (onComplete) onComplete();
-        } catch (e: unknown) {
-            message.destroy();
-            if (e instanceof Error) {
-                message.error({ content: `Failed to update description: \n ${e.message || ''}`, duration: 2 });
-            }
-        }
-        refetch?.();
-    };
-
-    // Function to handle all changes in Editor
-    const handleEditorChange = (editedDescription: string) => {
-        setUpdatedDescription(editedDescription);
-        if (editedDescription === description) {
-            setIsDescriptionUpdated(false);
-        } else {
-            setIsDescriptionUpdated(true);
-        }
-    };
-
-    // Handling the Discard Modal
-    const handleConfirmClose = (showConfirm: boolean | undefined = true) => {
-        if (showConfirm && isDescriptionUpdated) {
-            setConfirmCloseModalVisible(true);
-        } else if (onComplete) onComplete();
-    };
-
-    const handleCloseWithoutSaving = () => {
-        delete editedDescriptions[mutationUrn];
-        if (Object.keys(editedDescriptions).length === 0) {
-            localStorage.removeItem(EDITED_DESCRIPTIONS_CACHE_NAME);
-        } else {
-            localStorage.setItem(EDITED_DESCRIPTIONS_CACHE_NAME, JSON.stringify(editedDescriptions));
-        }
-        if (onComplete) onComplete();
-    };
-
-    return entityData ? (
-        <>
-            <DescriptionEditorToolbar
-                onSave={handleSave}
-                onClose={handleConfirmClose}
-                disableSave={!isDescriptionUpdated}
-            />
-            <EditorSourceWrapper>
-                <EditorContainer>
-                    <Editor content={updatedDescription} onChange={handleEditorChange} />
-                </EditorContainer>
-                <SourceDescription />
-            </EditorSourceWrapper>
-            {confirmCloseModalVisible && (
-                <DiscardDescriptionModal
-                    cancelModalVisible={confirmCloseModalVisible}
-                    onDiscard={handleCloseWithoutSaving}
-                    onCancel={() => setConfirmCloseModalVisible(false)}
-                />
-            )}
-        </>
-    ) : null;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx
deleted file mode 100644
index b8d5edced7a11b..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionEditorToolbar.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { CheckOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React from 'react';
-
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-
-type DescriptionEditorToolbarProps = {
-    disableSave: boolean;
-    onClose: () => void;
-    onSave: () => void;
-};
-
-export const DescriptionEditorToolbar = ({ disableSave, onClose, onSave }: DescriptionEditorToolbarProps) => {
-    return (
-        <TabToolbar>
-            <Button type="text" onClick={onClose}>
-                Back
-            </Button>
-            <Button data-testid="description-editor-save-button" onClick={onSave} disabled={disableSave}>
-                <CheckOutlined /> Save
-            </Button>
-        </TabToolbar>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreview.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreview.tsx
deleted file mode 100644
index b6346e23dc8be1..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreview.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { DescriptionPreviewToolbar } from '@app/entity/shared/tabs/Documentation/components/DescriptionPreviewToolbar';
-import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor';
-
-const EditorContainer = styled.div`
-    overflow: auto;
-    height: 100%;
-`;
-
-type DescriptionPreviewProps = {
-    description: string;
-    onEdit: () => void;
-};
-
-export const DescriptionPreview = ({ description, onEdit }: DescriptionPreviewProps) => {
-    return (
-        <>
-            <DescriptionPreviewToolbar onEdit={onEdit} />
-            <EditorContainer>
-                <Editor content={description} readOnly />
-            </EditorContainer>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx
deleted file mode 100644
index f5810ca1d26e5e..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewModal.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Modal } from 'antd';
-import React from 'react';
-
-import { useRouteToTab } from '@app/entity/shared/EntityContext';
-import { DescriptionEditor } from '@app/entity/shared/tabs/Documentation/components/DescriptionEditor';
-import { DescriptionPreview } from '@app/entity/shared/tabs/Documentation/components/DescriptionPreview';
-import ClickOutside from '@app/shared/ClickOutside';
-
-const modalStyle = {
-    top: '5%',
-    maxWidth: 1400,
-};
-
-const bodyStyle = {
-    margin: 0,
-    padding: 0,
-    height: '90vh',
-    display: 'flex',
-    flexDirection: 'column' as any,
-};
-
-type DescriptionPreviewModalProps = {
-    description: string;
-    editMode: boolean;
-    onClose: (showConfirm?: boolean) => void;
-};
-
-export const DescriptionPreviewModal = ({ description, editMode, onClose }: DescriptionPreviewModalProps) => {
-    const routeToTab = useRouteToTab();
-
-    const onConfirmClose = () => {
-        if (editMode) {
-            Modal.confirm({
-                title: `Exit Editor`,
-                content: `Are you sure you want to exit the editor? Any unsaved changes will be lost.`,
-                onOk() {
-                    onClose();
-                },
-                onCancel() {},
-                okText: 'Yes',
-                maskClosable: true,
-                closable: true,
-            });
-        } else {
-            onClose(false);
-        }
-    };
-
-    return (
-        <ClickOutside onClickOutside={onConfirmClose} wrapperClassName="description-editor-wrapper">
-            <Modal
-                width="80%"
-                style={modalStyle}
-                bodyStyle={bodyStyle}
-                title={undefined}
-                open
-                footer={null}
-                closable={false}
-                onCancel={onConfirmClose}
-                className="description-editor-wrapper"
-            >
-                {(editMode && (
-                    <DescriptionEditor
-                        onComplete={() => routeToTab({ tabName: 'Documentation', tabParams: { modal: true } })}
-                    />
-                )) || (
-                    <DescriptionPreview
-                        description={description}
-                        onEdit={() =>
-                            routeToTab({ tabName: 'Documentation', tabParams: { editing: true, modal: true } })
-                        }
-                    />
-                )}
-            </Modal>
-        </ClickOutside>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx
deleted file mode 100644
index e76f18bc4e6049..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DescriptionPreviewToolbar.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { EditOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React from 'react';
-
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-
-type DescriptionPreviewToolbarProps = {
-    onEdit: () => void;
-};
-
-export const DescriptionPreviewToolbar = ({ onEdit }: DescriptionPreviewToolbarProps) => {
-    return (
-        <TabToolbar>
-            <Button type="text" onClick={onEdit}>
-                <EditOutlined /> Edit
-            </Button>
-        </TabToolbar>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx
deleted file mode 100644
index 0fd33993987d3f..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Button, Modal } from 'antd';
-import React from 'react';
-
-type Props = {
-    cancelModalVisible?: boolean;
-    onDiscard?: () => void;
-    onCancel?: () => void;
-};
-
-export const DiscardDescriptionModal = ({ cancelModalVisible, onDiscard, onCancel }: Props) => {
-    return (
-        <>
-            <Modal
-                title="Exit Editor"
-                open={cancelModalVisible}
-                destroyOnClose
-                onCancel={onCancel}
-                footer={[
-                    <Button type="text" onClick={onCancel}>
-                        Cancel
-                    </Button>,
-                    <Button onClick={onDiscard}>Yes</Button>,
-                ]}
-            >
-                <p>Are you sure you want to close the documentation editor? Any unsaved changes will be lost.</p>
-            </Modal>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx
deleted file mode 100644
index 7ee6cf30a38b54..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/LinkList.tsx
+++ /dev/null
@@ -1,225 +0,0 @@
-import { DeleteOutlined, EditOutlined, LinkOutlined } from '@ant-design/icons';
-import { Button, Form, Input, List, Modal, Typography, message } from 'antd';
-import React, { useState } from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components/macro';
-
-import analytics, { EntityActionType, EventType } from '@app/analytics';
-import { useEntityData, useMutationUrn } from '@app/entity/shared/EntityContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { formatDateString } from '@app/entity/shared/containers/profile/utils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useAddLinkMutation, useRemoveLinkMutation } from '@graphql/mutations.generated';
-import { InstitutionalMemoryMetadata } from '@types';
-
-const LinkListItem = styled(List.Item)`
-    border-radius: 5px;
-    > .ant-btn {
-        opacity: 0;
-    }
-    &:hover {
-        background-color: ${ANTD_GRAY[2]};
-        > .ant-btn {
-            opacity: 1;
-        }
-    }
-`;
-
-const ListOffsetIcon = styled.span`
-    margin-left: -18px;
-    margin-right: 6px;
-`;
-
-type LinkListProps = {
-    refetch?: () => Promise<any>;
-};
-
-export const LinkList = ({ refetch }: LinkListProps) => {
-    const [editModalVisble, setEditModalVisible] = useState(false);
-    const [linkDetails, setLinkDetails] = useState<InstitutionalMemoryMetadata | undefined>(undefined);
-    const { urn: entityUrn, entityData, entityType } = useEntityData();
-    const entityRegistry = useEntityRegistry();
-    const [removeLinkMutation] = useRemoveLinkMutation();
-    const links = entityData?.institutionalMemory?.elements || [];
-    const [form] = Form.useForm();
-    const [addLinkMutation] = useAddLinkMutation();
-    const mutationUrn = useMutationUrn();
-
-    const handleDeleteLink = async (metadata: InstitutionalMemoryMetadata) => {
-        try {
-            await removeLinkMutation({
-                variables: {
-                    input: {
-                        linkUrl: metadata.url,
-                        label: metadata.label,
-                        resourceUrn: metadata.associatedUrn || entityUrn,
-                    },
-                },
-            });
-            message.success({ content: 'Link Removed', duration: 2 });
-        } catch (e: unknown) {
-            message.destroy();
-            if (e instanceof Error) {
-                message.error({ content: `Error removing link: \n ${e.message || ''}`, duration: 2 });
-            }
-        }
-        refetch?.();
-    };
-
-    const handleEditLink = (metadata: InstitutionalMemoryMetadata) => {
-        form.setFieldsValue({
-            url: metadata.url,
-            label: metadata.description,
-        });
-        setLinkDetails(metadata);
-        setEditModalVisible(true);
-    };
-
-    const handleClose = () => {
-        form.resetFields();
-        setEditModalVisible(false);
-    };
-
-    const handleEdit = async (formData: any) => {
-        if (!linkDetails) return;
-        try {
-            await removeLinkMutation({
-                variables: {
-                    input: {
-                        linkUrl: linkDetails.url,
-                        label: linkDetails.label,
-                        resourceUrn: linkDetails.associatedUrn || entityUrn,
-                    },
-                },
-            });
-            await addLinkMutation({
-                variables: { input: { linkUrl: formData.url, label: formData.label, resourceUrn: mutationUrn } },
-            });
-
-            message.success({ content: 'Link Updated', duration: 2 });
-
-            analytics.event({
-                type: EventType.EntityActionEvent,
-                entityType,
-                entityUrn: mutationUrn,
-                actionType: EntityActionType.UpdateLinks,
-            });
-
-            refetch?.();
-            handleClose();
-        } catch (e: unknown) {
-            message.destroy();
-
-            if (e instanceof Error) {
-                message.error({ content: `Error updating link: \n ${e.message || ''}`, duration: 2 });
-            }
-        }
-    };
-
-    const onConfirmDelete = (link) => {
-        Modal.confirm({
-            title: `Delete Link '${link?.description}'`,
-            content: `Are you sure you want to remove this Link?`,
-            onOk() {
-                handleDeleteLink(link);
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    return entityData ? (
-        <>
-            <Modal
-                title="Edit Link"
-                open={editModalVisble}
-                destroyOnClose
-                onCancel={handleClose}
-                footer={[
-                    <Button type="text" onClick={handleClose}>
-                        Cancel
-                    </Button>,
-                    <Button form="editLinkForm" key="submit" htmlType="submit">
-                        Edit
-                    </Button>,
-                ]}
-            >
-                <Form form={form} name="editLinkForm" onFinish={handleEdit} layout="vertical">
-                    <Form.Item
-                        name="url"
-                        label="URL"
-                        rules={[
-                            {
-                                required: true,
-                                message: 'A URL is required.',
-                            },
-                            {
-                                type: 'url',
-                                warningOnly: true,
-                                message: 'This field must be a valid url.',
-                            },
-                        ]}
-                    >
-                        <Input placeholder="https://" autoFocus />
-                    </Form.Item>
-                    <Form.Item
-                        name="label"
-                        label="Label"
-                        rules={[
-                            {
-                                required: true,
-                                message: 'A label is required.',
-                            },
-                        ]}
-                    >
-                        <Input placeholder="A short label for this link" />
-                    </Form.Item>
-                </Form>
-            </Modal>
-            {links.length > 0 && (
-                <List
-                    size="large"
-                    dataSource={links}
-                    renderItem={(link) => (
-                        <LinkListItem
-                            extra={
-                                <>
-                                    <Button onClick={() => handleEditLink(link)} type="text" shape="circle">
-                                        <EditOutlined />
-                                    </Button>
-                                    <Button onClick={() => onConfirmDelete(link)} type="text" shape="circle" danger>
-                                        <DeleteOutlined />
-                                    </Button>
-                                </>
-                            }
-                        >
-                            <List.Item.Meta
-                                title={
-                                    <Typography.Title level={5}>
-                                        <a href={link.url} target="_blank" rel="noreferrer">
-                                            <ListOffsetIcon>
-                                                <LinkOutlined />
-                                            </ListOffsetIcon>
-                                            {link.description || link.label}
-                                        </a>
-                                    </Typography.Title>
-                                }
-                                description={
-                                    <>
-                                        Added {formatDateString(link.created.time)} by{' '}
-                                        <Link to={`${entityRegistry.getEntityUrl(link.actor.type, link.actor.urn)}`}>
-                                            {entityRegistry.getDisplayName(link.actor.type, link.actor)}
-                                        </Link>
-                                    </>
-                                }
-                            />
-                        </LinkListItem>
-                    )}
-                />
-            )}
-        </>
-    ) : null;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/SourceDesription.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/SourceDesription.tsx
deleted file mode 100644
index b76d3fcb693f06..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/SourceDesription.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import DescriptionSection from '@app/entity/shared/containers/profile/sidebar/AboutSection/DescriptionSection';
-import { getPlatformName } from '@app/entity/shared/utils';
-
-const SourceDescriptionWrapper = styled.div`
-    border-top: 1px solid ${ANTD_GRAY[4]};
-    padding: 16px 0 16px 32px;
-`;
-
-const Title = styled.div`
-    font-weight: 700;
-    padding-bottom: 16px;
-`;
-
-export default function SourceDescription() {
-    const { entityData } = useEntityData();
-    const platformName = getPlatformName(entityData);
-    const sourceDescription = entityData?.properties?.description;
-
-    if (!sourceDescription || !entityData?.platform) return null;
-
-    return (
-        <SourceDescriptionWrapper>
-            <Title>{platformName ? <span>{platformName}</span> : <>Source</>} Documentation:</Title>
-            <DescriptionSection description={sourceDescription} limit={200} isExpandable />
-        </SourceDescriptionWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx
index f1e1759f497f09..2a4cdbfeffdc66 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/OnChangeMarkdown.tsx
@@ -2,7 +2,7 @@ import { DocChangedExtension } from '@remirror/core';
 import { useExtensionEvent, useHelpers } from '@remirror/react';
 import { useCallback } from 'react';
 
-export interface OnChangeMarkdownProps {
+interface OnChangeMarkdownProps {
     onChange: (md: string) => void;
 }
 
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx
deleted file mode 100644
index 5fc46f37cc7ea7..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/__tests__/Editor.test.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { render } from '@testing-library/react';
-import React from 'react';
-
-import { Editor } from '@app/entity/shared/tabs/Documentation/components/editor/Editor';
-
-// setupTests mocks Editor for all tests. We want to use the actual editor for this test module
-vi.mock('../Editor', async () => vi.importActual('../Editor'));
-
-describe('Editor', () => {
-    it('should render the Editor and content without failure', () => {
-        const content = 'testing the editor out';
-        const { getByText } = render(<Editor content={content} />);
-
-        expect(getByText(content)).toBeInTheDocument();
-        // loading the Editor in CI can be slow, extend the timeout beyond its usual 5 seconds to 20 seconds
-    }, 20000);
-});
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx
index 0b4da056bc74fc..7d5bf9f43cbfef 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CodeBlockToolbar.tsx
@@ -54,7 +54,7 @@ const codeBlockPositioner = Positioner.create<any>({
     },
 });
 
-export const CodeBlockMenu = () => {
+const CodeBlockMenu = () => {
     const commands = useCommands();
     const value = (useAttrs(true).codeBlock()?.language as string) ?? 'markup';
 
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx
index 8abde1480039e7..b309d48ae02f02 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/components/editor/toolbar/CommandButton.tsx
@@ -3,7 +3,7 @@ import { useHelpers } from '@remirror/react';
 import { Button, ButtonProps, Tooltip } from 'antd';
 import React, { MouseEventHandler, useCallback } from 'react';
 
-export interface CommandButtonProps extends Omit<ButtonProps, 'type'> {
+interface CommandButtonProps extends Omit<ButtonProps, 'type'> {
     active?: boolean;
     children?: React.ReactNode;
     commandName?: string;
diff --git a/datahub-web-react/src/app/entity/shared/tabs/ERModelRelationship/ERModelRelationshipTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/ERModelRelationship/ERModelRelationshipTab.tsx
deleted file mode 100644
index 14e77f4cd70e35..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/ERModelRelationship/ERModelRelationshipTab.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import '@app/entity/shared/tabs/ERModelRelationship/ERModelRelationshipTab.less';
-
-import { Divider } from 'antd';
-import React from 'react';
-
-import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext';
-import { ERModelRelationPreview } from '@app/entity/shared/components/styled/ERModelRelationship/ERModelRelationPreview';
-
-export const ERModelRelationshipTab = () => {
-    const { entityData } = useEntityData();
-    const refetch = useRefetch();
-    const ermodelrelationView = (ermodelrelationData?: any): JSX.Element => {
-        return (
-            <ERModelRelationPreview
-                ermodelrelationData={ermodelrelationData}
-                prePageType="ERModelRelationship"
-                refetch={refetch}
-            />
-        );
-    };
-    return (
-        <>
-            <div className="ERModelRelationshipTab">
-                <div className="ermodelrelation-preview-div">{ermodelrelationView(entityData)}</div>
-                <Divider className="thin-divider" />
-            </div>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Embed/EmbedTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Embed/EmbedTab.tsx
deleted file mode 100644
index 23bd630a93d0a9..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Embed/EmbedTab.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Empty } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-const EmbedContainer = styled.div`
-    width: 100%;
-    height: 100%;
-`;
-
-const StyledIframe = styled.iframe`
-    width: 100%;
-    height: 100%;
-`;
-
-const StyledEmpty = styled(Empty)`
-    margin-top: 28px;
-    font-size: 16px;
-    color: ${ANTD_GRAY[8]};
-`;
-
-export const EmbedTab = () => {
-    const { entityData } = useEntityData();
-    const embedRenderUrl = entityData?.embed?.renderUrl;
-    return (
-        <EmbedContainer>
-            {(embedRenderUrl && <StyledIframe src={embedRenderUrl} title={entityData?.urn} frameBorder={0} />) || (
-                <StyledEmpty description="No preview was found." />
-            )}
-        </EmbedContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/ChartDashboardsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/ChartDashboardsTab.tsx
deleted file mode 100644
index 7119eaa840b55c..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/ChartDashboardsTab.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { EntityList } from '@app/entity/shared/tabs/Entity/components/EntityList';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType } from '@types';
-
-export const ChartDashboardsTab = () => {
-    const entity = useBaseEntity() as any;
-    const chart = entity && entity.chart;
-    const dashboards = chart?.dashboards?.relationships?.map((relationship) => relationship.entity);
-    const entityRegistry = useEntityRegistry();
-    const totalDashboards = chart?.dashboards?.total || 0;
-    const title = `Found in ${totalDashboards} ${
-        totalDashboards === 1
-            ? entityRegistry.getEntityName(EntityType.Dashboard)
-            : entityRegistry.getCollectionName(EntityType.Dashboard)
-    }`;
-    return <EntityList title={title} type={EntityType.Dashboard} entities={dashboards || []} />;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardChartsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardChartsTab.tsx
deleted file mode 100644
index 9990862c37b8b8..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardChartsTab.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { EntityList } from '@app/entity/shared/tabs/Entity/components/EntityList';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType } from '@types';
-
-export const DashboardChartsTab = () => {
-    const entity = useBaseEntity() as any;
-    const dashboard = entity && entity.dashboard;
-    const charts = dashboard?.charts?.relationships?.map((relationship) => relationship.entity);
-    const entityRegistry = useEntityRegistry();
-    const totalCharts = dashboard?.charts?.total || 0;
-    const title = `Contains ${totalCharts} ${
-        totalCharts === 1
-            ? entityRegistry.getEntityName(EntityType.Chart)
-            : entityRegistry.getCollectionName(EntityType.Chart)
-    }`;
-    return <EntityList title={title} type={EntityType.Chart} entities={charts || []} />;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardDatasetsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardDatasetsTab.tsx
deleted file mode 100644
index c2629c449bb636..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/DashboardDatasetsTab.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { EntityList } from '@app/entity/shared/tabs/Entity/components/EntityList';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType } from '@types';
-
-export const DashboardDatasetsTab = () => {
-    const entity = useBaseEntity() as any;
-    const dashboard = entity && entity.dashboard;
-    const datasets = dashboard?.datasets?.relationships?.map((relationship) => relationship.entity);
-    const entityRegistry = useEntityRegistry();
-    const totalDatasets = dashboard?.datasets?.total || 0;
-    const title = `Consumes ${totalDatasets} ${
-        totalDatasets === 1
-            ? entityRegistry.getEntityName(EntityType.Dataset)
-            : entityRegistry.getCollectionName(EntityType.Dataset)
-    }`;
-    return <EntityList title={title} type={EntityType.Dataset} entities={datasets || []} />;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/DataFlowJobsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/DataFlowJobsTab.tsx
deleted file mode 100644
index 146f6efe94f798..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/DataFlowJobsTab.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import React, { useState } from 'react';
-
-import { EntityList } from '@app/entity/shared/tabs/Entity/components/EntityList';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { SearchCfg } from '@src/conf';
-
-import { useGetDataFlowChildJobsQuery } from '@graphql/dataFlow.generated';
-import { EntityType } from '@types';
-
-interface Props {
-    properties?: {
-        urn: string;
-    };
-}
-
-export const DataFlowJobsTab = ({ properties = { urn: '' } }: Props) => {
-    const [page, setPage] = useState(1);
-    const [numResultsPerPage, setNumResultsPerPage] = useState(SearchCfg.RESULTS_PER_PAGE);
-
-    const start: number = (page - 1) * numResultsPerPage;
-
-    const { data, loading, error } = useGetDataFlowChildJobsQuery({
-        variables: {
-            urn: properties.urn,
-            start,
-            count: numResultsPerPage,
-        },
-    });
-
-    const onChangePage = (newPage: number) => {
-        setPage(newPage);
-    };
-
-    const dataFlow = data && data?.dataFlow;
-    const dataJobs = dataFlow?.childJobs?.relationships?.map((relationship) => relationship.entity);
-    const entityRegistry = useEntityRegistry();
-    const totalJobs = dataFlow?.childJobs?.total || 0;
-    const pageSize = data?.dataFlow?.childJobs?.count || 0;
-    const pageStart = data?.dataFlow?.childJobs?.start || 0;
-    const lastResultIndex = pageStart + pageSize > totalJobs ? totalJobs : pageStart + pageSize;
-    const title = `Contains ${totalJobs} ${
-        totalJobs === 1
-            ? entityRegistry.getEntityName(EntityType.DataJob)
-            : entityRegistry.getCollectionName(EntityType.DataJob)
-    }`;
-    return (
-        <EntityList
-            title={title}
-            type={EntityType.DataJob}
-            entities={dataJobs || []}
-            showPagination
-            loading={loading}
-            error={error}
-            totalAssets={totalJobs}
-            page={page}
-            pageSize={numResultsPerPage}
-            lastResultIndex={lastResultIndex}
-            onChangePage={onChangePage}
-            setNumResultsPerPage={setNumResultsPerPage}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/DataJobFlowTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/DataJobFlowTab.tsx
deleted file mode 100644
index efa6685eda0050..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/DataJobFlowTab.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { EntityList } from '@app/entity/shared/tabs/Entity/components/EntityList';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType } from '@types';
-
-export const DataJobFlowTab = () => {
-    const entity = useBaseEntity() as any;
-    const dataJob = entity && entity.dataJob;
-    const dataFlow = dataJob?.dataFlow;
-    const entityRegistry = useEntityRegistry();
-    const title = `Part of ${entityRegistry.getEntityName(EntityType.DataFlow)}`;
-    return <EntityList title={title} type={EntityType.DataFlow} entities={dataFlow ? [dataFlow] : []} />;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/InputFieldsTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/InputFieldsTab.tsx
deleted file mode 100644
index 7c4e7460c0889d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/InputFieldsTab.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Empty } from 'antd';
-import React, { useMemo } from 'react';
-import styled from 'styled-components';
-
-import { groupByFieldPath } from '@app/entity/dataset/profile/schema/utils/utils';
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import SchemaTable from '@app/entity/shared/tabs/Dataset/Schema/SchemaTable';
-import SchemaEditableContext from '@app/shared/SchemaEditableContext';
-
-import { SchemaField } from '@types';
-
-const NoSchema = styled(Empty)`
-    color: ${ANTD_GRAY[6]};
-    padding-top: 60px;
-`;
-
-const SchemaTableContainer = styled.div`
-    overflow: auto;
-    height: 100%;
-`;
-export const InputFieldsTab = () => {
-    const { entityData } = useEntityData();
-    const inputFields = entityData?.inputFields || undefined;
-    const ungroupedRows = inputFields?.fields?.map((field) => field?.schemaField) as SchemaField[];
-
-    const rows = useMemo(() => {
-        return groupByFieldPath(ungroupedRows, { showKeySchema: false });
-    }, [ungroupedRows]);
-
-    return (
-        <>
-            <SchemaTableContainer>
-                {rows && rows.length > 0 ? (
-                    <>
-                        <SchemaEditableContext.Provider value={false}>
-                            <SchemaTable
-                                schemaMetadata={null}
-                                rows={rows}
-                                editableSchemaMetadata={null}
-                                usageStats={null}
-                                schemaFieldBlameList={null}
-                                showSchemaAuditView={false}
-                            />
-                        </SchemaEditableContext.Provider>
-                    </>
-                ) : (
-                    <NoSchema />
-                )}
-            </SchemaTableContainer>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx
deleted file mode 100644
index e6c26e29c6e5b3..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { render } from '@testing-library/react';
-import React from 'react';
-
-import { EntityContext } from '@app/entity/shared/EntityContext';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { DataJobFlowTab } from '@app/entity/shared/tabs/Entity/DataJobFlowTab';
-import { dataJob1, mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-import { EntityType } from '@types';
-
-describe('DataJobFlowTab', () => {
-    it('renders fields', async () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
-                    <EntityContext.Provider
-                        value={{
-                            urn: 'urn:li:dataJob:1',
-                            entityType: EntityType.DataJob,
-                            entityData: getDataForEntityType({
-                                data: dataJob1,
-                                entityType: EntityType.DataJob,
-                                getOverrideProperties: () => ({}),
-                            }),
-                            baseEntity: { dataJob: dataJob1 },
-                            updateEntity: vi.fn(),
-                            routeToTab: vi.fn(),
-                            refetch: vi.fn(),
-                            lineage: undefined,
-                            loading: true,
-                            dataNotCombinedWithSiblings: null,
-                        }}
-                    >
-                        <DataJobFlowTab />
-                    </EntityContext.Provider>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        expect(getByText('DataFlowInfoName')).toBeInTheDocument();
-        expect(getByText('DataFlowInfo1 Description')).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/components/EntityList.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/components/EntityList.tsx
deleted file mode 100644
index cd55622c43006a..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/components/EntityList.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import { List, Pagination, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { PreviewType } from '@app/entity/Entity';
-import { Message } from '@app/shared/Message';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { SearchCfg } from '@src/conf';
-
-import { EntityType } from '@types';
-
-const ScrollWrapper = styled.div`
-    overflow: auto;
-    height: 100%;
-
-    &::-webkit-scrollbar {
-        height: 12px;
-        width: 5px;
-        background: #f2f2f2;
-    }
-    &::-webkit-scrollbar-thumb {
-        background: #cccccc;
-        -webkit-border-radius: 1ex;
-        -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);
-    }
-`;
-
-const StyledList = styled(List)`
-    padding-left: 40px;
-    padding-right: 40px;
-    .ant-list-items > .ant-list-item {
-        padding-right: 0px;
-        padding-left: 0px;
-    }
-    > .ant-list-header {
-        padding-right: 0px;
-        padding-left: 0px;
-        font-size: 14px;
-        font-weight: 600;
-        margin-left: -20px;
-        border-bottom: none;
-        padding-bottom: 0px;
-        padding-top: 15px;
-    }
-` as typeof List;
-
-const StyledListItem = styled(List.Item)`
-    padding-top: 20px;
-`;
-
-const PaginationInfoContainer = styled.span`
-    padding: 8px;
-    padding-left: 16px;
-    border-top: 1px solid;
-    border-color: ${(props) => props.theme.styles['border-color-base']};
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-`;
-
-const StyledPagination = styled(Pagination)`
-    padding: 12px 12px 12px 12px;
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-`;
-
-const PaginationInfo = styled(Typography.Text)`
-    padding: 0px;
-    width: 20%;
-`;
-
-type EntityListProps = {
-    type: EntityType;
-    entities: Array<any>;
-    title?: string;
-    totalAssets?: number;
-    pageSize?: any;
-    page?: number;
-    lastResultIndex?: any;
-    showPagination?: boolean;
-    loading?: boolean;
-    error?: any;
-    onChangePage?: (number: any) => void;
-    setNumResultsPerPage?: (number: any) => void;
-};
-
-export const EntityList = ({
-    type,
-    entities,
-    title,
-    totalAssets,
-    pageSize,
-    page,
-    lastResultIndex,
-    showPagination = false,
-    loading = false,
-    error = undefined,
-    onChangePage,
-    setNumResultsPerPage,
-}: EntityListProps) => {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <>
-            <ScrollWrapper>
-                <StyledList
-                    bordered
-                    dataSource={entities}
-                    header={title || `${entities.length || 0} ${entityRegistry.getCollectionName(type)}`}
-                    renderItem={(item) => (
-                        <StyledListItem>{entityRegistry.renderPreview(type, PreviewType.PREVIEW, item)}</StyledListItem>
-                    )}
-                />
-            </ScrollWrapper>
-            {loading && <Message type="loading" content="Loading..." style={{ marginTop: '10%' }} />}
-            {error && <Message type="error" content="Failed to load results! An unexpected error occurred." />}
-            {showPagination && (
-                <PaginationInfoContainer>
-                    <PaginationInfo>
-                        <b>
-                            {lastResultIndex > 0 ? ((page as number) - 1) * pageSize + 1 : 0} - {lastResultIndex}
-                        </b>{' '}
-                        of <b>{totalAssets}</b>
-                    </PaginationInfo>
-                    <StyledPagination
-                        current={page}
-                        pageSize={pageSize}
-                        total={totalAssets}
-                        showLessItems
-                        onChange={onChangePage}
-                        showSizeChanger={(totalAssets as any) > SearchCfg.RESULTS_PER_PAGE}
-                        onShowSizeChange={(_currNum, newNum) => setNumResultsPerPage?.(newNum)}
-                        pageSizeOptions={['10', '20', '50', '100']}
-                    />
-                </PaginationInfoContainer>
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx
deleted file mode 100644
index 00eff5fae35b80..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { StyledTable } from '@app/entity/shared/components/styled/StyledTable';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import TableValueElement from '@app/entity/shared/tabs/Entity/weaklyTypedAspects/TableValueElement';
-
-type Props = {
-    payload: string | undefined | null;
-};
-
-const NameText = styled(Typography.Text)`
-    font-weight: 600;
-    font-size: 12px;
-    color: ${ANTD_GRAY[9]};
-`;
-
-export default function DynamicTabularTab({ payload: rawPayload }: Props) {
-    const aspectData = JSON.parse(rawPayload || '{}');
-    const transformedRowData = Object.keys(aspectData).map((key) => ({ key, value: aspectData[key] }));
-
-    const propertyTableColumns = [
-        {
-            width: 210,
-            title: 'Name',
-            dataIndex: 'key',
-            sorter: (a, b) => a?.key?.localeCompare(b?.key || '') || 0,
-            defaultSortOrder: 'ascend',
-            render: (name: string) => <NameText>{name}</NameText>,
-        },
-        {
-            title: 'Value',
-            dataIndex: 'value',
-            render: (value: string) => <TableValueElement value={value} />,
-        },
-    ];
-
-    return (
-        <StyledTable
-            pagination={false}
-            // typescript is complaining that default sort order is not a valid column field- overriding this here
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            columns={propertyTableColumns}
-            dataSource={transformedRowData}
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx
deleted file mode 100644
index 00fcf7d613bd21..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTab.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import DynamicPropertiesTab from '@app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicPropertiesTab';
-import DynamicTabularTab from '@app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab';
-
-import { AspectRenderSpec } from '@types';
-
-type Props = {
-    payload: string | undefined | null;
-    type: string | undefined | null;
-    renderSpec: AspectRenderSpec | undefined | null;
-};
-
-const QueryText = styled(Typography.Paragraph)`
-    margin: 20px;
-    &&& pre {
-        background-color: ${ANTD_GRAY[2]};
-        border: none;
-    }
-`;
-
-// NOTE: Yes, using `!important` is a shame. However, the SyntaxHighlighter is applying styles directly
-// to the component, so there's no way around this
-const NestedSyntax = styled(SyntaxHighlighter)`
-    background-color: transparent !important;
-    border: none !important;
-`;
-
-export default function DynamicTab({ renderSpec, payload, type }: Props) {
-    if (type === 'tabular') {
-        return <DynamicTabularTab payload={payload} tableKey={renderSpec?.key} />;
-    }
-    if (type === 'properties') {
-        return <DynamicPropertiesTab payload={payload} />;
-    }
-
-    // Default fallback behavior
-    return (
-        <>
-            <QueryText>
-                <pre>
-                    <NestedSyntax language="json">{JSON.stringify(JSON.parse(payload || '{}'), null, 2)}</NestedSyntax>
-                </pre>
-            </QueryText>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx
deleted file mode 100644
index b5456381eb6b68..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/DynamicTabularTab.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-
-import { StyledTable } from '@app/entity/shared/components/styled/StyledTable';
-import TableValueElement from '@app/entity/shared/tabs/Entity/weaklyTypedAspects/TableValueElement';
-
-type Props = {
-    payload: string | undefined | null;
-    tableKey: string | undefined | null;
-};
-
-export default function DynamicTabularTab({ payload: rawPayload, tableKey }: Props) {
-    const aspectData = JSON.parse(rawPayload || '{}');
-    const rowData = tableKey ? aspectData[tableKey] : aspectData[Object.keys(aspectData)[0]];
-    const columns = Object.keys(rowData[0]).map((columnName) => ({
-        title: columnName,
-        dataIndex: columnName,
-        render: (value: any) => <TableValueElement value={value} />,
-    }));
-
-    return (
-        <StyledTable
-            pagination={false}
-            // typescript is complaining that default sort order is not a valid column field- overriding this here
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            columns={columns}
-            dataSource={rowData}
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/TableValueElement.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/TableValueElement.tsx
deleted file mode 100644
index 13532d10dbe59f..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Entity/weaklyTypedAspects/TableValueElement.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-
-function isValidHttpUrl(string) {
-    let url;
-
-    try {
-        url = new URL(string);
-    } catch (_) {
-        return false;
-    }
-
-    return url.protocol === 'http:' || url.protocol === 'https:';
-}
-
-export default function TableValueElement({ value }: { value: any }) {
-    if (typeof value === 'boolean') {
-        return <span>{String(value)}</span>;
-    }
-    if (typeof value === 'string') {
-        if (isValidHttpUrl(value)) {
-            return <a href={value}>{value}</a>;
-        }
-        return <span>{value}</span>;
-    }
-    if (typeof value === 'number') {
-        return <span>{value}</span>;
-    }
-    return null;
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentSummary.tsx b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentSummary.tsx
index a08c072607dfc2..1bb94ffb031b41 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentSummary.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/components/IncidentSummary.tsx
@@ -31,7 +31,7 @@ const SummaryTitle = styled(Typography.Title)`
     }
 `;
 
-export type IncidentsSummary = {
+type IncidentsSummary = {
     totalIncident: number;
     resolvedIncident: number;
     activeIncident: number;
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Incident/incidentUtils.ts b/datahub-web-react/src/app/entity/shared/tabs/Incident/incidentUtils.ts
index 6d68d56d45588d..9cddc47c5fc02a 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Incident/incidentUtils.ts
+++ b/datahub-web-react/src/app/entity/shared/tabs/Incident/incidentUtils.ts
@@ -40,10 +40,9 @@ export const getNameFromType = (type: IncidentType) => {
 
 export const SUCCESS_COLOR_HEX = '#52C41A';
 export const FAILURE_COLOR_HEX = '#F5222D';
-export const WARNING_COLOR_HEX = '#FA8C16';
 
 // apollo caching
-export const addOrUpdateIncidentInList = (existingIncidents, newIncidents) => {
+const addOrUpdateIncidentInList = (existingIncidents, newIncidents) => {
     const incidents = [...existingIncidents];
     let didUpdate = false;
     const updatedIncidents = incidents.map((incident) => {
@@ -59,7 +58,7 @@ export const addOrUpdateIncidentInList = (existingIncidents, newIncidents) => {
 /**
  * Add an entry to the ListIncident cache.
  */
-export const updateListIncidentsCache = (client, urn, incident, pageSize) => {
+const updateListIncidentsCache = (client, urn, incident, pageSize) => {
     // Read the data from our cache for this query.
     const currData: any = client.readQuery({
         query: GetEntityIncidentsDocument,
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/ColumnLineageSelect.tsx b/datahub-web-react/src/app/entity/shared/tabs/Lineage/ColumnLineageSelect.tsx
deleted file mode 100644
index 7a381fb5ea97e0..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/ColumnLineageSelect.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import { blue } from '@ant-design/colors';
-import { CaretDownOutlined } from '@ant-design/icons';
-import { Button, Select, Tooltip } from 'antd';
-import * as React from 'react';
-import { useHistory, useLocation } from 'react-router';
-import styled from 'styled-components/macro';
-
-import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils';
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { ImpactAnalysisIcon } from '@app/entity/shared/tabs/Dataset/Schema/components/MenuColumn';
-import { useGetEntityWithSchema } from '@app/entity/shared/tabs/Dataset/Schema/useGetEntitySchema';
-import updateQueryParams from '@app/shared/updateQueryParams';
-
-const StyledSelect = styled(Select)`
-    margin-right: 5px;
-    min-width: 140px;
-    max-width: 200px;
-`;
-
-const StyledButton = styled(Button)<{ isSelected: boolean }>`
-    transition: color 0s;
-    display: flex;
-    align-items: center;
-
-    ${(props) =>
-        props.isSelected &&
-        `
-        color: ${blue[5]};
-        &:focus, &:hover {
-            color: ${blue[5]};
-        }
-    `};
-`;
-
-const TextWrapper = styled.span`
-    margin-left: 8px;
-`;
-
-interface Props {
-    selectedColumn?: string;
-    isColumnLevelLineage: boolean;
-    setSelectedColumn: (column: any) => void;
-    setIsColumnLevelLineage: (isShowing: boolean) => void;
-}
-
-export default function ColumnsLineageSelect({
-    selectedColumn,
-    isColumnLevelLineage,
-    setSelectedColumn,
-    setIsColumnLevelLineage,
-}: Props) {
-    const { entityData } = useEntityData();
-    const location = useLocation();
-    const history = useHistory();
-    const { entityWithSchema } = useGetEntityWithSchema();
-
-    function selectColumn(column: any) {
-        updateQueryParams({ column }, location, history);
-        setSelectedColumn(column);
-    }
-
-    const columnButtonTooltip = isColumnLevelLineage ? 'Hide column level lineage' : 'Show column level lineage';
-
-    return (
-        <>
-            {isColumnLevelLineage && (
-                <StyledSelect
-                    value={selectedColumn}
-                    onChange={selectColumn}
-                    showSearch
-                    allowClear
-                    placeholder="Select column"
-                >
-                    {entityWithSchema?.schemaMetadata?.fields?.map((field) => {
-                        const fieldPath = downgradeV2FieldPath(field.fieldPath);
-                        return (
-                            <Select.Option value={field.fieldPath}>
-                                <Tooltip title={fieldPath}>{fieldPath}</Tooltip>
-                            </Select.Option>
-                        );
-                    })}
-                    {entityData?.inputFields?.fields?.map((field, idx) => {
-                        const fieldPath = downgradeV2FieldPath(field?.schemaField?.fieldPath);
-                        const key = `${field?.schemaField?.fieldPath}-${idx}`;
-                        return (
-                            <Select.Option key={key} value={field?.schemaField?.fieldPath || ''}>
-                                <Tooltip title={fieldPath}>{fieldPath}</Tooltip>
-                            </Select.Option>
-                        );
-                    })}
-                </StyledSelect>
-            )}
-            <Tooltip title={columnButtonTooltip}>
-                <StyledButton
-                    type="text"
-                    onClick={() => setIsColumnLevelLineage(!isColumnLevelLineage)}
-                    data-testid="column-lineage-toggle"
-                    isSelected={isColumnLevelLineage}
-                >
-                    <ImpactAnalysisIcon />
-                    <TextWrapper>
-                        <b>Column Lineage</b>
-                        <CaretDownOutlined style={{ fontSize: '10px', marginLeft: 4 }} />
-                    </TextWrapper>
-                </StyledButton>
-            </Tooltip>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/ImpactAnalysis.tsx b/datahub-web-react/src/app/entity/shared/tabs/Lineage/ImpactAnalysis.tsx
deleted file mode 100644
index 567ad548c6be34..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/ImpactAnalysis.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import React from 'react';
-
-import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection';
-import generateUseDownloadScrollAcrossLineageSearchResultsHook from '@app/entity/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook';
-import generateUseSearchResultsViaRelationshipHook from '@app/entity/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook';
-
-import { LineageDirection } from '@types';
-
-type Props = {
-    urn: string;
-    direction: LineageDirection;
-    shouldRefetch?: boolean;
-    startTimeMillis?: number;
-    endTimeMillis?: number;
-    skipCache?: boolean;
-    setSkipCache?: (skipCache: boolean) => void;
-    resetShouldRefetch?: () => void;
-    onLineageClick?: () => void;
-    isLineageTab?: boolean;
-};
-
-export const ImpactAnalysis = ({
-    urn,
-    direction,
-    startTimeMillis,
-    endTimeMillis,
-    shouldRefetch,
-    skipCache,
-    setSkipCache,
-    resetShouldRefetch,
-    onLineageClick,
-    isLineageTab,
-}: Props) => {
-    const finalStartTimeMillis = startTimeMillis || undefined;
-    const finalEndTimeMillis = endTimeMillis || undefined;
-    return (
-        <EmbeddedListSearchSection
-            useGetSearchResults={generateUseSearchResultsViaRelationshipHook({
-                urn,
-                direction,
-                startTimeMillis: finalStartTimeMillis,
-                endTimeMillis: finalEndTimeMillis,
-                skipCache,
-                setSkipCache,
-            })}
-            useGetDownloadSearchResults={generateUseDownloadScrollAcrossLineageSearchResultsHook({
-                urn,
-                direction,
-                startTimeMillis: finalStartTimeMillis,
-                endTimeMillis: finalEndTimeMillis,
-                skipCache,
-                setSkipCache,
-            })}
-            defaultShowFilters
-            defaultFilters={[{ field: 'degree', values: ['1'] }]}
-            shouldRefetch={shouldRefetch}
-            resetShouldRefetch={resetShouldRefetch}
-            onLineageClick={onLineageClick}
-            isLineageTab={isLineageTab}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTab.tsx
deleted file mode 100644
index 9a94128576ffd6..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTab.tsx
+++ /dev/null
@@ -1,198 +0,0 @@
-import {
-    ArrowDownOutlined,
-    ArrowUpOutlined,
-    CaretDownFilled,
-    CaretDownOutlined,
-    PartitionOutlined,
-    ReloadOutlined,
-    SubnodeOutlined,
-} from '@ant-design/icons';
-import { Button, Select, Tooltip, Typography } from 'antd';
-import * as QueryString from 'query-string';
-import React, { useCallback, useState } from 'react';
-import { useHistory, useLocation } from 'react-router';
-import styled from 'styled-components/macro';
-
-import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils';
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { getEntityPath } from '@app/entity/shared/containers/profile/utils';
-import ColumnsLineageSelect from '@app/entity/shared/tabs/Lineage/ColumnLineageSelect';
-import { ImpactAnalysis } from '@app/entity/shared/tabs/Lineage/ImpactAnalysis';
-import { LineageTabContext } from '@app/entity/shared/tabs/Lineage/LineageTabContext';
-import LineageTabTimeSelector from '@app/entity/shared/tabs/Lineage/LineageTabTimeSelector';
-import { generateSchemaFieldUrn } from '@app/entity/shared/tabs/Lineage/utils';
-import ManageLineageMenu from '@app/lineage/manage/ManageLineageMenu';
-import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { LineageDirection } from '@types';
-
-const StyledTabToolbar = styled(TabToolbar)`
-    justify-content: space-between;
-    z-index: 2;
-`;
-
-const LeftButtonsWrapper = styled.div`
-    align-items: center;
-    display: flex;
-`;
-
-const RightButtonsWrapper = styled.div`
-    align-items: center;
-    display: flex;
-`;
-
-const ManageLineageIcon = styled(SubnodeOutlined)`
-    &&& {
-        margin-right: -2px;
-    }
-`;
-
-const StyledCaretDown = styled(CaretDownFilled)`
-    &&& {
-        font-size: 10px;
-        margin-left: 4px;
-    }
-`;
-
-const StyledSelect = styled(Select)`
-    &:hover {
-        background-color: ${ANTD_GRAY[2]};
-    }
-`;
-
-const RefreshCacheButton = styled(Button)`
-    margin-left: 8px;
-`;
-
-export const LineageTab = ({
-    properties = { defaultDirection: LineageDirection.Downstream },
-}: {
-    properties?: { defaultDirection: LineageDirection };
-}) => {
-    const { urn, entityType, entityData } = useEntityData();
-    const history = useHistory();
-    const location = useLocation();
-    const entityRegistry = useEntityRegistry();
-    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
-    const [lineageDirection, setLineageDirection] = useState<LineageDirection>(properties.defaultDirection);
-    const [selectedColumn, setSelectedColumn] = useState<string | undefined>(params?.column as string);
-    const [isColumnLevelLineage, setIsColumnLevelLineage] = useState(!!params?.column);
-    const [shouldRefetch, setShouldRefetch] = useState(false);
-    const [skipCache, setSkipCache] = useState(false);
-    const { startTimeMillis, endTimeMillis } = useGetLineageTimeParams();
-
-    function resetShouldRefetch() {
-        setShouldRefetch(false);
-    }
-
-    const routeToLineage = useCallback(() => {
-        history.push(
-            getEntityPath(entityType, urn, entityRegistry, true, false, 'Lineage', {
-                start_time_millis: startTimeMillis,
-                end_time_millis: endTimeMillis,
-            }),
-        );
-    }, [history, entityType, urn, entityRegistry, startTimeMillis, endTimeMillis]);
-
-    const selectedV1FieldPath = downgradeV2FieldPath(selectedColumn) || '';
-    const selectedColumnUrn = generateSchemaFieldUrn(selectedV1FieldPath, urn);
-    const impactAnalysisUrn = isColumnLevelLineage && selectedColumnUrn ? selectedColumnUrn : urn;
-    const canEditLineage = !!entityData?.privileges?.canEditLineage;
-
-    const directionOptions = [
-        {
-            label: (
-                <span data-testid="lineage-tab-direction-select-option-downstream">
-                    <ArrowDownOutlined style={{ marginRight: 4 }} />
-                    <b>Downstream</b>
-                </span>
-            ),
-            value: LineageDirection.Downstream,
-        },
-        {
-            label: (
-                <span data-testid="lineage-tab-direction-select-option-upstream">
-                    <ArrowUpOutlined style={{ marginRight: 4 }} />
-                    <b>Upstream</b>
-                </span>
-            ),
-            value: LineageDirection.Upstream,
-        },
-    ];
-
-    return (
-        <>
-            <StyledTabToolbar>
-                <LeftButtonsWrapper>
-                    <ManageLineageMenu
-                        entityUrn={urn}
-                        refetchEntity={() => setShouldRefetch(true)}
-                        setUpdatedLineages={() => {}}
-                        menuIcon={
-                            <Button type="text">
-                                <ManageLineageIcon />
-                                <Typography.Text>
-                                    <b>Edit</b>
-                                </Typography.Text>
-                                <StyledCaretDown />
-                            </Button>
-                        }
-                        showLoading
-                        entityType={entityType}
-                        entityPlatform={entityData?.platform?.name}
-                        canEditLineage={canEditLineage}
-                        disableDropdown={!canEditLineage}
-                    />
-                    <Button type="text" onClick={routeToLineage}>
-                        <PartitionOutlined />
-                        <Typography.Text>
-                            <b>Visualize Lineage</b>
-                        </Typography.Text>
-                    </Button>
-                </LeftButtonsWrapper>
-                <RightButtonsWrapper>
-                    <StyledSelect
-                        bordered={false}
-                        value={lineageDirection}
-                        options={directionOptions}
-                        onChange={(value) => setLineageDirection(value as LineageDirection)}
-                        suffixIcon={<CaretDownOutlined style={{ color: 'black' }} />}
-                        data-testid="lineage-tab-direction-select"
-                    />
-                    <ColumnsLineageSelect
-                        selectedColumn={selectedColumn}
-                        isColumnLevelLineage={isColumnLevelLineage}
-                        setSelectedColumn={setSelectedColumn}
-                        setIsColumnLevelLineage={setIsColumnLevelLineage}
-                    />
-                    <LineageTabTimeSelector />
-                    <Tooltip title="Click to refresh data">
-                        <RefreshCacheButton type="text" onClick={() => setSkipCache(true)}>
-                            <ReloadOutlined />
-                            <Typography.Text>
-                                <b>Refresh</b>
-                            </Typography.Text>
-                        </RefreshCacheButton>
-                    </Tooltip>
-                </RightButtonsWrapper>
-            </StyledTabToolbar>
-            <LineageTabContext.Provider value={{ isColumnLevelLineage, selectedColumn, lineageDirection }}>
-                <ImpactAnalysis
-                    urn={impactAnalysisUrn}
-                    onLineageClick={routeToLineage}
-                    isLineageTab
-                    direction={lineageDirection as LineageDirection}
-                    startTimeMillis={startTimeMillis}
-                    endTimeMillis={endTimeMillis}
-                    skipCache={skipCache}
-                    setSkipCache={setSkipCache}
-                    shouldRefetch={shouldRefetch}
-                    resetShouldRefetch={resetShouldRefetch}
-                />
-            </LineageTabContext.Provider>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTabContext.tsx b/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTabContext.tsx
deleted file mode 100644
index 13f402e6cc696a..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTabContext.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-
-import { LineageDirection } from '@types';
-
-export const LineageTabContext = React.createContext<LineageTabContextType>({
-    isColumnLevelLineage: false,
-    lineageDirection: LineageDirection.Downstream,
-    selectedColumn: undefined,
-});
-
-type LineageTabContextType = {
-    isColumnLevelLineage: boolean;
-    lineageDirection: LineageDirection;
-    selectedColumn?: string;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTabTimeSelector.tsx b/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTabTimeSelector.tsx
deleted file mode 100644
index 9562c5e931417a..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTabTimeSelector.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import moment from 'moment';
-import React from 'react';
-import { useHistory, useLocation } from 'react-router';
-
-import analytics, { EventType } from '@app/analytics';
-import LineageTimeSelector from '@app/lineage/LineageTimeSelector';
-import { useGetLineageTimeParams } from '@app/lineage/utils/useGetLineageTimeParams';
-import { getTimeFromNow } from '@app/shared/time/timeUtils';
-import updateQueryParams from '@app/shared/updateQueryParams';
-
-export default function LineageTabTimeSelector() {
-    const history = useHistory();
-    const location = useLocation();
-    const { startTimeMillis, endTimeMillis } = useGetLineageTimeParams();
-
-    const lineageTimeSelectorOnChange = (dates, _dateStrings) => {
-        if (dates) {
-            const [start, end] = dates;
-            const startTimeMillisValue = start?.valueOf();
-            const endTimeMillisValue = end?.valueOf();
-            const relativeStartDate = getTimeFromNow(startTimeMillisValue);
-            const relativeEndDate = getTimeFromNow(endTimeMillisValue);
-            analytics.event({
-                type: EventType.LineageGraphTimeRangeSelectionEvent,
-                relativeStartDate,
-                relativeEndDate,
-            });
-
-            updateQueryParams(
-                { start_time_millis: startTimeMillisValue, end_time_millis: endTimeMillisValue },
-                location,
-                history,
-            );
-        }
-    };
-
-    const initialDates: [moment.Moment | null, moment.Moment | null] = [
-        startTimeMillis ? moment(startTimeMillis) : null,
-        endTimeMillis ? moment(endTimeMillis) : null,
-    ];
-
-    return <LineageTimeSelector onChange={lineageTimeSelectorOnChange} initialDates={initialDates} />;
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTable.tsx b/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTable.tsx
deleted file mode 100644
index 1120339a1a8da8..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/LineageTable.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { List } from 'antd';
-import React from 'react';
-import VisiblitySensor from 'react-visibility-sensor';
-import styled from 'styled-components';
-
-import { PreviewType } from '@app/entity/Entity';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Entity } from '@types';
-
-const LineageList = styled(List)`
-    padding-left: 40px;
-    padding-right: 40px;
-    margin-top: -1px;
-    .ant-list-items > .ant-list-item {
-        padding-right: 0px;
-        padding-left: 0px;
-    }
-    > .ant-list-header {
-        padding-right: 0px;
-        padding-left: 0px;
-        font-size: 14px;
-        font-weight: 600;
-        margin-left: -20px;
-        border-bottom: none;
-        padding-bottom: 0px;
-        padding-top: 15px;
-    }
-` as typeof List;
-
-const ItemPlaceholder = styled.div`
-    min-height: 100px;
-    width: 100%;
-    background-color: ${ANTD_GRAY[2]};
-`;
-
-const ListItem = styled(List.Item)`
-    paddingtop: 20px;
-`;
-const TableTitle = styled.span`
-    font-size: 20px;
-`;
-
-type Props = {
-    title: string;
-    data?: Entity[];
-};
-
-export const LineageTable = ({ data, title }: Props) => {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <LineageList
-            bordered
-            dataSource={data}
-            header={<TableTitle>{title}</TableTitle>}
-            renderItem={(item) => (
-                <ListItem>
-                    <VisiblitySensor partialVisibility>
-                        {({ isVisible }) =>
-                            isVisible && !!item.type ? (
-                                entityRegistry.renderPreview(item.type, PreviewType.PREVIEW, item)
-                            ) : (
-                                <ItemPlaceholder />
-                            )
-                        }
-                    </VisiblitySensor>
-                </ListItem>
-            )}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts b/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts
deleted file mode 100644
index 9962726152b33d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseDownloadScrollAcrossLineageSearchResultsHook.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import {
-    DownloadSearchResults,
-    DownloadSearchResultsInput,
-    DownloadSearchResultsParams,
-} from '@app/search/utils/types';
-
-import { useGetDownloadScrollAcrossLineageResultsQuery } from '@graphql/scroll.generated';
-import { LineageDirection } from '@types';
-
-/**
- * Generates a hook which can be used to download Scroll Across Lineage Results to CSV inside the
- * Download as CSV modal.
- */
-export default function generateUseDownloadSearchAcrossLineageSearchResultsHook({
-    urn,
-    direction,
-    startTimeMillis,
-    endTimeMillis,
-}: {
-    urn: string;
-    direction: LineageDirection;
-    startTimeMillis?: number;
-    endTimeMillis?: number;
-    skipCache?: boolean;
-    setSkipCache?: (skipCache: boolean) => void;
-}) {
-    return function useDownloadSearchAcrossLineageSearchResults(params: DownloadSearchResultsParams) {
-        const { data, loading, error, refetch } = useGetDownloadScrollAcrossLineageResultsQuery({
-            ...params,
-            variables: {
-                input: {
-                    urn,
-                    direction,
-                    types: params.variables?.input?.types,
-                    query: params.variables?.input?.query,
-                    scrollId: params.variables?.input?.scrollId,
-                    count: params.variables?.input?.count,
-                    orFilters: params.variables?.input?.orFilters,
-                    startTimeMillis: startTimeMillis || undefined,
-                    endTimeMillis: endTimeMillis || undefined,
-                },
-            },
-        });
-
-        return {
-            searchResults: (data?.scrollAcrossLineage && {
-                ...data?.scrollAcrossLineage,
-                nextScrollId: data?.scrollAcrossLineage?.nextScrollId,
-                searchResults: data?.scrollAcrossLineage?.searchResults,
-            }) as DownloadSearchResults,
-            loading,
-            error,
-            refetch: (input: DownloadSearchResultsInput) => {
-                return refetch({
-                    input: {
-                        urn,
-                        direction,
-                        types: input.types,
-                        query: input.query,
-                        scrollId: input.scrollId,
-                        count: input.count,
-                        orFilters: input.orFilters,
-                        startTimeMillis: startTimeMillis || undefined,
-                        endTimeMillis: endTimeMillis || undefined,
-                    },
-                }).then((res) => {
-                    return (res.data?.scrollAcrossLineage && {
-                        ...res.data?.scrollAcrossLineage,
-                        nextScrollId: res.data?.scrollAcrossLineage?.nextScrollId,
-                    }) as DownloadSearchResults;
-                });
-            },
-        };
-    };
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts b/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts
deleted file mode 100644
index 6170414c89e8ae..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/generateUseSearchResultsViaRelationshipHook.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { useEffect } from 'react';
-
-import { GetSearchResultsParams } from '@app/entity/shared/components/styled/search/types';
-
-import { useSearchAcrossLineageQuery } from '@graphql/search.generated';
-import { LineageDirection } from '@types';
-
-const filtersExist = (filters, orFilters) => {
-    return filters?.length || orFilters?.length;
-};
-
-export default function generateUseSearchResultsViaRelationshipHook({
-    urn,
-    direction,
-    startTimeMillis,
-    endTimeMillis,
-    skipCache,
-    setSkipCache,
-}: {
-    urn: string;
-    direction: LineageDirection;
-    startTimeMillis?: number;
-    endTimeMillis?: number;
-    skipCache?: boolean;
-    setSkipCache?: (skipCache: boolean) => void;
-}) {
-    return function useGetSearchResultsViaSearchAcrossLineage(params: GetSearchResultsParams) {
-        const {
-            variables: {
-                input: { types, query, start, count, filters, orFilters },
-            },
-        } = params;
-        const inputFields = {
-            urn,
-            direction,
-            types,
-            query,
-            start,
-            count,
-            filters,
-            orFilters,
-            startTimeMillis: startTimeMillis || undefined,
-            endTimeMillis: endTimeMillis || undefined,
-        };
-
-        const { data, loading, error, refetch } = useSearchAcrossLineageQuery({
-            variables: {
-                input: inputFields,
-            },
-            fetchPolicy: 'cache-first',
-            skip: !filtersExist(filters, orFilters), // If you don't include any filters, we shound't return anything :). Might as well skip!
-        });
-
-        useEffect(() => {
-            if (skipCache) {
-                refetch({
-                    input: { ...inputFields, searchFlags: { skipCache: true, fulltext: true } },
-                });
-                setSkipCache?.(false);
-            }
-        });
-
-        return {
-            data: data?.searchAcrossLineage,
-            loading,
-            error,
-            refetch: (refetchParams: GetSearchResultsParams['variables']) => {
-                const {
-                    input: {
-                        types: refetchTypes,
-                        query: refetchQuery,
-                        start: refetchStart,
-                        count: refetchCount,
-                        filters: refetchFilters,
-                        orFilters: refetchOrFilters,
-                    },
-                } = refetchParams;
-                return refetch({
-                    input: {
-                        urn,
-                        direction,
-                        types: refetchTypes,
-                        query: refetchQuery,
-                        start: refetchStart,
-                        count: refetchCount,
-                        filters: refetchFilters,
-                        orFilters: refetchOrFilters,
-                    },
-                }).then((res) => res.data.searchAcrossLineage);
-            },
-        };
-    };
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/utils.ts b/datahub-web-react/src/app/entity/shared/tabs/Lineage/utils.ts
deleted file mode 100644
index ffadffaae12850..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Lineage/utils.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { encodeSchemaField } from '@app/lineage/utils/columnLineageUtils';
-
-export function generateSchemaFieldUrn(fieldPath: string | undefined, resourceUrn: string) {
-    if (!fieldPath) return null;
-    return `urn:li:schemaField:(${resourceUrn},${encodeSchemaField(fieldPath)})`;
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/ML/MlFeatureFeatureTableTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/ML/MlFeatureFeatureTableTab.tsx
deleted file mode 100644
index 4d815a5184f63f..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/ML/MlFeatureFeatureTableTab.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { EntityList } from '@app/entity/shared/tabs/Entity/components/EntityList';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { GetMlFeatureQuery } from '@graphql/mlFeature.generated';
-import { EntityType } from '@types';
-
-export const FeatureTableTab = () => {
-    const entity = useBaseEntity() as GetMlFeatureQuery;
-    const entityRegistry = useEntityRegistry();
-
-    const feature = entity && entity.mlFeature;
-    const featureTables = feature?.featureTables?.relationships?.map((relationship) => relationship.entity);
-
-    const title = `Part of ${entityRegistry.getEntityName(EntityType.MlfeatureTable)}`;
-    return <EntityList title={title} type={EntityType.MlfeatureTable} entities={featureTables || []} />;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx
deleted file mode 100644
index f2054aa0560f8d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/ML/MlPrimaryKeyFeatureTableTab.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { EntityList } from '@app/entity/shared/tabs/Entity/components/EntityList';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { GetMlPrimaryKeyQuery } from '@graphql/mlPrimaryKey.generated';
-import { EntityType } from '@types';
-
-export const FeatureTableTab = () => {
-    const entity = useBaseEntity() as GetMlPrimaryKeyQuery;
-    const entityRegistry = useEntityRegistry();
-
-    const feature = entity && entity.mlPrimaryKey;
-    const featureTables = feature?.featureTables?.relationships?.map((relationship) => relationship.entity);
-
-    const title = `Part of ${entityRegistry.getEntityName(EntityType.MlfeatureTable)}`;
-    return <EntityList title={title} type={EntityType.MlfeatureTable} entities={featureTables || []} />;
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/AddPropertyButton.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/AddPropertyButton.tsx
index e8ef37cf498b35..d85a9a2778a6a1 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/AddPropertyButton.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/AddPropertyButton.tsx
@@ -9,18 +9,15 @@ import { useEntityData } from '@app/entity/shared/EntityContext';
 import EditStructuredPropertyModal from '@app/entity/shared/tabs/Properties/Edit/EditStructuredPropertyModal';
 import { Icon, Input as InputComponent, Text, colors } from '@src/alchemy-components';
 import { useUserContext } from '@src/app/context/useUserContext';
-import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants';
 import { getStructuredPropertiesSearchInputs } from '@src/app/govern/structuredProperties/utils';
 import { useEntityRegistry } from '@src/app/useEntityRegistry';
-import { useIsThemeV2 } from '@src/app/useIsThemeV2';
 import { PageRoutes } from '@src/conf/Global';
 import { useGetSearchResultsForMultipleQuery } from '@src/graphql/search.generated';
 import { Maybe, StructuredProperties, StructuredPropertyEntity } from '@src/types.generated';
 
-const AddButton = styled.div<{ isThemeV2: boolean; isV1Drawer?: boolean }>`
+const AddButton = styled.div<{ isV1Drawer?: boolean }>`
     border-radius: 200px;
-    background-color: ${(props) =>
-        props.isThemeV2 ? props.theme.styles['primary-color'] : REDESIGN_COLORS.LINK_HOVER_BLUE};
+    background-color: ${(props) => props.theme.styles['primary-color']};
     width: ${(props) => (props.isV1Drawer ? '24px' : '32px')};
     height: ${(props) => (props.isV1Drawer ? '24px' : '32px')};
     display: flex;
@@ -82,7 +79,6 @@ interface Props {
 const AddPropertyButton = ({ fieldUrn, refetch, fieldProperties, isV1Drawer }: Props) => {
     const [searchQuery, setSearchQuery] = useState('');
     const { entityData, entityType } = useEntityData();
-    const isThemeV2 = useIsThemeV2();
     const me = useUserContext();
     const entityRegistry = useEntityRegistry();
     const [isEditModalVisible, setIsEditModalVisible] = useState(false);
@@ -194,7 +190,7 @@ const AddPropertyButton = ({ fieldUrn, refetch, fieldProperties, isV1Drawer }: P
                 )}
             >
                 <Tooltip title="Add property" placement="left" showArrow={false}>
-                    <AddButton isThemeV2={isThemeV2} isV1Drawer={isV1Drawer} data-testid="add-structured-prop-button">
+                    <AddButton isV1Drawer={isV1Drawer} data-testid="add-structured-prop-button">
                         <Icon icon="Add" size={isV1Drawer ? 'lg' : '2xl'} color="white" />
                     </AddButton>
                 </Tooltip>
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/CardinalityLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/CardinalityLabel.tsx
deleted file mode 100644
index c260268f875a5a..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/CardinalityLabel.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Tooltip } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { PropertyTypeBadge } from '@app/entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel';
-import { getStructuredPropertyValue } from '@app/entity/shared/utils';
-
-import { PropertyCardinality, StructuredPropertyEntity } from '@types';
-
-const Header = styled.div`
-    font-size: 10px;
-`;
-
-const List = styled.ul`
-    padding: 0 24px;
-    max-height: 500px;
-    overflow: auto;
-`;
-
-interface Props {
-    structuredProperty: StructuredPropertyEntity;
-}
-
-export default function CardinalityLabel({ structuredProperty }: Props) {
-    const labelText =
-        structuredProperty.definition.cardinality === PropertyCardinality.Single ? 'Single-Select' : 'Multi-Select';
-
-    return (
-        <Tooltip
-            color="#373D44"
-            title={
-                <>
-                    <Header>Property Options</Header>
-                    <List>
-                        {structuredProperty.definition.allowedValues?.map((value) => (
-                            <li>{getStructuredPropertyValue(value.value)}</li>
-                        ))}
-                    </List>
-                </>
-            }
-        >
-            <PropertyTypeBadge count={labelText} />
-        </Tooltip>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx
index 711ebb8e3c9266..45db88d032a246 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/Edit/EditColumn.tsx
@@ -12,7 +12,7 @@ import { ToastType, showToastMessage } from '@src/app/sharedV2/toastMessageUtils
 import { useRemoveStructuredPropertiesMutation } from '@src/graphql/structuredProperties.generated';
 import { EntityType, StructuredPropertyEntity } from '@src/types.generated';
 
-export const MoreOptionsContainer = styled.div`
+const MoreOptionsContainer = styled.div`
     display: flex;
     gap: 12px;
     justify-content: end;
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/NameColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/NameColumn.tsx
deleted file mode 100644
index 31fb3dbe055a9e..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/NameColumn.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import { Tooltip, Typography } from 'antd';
-import React from 'react';
-import Highlight from 'react-highlighter';
-import styled from 'styled-components';
-
-import ChildCountLabel from '@app/entity/shared/tabs/Dataset/Schema/components/ChildCountLabel';
-import PropertyTypeLabel from '@app/entity/shared/tabs/Dataset/Schema/components/PropertyTypeLabel';
-import CardinalityLabel from '@app/entity/shared/tabs/Properties/CardinalityLabel';
-import StructuredPropertyTooltip from '@app/entity/shared/tabs/Properties/StructuredPropertyTooltip';
-import { PropertyRow } from '@app/entity/shared/tabs/Properties/types';
-
-const ParentNameText = styled(Typography.Text)`
-    color: #373d44;
-    font-size: 16px;
-    font-family: Manrope;
-    font-weight: 600;
-    line-height: 20px;
-    word-wrap: break-word;
-    padding-left: 16px;
-    display: flex;
-    align-items: center;
-`;
-
-const ChildNameText = styled(Typography.Text)`
-    align-self: stretch;
-    color: #373d44;
-    font-size: 14px;
-    font-family: Manrope;
-    font-weight: 500;
-    line-height: 18px;
-    word-wrap: break-word;
-    padding-left: 16px;
-    display: flex;
-    align-items: center;
-`;
-
-const NameLabelWrapper = styled.span`
-    display: inline-flex;
-    align-items: center;
-    flex-wrap: wrap;
-`;
-
-interface Props {
-    propertyRow: PropertyRow;
-    filterText?: string;
-}
-
-export default function NameColumn({ propertyRow, filterText }: Props) {
-    const { structuredProperty } = propertyRow;
-    return (
-        <>
-            {propertyRow.children ? (
-                <NameLabelWrapper>
-                    <ParentNameText>
-                        <Highlight search={filterText}>{propertyRow.displayName}</Highlight>
-                    </ParentNameText>
-                    {propertyRow.childrenCount ? <ChildCountLabel count={propertyRow.childrenCount} /> : <span />}
-                </NameLabelWrapper>
-            ) : (
-                <NameLabelWrapper>
-                    <Tooltip
-                        color="#373D44"
-                        placement="topRight"
-                        title={
-                            structuredProperty ? (
-                                <StructuredPropertyTooltip structuredProperty={structuredProperty} />
-                            ) : (
-                                ''
-                            )
-                        }
-                    >
-                        <ChildNameText>
-                            <Highlight search={filterText}>{propertyRow.displayName}</Highlight>
-                        </ChildNameText>
-                    </Tooltip>
-                    {propertyRow.type ? (
-                        <PropertyTypeLabel type={propertyRow.type} dataType={propertyRow.dataType} />
-                    ) : (
-                        <span />
-                    )}
-                    {structuredProperty?.definition?.allowedValues && (
-                        <CardinalityLabel structuredProperty={structuredProperty} />
-                    )}
-                </NameLabelWrapper>
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/PropertiesTab.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/PropertiesTab.tsx
deleted file mode 100644
index 6e67f297fb36ad..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/PropertiesTab.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { StyledTable as Table } from '@app/entity/shared/components/styled/StyledTable';
-import ExpandIcon from '@app/entity/shared/tabs/Dataset/Schema/components/ExpandIcon';
-import { EditColumn } from '@app/entity/shared/tabs/Properties/Edit/EditColumn';
-import NameColumn from '@app/entity/shared/tabs/Properties/NameColumn';
-import TabHeader from '@app/entity/shared/tabs/Properties/TabHeader';
-import ValuesColumn from '@app/entity/shared/tabs/Properties/ValuesColumn';
-import { PropertyRow } from '@app/entity/shared/tabs/Properties/types';
-import useStructuredProperties from '@app/entity/shared/tabs/Properties/useStructuredProperties';
-import useUpdateExpandedRowsFromFilter from '@app/entity/shared/tabs/Properties/useUpdateExpandedRowsFromFilter';
-import {
-    getFilteredCustomProperties,
-    mapCustomPropertiesToPropertyRows,
-} from '@app/entity/shared/tabs/Properties/utils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-const StyledTable = styled(Table)`
-    &&& .ant-table-cell-with-append {
-        padding: 4px;
-    }
-` as typeof Table;
-
-export const PropertiesTab = () => {
-    const [filterText, setFilterText] = useState('');
-    const { entityData } = useEntityData();
-    const entityRegistry = useEntityRegistry();
-
-    const propertyTableColumns = [
-        {
-            width: '40%',
-            title: 'Name',
-            defaultSortOrder: 'ascend',
-            render: (propertyRow: PropertyRow) => <NameColumn propertyRow={propertyRow} filterText={filterText} />,
-        },
-        {
-            title: 'Value',
-            render: (propertyRow: PropertyRow) => <ValuesColumn propertyRow={propertyRow} filterText={filterText} />,
-        },
-    ];
-
-    if (entityData?.privileges?.canEditProperties) {
-        propertyTableColumns.push({
-            title: '',
-            width: '10%',
-            render: (propertyRow: PropertyRow) => (
-                <EditColumn
-                    structuredProperty={propertyRow.structuredProperty}
-                    associatedUrn={propertyRow.associatedUrn}
-                    values={propertyRow.values?.map((v) => v.value) || []}
-                />
-            ),
-        } as any);
-    }
-
-    const { structuredPropertyRows, expandedRowsFromFilter } = useStructuredProperties(entityRegistry, filterText);
-    const filteredStructuredPropertyRows = structuredPropertyRows.filter(
-        (row) => !row.structuredProperty?.settings?.isHidden,
-    );
-    const customProperties = getFilteredCustomProperties(filterText, entityData) || [];
-    const customPropertyRows = mapCustomPropertiesToPropertyRows(customProperties);
-    const dataSource: PropertyRow[] = filteredStructuredPropertyRows.concat(customPropertyRows);
-
-    const [expandedRows, setExpandedRows] = useState<Set<string>>(new Set());
-
-    useUpdateExpandedRowsFromFilter({ expandedRowsFromFilter, setExpandedRows });
-
-    return (
-        <>
-            <TabHeader setFilterText={setFilterText} />
-            <StyledTable
-                pagination={false}
-                // typescript is complaining that default sort order is not a valid column field- overriding this here
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore
-                columns={propertyTableColumns}
-                dataSource={dataSource}
-                rowKey="qualifiedName"
-                expandable={{
-                    expandedRowKeys: [...Array.from(expandedRows)],
-                    defaultExpandAllRows: false,
-                    expandRowByClick: false,
-                    expandIcon: ExpandIcon,
-                    onExpand: (expanded, record) => {
-                        if (expanded) {
-                            setExpandedRows((previousRows) => new Set(previousRows.add(record.qualifiedName)));
-                        } else {
-                            setExpandedRows((previousRows) => {
-                                previousRows.delete(record.qualifiedName);
-                                return new Set(previousRows);
-                            });
-                        }
-                    },
-                    indentSize: 0,
-                }}
-            />
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/StructuredPropertyTooltip.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/StructuredPropertyTooltip.tsx
deleted file mode 100644
index 64a7da40cc2d26..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/StructuredPropertyTooltip.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { StructuredPropertyEntity } from '@types';
-
-const ContentWrapper = styled.div`
-    font-size: 12px;
-`;
-
-const Header = styled.div`
-    font-size: 10px;
-`;
-
-const Description = styled.div`
-    padding-left: 16px;
-`;
-
-interface Props {
-    structuredProperty: StructuredPropertyEntity;
-}
-
-export default function StructuredPropertyTooltip({ structuredProperty }: Props) {
-    return (
-        <ContentWrapper>
-            <Header>Structured Property</Header>
-            <div>{structuredProperty.definition.displayName || structuredProperty.definition.qualifiedName}</div>
-            {structuredProperty.definition.description && (
-                <Description>{structuredProperty.definition.description}</Description>
-            )}
-        </ContentWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/StructuredPropertyValue.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/StructuredPropertyValue.tsx
deleted file mode 100644
index 9fc7f469b2d18a..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/StructuredPropertyValue.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import Icon from '@ant-design/icons/lib/components/Icon';
-import { Typography } from 'antd';
-import React from 'react';
-import Highlight from 'react-highlighter';
-import styled from 'styled-components';
-
-import EntityIcon from '@app/entity/shared/components/styled/EntityIcon';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import CompactMarkdownViewer from '@app/entity/shared/tabs/Documentation/components/CompactMarkdownViewer';
-import { ValueColumnData } from '@app/entity/shared/tabs/Properties/types';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import ExternalLink from '@images/link-out.svg?react';
-
-const ValueText = styled(Typography.Text)`
-    font-family: 'Manrope';
-    font-weight: 400;
-    font-size: 12px;
-    color: ${ANTD_GRAY[9]};
-    display: block;
-    width: 100%;
-    margin-bottom: 2px;
-
-    .remirror-editor.ProseMirror {
-        font-size: 12px;
-    }
-`;
-
-const StyledIcon = styled(Icon)`
-    margin-left: 6px;
-`;
-
-const IconWrapper = styled.span`
-    margin-right: 4px;
-    display: flex;
-`;
-
-const EntityWrapper = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const EntityName = styled(Typography.Text)`
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-`;
-
-const StyledHighlight = styled(Highlight)<{ truncateText?: boolean }>`
-    line-height: 1.5;
-    text-wrap: wrap;
-
-    ${(props) =>
-        props.truncateText &&
-        `
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        max-width: 100%;
-        display: block;
-    `}
-`;
-
-interface Props {
-    value: ValueColumnData;
-    isRichText?: boolean;
-    filterText?: string;
-    truncateText?: boolean;
-    isFieldColumn?: boolean;
-}
-
-export default function StructuredPropertyValue({ value, isRichText, filterText, truncateText, isFieldColumn }: Props) {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <ValueText>
-            {value.entity ? (
-                <EntityWrapper>
-                    <IconWrapper>
-                        <EntityIcon entity={value.entity} size={12} />
-                    </IconWrapper>
-                    <EntityName ellipsis={{ tooltip: true }}>
-                        {entityRegistry.getDisplayName(value.entity.type, value.entity)}
-                    </EntityName>
-                    <Typography.Link
-                        href={entityRegistry.getEntityUrl(value.entity.type, value.entity.urn)}
-                        target="_blank"
-                        rel="noopener noreferrer"
-                    >
-                        <StyledIcon component={ExternalLink} />
-                    </Typography.Link>
-                </EntityWrapper>
-            ) : (
-                <>
-                    {isRichText ? (
-                        <CompactMarkdownViewer
-                            content={value.value?.toString() ?? ''}
-                            lineLimit={isFieldColumn ? 1 : undefined}
-                            hideShowMore={isFieldColumn}
-                            scrollableY={!isFieldColumn}
-                        />
-                    ) : (
-                        <>
-                            {truncateText ? (
-                                <Typography.Text ellipsis={{ tooltip: true }}>
-                                    {value.value?.toString() || <div style={{ minHeight: 22 }} />}
-                                </Typography.Text>
-                            ) : (
-                                <StyledHighlight search={filterText} truncateText={truncateText}>
-                                    {value.value?.toString() || <div style={{ minHeight: 22 }} />}
-                                </StyledHighlight>
-                            )}
-                        </>
-                    )}
-                </>
-            )}
-        </ValueText>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/ValuesColumn.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/ValuesColumn.tsx
deleted file mode 100644
index 30ef3f24e3be86..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/ValuesColumn.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-
-import StructuredPropertyValue from '@app/entity/shared/tabs/Properties/StructuredPropertyValue';
-import { PropertyRow } from '@app/entity/shared/tabs/Properties/types';
-
-import { StdDataType } from '@types';
-
-interface Props {
-    propertyRow: PropertyRow;
-    filterText?: string;
-}
-
-export default function ValuesColumn({ propertyRow, filterText }: Props) {
-    const { values } = propertyRow;
-    const isRichText = propertyRow.dataType?.info?.type === StdDataType.RichText;
-
-    return (
-        <>
-            {values ? (
-                values.map((v) => <StructuredPropertyValue value={v} isRichText={isRichText} filterText={filterText} />)
-            ) : (
-                <span />
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts b/datahub-web-react/src/app/entity/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts
deleted file mode 100644
index 027b248236562d..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/__tests__/useStructuredProperties.test.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { identifyAndAddParentRows } from '@app/entity/shared/tabs/Properties/useStructuredProperties';
-
-describe('identifyAndAddParentRows', () => {
-    it('should not return parent rows when there are none', () => {
-        const propertyRows = [
-            { displayName: 'test1', qualifiedName: 'test1' },
-            { displayName: 'test2', qualifiedName: 'test2' },
-        ];
-        expect(identifyAndAddParentRows(propertyRows)).toMatchObject([]);
-    });
-
-    it('should not return parent rows when another row starts with the same letters but is a different token', () => {
-        const propertyRows = [
-            { displayName: 'test1', qualifiedName: 'testing.one' },
-            { displayName: 'test2', qualifiedName: 'testingAgain.two' },
-        ];
-        expect(identifyAndAddParentRows(propertyRows)).toMatchObject([]);
-    });
-
-    it('should return parent rows properly', () => {
-        const propertyRows = [
-            { displayName: 'test1', qualifiedName: 'testing.one' },
-            { displayName: 'test2', qualifiedName: 'testing.two' },
-            { displayName: 'test3', qualifiedName: 'testing.three' },
-        ];
-        expect(identifyAndAddParentRows(propertyRows)).toMatchObject([
-            { displayName: 'testing', qualifiedName: 'testing', childrenCount: 3 },
-        ]);
-    });
-
-    it('should return parent rows properly with multiple layers of nesting', () => {
-        const propertyRows = [
-            { displayName: 'test1', qualifiedName: 'testing.one.two.a.1' },
-            { displayName: 'test1', qualifiedName: 'testing.one.two.a.2' },
-            { displayName: 'test1', qualifiedName: 'testing.one.two.b' },
-            { displayName: 'test1', qualifiedName: 'testing.one.three' },
-            { displayName: 'test2', qualifiedName: 'testing.two.c.d' },
-            { displayName: 'test3', qualifiedName: 'testing.three' },
-            { displayName: 'test3', qualifiedName: 'testParent' },
-        ];
-        expect(identifyAndAddParentRows(propertyRows)).toMatchObject([
-            { displayName: 'testing', qualifiedName: 'testing', isParentRow: true, childrenCount: 6 },
-            { displayName: 'testing.one', qualifiedName: 'testing.one', isParentRow: true, childrenCount: 4 },
-            { displayName: 'testing.one.two', qualifiedName: 'testing.one.two', isParentRow: true, childrenCount: 3 },
-            {
-                displayName: 'testing.one.two.a',
-                qualifiedName: 'testing.one.two.a',
-                isParentRow: true,
-                childrenCount: 2,
-            },
-        ]);
-    });
-
-    it('should return parent rows properly with multiple layers of nesting regardless of order', () => {
-        const propertyRows = [
-            { displayName: 'test1', qualifiedName: 'testing.one.two.a.1' },
-            { displayName: 'test3', qualifiedName: 'testParent' },
-            { displayName: 'test1', qualifiedName: 'testing.one.three' },
-            { displayName: 'test2', qualifiedName: 'testing.two.c.d' },
-            { displayName: 'test1', qualifiedName: 'testing.one.two.b' },
-            { displayName: 'test3', qualifiedName: 'testing.three' },
-            { displayName: 'test1', qualifiedName: 'testing.one.two.a.2' },
-        ];
-        expect(identifyAndAddParentRows(propertyRows)).toMatchObject([
-            { displayName: 'testing', qualifiedName: 'testing', isParentRow: true, childrenCount: 6 },
-            { displayName: 'testing.one', qualifiedName: 'testing.one', isParentRow: true, childrenCount: 4 },
-            { displayName: 'testing.one.two', qualifiedName: 'testing.one.two', isParentRow: true, childrenCount: 3 },
-            {
-                displayName: 'testing.one.two.a',
-                qualifiedName: 'testing.one.two.a',
-                isParentRow: true,
-                childrenCount: 2,
-            },
-        ]);
-    });
-
-    it('should return parent rows properly with simpler layers of nesting', () => {
-        const propertyRows = [
-            { displayName: 'test2', qualifiedName: 'testing.two.c.d' },
-            { displayName: 'test3', qualifiedName: 'testing.three' },
-            { displayName: 'test3', qualifiedName: 'testParent' },
-        ];
-        expect(identifyAndAddParentRows(propertyRows)).toMatchObject([
-            { displayName: 'testing', qualifiedName: 'testing', isParentRow: true, childrenCount: 2 },
-        ]);
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/__tests__/utils.test.ts b/datahub-web-react/src/app/entity/shared/tabs/Properties/__tests__/utils.test.ts
deleted file mode 100644
index 3b5e1d6e37af7e..00000000000000
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/__tests__/utils.test.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { PropertyRow } from '@app/entity/shared/tabs/Properties/types';
-import { filterStructuredProperties } from '@app/entity/shared/tabs/Properties/utils';
-import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer';
-
-describe('filterSchemaRows', () => {
-    const testEntityRegistry = getTestEntityRegistry();
-    const rows = [
-        {
-            displayName: 'Has PII',
-            qualifiedName: 'io.acryl.ads.data_protection.has_pii',
-            values: [{ value: 'yes', entity: null }],
-        },
-        {
-            displayName: 'Discovery Date Utc',
-            qualifiedName: 'io.acryl.ads.change_management.discovery_date_utc',
-            values: [{ value: '2023-10-31', entity: null }],
-        },
-        {
-            displayName: 'Link Data Location',
-            qualifiedName: 'io.acryl.ads.context.data_location',
-            values: [{ value: 'New York City', entity: null }],
-        },
-        {
-            displayName: 'Number Prop',
-            qualifiedName: 'io.acryl.ads.number',
-            values: [{ value: 100, entity: null }],
-        },
-    ] as PropertyRow[];
-
-    it('should properly filter structured properties based on field name', () => {
-        const filterText = 'has pi';
-        const { filteredRows, expandedRowsFromFilter } = filterStructuredProperties(
-            testEntityRegistry,
-            rows,
-            filterText,
-        );
-
-        expect(filteredRows).toMatchObject([
-            {
-                displayName: 'Has PII',
-                qualifiedName: 'io.acryl.ads.data_protection.has_pii',
-                values: [{ value: 'yes', entity: null }],
-            },
-        ]);
-        expect(expandedRowsFromFilter).toMatchObject(
-            new Set(['io', 'io.acryl', 'io.acryl.ads', 'io.acryl.ads.data_protection']),
-        );
-    });
-
-    it('should properly filter structured properties based on field value', () => {
-        const filterText = 'new york';
-        const { filteredRows, expandedRowsFromFilter } = filterStructuredProperties(
-            testEntityRegistry,
-            rows,
-            filterText,
-        );
-
-        expect(filteredRows).toMatchObject([
-            {
-                displayName: 'Link Data Location',
-                qualifiedName: 'io.acryl.ads.context.data_location',
-                values: [{ value: 'New York City', entity: null }],
-            },
-        ]);
-        expect(expandedRowsFromFilter).toMatchObject(
-            new Set(['io', 'io.acryl', 'io.acryl.ads', 'io.acryl.ads.context']),
-        );
-    });
-
-    it('should properly filter structured properties based on field value even for numbers', () => {
-        const filterText = '100';
-        const { filteredRows, expandedRowsFromFilter } = filterStructuredProperties(
-            testEntityRegistry,
-            rows,
-            filterText,
-        );
-
-        expect(filteredRows).toMatchObject([
-            {
-                displayName: 'Number Prop',
-                qualifiedName: 'io.acryl.ads.number',
-                values: [{ value: 100, entity: null }],
-            },
-        ]);
-        expect(expandedRowsFromFilter).toMatchObject(new Set(['io', 'io.acryl', 'io.acryl.ads']));
-    });
-});
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/types.ts b/datahub-web-react/src/app/entity/shared/tabs/Properties/types.ts
index 370fc94488148e..dab1db5f075768 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/types.ts
+++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/types.ts
@@ -1,6 +1,6 @@
 import { DataTypeEntity, Entity, StructuredPropertyEntity } from '@types';
 
-export interface ValueColumnData {
+interface ValueColumnData {
     value: string | number | null;
     entity: Entity | null;
 }
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/useStructuredProperties.tsx b/datahub-web-react/src/app/entity/shared/tabs/Properties/useStructuredProperties.tsx
index d4aa029d48cff2..9b6c747f650dd2 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/useStructuredProperties.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/useStructuredProperties.tsx
@@ -1,8 +1,4 @@
-import EntityRegistry from '@app/entity/EntityRegistry';
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { PropertyRow } from '@app/entity/shared/tabs/Properties/types';
-import { filterStructuredProperties } from '@app/entity/shared/tabs/Properties/utils';
-import { GenericEntityProperties } from '@app/entity/shared/types';
+
 import { getStructuredPropertyValue } from '@app/entity/shared/utils';
 
 import { PropertyValue, StructuredPropertiesEntry } from '@types';
@@ -12,7 +8,7 @@ const typeNameToType = {
     NumberValue: { type: 'number', nativeDataType: 'float' },
 };
 
-export function mapStructuredPropertyValues(structuredPropertiesEntry: StructuredPropertiesEntry) {
+function mapStructuredPropertyValues(structuredPropertiesEntry: StructuredPropertiesEntry) {
     return structuredPropertiesEntry.values
         .filter((value) => !!value)
         .map((value) => ({
@@ -43,198 +39,3 @@ export function mapStructuredPropertyToPropertyRow(structuredPropertiesEntry: St
         attribution: structuredPropertiesEntry.attribution,
     };
 }
-
-// map the properties map into a list of PropertyRow objects to render in a table
-function getStructuredPropertyRows(entityData?: GenericEntityProperties | null) {
-    const structuredPropertyRows: PropertyRow[] = [];
-
-    entityData?.structuredProperties?.properties
-        ?.filter((prop) => prop.structuredProperty.exists)
-        .forEach((structuredPropertiesEntry) => {
-            const { displayName, qualifiedName } = structuredPropertiesEntry.structuredProperty.definition;
-            structuredPropertyRows.push({
-                displayName: displayName || qualifiedName,
-                qualifiedName,
-                values: mapStructuredPropertyValues(structuredPropertiesEntry),
-                dataType: structuredPropertiesEntry.structuredProperty.definition.valueType,
-                structuredProperty: structuredPropertiesEntry.structuredProperty,
-                type:
-                    structuredPropertiesEntry.values[0] && structuredPropertiesEntry.values[0].__typename
-                        ? {
-                              type: typeNameToType[structuredPropertiesEntry.values[0].__typename].type,
-                              nativeDataType:
-                                  typeNameToType[structuredPropertiesEntry.values[0].__typename].nativeDataType,
-                          }
-                        : undefined,
-                associatedUrn: structuredPropertiesEntry.associatedUrn,
-            });
-        });
-
-    return structuredPropertyRows;
-}
-
-export function findAllSubstrings(s: string): Array<string> {
-    const substrings: Array<string> = [];
-
-    for (let i = 0; i < s.length; i++) {
-        if (s[i] === '.') {
-            substrings.push(s.substring(0, i));
-        }
-    }
-    substrings.push(s);
-    return substrings;
-}
-
-export function createParentPropertyRow(displayName: string, qualifiedName: string): PropertyRow {
-    return {
-        displayName,
-        qualifiedName,
-        isParentRow: true,
-    };
-}
-
-export function identifyAndAddParentRows(rows?: Array<PropertyRow>): Array<PropertyRow> {
-    /**
-     * This function takes in an array of PropertyRow objects and determines which rows are parents. These parents need
-     * to be extracted in order to organize the rows into a properly nested structure later on. The final product returned
-     * is a list of parent rows, without values or children assigned.
-     */
-    const qualifiedNames: Array<string> = [];
-
-    // Get list of fqns
-    if (rows) {
-        rows.forEach((row) => {
-            qualifiedNames.push(row.qualifiedName);
-        });
-    }
-
-    const finalParents: PropertyRow[] = [];
-    const finalParentNames = new Set();
-
-    // Loop through list of fqns and find all substrings.
-    // e.g. a.b.c.d becomes a, a.b, a.b.c, a.b.c.d
-    qualifiedNames.forEach((fqn) => {
-        let previousCount: number | null = null;
-        let previousParentName = '';
-
-        const substrings = findAllSubstrings(fqn);
-
-        // Loop through substrings and count how many other fqns have that substring in them. Use this to determine
-        // if a property should be nested. If the count is equal then we should not nest, because there's no split
-        // that would tell us to nest. If the count is not equal, we should nest the child properties.
-        for (let index = 0; index < substrings.length; index++) {
-            const token = substrings[index];
-            const currentCount = qualifiedNames.filter((name) => name.startsWith(`${token}.`)).length;
-
-            // If there's only one child, don't nest it
-            if (currentCount === 1) {
-                break;
-            }
-
-            // Add previous fqn, or,previousParentName, if we have found a viable parent path
-            if (previousCount !== null && previousCount !== currentCount) {
-                if (!finalParentNames.has(previousParentName)) {
-                    const parent: PropertyRow = createParentPropertyRow(previousParentName, previousParentName);
-                    parent.childrenCount = previousCount;
-                    finalParentNames.add(previousParentName);
-                    finalParents.push(parent);
-                }
-            }
-
-            previousCount = currentCount;
-            previousParentName = token;
-        }
-    });
-
-    return finalParents;
-}
-
-export function groupByParentProperty(rows?: Array<PropertyRow>): Array<PropertyRow> {
-    /**
-     * This function takes in an array of PropertyRow objects, representing parent and child properties. Parent properties
-     * will not have values, but child properties will. It organizes the rows into the parent and child structure and
-     * returns a list of PropertyRow objects representing it.
-     */
-    const outputRows: Array<PropertyRow> = [];
-    const outputRowByPath = {};
-
-    if (rows) {
-        // Iterate through all rows
-        for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
-            let parentRow: null | PropertyRow = null;
-            const row = { children: undefined, ...rows[rowIndex], depth: 0 };
-
-            // Iterate through a row's characters, and split the row's path into tokens
-            // e.g. a, b, c for the example a.b.c
-            for (let j = rowIndex - 1; j >= 0; j--) {
-                const rowTokens = row.qualifiedName.split('.');
-                let parentPath: null | string = null;
-                let previousParentPath = rowTokens.slice(0, rowTokens.length - 1).join('.');
-
-                // Iterate through a row's path backwards, and check if the previous row's path has been seen. If it has,
-                // populate parentRow. If not, move on to the next path token.
-                // e.g. for a.b.c.d, first evaluate a.b.c to see if it has been seen. If it hasn't, move to a.b
-                for (
-                    let lastParentTokenIndex = rowTokens.length - 2;
-                    lastParentTokenIndex >= 0;
-                    --lastParentTokenIndex
-                ) {
-                    const lastParentToken: string = rowTokens[lastParentTokenIndex];
-                    if (lastParentToken && Object.keys(outputRowByPath).includes(previousParentPath)) {
-                        parentPath = rowTokens.slice(0, lastParentTokenIndex + 1).join('.');
-                        break;
-                    }
-                    previousParentPath = rowTokens.slice(0, lastParentTokenIndex).join('.');
-                }
-
-                if (parentPath && rows[j].qualifiedName === parentPath) {
-                    parentRow = outputRowByPath[rows[j].qualifiedName];
-                    break;
-                }
-            }
-
-            // If the parent row exists in the ouput, add the current row as a child. If not, add the current row
-            // to the final output.
-            if (parentRow) {
-                row.depth = (parentRow.depth || 0) + 1;
-                row.parent = parentRow;
-                if (row.isParentRow) {
-                    row.displayName = row.displayName.replace(`${parentRow.displayName}.`, '');
-                }
-                parentRow.children = [...(parentRow.children || []), row];
-            } else {
-                outputRows.push(row);
-            }
-            outputRowByPath[row.qualifiedName] = row;
-        }
-    }
-    return outputRows;
-}
-
-export default function useStructuredProperties(entityRegistry: EntityRegistry, filterText?: string) {
-    const { entityData } = useEntityData();
-
-    let structuredPropertyRowsRaw = getStructuredPropertyRows(entityData);
-    const parentRows = identifyAndAddParentRows(structuredPropertyRowsRaw);
-
-    structuredPropertyRowsRaw = [...structuredPropertyRowsRaw, ...parentRows];
-
-    const { filteredRows, expandedRowsFromFilter } = filterStructuredProperties(
-        entityRegistry,
-        structuredPropertyRowsRaw,
-        filterText,
-    );
-
-    // Sort by fqn before nesting algorithm
-    const copy = [...filteredRows].sort((a, b) => {
-        return a.qualifiedName.localeCompare(b.qualifiedName);
-    });
-
-    // group properties by path
-    const structuredPropertyRows = groupByParentProperty(copy);
-
-    return {
-        structuredPropertyRows,
-        expandedRowsFromFilter: expandedRowsFromFilter as Set<string>,
-    };
-}
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Properties/utils.ts b/datahub-web-react/src/app/entity/shared/tabs/Properties/utils.ts
index a53544d4db4ce9..41409df06f658c 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Properties/utils.ts
+++ b/datahub-web-react/src/app/entity/shared/tabs/Properties/utils.ts
@@ -1,5 +1,5 @@
-import EntityRegistry from '@app/entity/EntityRegistry';
-import { PropertyRow, ValueColumnData } from '@app/entity/shared/tabs/Properties/types';
+
+import { PropertyRow } from '@app/entity/shared/tabs/Properties/types';
 import { GenericEntityProperties } from '@app/entity/shared/types';
 
 import { CustomPropertiesEntry } from '@types';
@@ -16,54 +16,8 @@ function matchesName(name: string, filterText: string) {
     return name.toLocaleLowerCase().includes(filterText.toLocaleLowerCase());
 }
 
-function matchesAnyFromValues(values: ValueColumnData[], filterText: string, entityRegistry: EntityRegistry) {
-    return values.some(
-        (value) =>
-            matchesName(value.value?.toString() || '', filterText) ||
-            matchesName(value.entity ? entityRegistry.getDisplayName(value.entity.type, value.entity) : '', filterText),
-    );
-}
-
 export function getFilteredCustomProperties(filterText: string, entityData?: GenericEntityProperties | null) {
     return entityData?.customProperties?.filter(
         (property) => matchesName(property.key, filterText) || matchesName(property.value || '', filterText),
     );
 }
-
-export function filterStructuredProperties(
-    entityRegistry: EntityRegistry,
-    propertyRows: PropertyRow[],
-    filterText?: string,
-) {
-    if (!propertyRows) return { filteredRows: [], expandedRowsFromFilter: new Set() };
-    if (!filterText) return { filteredRows: propertyRows, expandedRowsFromFilter: new Set() };
-    const formattedFilterText = filterText.toLocaleLowerCase();
-
-    const finalQualifiedNames = new Set<string>();
-    const expandedRowsFromFilter = new Set<string>();
-
-    propertyRows.forEach((row) => {
-        // if we match on the qualified name (maybe from a parent) do not filter out
-        if (matchesName(row.qualifiedName, formattedFilterText)) {
-            finalQualifiedNames.add(row.qualifiedName);
-        }
-        // if we match specifically on this property (not just its parent), add and expand all parents
-        if (
-            matchesName(row.displayName, formattedFilterText) ||
-            matchesAnyFromValues(row.values || [], formattedFilterText, entityRegistry)
-        ) {
-            finalQualifiedNames.add(row.qualifiedName);
-
-            const splitFieldPath = row.qualifiedName.split('.');
-            splitFieldPath.reduce((previous, current) => {
-                finalQualifiedNames.add(previous);
-                expandedRowsFromFilter.add(previous);
-                return `${previous}.${current}`;
-            });
-        }
-    });
-
-    const filteredRows = propertyRows.filter((row) => finalQualifiedNames.has(row.qualifiedName));
-
-    return { filteredRows, expandedRowsFromFilter };
-}
diff --git a/datahub-web-react/src/app/entity/shared/types.ts b/datahub-web-react/src/app/entity/shared/types.ts
index eda056f17efa54..fa3a6ccd54fd79 100644
--- a/datahub-web-react/src/app/entity/shared/types.ts
+++ b/datahub-web-react/src/app/entity/shared/types.ts
@@ -54,18 +54,6 @@ import {
     VersionProperties,
 } from '@types';
 
-export type EntityTab = {
-    name: string;
-    component: React.FunctionComponent<{ properties?: any }>;
-    display?: {
-        visible: (GenericEntityProperties, T) => boolean; // Whether the tab is visible on the UI. Defaults to true.
-        enabled: (GenericEntityProperties, T) => boolean; // Whether the tab is enabled on the UI. Defaults to true.
-    };
-    properties?: any;
-    id?: string;
-    getDynamicName?: (GenericEntityProperties, T) => string;
-};
-
 export type EntitySidebarSection = {
     component: React.FunctionComponent<{ properties?: any; readOnly?: boolean }>;
     display?: {
@@ -201,10 +189,6 @@ export type SchemaContextType = {
     refetch?: () => Promise<any>;
 };
 
-export type RequiredAndNotNull<T> = {
-    [P in keyof T]-?: Exclude<T[P], null | undefined>;
-};
-
 export type EntityAndType = {
     urn: string;
     type: EntityType;
diff --git a/datahub-web-react/src/app/entity/shared/utils.ts b/datahub-web-react/src/app/entity/shared/utils.ts
index 6074051e00ab02..ebacb2192e5605 100644
--- a/datahub-web-react/src/app/entity/shared/utils.ts
+++ b/datahub-web-react/src/app/entity/shared/utils.ts
@@ -1,9 +1,9 @@
-import { Maybe } from 'graphql/jsutils/Maybe';
+
 
 import { GenericEntityProperties } from '@app/entity/shared/types';
 import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
 
-import { DataProduct, Entity, EntityRelationshipsResult, EntityType, PropertyValue } from '@types';
+import { Entity, EntityType, PropertyValue } from '@types';
 
 export function dictToQueryStringParams(params: Record<string, string | boolean>) {
     return Object.keys(params)
@@ -32,12 +32,6 @@ export function decodeUrn(encodedUrn: string) {
     return decodeURIComponent(encodedUrn).replace(/{{encoded_percent}}/g, '%');
 }
 
-export function getNumberWithOrdinal(n) {
-    const suffixes = ['th', 'st', 'nd', 'rd'];
-    const v = n % 100;
-    return n + (suffixes[(v - 20) % 10] || suffixes[v] || suffixes[0]);
-}
-
 export const encodeComma = (str: string) => {
     return str.replace(/,/g, '%2C');
 };
@@ -46,10 +40,6 @@ export const decodeComma = (str: string) => {
     return str.replace(/%2C/g, ',');
 };
 
-export function notEmpty<TValue>(value: TValue | null | undefined): value is TValue {
-    return value !== null && value !== undefined;
-}
-
 export const truncate = (length: number, input?: string | null) => {
     if (!input) return '';
     if (input.length > length) {
@@ -75,8 +65,6 @@ export function getPlatformName(entityData: GenericEntityProperties | null) {
     return entityData?.platform?.properties?.displayName || capitalizeFirstLetterOnly(entityData?.platform?.name);
 }
 
-export const EDITED_DESCRIPTIONS_CACHE_NAME = 'editedDescriptions';
-
 export const FORBIDDEN_URN_CHARS_REGEX = /.*[(),\\].*/;
 
 /**
@@ -125,12 +113,6 @@ export function getFineGrainedLineageWithSiblings(
     });
     return fineGrainedLineages;
 }
-export function getDataProduct(dataProductResult: Maybe<EntityRelationshipsResult> | undefined) {
-    if (dataProductResult?.relationships && dataProductResult.relationships.length > 0) {
-        return dataProductResult.relationships[0].entity as DataProduct;
-    }
-    return null;
-}
 
 export function getStructuredPropertyValue(value: PropertyValue) {
     if (value.__typename === 'StringValue') {
@@ -143,7 +125,7 @@ export function getStructuredPropertyValue(value: PropertyValue) {
 }
 
 // Utility for formatting any casing of type to the expected casing for the API
-export function formatEntityType(type: string): string {
+function formatEntityType(type: string): string {
     if (!type) return '';
 
     switch (type.toLowerCase()) {
diff --git a/datahub-web-react/src/app/entity/structuredProperty/StructuredPropertyEntity.tsx b/datahub-web-react/src/app/entity/structuredProperty/StructuredPropertyEntity.tsx
deleted file mode 100644
index 580b6606856b3e..00000000000000
--- a/datahub-web-react/src/app/entity/structuredProperty/StructuredPropertyEntity.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import * as React from 'react';
-import styled from 'styled-components';
-
-import { Entity, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { urlEncodeUrn } from '@app/entity/shared/utils';
-import DefaultPreviewCard from '@src/app/preview/DefaultPreviewCard';
-import { TYPE_ICON_CLASS_NAME } from '@src/app/shared/constants';
-import TableIcon from '@src/images/table-icon.svg?react';
-
-import { EntityType, SearchResult, StructuredPropertyEntity as StructuredProperty } from '@types';
-
-const PreviewPropIcon = styled(TableIcon)`
-    font-size: 20px;
-`;
-
-/**
- * Definition of the DataHub Structured Property entity.
- */
-export class StructuredPropertyEntity implements Entity<StructuredProperty> {
-    type: EntityType = EntityType.StructuredProperty;
-
-    icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <TableIcon className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <TableIcon className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#B37FEB' }} />;
-        }
-
-        return (
-            <TableIcon
-                className={TYPE_ICON_CLASS_NAME}
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => false;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getGraphName = () => 'structuredProperty';
-
-    getPathName: () => string = () => this.getGraphName();
-
-    getCollectionName: () => string = () => 'Structured Properties';
-
-    getEntityName: () => string = () => 'Structured Property';
-
-    renderProfile: (urn: string) => JSX.Element = (_urn) => <div />; // not used right now
-
-    renderPreview = (previewType: PreviewType, data: StructuredProperty) => (
-        <DefaultPreviewCard
-            description={data.definition?.description || ''}
-            name={this.displayName(data)}
-            urn={data.urn}
-            url={`/${this.getPathName()}/${urlEncodeUrn(data.urn)}`}
-            logoComponent={<PreviewPropIcon />}
-            typeIcon={this.icon(14, IconStyleType.ACCENT)}
-            previewType={previewType}
-        />
-    );
-
-    renderSearch = (result: SearchResult) => {
-        return this.renderPreview(PreviewType.SEARCH, result.entity as StructuredProperty);
-    };
-
-    displayName = (data: StructuredProperty) => {
-        return data.definition?.displayName || data.definition?.qualifiedName || data.urn;
-    };
-
-    getGenericEntityProperties = (entity: StructuredProperty) => {
-        return getDataForEntityType({ data: entity, entityType: this.type, getOverrideProperties: (data) => data });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/tag/Tag.tsx b/datahub-web-react/src/app/entity/tag/Tag.tsx
deleted file mode 100644
index 19cde74db62882..00000000000000
--- a/datahub-web-react/src/app/entity/tag/Tag.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import { TagFilled, TagOutlined } from '@ant-design/icons';
-import * as React from 'react';
-import styled from 'styled-components';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import { urlEncodeUrn } from '@app/entity/shared/utils';
-import TagProfile from '@app/entity/tag/TagProfile';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-
-import { useGetTagQuery } from '@graphql/tag.generated';
-import { EntityType, SearchResult, Tag } from '@types';
-
-const PreviewTagIcon = styled(TagOutlined)`
-    font-size: 20px;
-`;
-
-/**
- * Definition of the DataHub Tag entity.
- */
-export class TagEntity implements Entity<Tag> {
-    type: EntityType = EntityType.Tag;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <TagFilled style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <TagFilled style={{ fontSize, color: color || '#B37FEB' }} />;
-        }
-
-        return (
-            <TagOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => false;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'name';
-
-    getGraphName = () => 'tag';
-
-    getPathName: () => string = () => 'tag';
-
-    getCollectionName: () => string = () => 'Tags';
-
-    getEntityName: () => string = () => 'Tag';
-
-    useEntityQuery = useGetTagQuery;
-
-    renderProfile: (urn: string) => JSX.Element = (_) => <TagProfile />;
-
-    renderPreview = (previewType: PreviewType, data: Tag) => (
-        <DefaultPreviewCard
-            description={data.description || ''}
-            name={this.displayName(data)}
-            urn={data.urn}
-            url={`/${this.getPathName()}/${urlEncodeUrn(data.urn)}`}
-            logoComponent={<PreviewTagIcon />}
-            type="Tag"
-            typeIcon={this.icon(14, IconStyleType.ACCENT)}
-            previewType={previewType}
-        />
-    );
-
-    renderSearch = (result: SearchResult) => {
-        return this.renderPreview(PreviewType.SEARCH, result.entity as Tag);
-    };
-
-    displayName = (data: Tag) => {
-        return data.properties?.name || data.name || data.urn;
-    };
-
-    getGenericEntityProperties = (tag: Tag) => {
-        return getDataForEntityType({ data: tag, entityType: this.type, getOverrideProperties: (data) => data });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([EntityCapabilityType.OWNERS]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/tag/TagProfile.tsx b/datahub-web-react/src/app/entity/tag/TagProfile.tsx
deleted file mode 100644
index f86a8dbff1256c..00000000000000
--- a/datahub-web-react/src/app/entity/tag/TagProfile.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import { useParams } from 'react-router';
-import styled from 'styled-components';
-
-import { decodeUrn } from '@app/entity/shared/utils';
-import { Message } from '@app/shared/Message';
-import TagStyleEntity from '@app/shared/TagStyleEntity';
-
-import { useGetTagQuery } from '@graphql/tag.generated';
-
-const PageContainer = styled.div`
-    padding: 32px 100px;
-`;
-
-const LoadingMessage = styled(Message)`
-    margin-top: 10%;
-`;
-
-type TagPageParams = {
-    urn: string;
-};
-
-/**
- * Responsible for displaying metadata about a tag
- */
-export default function TagProfile() {
-    const { urn: encodedUrn } = useParams<TagPageParams>();
-    const urn = decodeUrn(encodedUrn);
-    const { loading } = useGetTagQuery({ variables: { urn } });
-
-    return (
-        <PageContainer>
-            {loading && <LoadingMessage type="loading" content="Loading..." />}
-            <TagStyleEntity urn={urn} />
-        </PageContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/tag/__tests__/TagProfile.test.tsx b/datahub-web-react/src/app/entity/tag/__tests__/TagProfile.test.tsx
deleted file mode 100644
index 4c88c0f4ef8de0..00000000000000
--- a/datahub-web-react/src/app/entity/tag/__tests__/TagProfile.test.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { render, waitFor } from '@testing-library/react';
-import React from 'react';
-import { Route } from 'react-router';
-
-import TagProfile from '@app/entity/tag/TagProfile';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-describe('TagProfile', () => {
-    it('renders tag details', async () => {
-        const { getByText, queryByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/tag/urn:li:tag:abc-sample-tag']}>
-                    <Route path="/tag/:urn" render={() => <TagProfile />} />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        await waitFor(() => expect(queryByText('abc-sample-tag')).toBeInTheDocument());
-
-        expect(getByText('abc-sample-tag')).toBeInTheDocument();
-        expect(getByText('sample tag description')).toBeInTheDocument();
-    });
-
-    it('renders tag ownership', async () => {
-        const { queryByText } = render(
-            <MockedProvider
-                mocks={mocks}
-                addTypename={false}
-                defaultOptions={{
-                    watchQuery: { fetchPolicy: 'no-cache' },
-                    query: { fetchPolicy: 'no-cache' },
-                }}
-            >
-                <TestPageContainer initialEntries={['/tag/urn:li:tag:abc-sample-tag']}>
-                    <Route path="/tag/:urn" render={() => <TagProfile />} />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        await waitFor(() => expect(queryByText('abc-sample-tag')).not.toBeInTheDocument());
-    });
-
-    it('renders stats', async () => {
-        const { queryByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/tag/urn:li:tag:abc-sample-tag']}>
-                    <Route path="/tag/:urn" render={() => <TagProfile />} />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        await waitFor(() => expect(queryByText('abc-sample-tag')).not.toBeInTheDocument());
-
-        await waitFor(() => expect(queryByText('Loading')).not.toBeInTheDocument());
-    });
-});
diff --git a/datahub-web-react/src/app/entity/user/User.tsx b/datahub-web-react/src/app/entity/user/User.tsx
deleted file mode 100644
index 41a12c14fda287..00000000000000
--- a/datahub-web-react/src/app/entity/user/User.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import { UserOutlined } from '@ant-design/icons';
-import * as React from 'react';
-
-import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '@app/entity/Entity';
-import { getDataForEntityType } from '@app/entity/shared/containers/profile/utils';
-import UserProfile from '@app/entity/user/UserProfile';
-import { Preview } from '@app/entity/user/preview/Preview';
-
-import { CorpUser, EntityType, SearchResult } from '@types';
-
-/**
- * Definition of the DataHub Dataset entity.
- */
-export class UserEntity implements Entity<CorpUser> {
-    type: EntityType = EntityType.CorpUser;
-
-    icon = (fontSize: number, styleType: IconStyleType, color?: string) => {
-        if (styleType === IconStyleType.TAB_VIEW) {
-            return <UserOutlined style={{ fontSize, color }} />;
-        }
-
-        if (styleType === IconStyleType.HIGHLIGHT) {
-            return <UserOutlined style={{ fontSize, color }} />;
-        }
-
-        return (
-            <UserOutlined
-                style={{
-                    fontSize,
-                    color: color || '#BFBFBF',
-                }}
-            />
-        );
-    };
-
-    isSearchEnabled = () => true;
-
-    isBrowseEnabled = () => false;
-
-    isLineageEnabled = () => false;
-
-    getAutoCompleteFieldName = () => 'username';
-
-    getGraphName: () => string = () => 'corpuser';
-
-    getPathName: () => string = () => 'user';
-
-    getEntityName = () => 'Person';
-
-    getCollectionName: () => string = () => 'People';
-
-    renderProfile: (urn: string) => JSX.Element = (_) => <UserProfile />;
-
-    renderPreview = (_: PreviewType, data: CorpUser) => (
-        <Preview
-            urn={data.urn}
-            name={this.displayName(data)}
-            title={data.editableProperties?.title || data.info?.title || ''}
-            photoUrl={data.editableInfo?.pictureLink || undefined}
-        />
-    );
-
-    renderSearch = (result: SearchResult) => {
-        return this.renderPreview(PreviewType.SEARCH, result.entity as CorpUser);
-    };
-
-    displayName = (data: CorpUser) => {
-        return (
-            data.editableProperties?.displayName ||
-            data.properties?.displayName ||
-            data.properties?.fullName ||
-            data.info?.displayName || // Deprecated info field
-            data.info?.fullName || // Deprecated info field
-            data.username ||
-            data.urn
-        );
-    };
-
-    getGenericEntityProperties = (user: CorpUser) => {
-        return getDataForEntityType({ data: user, entityType: this.type, getOverrideProperties: (data) => data });
-    };
-
-    supportedCapabilities = () => {
-        return new Set([EntityCapabilityType.ROLES]);
-    };
-}
diff --git a/datahub-web-react/src/app/entity/user/UserAssets.tsx b/datahub-web-react/src/app/entity/user/UserAssets.tsx
deleted file mode 100644
index e2cea33a72ec2e..00000000000000
--- a/datahub-web-react/src/app/entity/user/UserAssets.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { EmbeddedListSearchSection } from '@app/entity/shared/components/styled/search/EmbeddedListSearchSection';
-import { UnionType } from '@app/search/utils/constants';
-import useGetUserGroupUrns from '@src/app/entityV2/user/useGetUserGroupUrns';
-
-const UserAssetsWrapper = styled.div`
-    height: calc(100vh - 114px);
-    overflow: auto;
-`;
-
-type Props = {
-    urn: string;
-};
-
-export const UserAssets = ({ urn }: Props) => {
-    const { groupUrns, data, loading } = useGetUserGroupUrns(urn);
-
-    if (!data || loading) return null;
-
-    return (
-        <UserAssetsWrapper>
-            <EmbeddedListSearchSection
-                skipCache
-                fixedFilters={{
-                    unionType: UnionType.AND,
-                    filters: [{ field: 'owners', values: [urn, ...groupUrns] }],
-                }}
-                emptySearchQuery="*"
-                placeholderText="Filter entities..."
-            />
-        </UserAssetsWrapper>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/user/UserEditProfileModal.tsx b/datahub-web-react/src/app/entity/user/UserEditProfileModal.tsx
deleted file mode 100644
index aa93d1ddb7e9b9..00000000000000
--- a/datahub-web-react/src/app/entity/user/UserEditProfileModal.tsx
+++ /dev/null
@@ -1,252 +0,0 @@
-import { Button, Form, Input, Modal, Tooltip, Typography, message } from 'antd';
-import React, { useEffect, useState } from 'react';
-
-import { useEnterKeyListener } from '@app/shared/useEnterKeyListener';
-import { useAppConfig } from '@app/useAppConfig';
-
-import { useUpdateCorpUserPropertiesMutation } from '@graphql/user.generated';
-
-type PropsData = {
-    name: string | undefined;
-    title: string | undefined;
-    image: string | undefined;
-    team: string | undefined;
-    email: string | undefined;
-    slack: string | undefined;
-    phone: string | undefined;
-    urn: string | undefined;
-};
-
-type Props = {
-    open: boolean;
-    onClose: () => void;
-    onSave: () => void;
-    editModalData: PropsData;
-};
-/** Regex Validations */
-export const USER_NAME_REGEX = new RegExp('^[a-zA-Z ]*$');
-
-export default function UserEditProfileModal({ open, onClose, onSave, editModalData }: Props) {
-    const { config } = useAppConfig();
-    const { readOnlyModeEnabled } = config.featureFlags;
-    const [updateCorpUserPropertiesMutation] = useUpdateCorpUserPropertiesMutation();
-    const [form] = Form.useForm();
-
-    const [saveButtonEnabled, setSaveButtonEnabled] = useState(true);
-    const [data, setData] = useState<PropsData>({
-        name: editModalData.name,
-        title: editModalData.title,
-        image: editModalData.image,
-        team: editModalData.team,
-        email: editModalData.email,
-        slack: editModalData.slack,
-        phone: editModalData.phone,
-        urn: editModalData.urn,
-    });
-
-    useEffect(() => {
-        setData({ ...editModalData });
-    }, [editModalData]);
-
-    // save changes function
-    const onSaveChanges = () => {
-        updateCorpUserPropertiesMutation({
-            variables: {
-                urn: editModalData?.urn || '',
-                input: {
-                    displayName: data.name,
-                    title: data.title,
-                    pictureLink: data.image,
-                    teams: data.team?.split(','),
-                    email: data.email,
-                    slack: data.slack,
-                    phone: data.phone,
-                },
-            },
-        })
-            .then(() => {
-                message.success({
-                    content: `Changes saved.`,
-                    duration: 3,
-                });
-                onSave(); // call the refetch function once save
-                // clear the values from edit profile form
-                setData({
-                    name: '',
-                    title: '',
-                    image: '',
-                    team: '',
-                    email: '',
-                    slack: '',
-                    phone: '',
-                    urn: '',
-                });
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to Save changes!: \n ${e.message || ''}`, duration: 3 });
-            });
-        onClose();
-    };
-
-    // Handle the Enter press
-    useEnterKeyListener({
-        querySelectorToExecuteClick: '#editUserButton',
-    });
-
-    return (
-        <Modal
-            title="Edit Profile"
-            open={open}
-            onCancel={onClose}
-            footer={
-                <>
-                    <Button onClick={onClose} type="text">
-                        Cancel
-                    </Button>
-                    <Button id="editUserButton" onClick={onSaveChanges} disabled={saveButtonEnabled}>
-                        Save Changes
-                    </Button>
-                </>
-            }
-        >
-            <Form
-                form={form}
-                initialValues={{ ...editModalData }}
-                autoComplete="off"
-                layout="vertical"
-                onFieldsChange={() =>
-                    setSaveButtonEnabled(form.getFieldsError().some((field) => field.errors.length > 0))
-                }
-            >
-                <Form.Item
-                    name="name"
-                    label={<Typography.Text strong>Name</Typography.Text>}
-                    rules={[
-                        {
-                            required: true,
-                            message: 'Enter a display name.',
-                        },
-                        { whitespace: true },
-                        { min: 2, max: 50 },
-                        {
-                            pattern: USER_NAME_REGEX,
-                            message: '',
-                        },
-                    ]}
-                    hasFeedback
-                >
-                    <Input
-                        placeholder="John Smith"
-                        value={data.name}
-                        onChange={(event) => setData({ ...data, name: event.target.value })}
-                        disabled={readOnlyModeEnabled}
-                    />
-                </Form.Item>
-                <Form.Item
-                    name="title"
-                    label={<Typography.Text strong>Title/Role</Typography.Text>}
-                    rules={[{ whitespace: true }, { min: 2, max: 50 }]}
-                    hasFeedback
-                >
-                    <Input
-                        placeholder="Data Analyst"
-                        value={data.title}
-                        onChange={(event) => setData({ ...data, title: event.target.value })}
-                        disabled={readOnlyModeEnabled}
-                    />
-                </Form.Item>
-                <Tooltip
-                    title="Editing image URL has been disabled."
-                    overlayStyle={readOnlyModeEnabled ? {} : { display: 'none' }}
-                    placement="bottom"
-                >
-                    <Form.Item
-                        name="image"
-                        label={<Typography.Text strong>Image URL</Typography.Text>}
-                        rules={[{ whitespace: true }, { type: 'url', message: 'not valid url' }]}
-                        hasFeedback
-                    >
-                        <Input
-                            placeholder="https://www.example.com/photo.png"
-                            value={data.image}
-                            onChange={(event) => setData({ ...data, image: event.target.value })}
-                            disabled={readOnlyModeEnabled}
-                        />
-                    </Form.Item>
-                </Tooltip>
-                <Form.Item
-                    name="team"
-                    label={<Typography.Text strong>Team</Typography.Text>}
-                    rules={[{ whitespace: true }, { min: 2, max: 50 }]}
-                >
-                    <Input
-                        placeholder="Product Engineering"
-                        value={data.team}
-                        onChange={(event) => setData({ ...data, team: event.target.value })}
-                        disabled={readOnlyModeEnabled}
-                    />
-                </Form.Item>
-                <Form.Item
-                    name="email"
-                    label={<Typography.Text strong>Email</Typography.Text>}
-                    rules={[
-                        {
-                            required: true,
-                            message: 'Enter your email',
-                        },
-                        {
-                            type: 'email',
-                            message: 'Please enter valid email',
-                        },
-                        { whitespace: true },
-                        { min: 2, max: 50 },
-                    ]}
-                    hasFeedback
-                >
-                    <Input
-                        placeholder="john.smith@example.com"
-                        value={data.email}
-                        onChange={(event) => setData({ ...data, email: event.target.value })}
-                        disabled={readOnlyModeEnabled}
-                    />
-                </Form.Item>
-                <Form.Item
-                    name="slack"
-                    label={<Typography.Text strong>Slack</Typography.Text>}
-                    rules={[{ whitespace: true }, { min: 2, max: 50 }]}
-                    hasFeedback
-                >
-                    <Input
-                        placeholder="john_smith"
-                        value={data.slack}
-                        onChange={(event) => setData({ ...data, slack: event.target.value })}
-                        disabled={readOnlyModeEnabled}
-                    />
-                </Form.Item>
-                <Form.Item
-                    name="phone"
-                    label={<Typography.Text strong>Phone</Typography.Text>}
-                    rules={[
-                        {
-                            pattern: new RegExp('^(?=.*[0-9])[- +()0-9]+$'),
-                            message: 'not valid phone number',
-                        },
-                        {
-                            min: 5,
-                            max: 15,
-                        },
-                    ]}
-                    hasFeedback
-                >
-                    <Input
-                        placeholder="444-999-9999"
-                        value={data.phone}
-                        onChange={(event) => setData({ ...data, phone: event.target.value })}
-                        disabled={readOnlyModeEnabled}
-                    />
-                </Form.Item>
-            </Form>
-        </Modal>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/user/UserGroups.tsx b/datahub-web-react/src/app/entity/user/UserGroups.tsx
deleted file mode 100644
index 55ef6f1ab526e0..00000000000000
--- a/datahub-web-react/src/app/entity/user/UserGroups.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import { Col, Pagination, Row, Tooltip } from 'antd';
-import React, { useState } from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { scrollToTop } from '@app/shared/searchUtils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetUserGroupsLazyQuery } from '@graphql/user.generated';
-import { CorpGroup, EntityRelationship, EntityType } from '@types';
-
-type Props = {
-    urn: string;
-    initialRelationships?: Array<EntityRelationship> | null;
-    pageSize: number;
-};
-
-const GroupsViewWrapper = styled.div`
-    height: calc(100vh - 173px);
-    overflow-y: auto;
-
-    .user-group-pagination {
-        justify-content: center;
-        bottom: 24px;
-        position: absolute;
-        width: 100%;
-        left: 50%;
-        -webkit-transform: translateX(-50%);
-        -moz-transform: translateX(-50%);
-        -webkit-transform: translateX(-50%);
-        -ms-transform: translateX(-50%);
-        transform: translateX(-50%);
-    }
-`;
-
-const GroupItemColumn = styled(Col)`
-    padding: 10px;
-`;
-
-const GroupItem = styled.div`
-    border: 1px solid #eaeaea;
-    padding: 10px;
-    min-height: 107px;
-    max-height: 107px;
-    border-radius: 5px;
-
-    .title-row {
-        padding: 9px 11px 9px 11px;
-    }
-    .description-row {
-        padding: 2px 13px;
-    }
-`;
-
-const GroupTitle = styled.span`
-    font-size: 14px;
-    line-height: 22px;
-    font-weight: bold;
-    color: #262626;
-`;
-
-const GroupMember = styled.span`
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 23px;
-    color: #8c8c8c;
-    padding-left: 7px;
-`;
-
-const GroupDescription = styled.span`
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 20px;
-    color: #262626;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    max-width: 100%;
-    height: 43px;
-`;
-export default function UserGroups({ urn, initialRelationships, pageSize }: Props) {
-    const [page, setPage] = useState(1);
-    const entityRegistry = useEntityRegistry();
-
-    const [getGroups, { data: groupsData }] = useGetUserGroupsLazyQuery();
-
-    const onChangeGroupsPage = (newPage: number) => {
-        scrollToTop();
-        setPage(newPage);
-        const start = (newPage - 1) * pageSize;
-        getGroups({ variables: { urn, start, count: pageSize } });
-    };
-
-    const relationships = groupsData ? groupsData.corpUser?.relationships?.relationships : initialRelationships;
-    const total = relationships?.length || 0;
-    const userGroups = relationships?.map((rel) => rel.entity as CorpGroup) || [];
-
-    return (
-        <GroupsViewWrapper>
-            <Row justify="start">
-                {userGroups &&
-                    userGroups.map((item) => {
-                        return (
-                            <GroupItemColumn xl={8} lg={8} md={12} sm={12} xs={24} key={item.urn}>
-                                <Link to={entityRegistry.getEntityUrl(EntityType.CorpGroup, item.urn)}>
-                                    <GroupItem>
-                                        <Row className="title-row">
-                                            <GroupTitle>{item.info?.displayName || item.name}</GroupTitle>
-                                            <GroupMember>
-                                                {item.relationships?.total}
-                                                {item.relationships?.total === 1 ? ' member' : ' members'}
-                                            </GroupMember>
-                                        </Row>
-                                        <Row className="description-row">
-                                            <GroupDescription>
-                                                <Tooltip title={item.info?.description}>
-                                                    {item.info?.description}
-                                                </Tooltip>
-                                            </GroupDescription>
-                                        </Row>
-                                    </GroupItem>
-                                </Link>
-                            </GroupItemColumn>
-                        );
-                    })}
-            </Row>
-            <Row className="user-group-pagination">
-                <Pagination
-                    current={page}
-                    pageSize={pageSize}
-                    total={total}
-                    showLessItems
-                    onChange={onChangeGroupsPage}
-                    showSizeChanger={false}
-                />
-            </Row>
-        </GroupsViewWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/user/UserHeader.tsx b/datahub-web-react/src/app/entity/user/UserHeader.tsx
deleted file mode 100644
index 11637464c18e9d..00000000000000
--- a/datahub-web-react/src/app/entity/user/UserHeader.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-// import { UserOutlined } from '@ant-design/icons';
-import { Badge, Divider, Space, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import CustomAvatar from '@app/shared/avatar/CustomAvatar';
-
-type Props = {
-    profileSrc?: string | null;
-    name: string;
-    title?: string | null;
-    skills?: string[] | null;
-    teams?: string[] | null;
-    email?: string | null;
-};
-
-const Row = styled.div`
-    display: inline-flex;
-`;
-
-const AvatarWrapper = styled.div`
-    margin-right: 32px;
-`;
-
-const Traits = styled.div`
-    display: inline-flex;
-    margin-top: 32px;
-`;
-
-const Skills = styled.div`
-    margin-right: 32px;
-`;
-
-const TitleContainer = styled.div`
-    display: flex;
-    justify-content: center;
-    align-items: center;
-`;
-
-const HeaderContainer = styled.div`
-    display: flex;
-    justify-content: center;
-    align-items: center;
-`;
-
-const NameContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: left;
-`;
-
-export default function UserHeader({ profileSrc, name, title, skills, teams, email }: Props) {
-    return (
-        <Row>
-            <div>
-                <HeaderContainer>
-                    <AvatarWrapper>
-                        <CustomAvatar size={100} photoUrl={profileSrc || undefined} name={name || undefined} />
-                    </AvatarWrapper>
-                    <NameContainer>
-                        <Typography.Title level={3}>{name}</Typography.Title>
-                        <TitleContainer>
-                            {title && (
-                                <>
-                                    <Typography.Text>{title}</Typography.Text>
-                                    <Divider type="vertical" />
-                                </>
-                            )}
-                            {email && (
-                                <a href={`mailto:${email}`}>
-                                    <Typography.Text strong>{email}</Typography.Text>
-                                </a>
-                            )}
-                        </TitleContainer>
-                    </NameContainer>
-                </HeaderContainer>
-                <div>
-                    <Traits>
-                        <Skills>
-                            <Typography.Title level={5}>Ask me about</Typography.Title>
-                            <Space>
-                                {skills?.map((skill) => (
-                                    <Badge style={{ backgroundColor: '#108ee9' }} count={skill} key={skill} />
-                                ))}
-                            </Space>
-                        </Skills>
-                        <div>
-                            <Typography.Title level={5}>Teams</Typography.Title>
-                            <Space>
-                                {teams?.map((team) => (
-                                    <Badge style={{ backgroundColor: '#87d068' }} count={team} key={team} />
-                                ))}
-                            </Space>
-                        </div>
-                    </Traits>
-                </div>
-            </div>
-        </Row>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/user/UserInfoSideBar.tsx b/datahub-web-react/src/app/entity/user/UserInfoSideBar.tsx
deleted file mode 100644
index 102af7005dee35..00000000000000
--- a/datahub-web-react/src/app/entity/user/UserInfoSideBar.tsx
+++ /dev/null
@@ -1,223 +0,0 @@
-import { EditOutlined, MailOutlined, PhoneOutlined, SlackOutlined } from '@ant-design/icons';
-import { Button, Divider, Space, Tag, Typography, message } from 'antd';
-import React, { useEffect, useState } from 'react';
-
-import { useUserContext } from '@app/context/useUserContext';
-import EntityGroups from '@app/entity/shared/EntityGroups';
-import {
-    AboutSection,
-    AboutSectionText,
-    EditButton,
-    EmptyValue,
-    GroupsSection,
-    LocationSection,
-    LocationSectionText,
-    Name,
-    SideBar,
-    SideBarSubSection,
-    SocialDetails,
-    Team,
-    TitleRole,
-    UserDetails,
-} from '@app/entity/shared/SidebarStyledComponents';
-import UserEditProfileModal from '@app/entity/user/UserEditProfileModal';
-import { mapRoleIcon } from '@app/identity/user/UserUtils';
-import { useBrowserTitle } from '@app/shared/BrowserTabTitleContext';
-import CustomAvatar from '@app/shared/avatar/CustomAvatar';
-import { getCountryName } from '@src/app/shared/sidebar/components';
-
-import { useUpdateCorpUserPropertiesMutation } from '@graphql/user.generated';
-import { DataHubRole, EntityRelationship } from '@types';
-
-import GlobeIcon from '@images/Globe.svg';
-
-const { Paragraph } = Typography;
-
-type SideBarData = {
-    photoUrl: string | undefined;
-    avatarName: string | undefined;
-    name: string | undefined;
-    role: string | undefined;
-    team: string | undefined;
-    email: string | undefined;
-    slack: string | undefined;
-    phone: string | undefined;
-    aboutText: string | undefined;
-    groupsDetails: Array<EntityRelationship>;
-    urn: string | undefined;
-    dataHubRoles: Array<EntityRelationship>;
-    countryCode: string | undefined;
-    username: string | undefined;
-};
-
-type Props = {
-    sideBarData: SideBarData;
-    refetch: () => void;
-};
-
-const AVATAR_STYLE = { marginTop: '14px' };
-
-/**
- * UserInfoSideBar- Sidebar section for users profiles.
- */
-export default function UserInfoSideBar({ sideBarData, refetch }: Props) {
-    const {
-        name,
-        aboutText,
-        avatarName,
-        email,
-        groupsDetails,
-        phone,
-        photoUrl,
-        role,
-        slack,
-        team,
-        dataHubRoles,
-        urn,
-        countryCode,
-        username,
-    } = sideBarData;
-
-    const [updateCorpUserPropertiesMutation] = useUpdateCorpUserPropertiesMutation();
-
-    const [groupSectionExpanded, setGroupSectionExpanded] = useState(false);
-    const [editProfileModal, showEditProfileModal] = useState(false);
-    /* eslint-disable @typescript-eslint/no-unused-vars */
-    const me = useUserContext();
-    const isProfileOwner = me?.user?.urn === urn;
-
-    const { updateTitle } = useBrowserTitle();
-
-    useEffect(() => {
-        // You can use the title and updateTitle function here
-        // For example, updating the title when the component mounts
-        if (name) {
-            updateTitle(`User | ${name}`);
-        }
-        // // Don't forget to clean up the title when the component unmounts
-        return () => {
-            if (name) {
-                // added to condition for rerendering issue
-                updateTitle('');
-            }
-        };
-    }, [name, updateTitle]);
-
-    const getEditModalData = {
-        urn,
-        name,
-        title: role,
-        team,
-        email,
-        image: photoUrl,
-        slack,
-        phone,
-    };
-
-    // About Text save
-    const onSaveAboutMe = (inputString) => {
-        updateCorpUserPropertiesMutation({
-            variables: {
-                urn: urn || '',
-                input: {
-                    aboutMe: inputString,
-                },
-            },
-        })
-            .then(() => {
-                message.success({
-                    content: `Changes saved.`,
-                    duration: 3,
-                });
-                refetch();
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to Save changes!: \n ${e.message || ''}`, duration: 3 });
-            });
-    };
-    const dataHubRoleName = dataHubRoles && dataHubRoles.length > 0 && (dataHubRoles[0]?.entity as DataHubRole).name;
-
-    const maybeCountryName = getCountryName(countryCode ?? '');
-    return (
-        <>
-            <SideBar>
-                <SideBarSubSection className={isProfileOwner ? '' : 'fullView'}>
-                    <CustomAvatar size={160} photoUrl={photoUrl} name={avatarName} style={AVATAR_STYLE} />
-                    <Name>{name || <EmptyValue />}</Name>
-                    <UserDetails>{username || <EmptyValue />}</UserDetails>
-                    {role && <TitleRole>{role}</TitleRole>}
-                    {team && <Team>{team}</Team>}
-                    {dataHubRoleName && <Tag icon={mapRoleIcon(dataHubRoleName)}>{dataHubRoleName}</Tag>}
-                    <Divider className="divider-infoSection" />
-                    <SocialDetails>
-                        <Space>
-                            <MailOutlined />
-                            {email || <EmptyValue />}
-                        </Space>
-                    </SocialDetails>
-                    <SocialDetails>
-                        <Space>
-                            <SlackOutlined />
-                            {slack || <EmptyValue />}
-                        </Space>
-                    </SocialDetails>
-                    <SocialDetails>
-                        <Space>
-                            <PhoneOutlined />
-                            {phone || <EmptyValue />}
-                        </Space>
-                    </SocialDetails>
-                    <Divider className="divider-aboutSection" />
-                    {maybeCountryName != null ? (
-                        <LocationSection>
-                            Location
-                            <br />
-                            <LocationSectionText>
-                                <img src={GlobeIcon} alt="Manage Users" style={{ display: 'inline' }} /> &nbsp;
-                                {maybeCountryName}
-                            </LocationSectionText>
-                            <Divider className="divider-aboutSection" />
-                        </LocationSection>
-                    ) : null}
-                    <AboutSection>
-                        About
-                        <AboutSectionText>
-                            <Paragraph
-                                editable={isProfileOwner ? { onChange: onSaveAboutMe } : false}
-                                ellipsis={{ rows: 2, expandable: true, symbol: 'Read more' }}
-                            >
-                                {aboutText || <EmptyValue />}
-                            </Paragraph>
-                        </AboutSectionText>
-                    </AboutSection>
-                    <Divider className="divider-groupsSection" />
-                    <GroupsSection>
-                        Groups
-                        <EntityGroups
-                            readMore={groupSectionExpanded}
-                            setReadMore={() => setGroupSectionExpanded(!groupSectionExpanded)}
-                            groupMemberRelationships={groupsDetails}
-                        />
-                    </GroupsSection>
-                </SideBarSubSection>
-                {isProfileOwner && (
-                    <EditButton>
-                        <Button icon={<EditOutlined />} onClick={() => showEditProfileModal(true)}>
-                            Edit Profile
-                        </Button>
-                    </EditButton>
-                )}
-            </SideBar>
-            {/* Modal */}
-            <UserEditProfileModal
-                open={editProfileModal}
-                onClose={() => showEditProfileModal(false)}
-                onSave={() => {
-                    refetch();
-                }}
-                editModalData={getEditModalData}
-            />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/user/UserProfile.tsx b/datahub-web-react/src/app/entity/user/UserProfile.tsx
deleted file mode 100644
index b25bb092cd0c61..00000000000000
--- a/datahub-web-react/src/app/entity/user/UserProfile.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-import { Col, Row } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import NonExistentEntityPage from '@app/entity/shared/entity/NonExistentEntityPage';
-import { decodeUrn } from '@app/entity/shared/utils';
-import { UserAssets } from '@app/entity/user/UserAssets';
-import UserGroups from '@app/entity/user/UserGroups';
-import UserInfoSideBar from '@app/entity/user/UserInfoSideBar';
-import { RoutedTabs } from '@app/shared/RoutedTabs';
-import useUserParams from '@app/shared/entitySearch/routingUtils/useUserParams';
-import { ErrorSection } from '@app/shared/error/ErrorSection';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetUserQuery } from '@graphql/user.generated';
-import { EntityRelationship, EntityType } from '@types';
-
-export interface Props {
-    onTabChange: (selectedTab: string) => void;
-}
-
-export enum TabType {
-    Assets = 'Owner Of',
-    Groups = 'Groups',
-}
-const ENABLED_TAB_TYPES = [TabType.Assets, TabType.Groups];
-
-const GROUP_PAGE_SIZE = 20;
-
-/**
- * Styled Components
- */
-const UserProfileWrapper = styled.div`
-    &&& .ant-tabs-nav {
-        margin: 0;
-    }
-`;
-
-const Content = styled.div`
-    color: #262626;
-    height: calc(100vh - 60px);
-
-    &&& .ant-tabs > .ant-tabs-nav .ant-tabs-nav-wrap {
-        padding-left: 15px;
-    }
-`;
-
-export const EmptyValue = styled.div`
-    &:after {
-        content: 'None';
-        color: #b7b7b7;
-        font-style: italic;
-        font-weight: 100;
-    }
-`;
-
-/**
- * Responsible for reading & writing users.
- */
-export default function UserProfile() {
-    const { urn: encodedUrn } = useUserParams();
-    const urn = decodeUrn(encodedUrn);
-    const entityRegistry = useEntityRegistry();
-
-    const { error, data, refetch } = useGetUserQuery({ variables: { urn, groupsCount: GROUP_PAGE_SIZE } });
-
-    const castedCorpUser = data?.corpUser as any;
-
-    const userGroups: Array<EntityRelationship> =
-        castedCorpUser?.groups?.relationships?.map((relationship) => relationship as EntityRelationship) || [];
-    const userRoles: Array<EntityRelationship> =
-        castedCorpUser?.roles?.relationships?.map((relationship) => relationship as EntityRelationship) || [];
-
-    // Routed Tabs Constants
-    const getTabs = () => {
-        return [
-            {
-                name: TabType.Assets,
-                path: TabType.Assets.toLocaleLowerCase(),
-                content: <UserAssets urn={urn} />,
-                display: {
-                    enabled: () => true,
-                },
-            },
-            {
-                name: TabType.Groups,
-                path: TabType.Groups.toLocaleLowerCase(),
-                content: <UserGroups urn={urn} initialRelationships={userGroups} pageSize={GROUP_PAGE_SIZE} />,
-                display: {
-                    enabled: () => userGroups?.length > 0,
-                },
-            },
-        ].filter((tab) => ENABLED_TAB_TYPES.includes(tab.name));
-    };
-    const defaultTabPath = getTabs() && getTabs()?.length > 0 ? getTabs()[0].path : '';
-    const onTabChange = () => null;
-
-    // Side bar data
-    const sideBarData = {
-        photoUrl: data?.corpUser?.editableProperties?.pictureLink || undefined,
-        avatarName:
-            data?.corpUser?.editableProperties?.displayName ||
-            data?.corpUser?.info?.displayName ||
-            data?.corpUser?.info?.fullName ||
-            data?.corpUser?.urn,
-        name:
-            data?.corpUser?.editableProperties?.displayName ||
-            (data?.corpUser && entityRegistry.getDisplayName(EntityType.CorpUser, data?.corpUser)) ||
-            undefined,
-        role: data?.corpUser?.editableProperties?.title || data?.corpUser?.info?.title || undefined,
-        team: data?.corpUser?.editableProperties?.teams?.join(',') || data?.corpUser?.info?.departmentName || undefined,
-        countryCode: data?.corpUser?.info?.countryCode || undefined,
-        email: data?.corpUser?.editableProperties?.email || data?.corpUser?.info?.email || undefined,
-        slack: data?.corpUser?.editableProperties?.slack || undefined,
-        phone: data?.corpUser?.editableProperties?.phone || undefined,
-        aboutText: data?.corpUser?.editableProperties?.aboutMe || undefined,
-        groupsDetails: userGroups,
-        dataHubRoles: userRoles,
-        urn,
-        username: data?.corpUser?.username,
-    };
-
-    if (data?.corpUser?.exists === false) {
-        return <NonExistentEntityPage />;
-    }
-
-    return (
-        <>
-            {error && <ErrorSection />}
-            <UserProfileWrapper>
-                <Row>
-                    <Col xl={5} lg={5} md={5} sm={24} xs={24}>
-                        <UserInfoSideBar sideBarData={sideBarData} refetch={refetch} />
-                    </Col>
-                    <Col xl={19} lg={19} md={19} sm={24} xs={24} style={{ borderLeft: '1px solid #E9E9E9' }}>
-                        <Content>
-                            <RoutedTabs defaultPath={defaultTabPath} tabs={getTabs()} onTabChange={onTabChange} />
-                        </Content>
-                    </Col>
-                </Row>
-            </UserProfileWrapper>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/user/__tests__/UserHeader.test.tsx b/datahub-web-react/src/app/entity/user/__tests__/UserHeader.test.tsx
deleted file mode 100644
index 469e44dc7a0405..00000000000000
--- a/datahub-web-react/src/app/entity/user/__tests__/UserHeader.test.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { render } from '@testing-library/react';
-import React from 'react';
-
-import UserHeader from '@app/entity/user/UserHeader';
-
-describe('UserHeader', () => {
-    it('renders name, title, skills, teams and email', () => {
-        const { getByText } = render(
-            <UserHeader
-                name="Jane Doe"
-                title="Software Engineer"
-                skills={['Pandas', 'Multivariate Calculus', 'Juggling']}
-                teams={['Product', 'Data Science']}
-                email="jane@datahub.ui"
-            />,
-        );
-        expect(getByText('Jane Doe')).toBeInTheDocument();
-        expect(getByText('Software Engineer')).toBeInTheDocument();
-        expect(getByText('Pandas')).toBeInTheDocument();
-        expect(getByText('Juggling')).toBeInTheDocument();
-        expect(getByText('Product')).toBeInTheDocument();
-        expect(getByText('Data Science')).toBeInTheDocument();
-        expect(getByText('jane@datahub.ui')).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/entity/user/preview/Preview.tsx b/datahub-web-react/src/app/entity/user/preview/Preview.tsx
deleted file mode 100644
index 580cdedca8523c..00000000000000
--- a/datahub-web-react/src/app/entity/user/preview/Preview.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { IconStyleType } from '@app/entity/Entity';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import SearchTextHighlighter from '@app/search/matches/SearchTextHighlighter';
-import { CustomAvatar } from '@app/shared/avatar';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType } from '@types';
-
-const PreviewContainer = styled.div`
-    display: flex;
-    width: 100%;
-    justify-content: space-between;
-    align-items: center;
-`;
-
-const PlatformInfo = styled.div`
-    margin-bottom: 8px;
-    display: flex;
-    align-items: center;
-    height: 24px;
-`;
-
-const TitleContainer = styled.div`
-    margin-bottom: 8px;
-`;
-
-const PreviewImage = styled.div`
-    max-height: 18px;
-    width: auto;
-    object-fit: contain;
-    margin-right: 10px;
-    background-color: transparent;
-`;
-
-const EntityTitle = styled(Typography.Text)`
-    &&& {
-        margin-bottom: 0;
-        font-size: 16px;
-        font-weight: 600;
-        vertical-align: middle;
-    }
-`;
-
-const PlatformText = styled(Typography.Text)`
-    font-size: 12px;
-    line-height: 20px;
-    font-weight: 700;
-    color: ${ANTD_GRAY[7]};
-`;
-
-const AvatarContainer = styled.div`
-    margin-right: 60px;
-`;
-
-export const Preview = ({
-    urn,
-    name,
-    title,
-    photoUrl,
-}: {
-    urn: string;
-    name: string;
-    photoUrl?: string | undefined;
-    title?: string | undefined;
-}): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    const url = entityRegistry.getEntityUrl(EntityType.CorpUser, urn);
-
-    return (
-        <PreviewContainer>
-            <div>
-                <Link to={url}>
-                    <TitleContainer>
-                        <PlatformInfo>
-                            <PreviewImage>
-                                {entityRegistry.getIcon(EntityType.CorpUser, 20, IconStyleType.HIGHLIGHT)}
-                            </PreviewImage>
-                            <PlatformText>{entityRegistry.getEntityName(EntityType.CorpUser)}</PlatformText>
-                        </PlatformInfo>
-                        <Link to={url}>
-                            <EntityTitle>{name ? <SearchTextHighlighter field="name" text={name} /> : urn}</EntityTitle>
-                        </Link>
-                    </TitleContainer>
-                </Link>
-                {title && (
-                    <TitleContainer>
-                        <SearchTextHighlighter field="title" text={title} />
-                    </TitleContainer>
-                )}
-            </div>
-            <Link to={url}>
-                <AvatarContainer>
-                    <CustomAvatar size={48} photoUrl={photoUrl} name={name || undefined} />
-                </AvatarContainer>
-            </Link>
-        </PreviewContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/view/ManageViews.tsx b/datahub-web-react/src/app/entity/view/ManageViews.tsx
deleted file mode 100644
index 0304c6cef5bc01..00000000000000
--- a/datahub-web-react/src/app/entity/view/ManageViews.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ViewsList } from '@app/entity/view/ViewsList';
-
-const PageContainer = styled.div`
-    padding-top: 20px;
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    overflow: auto;
-`;
-
-const PageHeaderContainer = styled.div`
-    && {
-        padding-left: 24px;
-    }
-`;
-
-const PageTitle = styled(Typography.Title)`
-    && {
-        margin-bottom: 12px;
-    }
-`;
-
-const ListContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    overflow: auto;
-`;
-
-/**
- * Component used for displaying the 'Manage Views' experience.
- */
-export const ManageViews = () => {
-    return (
-        <PageContainer>
-            <PageHeaderContainer>
-                <PageTitle level={3}>Manage Views</PageTitle>
-                <Typography.Paragraph type="secondary">
-                    Create, edit, and remove your Views. Views allow you to save and share sets of filters for reuse
-                    when browsing DataHub.
-                </Typography.Paragraph>
-            </PageHeaderContainer>
-            <ListContainer>
-                <ViewsList />
-            </ListContainer>
-        </PageContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/view/ViewsList.tsx b/datahub-web-react/src/app/entity/view/ViewsList.tsx
deleted file mode 100644
index a548974ad3845e..00000000000000
--- a/datahub-web-react/src/app/entity/view/ViewsList.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Pagination, message } from 'antd';
-import * as QueryString from 'query-string';
-import React, { useEffect, useState } from 'react';
-import { useLocation } from 'react-router';
-import styled from 'styled-components';
-
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import { ViewsTable } from '@app/entity/view/ViewsTable';
-import { ViewBuilder } from '@app/entity/view/builder/ViewBuilder';
-import { ViewBuilderMode } from '@app/entity/view/builder/types';
-import { DEFAULT_LIST_VIEWS_PAGE_SIZE, searchViews } from '@app/entity/view/utils';
-import { SearchBar } from '@app/search/SearchBar';
-import { Message } from '@app/shared/Message';
-import { scrollToTop } from '@app/shared/searchUtils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useListMyViewsQuery } from '@graphql/view.generated';
-
-const PaginationContainer = styled.div`
-    display: flex;
-    justify-content: center;
-`;
-
-const StyledPagination = styled(Pagination)`
-    margin: 40px;
-`;
-
-const searchBarStyle = {
-    maxWidth: 220,
-    padding: 0,
-};
-
-const searchBarInputStyle = {
-    height: 32,
-    fontSize: 12,
-};
-
-/**
- * This component renders a paginated, searchable list of Views.
- */
-export const ViewsList = () => {
-    /**
-     * Context
-     */
-    const location = useLocation();
-    const entityRegistry = useEntityRegistry();
-
-    /**
-     * Query Params
-     */
-    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
-    const paramsQuery = (params?.query as string) || undefined;
-
-    /**
-     * State
-     */
-    const [page, setPage] = useState(1);
-    const [selectedViewUrn, setSelectedViewUrn] = useState<undefined | string>(undefined);
-    const [showViewBuilder, setShowViewBuilder] = useState<boolean>(false);
-    const [query, setQuery] = useState<undefined | string>(undefined);
-    useEffect(() => setQuery(paramsQuery), [paramsQuery]);
-
-    /**
-     * Queries
-     */
-    const pageSize = DEFAULT_LIST_VIEWS_PAGE_SIZE;
-    const start = (page - 1) * pageSize;
-    const { loading, error, data } = useListMyViewsQuery({
-        variables: {
-            start,
-            count: pageSize,
-        },
-        fetchPolicy: 'cache-first',
-    });
-
-    const onClickCreateView = () => {
-        setShowViewBuilder(true);
-    };
-
-    const onClickEditView = (urn: string) => {
-        setShowViewBuilder(true);
-        setSelectedViewUrn(urn);
-    };
-
-    const onCloseModal = () => {
-        setShowViewBuilder(false);
-        setSelectedViewUrn(undefined);
-    };
-
-    const onChangePage = (newPage: number) => {
-        scrollToTop();
-        setPage(newPage);
-    };
-
-    /**
-     * Render variables.
-     */
-    const totalViews = data?.listMyViews?.total || 0;
-    const views = searchViews(data?.listMyViews?.views || [], query);
-    const selectedView = (selectedViewUrn && views.find((view) => view.urn === selectedViewUrn)) || undefined;
-
-    return (
-        <>
-            {!data && loading && <Message type="loading" content="Loading Views..." />}
-            {error && message.error({ content: `Failed to load Views! An unexpected error occurred.`, duration: 3 })}
-            <TabToolbar>
-                <Button type="text" onClick={onClickCreateView}>
-                    <PlusOutlined /> Create new View
-                </Button>
-                <SearchBar
-                    initialQuery=""
-                    placeholderText="Search Views..."
-                    suggestions={[]}
-                    style={searchBarStyle}
-                    inputStyle={searchBarInputStyle}
-                    onSearch={() => null}
-                    onQueryChange={(q) => setQuery(q.length > 0 ? q : undefined)}
-                    entityRegistry={entityRegistry}
-                />
-            </TabToolbar>
-            <ViewsTable views={views} onEditView={onClickEditView} />
-            {totalViews >= pageSize && (
-                <PaginationContainer>
-                    <StyledPagination
-                        current={page}
-                        pageSize={pageSize}
-                        total={totalViews}
-                        showLessItems
-                        onChange={onChangePage}
-                        showSizeChanger={false}
-                    />
-                </PaginationContainer>
-            )}
-            {showViewBuilder && (
-                <ViewBuilder
-                    mode={ViewBuilderMode.EDITOR}
-                    urn={selectedViewUrn}
-                    initialState={selectedView}
-                    onSubmit={onCloseModal}
-                    onCancel={onCloseModal}
-                />
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entity/view/ViewsTable.tsx b/datahub-web-react/src/app/entity/view/ViewsTable.tsx
deleted file mode 100644
index 2de13122be347b..00000000000000
--- a/datahub-web-react/src/app/entity/view/ViewsTable.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { Empty } from 'antd';
-import React from 'react';
-
-import { StyledTable } from '@app/entity/shared/components/styled/StyledTable';
-import {
-    ActionsColumn,
-    DescriptionColumn,
-    NameColumn,
-    ViewTypeColumn,
-} from '@app/entity/view/select/ViewsTableColumns';
-
-import { DataHubView } from '@types';
-
-type ViewsTableProps = {
-    views: DataHubView[];
-    onEditView: (urn) => void;
-};
-
-/**
- * This component renders a table of Views.
- */
-export const ViewsTable = ({ views, onEditView }: ViewsTableProps) => {
-    const tableColumns = [
-        {
-            title: 'Name',
-            dataIndex: 'name',
-            key: 'name',
-            render: (name, record) => <NameColumn name={name} record={record} onEditView={onEditView} />,
-        },
-        {
-            title: 'Description',
-            dataIndex: 'description',
-            key: 'description',
-            render: (description) => <DescriptionColumn description={description} />,
-        },
-        {
-            title: 'Type',
-            dataIndex: 'viewType',
-            key: 'viewType',
-            render: (viewType) => <ViewTypeColumn viewType={viewType} />,
-        },
-        {
-            title: '',
-            dataIndex: '',
-            key: 'x',
-            render: (record) => <ActionsColumn record={record} />,
-        },
-    ];
-
-    /**
-     * The data for the Views List.
-     */
-    const tableData = views.map((view) => ({
-        ...view,
-    }));
-
-    return (
-        <StyledTable
-            columns={tableColumns}
-            dataSource={tableData}
-            rowKey="urn"
-            locale={{
-                emptyText: <Empty description="No Views found!" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
-            }}
-            pagination={false}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entity/view/builder/__tests__/utils.test.ts b/datahub-web-react/src/app/entity/view/builder/__tests__/utils.test.ts
deleted file mode 100644
index 9ca1c164b02991..00000000000000
--- a/datahub-web-react/src/app/entity/view/builder/__tests__/utils.test.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { convertNestedSubTypeFilter } from '@app/entity/view/builder/utils';
-import { ENTITY_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME, TYPE_NAMES_FILTER_NAME } from '@app/search/utils/constants';
-
-describe('view builder utils', () => {
-    it('should convert the nested subtypes filter properly along with other filters', () => {
-        const filters = [
-            { field: 'platform', values: ['platform1', 'platform2'] },
-            { field: ENTITY_SUB_TYPE_FILTER_NAME, values: ['DATASETS', 'CONTAINERS␞schema'] },
-            { field: 'tag', values: ['tag1', 'tag2'] },
-        ];
-
-        expect(convertNestedSubTypeFilter(filters)).toMatchObject([
-            { field: 'platform', values: ['platform1', 'platform2'] },
-            { field: 'tag', values: ['tag1', 'tag2'] },
-            { field: ENTITY_FILTER_NAME, values: ['DATASETS'] },
-            { field: TYPE_NAMES_FILTER_NAME, values: ['schema'] },
-        ]);
-    });
-});
diff --git a/datahub-web-react/src/app/entity/view/builder/utils.ts b/datahub-web-react/src/app/entity/view/builder/utils.ts
index 131d9bc81582ca..a3ce922cc642f5 100644
--- a/datahub-web-react/src/app/entity/view/builder/utils.ts
+++ b/datahub-web-react/src/app/entity/view/builder/utils.ts
@@ -26,7 +26,7 @@ export const extractEntityTypesFilterValues = (filters: Array<FacetFilterInput>)
  * Example: { field: "_entityType␞typeNames" values: ["DATASETS␞table"] } -> { field: "typeNames", values: ["table"]}
  * Example: { field: "_entityType␞typeNames" values: ["DATASETS", "CONTAINERS"] } -> { field: "_entityType", values: ["DATASETS", "CONTAINERS"]}
  */
-export function convertNestedSubTypeFilter(filters: Array<FacetFilterInput>) {
+function convertNestedSubTypeFilter(filters: Array<FacetFilterInput>) {
     const convertedFilters = filters.filter((f) => f.field !== ENTITY_SUB_TYPE_FILTER_NAME) || [];
     const nestedSubTypeFilter = filters.find((f) => f.field === ENTITY_SUB_TYPE_FILTER_NAME);
     if (nestedSubTypeFilter) {
@@ -57,7 +57,7 @@ export function convertNestedSubTypeFilter(filters: Array<FacetFilterInput>) {
  * @param filters a list of Facet Filter Inputs representing the view filters. This can include the entity type filter.
  * @param operatorType a logical operator to be used when joining the filters into the View definition.
  */
-export const buildViewDefinition = (filters: Array<FacetFilterInput>, operatorType: LogicalOperator) => {
+const buildViewDefinition = (filters: Array<FacetFilterInput>, operatorType: LogicalOperator) => {
     const convertedFilters = convertNestedSubTypeFilter(filters);
     const entityTypes = extractEntityTypesFilterValues(convertedFilters);
     const filteredFilters = convertedFilters.filter((filter) => filter.field !== ENTITY_FILTER_NAME);
diff --git a/datahub-web-react/src/app/entity/view/select/ViewsTableColumns.tsx b/datahub-web-react/src/app/entity/view/select/ViewsTableColumns.tsx
deleted file mode 100644
index 62324082eb3882..00000000000000
--- a/datahub-web-react/src/app/entity/view/select/ViewsTableColumns.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { Button, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useUserContext } from '@app/context/useUserContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { ViewTypeLabel } from '@app/entity/view/ViewTypeLabel';
-import { ViewDropdownMenu } from '@app/entity/view/menu/ViewDropdownMenu';
-import { GlobalDefaultViewIcon } from '@app/entity/view/shared/GlobalDefaultViewIcon';
-import { UserDefaultViewIcon } from '@app/entity/view/shared/UserDefaultViewIcon';
-
-import { DataHubViewType } from '@types';
-
-const StyledDescription = styled.div`
-    max-width: 300px;
-`;
-
-const ActionButtonsContainer = styled.div`
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding-right: 8px;
-`;
-
-const NameContainer = styled.span`
-    display: flex;
-    align-items: center;
-    justify-content: left;
-`;
-
-const IconPlaceholder = styled.span`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-`;
-
-type NameColumnProps = {
-    name: string;
-    record: any;
-    onEditView: (urn) => void;
-};
-
-export function NameColumn({ name, record, onEditView }: NameColumnProps) {
-    const userContext = useUserContext();
-    const maybePersonalDefaultViewUrn = userContext.state?.views?.personalDefaultViewUrn;
-    const maybeGlobalDefaultViewUrn = userContext.state?.views?.globalDefaultViewUrn;
-
-    const isUserDefault = record.urn === maybePersonalDefaultViewUrn;
-    const isGlobalDefault = record.urn === maybeGlobalDefaultViewUrn;
-
-    return (
-        <NameContainer>
-            <IconPlaceholder>
-                {isUserDefault && <UserDefaultViewIcon title="Your default View." />}
-                {isGlobalDefault && <GlobalDefaultViewIcon title="Your organization's default View." />}
-            </IconPlaceholder>
-            <Button type="text" onClick={() => onEditView(record.urn)}>
-                <Typography.Text strong>{name}</Typography.Text>
-            </Button>
-        </NameContainer>
-    );
-}
-
-type DescriptionColumnProps = {
-    description: string;
-};
-
-export function DescriptionColumn({ description }: DescriptionColumnProps) {
-    return (
-        <StyledDescription>
-            {description || <Typography.Text type="secondary">No description</Typography.Text>}
-        </StyledDescription>
-    );
-}
-
-type ViewTypeColumnProps = {
-    viewType: DataHubViewType;
-};
-
-export function ViewTypeColumn({ viewType }: ViewTypeColumnProps) {
-    return <ViewTypeLabel color={ANTD_GRAY[8]} type={viewType} />;
-}
-
-type ActionColumnProps = {
-    record: any;
-};
-
-export function ActionsColumn({ record }: ActionColumnProps) {
-    return (
-        <ActionButtonsContainer>
-            <ViewDropdownMenu view={record} visible />
-        </ActionButtonsContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/entity/view/select/styledComponents.tsx b/datahub-web-react/src/app/entity/view/select/styledComponents.tsx
index a2ba05a83e9e5b..d069d4c04efd26 100644
--- a/datahub-web-react/src/app/entity/view/select/styledComponents.tsx
+++ b/datahub-web-react/src/app/entity/view/select/styledComponents.tsx
@@ -1,18 +1,9 @@
-import { RightOutlined } from '@ant-design/icons';
+
 import { Button } from 'antd';
 import styled from 'styled-components';
 
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
 export const NoMarginButton = styled(Button)`
     && {
         margin: 0px;
     }
 `;
-
-export const StyledRightOutlined = styled(RightOutlined)`
-    && {
-        font-size: 8px;
-        color: ${ANTD_GRAY[7]};
-    }
-`;
diff --git a/datahub-web-react/src/app/entity/view/utils.ts b/datahub-web-react/src/app/entity/view/utils.ts
index 589780e3858c4a..23f891cd2c6215 100644
--- a/datahub-web-react/src/app/entity/view/utils.ts
+++ b/datahub-web-react/src/app/entity/view/utils.ts
@@ -1,7 +1,5 @@
 import { ViewBuilderState } from '@app/entity/view/types';
 
-import { DataHubView, DataHubViewType, EntityType, LogicalOperator } from '@types';
-
 /**
  *  The max single-page results in both the View Select and Manage Views list.
  *
@@ -39,46 +37,3 @@ export const convertStateToUpdateInput = (state: ViewBuilderState) => {
         },
     };
 };
-
-/**
- * Convert ViewBuilderState and an URN into a DataHubView object.
- *
- * @param urn urn of the View
- * @param state state of the View
- */
-export const convertStateToView = (urn: string, state: ViewBuilderState): DataHubView => {
-    return {
-        urn,
-        type: EntityType.DatahubView,
-        viewType: state.viewType as DataHubViewType,
-        name: state.name as string,
-        description: state.description,
-        definition: {
-            entityTypes: state.definition?.entityTypes || [],
-            filter: {
-                operator: state?.definition?.filter?.operator as LogicalOperator,
-                filters: state?.definition?.filter?.filters?.map((filter) => ({
-                    field: filter.field,
-                    condition: filter.condition,
-                    values: filter.values,
-                    negated: filter.negated || false,
-                })) as any,
-            },
-        },
-    };
-};
-
-/**
- * Search through a list of Views by a text string by comparing
- * against View name and descriptions.
- *
- * @param views: A list of DataHub View objects.
- * @param q: An optional search query.
- */
-export const searchViews = (views: Array<DataHubView>, q?: string) => {
-    if (q && q.length > 0) {
-        const qLower = q.toLowerCase();
-        return views.filter((view) => view.name.toLowerCase().includes(qLower) || view.description?.includes(qLower));
-    }
-    return views;
-};
diff --git a/datahub-web-react/src/app/entityV2/application/AssetsSections.tsx b/datahub-web-react/src/app/entityV2/application/AssetsSections.tsx
index 2ad0f4dd056e2f..950f7b1ce63029 100644
--- a/datahub-web-react/src/app/entityV2/application/AssetsSections.tsx
+++ b/datahub-web-react/src/app/entityV2/application/AssetsSections.tsx
@@ -25,7 +25,7 @@ const AssetsSectionWrapper = styled.div`
     min-width: 100px;
 `;
 
-export const StyledHeaderWrapper = styled(SummaryTabHeaderWrapper)`
+const StyledHeaderWrapper = styled(SummaryTabHeaderWrapper)`
     margin-bottom: 8px;
 `;
 
diff --git a/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx b/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx
index 1ee9d902570a16..3e4773cacd4b91 100644
--- a/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx
+++ b/datahub-web-react/src/app/entityV2/businessAttribute/profile/BusinessAttributeDataTypeSection.tsx
@@ -97,4 +97,3 @@ export const BusinessAttributeDataTypeSection = ({ readOnly }: Props) => {
     );
 };
 
-export default BusinessAttributeDataTypeSection;
diff --git a/datahub-web-react/src/app/entityV2/dataProduct/AddOutputPortCard.tsx b/datahub-web-react/src/app/entityV2/dataProduct/AddOutputPortCard.tsx
deleted file mode 100644
index d84ad7c7e39bc9..00000000000000
--- a/datahub-web-react/src/app/entityV2/dataProduct/AddOutputPortCard.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import React from 'react';
-import styled from 'styled-components';
-
-import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-import { Card } from '@app/sharedV2/cards/components';
-
-const DataProductTitle = styled.div`
-    font-size: 16px;
-    font-weight: 400;
-    color: ${REDESIGN_COLORS.BLUE};
-    padding: 10px 14px;
-`;
-
-export default function AddOutputPortCard() {
-    return (
-        <Card>
-            <DataProductTitle>
-                <PlusOutlined style={{ marginRight: 4 }} />
-                Add Output Port
-            </DataProductTitle>
-        </Card>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/Lineage.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/Lineage.tsx
index 558f48b760a6cd..776e2afa66660e 100644
--- a/datahub-web-react/src/app/entityV2/dataset/profile/Lineage.tsx
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/Lineage.tsx
@@ -9,7 +9,7 @@ import { useEntityRegistry } from '@app/useEntityRegistry';
 
 import { DownstreamEntityRelationships, EntityType, UpstreamEntityRelationships } from '@types';
 
-export type Props = {
+type Props = {
     upstreamLineage?: UpstreamEntityRelationships | null;
     downstreamLineage?: DownstreamEntityRelationships | null;
 };
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/UsageFacepile.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/UsageFacepile.tsx
deleted file mode 100644
index bba44711ba1dba..00000000000000
--- a/datahub-web-react/src/app/entityV2/dataset/profile/UsageFacepile.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Tooltip } from '@components';
-import React, { useMemo } from 'react';
-
-import ActorAvatar from '@app/entityV2/shared/ActorAvatar';
-import { SpacedAvatarGroup } from '@app/shared/avatar/SpaceAvatarGroup';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType, UserUsageCounts } from '@types';
-
-export type Props = {
-    users?: (UserUsageCounts | null)[] | null;
-    maxNumberDisplayed?: number;
-};
-
-export default function UsageFacepile({ users, maxNumberDisplayed }: Props) {
-    const sortedUsers = useMemo(() => users?.slice().sort((a, b) => (b?.count || 0) - (a?.count || 0)), [users]);
-    let displayedUsers = sortedUsers;
-    if (maxNumberDisplayed) {
-        displayedUsers = displayedUsers?.slice(0, maxNumberDisplayed);
-    }
-
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <SpacedAvatarGroup maxCount={2}>
-            {displayedUsers?.map((displayedUser) => {
-                const user = displayedUser?.user;
-                const userName = entityRegistry.getDisplayName(EntityType.CorpUser, user);
-                return (
-                    <Tooltip title={userName}>
-                        <ActorAvatar
-                            size={32}
-                            name={userName}
-                            url={`/${entityRegistry.getPathName(EntityType.CorpUser)}/${user?.urn}`}
-                            photoUrl={
-                                user?.editableProperties?.pictureLink || user?.editableInfo?.pictureLink || undefined
-                            }
-                        />
-                    </Tooltip>
-                );
-            })}
-        </SpacedAvatarGroup>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/CustomPagination.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/CustomPagination.tsx
deleted file mode 100644
index a9a98b7d506ec2..00000000000000
--- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/CustomPagination.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { LeftOutlined, RightOutlined } from '@ant-design/icons';
-import { Button, Dropdown, Menu, Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-const CustomPaginationContainer = styled.div`
-    display: flex;
-    flex-direction: row;
-    height: 32px;
-`;
-const NavButton = styled(Button)`
-    margin: 4px 6px;
-    cursor: pointer;
-`;
-const DescriptionText = styled(Typography.Text)`
-    line-height: 32px;
-`;
-const VersionText = styled(Typography.Text)`
-    padding: 0 4px;
-    line-height: 32px;
-    cursor: pointer;
-`;
-const VersionRightText = styled(Typography.Text)`
-    padding-left: 4px;
-    line-height: 32px;
-    cursor: pointer;
-`;
-
-type Props = {
-    onChange: (version1: number, version2: number) => void;
-    maxVersion: number;
-};
-
-export default function CustomPagination({ onChange, maxVersion }: Props) {
-    const [version1, setVersion1] = useState(maxVersion || 1); // current version - first dropdown selected
-    const [version2, setVersion2] = useState(maxVersion ? maxVersion - 1 : 0); // past version comparing with current - second dropdown
-
-    const onNextClick = () => {
-        setVersion1((v) => v - 1);
-        setVersion2(version1 - 2);
-        onChange(version1 - 1, version1 - 2);
-    };
-    const onPrevClick = () => {
-        setVersion1((v) => v + 1);
-        setVersion2(version1);
-        onChange(version1 + 1, version1);
-    };
-    const onVersion1Click = ({ key }) => {
-        const newVersion1 = parseInt(key, 10);
-        setVersion1(newVersion1);
-        if (version2 >= newVersion1) {
-            setVersion2(newVersion1 - 1);
-            onChange(newVersion1, newVersion1 - 1);
-            return;
-        }
-        onChange(newVersion1, version2);
-    };
-    const onVersion2Click = ({ key }) => {
-        setVersion2(parseInt(key, 10));
-        onChange(version1, parseInt(key, 10));
-    };
-
-    const menu1 = (
-        <Menu onClick={onVersion1Click} selectedKeys={[`${version1}`]}>
-            {[...Array(maxVersion)].map((_, i) => (
-                // eslint-disable-next-line react/no-array-index-key
-                <Menu.Item key={maxVersion - i}>
-                    <Typography.Text>{i === 0 ? 'latest' : `version ${maxVersion + 1 - i}`}</Typography.Text>
-                </Menu.Item>
-            ))}
-        </Menu>
-    );
-
-    const menu2 = (
-        <Menu onClick={onVersion2Click} selectedKeys={[`${version2}`]}>
-            {[...Array(version1)].map((_, i) => (
-                // eslint-disable-next-line react/no-array-index-key
-                <Menu.Item key={version1 - i - 1}>
-                    <Typography.Text>{`version ${version1 - i}`}</Typography.Text>
-                </Menu.Item>
-            ))}
-        </Menu>
-    );
-
-    return (
-        <CustomPaginationContainer>
-            <NavButton
-                size="small"
-                type="text"
-                icon={<LeftOutlined />}
-                onClick={onPrevClick}
-                disabled={version1 >= maxVersion}
-            />
-            <DescriptionText>Comparing</DescriptionText>
-            <Dropdown overlay={menu1} trigger={['click']}>
-                <VersionText strong type="success">
-                    {version1 === maxVersion ? 'latest' : `version ${version1 + 1}`}
-                </VersionText>
-            </Dropdown>
-            <DescriptionText>to</DescriptionText>
-            <Dropdown overlay={menu2} trigger={['click']}>
-                <VersionRightText strong type="success">{`version ${version2 + 1}`}</VersionRightText>
-            </Dropdown>
-            <NavButton
-                size="small"
-                type="text"
-                icon={<RightOutlined />}
-                onClick={onNextClick}
-                disabled={version1 <= 1}
-            />
-        </CustomPaginationContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaVersionSummary.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaVersionSummary.tsx
deleted file mode 100644
index 2a27a41a8cf387..00000000000000
--- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/SchemaVersionSummary.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const SummaryContainer = styled.div`
-    margin-bottom: 16px;
-    padding-left: 10px;
-    & ul {
-        padding-inline-start: 30px;
-        margin-top: 5px;
-    }
-`;
-
-export interface SchemaDiffSummary {
-    added: number;
-    removed: number;
-    updated: number;
-}
-
-type Props = {
-    diffSummary: SchemaDiffSummary;
-};
-
-export default function SchemaVersionSummary({ diffSummary }: Props) {
-    return (
-        <SummaryContainer>
-            <ul>
-                {diffSummary.added ? (
-                    <li>
-                        <Typography.Text>{`${diffSummary.added} column${
-                            diffSummary.added > 1 ? 's were' : ' was'
-                        } added`}</Typography.Text>
-                    </li>
-                ) : null}
-                {diffSummary.removed ? (
-                    <li>
-                        <Typography.Text>{`${diffSummary.removed} column${
-                            diffSummary.removed > 1 ? 's were' : ' was'
-                        } removed`}</Typography.Text>
-                    </li>
-                ) : null}
-                {diffSummary.updated ? (
-                    <li>
-                        <Typography.Text>{`${diffSummary.updated} description${
-                            diffSummary.updated > 1 ? 's were' : ' was'
-                        } updated`}</Typography.Text>
-                    </li>
-                ) : null}
-            </ul>
-        </SummaryContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/TypeIcon.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/TypeIcon.tsx
deleted file mode 100644
index 8324ce90309a91..00000000000000
--- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/TypeIcon.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import {
-    CalendarOutlined,
-    FieldBinaryOutlined,
-    FieldTimeOutlined,
-    NumberOutlined,
-    QuestionCircleOutlined,
-    UnderlineOutlined,
-    UnorderedListOutlined,
-} from '@ant-design/icons';
-import { Tooltip } from '@components';
-import { Typography } from 'antd';
-import React, { FC } from 'react';
-import { VscFileBinary, VscSymbolString } from 'react-icons/vsc';
-import styled from 'styled-components';
-
-import { capitalizeFirstLetter } from '@app/shared/textUtil';
-
-import { SchemaFieldDataType } from '@types';
-
-const TypeIconContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    text-align: center;
-    margin-top: 2.5px;
-    width: 40px;
-`;
-
-const TypeSubtitle = styled(Typography.Text)<{ hasicon?: string }>`
-    font-size: 8px;
-    text-align: center;
-    ${(props) => (props.hasicon ? '' : 'margin-top: 4px;')}
-`;
-
-const IconSpan = styled.span`
-    font-size: 18px;
-`;
-
-const DATA_TYPE_ICON_MAP: Record<SchemaFieldDataType, { icon: FC<{ style: any }> | null; size: number; text: string }> =
-    {
-        [SchemaFieldDataType.Boolean]: {
-            icon: FieldBinaryOutlined,
-            size: 18,
-            text: 'Boolean',
-        },
-        [SchemaFieldDataType.Fixed]: { icon: FieldBinaryOutlined, size: 18, text: 'Fixed' },
-        [SchemaFieldDataType.String]: {
-            icon: () => (
-                <IconSpan role="img" aria-label="calendar" className="anticon anticon-calendar">
-                    <VscSymbolString />
-                </IconSpan>
-            ),
-            size: 20,
-            text: 'String',
-        },
-        [SchemaFieldDataType.Bytes]: {
-            icon: () => (
-                <IconSpan role="img" aria-label="calendar" className="anticon anticon-calendar">
-                    <VscFileBinary />
-                </IconSpan>
-            ),
-            size: 18,
-            text: 'Bytes',
-        },
-        [SchemaFieldDataType.Number]: { icon: NumberOutlined, size: 14, text: 'Number' },
-        [SchemaFieldDataType.Date]: { icon: CalendarOutlined, size: 18, text: 'Date' },
-        [SchemaFieldDataType.Time]: { icon: FieldTimeOutlined, size: 18, text: 'Time' },
-        [SchemaFieldDataType.Enum]: { icon: UnorderedListOutlined, size: 18, text: 'Enum' },
-        [SchemaFieldDataType.Null]: { icon: QuestionCircleOutlined, size: 16, text: '' },
-        [SchemaFieldDataType.Map]: { icon: null, size: 0, text: 'Map' },
-        [SchemaFieldDataType.Array]: { icon: UnorderedListOutlined, size: 14, text: 'Array' },
-        [SchemaFieldDataType.Union]: { icon: UnderlineOutlined, size: 14, text: 'Union' },
-        [SchemaFieldDataType.Struct]: { icon: null, size: 0, text: 'Struct' },
-    };
-
-const truncate = (length: number, input?: string | null) => {
-    if (!input) return '';
-    if (input.length > length) {
-        return `${input.substring(0, length)}...`;
-    }
-    return input;
-};
-
-type Props = {
-    type: SchemaFieldDataType;
-    nativeDataType: string | null | undefined;
-};
-
-export default function TypeIcon({ type, nativeDataType }: Props) {
-    const { icon: Icon, size, text } = DATA_TYPE_ICON_MAP[type];
-
-    // if unable to match type to DataHub, display native type info by default
-    const nativeFallback = type === SchemaFieldDataType.Null;
-
-    // eslint-disable-next-line react/prop-types
-    const NativeDataTypeTooltip = ({ children }) =>
-        nativeDataType ? (
-            <Tooltip placement="top" title={capitalizeFirstLetter(nativeDataType)}>
-                {children}
-            </Tooltip>
-        ) : (
-            <>{children}</>
-        );
-
-    return (
-        <NativeDataTypeTooltip>
-            <TypeIconContainer data-testid={`icon-${type}`}>
-                {Icon && <Icon style={{ fontSize: size }} />}
-                <TypeSubtitle type="secondary" hasicon={Icon ? 'yes' : undefined}>
-                    {nativeFallback ? truncate(250, nativeDataType) : text}
-                </TypeSubtitle>
-            </TypeIconContainer>
-        </NativeDataTypeTooltip>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/VersionSelector.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/VersionSelector.tsx
index 6e44c27f748ce8..d8007c19f9180b 100644
--- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/VersionSelector.tsx
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/components/VersionSelector.tsx
@@ -13,7 +13,7 @@ import navigateToUrl from '@app/utils/navigateToUrl';
 import { DataPlatform, SemanticVersionStruct } from '@types';
 
 export const SEMANTIC_VERSION_PARAM = 'semantic_version';
-export const SIBLING_VERSION_PARAM = 'secondary_version'; // Note: Currently unused
+const SIBLING_VERSION_PARAM = 'secondary_version'; // Note: Currently unused
 
 const Wrapper = styled.div`
     display: flex;
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/types.ts b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/types.ts
index 0b43ef2f113ea7..5d1f8582baf804 100644
--- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/types.ts
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/types.ts
@@ -9,8 +9,3 @@ export interface ExtendedSchemaFields extends SchemaField {
     isDeletedRow?: boolean;
     parent?: ExtendedSchemaFields;
 }
-
-export enum SchemaViewType {
-    NORMAL,
-    BLAME,
-}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/utils.ts b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/utils.ts
index ff3e2e53c8d929..a041738e8af1b3 100644
--- a/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/utils.ts
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/schema/utils/utils.ts
@@ -1,52 +1,13 @@
 import { SorterResult } from 'antd/lib/table/interface';
 import * as diff from 'diff';
-
-import { SchemaDiffSummary } from '@app/entityV2/dataset/profile/schema/components/SchemaVersionSummary';
 import { KEY_SCHEMA_PREFIX, UNION_TOKEN, VERSION_PREFIX } from '@app/entityV2/dataset/profile/schema/utils/constants';
 import { ExtendedSchemaFields } from '@app/entityV2/dataset/profile/schema/utils/types';
-import { convertTagsForUpdate } from '@app/shared/tags/utils/convertTagsForUpdate';
 
 import {
-    EditableSchemaFieldInfo,
-    EditableSchemaMetadata,
-    EditableSchemaMetadataUpdate,
     PlatformSchema,
     SchemaField,
 } from '@types';
 
-export function convertEditableSchemaMeta(
-    editableSchemaMeta?: Array<EditableSchemaFieldInfo>,
-    fields?: Array<SchemaField>,
-): Array<SchemaField> {
-    const updatedFields = [...(fields || [])] as Array<SchemaField>;
-    if (editableSchemaMeta && editableSchemaMeta.length > 0) {
-        editableSchemaMeta.forEach((updatedField) => {
-            const originalFieldIndex = updatedFields.findIndex((f) => f.fieldPath === updatedField.fieldPath);
-            if (originalFieldIndex > -1) {
-                updatedFields[originalFieldIndex] = {
-                    ...updatedFields[originalFieldIndex],
-                    description: updatedField.description,
-                    globalTags: { ...updatedField.globalTags },
-                };
-            }
-        });
-    }
-    return updatedFields;
-}
-
-export function convertEditableSchemaMetadataForUpdate(
-    editableSchemaMetadata: EditableSchemaMetadata | null | undefined,
-): EditableSchemaMetadataUpdate {
-    return {
-        editableSchemaFieldInfo:
-            editableSchemaMetadata?.editableSchemaFieldInfo?.map((editableSchemaFieldInfo) => ({
-                fieldPath: editableSchemaFieldInfo?.fieldPath,
-                description: editableSchemaFieldInfo?.description,
-                globalTags: { tags: convertTagsForUpdate(editableSchemaFieldInfo?.globalTags?.tags || []) },
-            })) || [],
-    };
-}
-
 export function filterKeyFieldPath(showKeySchema: boolean, field: SchemaField) {
     return field.fieldPath.indexOf(KEY_SCHEMA_PREFIX) > -1 ? showKeySchema : !showKeySchema;
 }
@@ -151,21 +112,6 @@ export function groupByFieldPath(
     return outputRows;
 }
 
-export function diffMarkdown(oldStr: string, newStr: string) {
-    const diffArray = diff.diffChars(oldStr || '', newStr || '');
-    return diffArray
-        .map((diffOne) => {
-            if (diffOne.added) {
-                return `<ins class="diff">${diffOne.value}</ins>`;
-            }
-            if (diffOne.removed) {
-                return `<del class="diff">${diffOne.value}</del>`;
-            }
-            return diffOne.value;
-        })
-        .join('');
-}
-
 export function diffJson(oldStr: string, newStr: string) {
     const diffArray = diff.diffJson(oldStr || '', newStr || '');
     return diffArray
@@ -206,54 +152,6 @@ export function getRawSchema(schema: PlatformSchema | undefined | null, showKeyS
     return '';
 }
 
-// Get diff summary between two versions and prepare to visualize description diff changes
-export function getDiffSummary(
-    currentVersionRows?: Array<SchemaField>,
-    previousVersionRows?: Array<SchemaField>,
-    options: { showKeySchema: boolean } = { showKeySchema: false },
-): {
-    rows: Array<ExtendedSchemaFields>;
-    diffSummary: SchemaDiffSummary;
-} {
-    let rows = [
-        ...(currentVersionRows?.filter(filterKeyFieldPath.bind({}, options.showKeySchema)) || []),
-    ] as Array<ExtendedSchemaFields>;
-    const previousRows = [
-        ...(previousVersionRows?.filter(filterKeyFieldPath.bind({}, options.showKeySchema)) || []),
-    ] as Array<ExtendedSchemaFields>;
-
-    const diffSummary: SchemaDiffSummary = {
-        added: 0,
-        removed: 0,
-        updated: 0,
-    };
-
-    if (previousVersionRows && previousVersionRows.length > 0) {
-        rows.forEach((field, rowIndex) => {
-            const relevantPastFieldIndex = previousRows.findIndex(
-                (pf) => pf.type === rows[rowIndex].type && pf.fieldPath === rows[rowIndex].fieldPath,
-            );
-            if (relevantPastFieldIndex > -1) {
-                if (previousRows[relevantPastFieldIndex].description !== rows[rowIndex].description) {
-                    rows[rowIndex] = {
-                        ...rows[rowIndex],
-                        previousDescription: previousRows[relevantPastFieldIndex].description,
-                    };
-                    diffSummary.updated++; // Increase updated row number in diff summary
-                }
-                previousRows.splice(relevantPastFieldIndex, 1);
-            } else {
-                rows[rowIndex] = { ...rows[rowIndex], isNewRow: true };
-                diffSummary.added++; // Increase added row number in diff summary
-            }
-        });
-        rows = [...rows, ...previousRows.map((pf) => ({ ...pf, isDeletedRow: true }))];
-        diffSummary.removed = previousRows.length; // removed row number in diff summary
-    }
-
-    return { rows, diffSummary };
-}
-
 // we need to calculate excluding collapsed fields because Antd table expects
 // an indexToScroll to only counting based on visible fields
 export function findIndexOfFieldPathExcludingCollapsedFields(
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/Stats.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/Stats.tsx
deleted file mode 100644
index 1385f6df5aa25e..00000000000000
--- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/Stats.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Radio } from 'antd';
-import React, { useState } from 'react';
-
-import HistoricalStatsView from '@app/entityV2/dataset/profile/stats/historical/HistoricalStatsView';
-import LatestStatsView from '@app/entityV2/dataset/profile/stats/snapshot/LatestStatsView';
-
-import { DatasetProfile } from '@types';
-
-export type Props = {
-    urn: string;
-    profile: DatasetProfile;
-};
-
-enum ViewType {
-    LATEST,
-    HISTORICAL,
-}
-
-export default function Stats({ urn, profile }: Props) {
-    /**
-     * Determines which view should be visible: latest or historical.
-     */
-    const [view, setView] = useState(ViewType.LATEST);
-
-    const onChangeView = (e) => {
-        setView(e.target.value);
-    };
-
-    const toggleView = (
-        <Radio.Group value={view} onChange={onChangeView}>
-            <Radio.Button value={ViewType.LATEST}>Latest</Radio.Button>
-            <Radio.Button value={ViewType.HISTORICAL}>Historical</Radio.Button>
-        </Radio.Group>
-    );
-
-    return (
-        <>
-            {view === ViewType.LATEST && <LatestStatsView profile={profile} toggleView={toggleView} />}
-            {view === ViewType.HISTORICAL && <HistoricalStatsView urn={urn} toggleView={toggleView} />}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/StatsSection.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/StatsSection.tsx
index 32244ee67cc374..b5855f29524e93 100644
--- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/StatsSection.tsx
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/StatsSection.tsx
@@ -14,7 +14,7 @@ const ThinDivider = styled(Divider)`
     margin-bottom: 8px;
 `;
 
-export type Props = {
+type Props = {
     children: React.ReactNode;
     title: string;
     rightFloatView?: React.ReactNode;
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/HistoricalStatsView.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/HistoricalStatsView.tsx
deleted file mode 100644
index 421d9474d075b5..00000000000000
--- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/HistoricalStatsView.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import { Affix, Row, Select, Typography } from 'antd';
-import React, { ReactNode, useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import StatsSection from '@app/entityV2/dataset/profile/stats/StatsSection';
-import ProfilingRunsChart from '@app/entityV2/dataset/profile/stats/historical/charts/ProfilingRunsChart';
-import StatChart from '@app/entityV2/dataset/profile/stats/historical/charts/StatChart';
-import {
-    computeAllFieldPaths,
-    computeChartTickInterval,
-    extractChartValuesFromFieldProfiles,
-    extractChartValuesFromTableProfiles,
-} from '@app/entityV2/shared/utils';
-import { Message } from '@app/shared/Message';
-import { getFixedLookbackWindow } from '@app/shared/time/timeUtils';
-
-import { useGetDataProfilesLazyQuery } from '@graphql/dataset.generated';
-import { DateInterval } from '@types';
-
-const HeaderRow = styled(Row)`
-    padding-top: 24px;
-    padding-bottom: 28px;
-    background-color: white;
-`;
-
-const SubHeaderText = styled(Typography.Text)`
-    color: gray;
-    font-size: 16px;
-`;
-
-const EmbeddedSelect = styled(Select)`
-    padding-left: 8px;
-`;
-
-/**
- * Change this to add or modify the lookback windows that are selectable via the UI.
- */
-const LOOKBACK_WINDOWS = [
-    { text: '1 day', windowSize: { interval: DateInterval.Day, count: 1 } },
-    { text: '1 week', windowSize: { interval: DateInterval.Week, count: 1 } },
-    { text: '1 month', windowSize: { interval: DateInterval.Month, count: 1 } },
-    { text: '3 months', windowSize: { interval: DateInterval.Month, count: 3 } },
-    { text: '1 year', windowSize: { interval: DateInterval.Year, count: 1 } },
-];
-
-const DEFAULT_LOOKBACK_WINDOW = '3 months';
-
-const getLookbackWindowSize = (text: string) => {
-    for (let i = 0; i < LOOKBACK_WINDOWS.length; i++) {
-        const window = LOOKBACK_WINDOWS[i];
-        if (window.text === text) {
-            return window.windowSize;
-        }
-    }
-    throw new Error(`Unrecognized lookback window size ${text} provided`);
-};
-
-export type Props = {
-    urn: string;
-    toggleView: ReactNode;
-};
-
-export default function HistoricalStatsView({ urn, toggleView }: Props) {
-    const [getDataProfiles, { data: profilesData, loading: profilesLoading }] = useGetDataProfilesLazyQuery({
-        fetchPolicy: 'cache-first',
-    });
-
-    /**
-     * Perform initial fetch of default lookback window stats.
-     */
-    useEffect(() => {
-        getDataProfiles({
-            variables: { urn, ...getFixedLookbackWindow(getLookbackWindowSize(DEFAULT_LOOKBACK_WINDOW)) },
-        });
-    }, [urn, getDataProfiles]);
-
-    /**
-     * Determines which fixed lookback window is used to display historical statistics. See above for valid options.
-     */
-    const [selectedLookbackWindow, setSelectedLookbackWindow] = useState(DEFAULT_LOOKBACK_WINDOW);
-    const selectedWindowSize = getLookbackWindowSize(selectedLookbackWindow);
-    const selectedWindow = getFixedLookbackWindow(selectedWindowSize);
-
-    /**
-     * Determines which field path is highlighted in column stats. Defaults to none.
-     */
-    const [selectedFieldPath, setSelectedFieldPath] = useState('');
-
-    /**
-     *  Change handlers.
-     */
-    const onChangeSelectedLookbackWindow = (text) => {
-        const newWindowSize = getLookbackWindowSize(text);
-        const newTimeWindow = getFixedLookbackWindow(newWindowSize);
-        getDataProfiles({
-            variables: { urn, ...newTimeWindow },
-        });
-        setSelectedLookbackWindow(text);
-    };
-
-    const onChangeSelectedFieldPath = (value) => {
-        setSelectedFieldPath(value);
-    };
-
-    const graphTickInterval = computeChartTickInterval(selectedWindowSize);
-    const graphDateRange = {
-        start: selectedWindow.startTime.toString(),
-        end: selectedWindow.endTime.toString(),
-    };
-
-    const profiles = profilesData?.dataset?.datasetProfiles || [];
-    const allFieldPaths = Array.from(computeAllFieldPaths(profiles));
-
-    if (selectedFieldPath === '' && allFieldPaths.length > 0) {
-        // Set initially selected field path.
-        setSelectedFieldPath(allFieldPaths[0]);
-    }
-
-    const columnSelectView = (
-        <span>
-            <SubHeaderText>Viewing stats for column</SubHeaderText>
-            <EmbeddedSelect style={{ width: 200 }} value={selectedFieldPath} onChange={onChangeSelectedFieldPath}>
-                {allFieldPaths.map((fieldPath) => (
-                    <Select.Option value={fieldPath}>{fieldPath}</Select.Option>
-                ))}
-            </EmbeddedSelect>
-        </span>
-    );
-
-    /**
-     * Compute Table Stat chart data.
-     */
-    const rowCountChartValues = extractChartValuesFromTableProfiles(profiles, 'rowCount');
-    const columnCountChartValues = extractChartValuesFromTableProfiles(profiles, 'columnCount');
-
-    /**
-     * Compute Column Stat chart data.
-     */
-    const nullCountChartValues: Array<any> = extractChartValuesFromFieldProfiles(
-        profiles,
-        selectedFieldPath,
-        'nullCount',
-    );
-    const nullPercentageChartValues: Array<any> = extractChartValuesFromFieldProfiles(
-        profiles,
-        selectedFieldPath,
-        'nullProportion',
-    );
-    const distinctCountChartValues: Array<any> = extractChartValuesFromFieldProfiles(
-        profiles,
-        selectedFieldPath,
-        'uniqueCount',
-    );
-    const distinctPercentageChartValues: Array<any> = extractChartValuesFromFieldProfiles(
-        profiles,
-        selectedFieldPath,
-        'uniqueProportion',
-    );
-
-    return (
-        <>
-            {profilesLoading && <Message type="loading" content="Loading..." style={{ marginTop: '10%' }} />}
-            <Affix offsetTop={127}>
-                <HeaderRow justify="space-between" align="middle">
-                    <div>
-                        <Typography.Title level={2}>Profiling History</Typography.Title>
-                        <span>
-                            <SubHeaderText>Viewing profiling history for the past</SubHeaderText>
-                            <EmbeddedSelect value={selectedLookbackWindow} onChange={onChangeSelectedLookbackWindow}>
-                                {LOOKBACK_WINDOWS.map((lookbackWindow) => (
-                                    <Select.Option value={lookbackWindow.text}>{lookbackWindow.text}</Select.Option>
-                                ))}
-                            </EmbeddedSelect>
-                        </span>
-                    </div>
-                    {toggleView}
-                </HeaderRow>
-            </Affix>
-            <StatsSection title="Profiling Runs">
-                <Row>
-                    <ProfilingRunsChart profiles={profiles} />
-                </Row>
-            </StatsSection>
-            <StatsSection title="Historical Table Stats">
-                <Row>
-                    <StatChart
-                        title="Row Count Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={rowCountChartValues}
-                    />
-                    <StatChart
-                        title="Column Count Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={columnCountChartValues}
-                    />
-                </Row>
-            </StatsSection>
-            <StatsSection title="Historical Column Stats" rightFloatView={columnSelectView}>
-                <Row>
-                    <StatChart
-                        title="Null Count Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={nullCountChartValues}
-                    />
-                    <StatChart
-                        title="Null Percentage Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={nullPercentageChartValues}
-                    />
-                    <StatChart
-                        title="Distinct Count Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={distinctCountChartValues}
-                    />
-                    <StatChart
-                        title="Distinct Percentage Over Time"
-                        tickInterval={graphTickInterval}
-                        dateRange={graphDateRange}
-                        values={distinctPercentageChartValues}
-                    />
-                </Row>
-            </StatsSection>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx
deleted file mode 100644
index 4d1cbeeafe4f00..00000000000000
--- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/ProfilingRunsChart.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { Button, Col, Modal, Table, Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import DataProfileView from '@app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView';
-
-import { DatasetProfile } from '@types';
-
-export const ChartTable = styled(Table)`
-    margin: 12px;
-    box-shadow: ${(props) => props.theme.styles['box-shadow']};
-`;
-
-export type Props = {
-    profiles: Array<DatasetProfile>;
-};
-
-export default function ProfilingRunsChart({ profiles }: Props) {
-    const [showModal, setShowModal] = useState(false);
-    const [selectedProfileIndex, setSelectedProfileIndex] = useState(-1);
-
-    const showProfileModal = (index: number) => {
-        setSelectedProfileIndex(index);
-        setShowModal(true);
-    };
-
-    const onClose = () => {
-        setShowModal(false);
-        setSelectedProfileIndex(-1);
-    };
-
-    const tableData = profiles.map((profile) => {
-        const profileDate = new Date(profile.timestampMillis);
-        return {
-            timestamp: `${profileDate.toLocaleDateString()} at ${profileDate.toLocaleTimeString()}`,
-            rowCount: profile.rowCount?.toString() || 'unknown',
-            columnCount: profile.columnCount?.toString() || 'unknown',
-        };
-    });
-
-    const tableColumns = [
-        {
-            title: 'Recent Profiles',
-            key: 'Recent Profiles',
-            dataIndex: 'timestamp',
-            render: (title, record, index) => {
-                return (
-                    <Button type="text" onClick={() => showProfileModal(index)}>
-                        <Typography.Text underline>{title}</Typography.Text>
-                    </Button>
-                );
-            },
-        },
-        {
-            title: 'Row Count',
-            key: 'Row Count',
-            dataIndex: 'rowCount',
-        },
-        {
-            title: 'Column Count',
-            key: 'Column Count',
-            dataIndex: 'columnCount',
-        },
-    ];
-
-    const selectedProfile = (selectedProfileIndex >= 0 && profiles[selectedProfileIndex]) || undefined;
-    const profileModalTitle =
-        selectedProfile &&
-        `Showing profile from ${new Date(selectedProfile?.timestampMillis).toLocaleDateString()} at ${new Date(
-            selectedProfile?.timestampMillis,
-        ).toLocaleTimeString()}`;
-
-    return (
-        <>
-            {selectedProfile && (
-                <Modal width="100%" footer={null} title={profileModalTitle} visible={showModal} onCancel={onClose}>
-                    <DataProfileView profile={selectedProfile} />
-                </Modal>
-            )}
-            <Col sm={24} md={24} lg={12} xl={12}>
-                <ChartTable
-                    scroll={{ y: 400 }}
-                    bordered
-                    style={{ width: '100%', maxHeight: 440 }}
-                    columns={tableColumns}
-                    dataSource={tableData}
-                    pagination={false}
-                    size="small"
-                />
-            </Col>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/StatChart.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/StatChart.tsx
deleted file mode 100644
index 3a8866ad62d651..00000000000000
--- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/historical/charts/StatChart.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import { Col, Divider, Typography } from 'antd';
-import React, { useMemo } from 'react';
-import styled from 'styled-components';
-
-import { ChartCard } from '@app/analyticsDashboard/components/ChartCard';
-import { ChartContainer } from '@app/analyticsDashboard/components/ChartContainer';
-import { TimeSeriesChart } from '@app/analyticsDashboard/components/TimeSeriesChart';
-
-import { DateInterval, DateRange } from '@types';
-
-const ChartTitle = styled(Typography.Title)`
-    && {
-        margin-bottom: 20px;
-        text-align: left;
-        width: 100%;
-    }
-`;
-
-const ThinDivider = styled(Divider)`
-    margin: 0px;
-    padding: 0px;
-`;
-
-type Point = {
-    timeMs: number;
-    value: number;
-};
-
-export type Props = {
-    title: string;
-    values: Array<Point>;
-    tickInterval: DateInterval;
-    dateRange: DateRange;
-};
-
-/**
- * Change these to change the chart axis & line colors
- * TODO: Add this to the theme config.
- */
-const DEFAULT_LINE_COLOR = '#20d3bd';
-const DEFAULT_AXIS_COLOR = '#D8D8D8';
-const DEFAULT_AXIS_WIDTH = 2;
-
-/**
- * Time Series Chart with a single line.
- */
-export default function StatChart({ title, values, tickInterval: interval, dateRange }: Props) {
-    const timeSeriesData = useMemo(
-        () =>
-            values
-                .sort((a, b) => a.timeMs - b.timeMs)
-                .map((value) => {
-                    const dateStr = new Date(value.timeMs).toISOString();
-                    return {
-                        x: dateStr,
-                        y: value.value,
-                    };
-                }),
-        [values],
-    );
-
-    const chartData = {
-        title,
-        lines: [
-            {
-                name: 'line_1',
-                data: timeSeriesData,
-            },
-        ],
-        interval,
-        dateRange,
-    };
-
-    return (
-        <>
-            <Col sm={24} md={24} lg={8} xl={8}>
-                <ChartCard $shouldScroll={false}>
-                    <ChartContainer>
-                        <ChartTitle level={5}>{chartData.title}</ChartTitle>
-                        <ThinDivider />
-                        <TimeSeriesChart
-                            style={{
-                                lineColor: DEFAULT_LINE_COLOR,
-                                axisColor: DEFAULT_AXIS_COLOR,
-                                axisWidth: DEFAULT_AXIS_WIDTH,
-                            }}
-                            hideLegend
-                            chartData={chartData}
-                            width={360}
-                            height={300}
-                        />
-                    </ChartContainer>
-                </ChartCard>
-            </Col>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/LatestStatsView.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/LatestStatsView.tsx
deleted file mode 100644
index b253ce627fc44f..00000000000000
--- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/LatestStatsView.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Affix, Row, Typography } from 'antd';
-import React, { ReactNode } from 'react';
-import styled from 'styled-components';
-
-import DataProfileView from '@app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView';
-
-import { DatasetProfile } from '@types';
-
-const HeaderRow = styled(Row)`
-    padding-top: 24px;
-    padding-bottom: 28px;
-    background-color: white;
-`;
-
-export type Props = {
-    profile: DatasetProfile;
-    toggleView: ReactNode;
-};
-
-export default function LatestStatsView({ profile, toggleView }: Props) {
-    const reportedAtDate = new Date(profile.timestampMillis);
-    return (
-        <>
-            <Affix offsetTop={127}>
-                <HeaderRow justify="space-between" align="middle">
-                    <div>
-                        <Typography.Title level={2}>Latest Stats</Typography.Title>
-                        <Typography.Text style={{ color: 'gray' }}>
-                            Reported on {reportedAtDate.toLocaleDateString()} at {reportedAtDate.toLocaleTimeString()}
-                        </Typography.Text>
-                    </div>
-                    {toggleView}
-                </HeaderRow>
-            </Affix>
-            <DataProfileView profile={profile} />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView.tsx b/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView.tsx
index 279f52e12a0ec7..419c391b15efc5 100644
--- a/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView.tsx
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stats/snapshot/SnapshotStatsView.tsx
@@ -20,7 +20,7 @@ const decimalToPercentStr = (decimal: number, precision: number): string => {
     return `${(decimal * 100).toFixed(precision)}%`;
 };
 
-export type Props = {
+type Props = {
     profile: DatasetProfile;
 };
 
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stories/documentation.ts b/datahub-web-react/src/app/entityV2/dataset/profile/stories/documentation.ts
deleted file mode 100644
index 345d33faddfec0..00000000000000
--- a/datahub-web-react/src/app/entityV2/dataset/profile/stories/documentation.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { EntityType } from '@types';
-
-export const sampleDocs = [
-    {
-        url: 'https://www.google.com',
-        description: 'This doc spans the internet web',
-        author: { urn: 'urn:li:corpuser:1', username: '1', type: EntityType.CorpUser },
-        created: {
-            time: 0,
-            actor: 'urn:li:corpuser:1',
-        },
-    },
-];
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stories/lineageEntities.ts b/datahub-web-react/src/app/entityV2/dataset/profile/stories/lineageEntities.ts
index 3583ca1a8e2dc0..a44be98c3dc0a6 100644
--- a/datahub-web-react/src/app/entityV2/dataset/profile/stories/lineageEntities.ts
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stories/lineageEntities.ts
@@ -1,6 +1,6 @@
 import { EntityType, FabricType, PlatformNativeType } from '@types';
 
-export const sampleUpstreamEntities = [
+const sampleUpstreamEntities = [
     {
         name: 'Upstream HiveDataset',
         type: EntityType.Dataset,
@@ -43,7 +43,7 @@ export const sampleUpstreamEntities = [
     },
 ];
 
-export const sampleDownstreamEntities = [
+const sampleDownstreamEntities = [
     {
         name: 'Downstream HiveDataset',
         type: EntityType.Dataset,
diff --git a/datahub-web-react/src/app/entityV2/dataset/profile/stories/sampleSchema.ts b/datahub-web-react/src/app/entityV2/dataset/profile/stories/sampleSchema.ts
index 9ce31ac0469f91..b19086554bd14a 100644
--- a/datahub-web-react/src/app/entityV2/dataset/profile/stories/sampleSchema.ts
+++ b/datahub-web-react/src/app/entityV2/dataset/profile/stories/sampleSchema.ts
@@ -2,19 +2,6 @@ import { dataset3 } from '@src/Mocks';
 
 import { EntityType, Schema, SchemaField, SchemaFieldDataType, SchemaMetadata } from '@types';
 
-// Extending the schema type with an option for tags
-export type TaggedSchemaField = {
-    tags: Tag[];
-} & SchemaField;
-
-export type Tag = {
-    name: string;
-    value?: string;
-    color: string;
-    category: string;
-    descriptor?: boolean;
-};
-
 export const sampleSchema: SchemaMetadata | Schema | null = {
     name: 'MockSchema',
     platformUrn: 'mock:urn',
diff --git a/datahub-web-react/src/app/entityV2/dataset/shared/FormattedBytesStat.tsx b/datahub-web-react/src/app/entityV2/dataset/shared/FormattedBytesStat.tsx
deleted file mode 100644
index 188fa2b21b18b4..00000000000000
--- a/datahub-web-react/src/app/entityV2/dataset/shared/FormattedBytesStat.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Tooltip } from '@components';
-import React from 'react';
-
-import { formatBytes, formatNumberWithoutAbbreviation } from '@app/shared/formatNumber';
-
-export const FormattedBytesStat = ({ bytes }: { bytes: number }) => {
-    const formattedBytes = formatBytes(bytes);
-    return (
-        <Tooltip title={`This dataset consumes ${formatNumberWithoutAbbreviation(bytes)} bytes of storage.`}>
-            <b>{formattedBytes.number}</b> {formattedBytes.unit}
-        </Tooltip>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductsTab.tsx b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductsTab.tsx
index 1d7bb40c1d988e..36f035a1c45e6d 100644
--- a/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductsTab.tsx
+++ b/datahub-web-react/src/app/entityV2/domain/DataProductsTab/DataProductsTab.tsx
@@ -5,7 +5,7 @@ import React, { useState } from 'react';
 import { useLocation } from 'react-router';
 import styled from 'styled-components';
 
-import { DomainsPaginationContainer } from '@app/domain/DomainsList';
+import { DomainsPaginationContainer } from '@app/domainV2/DomainsList';
 import { useEntityContext, useEntityData } from '@app/entity/shared/EntityContext';
 import CreateDataProductModal from '@app/entityV2/domain/DataProductsTab/CreateDataProductModal';
 import DataProductResult from '@app/entityV2/domain/DataProductsTab/DataProductResult';
diff --git a/datahub-web-react/src/app/entityV2/domain/summary/DocumentationSection.tsx b/datahub-web-react/src/app/entityV2/domain/summary/DocumentationSection.tsx
deleted file mode 100644
index 0b9dc3931bf797..00000000000000
--- a/datahub-web-react/src/app/entityV2/domain/summary/DocumentationSection.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import { EditOutlined, ExpandAltOutlined, FileOutlined } from '@ant-design/icons';
-import { Divider, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useEntityData, useRefetch, useRouteToTab } from '@app/entity/shared/EntityContext';
-import { AddLinkModal } from '@app/entityV2/shared/components/styled/AddLinkModal';
-import { EmptyTab } from '@app/entityV2/shared/components/styled/EmptyTab';
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import { LinkList } from '@app/entityV2/shared/tabs/Documentation/components/LinkList';
-import { Button, Editor } from '@src/alchemy-components';
-
-const Header = styled.div`
-    display: flex;
-    align-items: start;
-    justify-content: space-between;
-    padding: 16px 4px;
-`;
-
-const Title = styled(Typography.Title)`
-    && {
-        color: ${ANTD_GRAY[9]};
-        padding: 0px;
-        margin: 0px;
-        display: flex;
-        align-items: center;
-    }
-`;
-
-const ThinDivider = styled(Divider)`
-    && {
-        padding-top: 0px;
-        padding-bottom: 0px;
-        margin-top: 0px;
-        margin-bottom: 20px;
-    }
-`;
-
-const Documentation = styled.div`
-    .remirror-editor.ProseMirror {
-        padding: 0px 8px;
-    }
-`;
-
-const StyledFileOutlined = styled(FileOutlined)`
-    && {
-        font-size: 16px;
-        margin-right: 8px;
-    }
-`;
-
-export const DocumentationSection = () => {
-    // The summary tab consists of modules
-    const { entityData } = useEntityData();
-    const refetch = useRefetch();
-    const routeToTab = useRouteToTab();
-
-    const description = entityData?.editableProperties?.description || entityData?.properties?.description || '';
-    const hasDescription = description || description !== '';
-
-    return (
-        <>
-            <Header>
-                <Title level={3}>
-                    <StyledFileOutlined />
-                    About
-                </Title>
-                {hasDescription && (
-                    <Button
-                        variant="text"
-                        onClick={() =>
-                            routeToTab({
-                                tabName: 'Documentation',
-                                tabParams: { modal: true },
-                            })
-                        }
-                    >
-                        <ExpandAltOutlined />
-                    </Button>
-                )}
-            </Header>
-            <ThinDivider />
-            <Documentation>
-                {(hasDescription && <Editor content={description} readOnly />) || (
-                    <EmptyTab tab="documentation">
-                        <AddLinkModal refetch={refetch} />
-                        <Button
-                            data-testid="add-documentation"
-                            onClick={() => routeToTab({ tabName: 'Documentation', tabParams: { editing: true } })}
-                        >
-                            <EditOutlined /> Add Documentation
-                        </Button>
-                    </EmptyTab>
-                )}
-                <LinkList refetch={refetch} />
-            </Documentation>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/glossaryNode/useGlossaryChildren.ts b/datahub-web-react/src/app/entityV2/glossaryNode/useGlossaryChildren.ts
index 951d369e7d7fe9..fd4af0abbf5e03 100644
--- a/datahub-web-react/src/app/entityV2/glossaryNode/useGlossaryChildren.ts
+++ b/datahub-web-react/src/app/entityV2/glossaryNode/useGlossaryChildren.ts
@@ -9,7 +9,7 @@ import { ENTITY_NAME_FIELD } from '@src/app/searchV2/context/constants';
 import { useGetAutoCompleteMultipleResultsQuery, useScrollAcrossEntitiesQuery } from '@src/graphql/search.generated';
 import { Entity, EntityType, SortOrder } from '@src/types.generated';
 
-export const GLOSSARY_CHILDREN_COUNT = 50;
+const GLOSSARY_CHILDREN_COUNT = 50;
 
 function getGlossaryChildrenScrollInput(urn: string, scrollId: string | null) {
     return {
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx
index a86dd1d358bc8a..3932d6f84d547a 100644
--- a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx
+++ b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossaryRelatedTermsResult.tsx
@@ -19,7 +19,7 @@ export enum RelatedTermTypes {
     isAChildren = 'Inherited by',
 }
 
-export type Props = {
+type Props = {
     glossaryRelatedTermType: string;
     glossaryRelatedTermResult: Array<any>;
 };
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossarySidebarAboutSection.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossarySidebarAboutSection.tsx
deleted file mode 100644
index 7b9653f2bab5fb..00000000000000
--- a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/GlossarySidebarAboutSection.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useEntityData, useRouteToTab } from '@app/entity/shared/EntityContext';
-import StripMarkdownText from '@app/entityV2/shared/components/styled/StripMarkdownText';
-import { SidebarHeader } from '@app/entityV2/shared/containers/profile/sidebar/SidebarHeader';
-
-const DescriptionTypography = styled(Typography.Paragraph)`
-    max-width: 65ch;
-`;
-
-export default function GlossarySidebarAboutSection() {
-    const { entityData }: any = useEntityData();
-    const description = entityData?.glossaryTermInfo?.definition;
-    const source = entityData?.glossaryTermInfo?.sourceRef;
-    const sourceUrl = entityData?.glossaryTermInfo?.sourceUrl;
-    const routeToTab = useRouteToTab();
-
-    return (
-        <div>
-            <SidebarHeader title="About" />
-            {description && (
-                <DescriptionTypography>
-                    <StripMarkdownText
-                        limit={205}
-                        readMore={
-                            <Typography.Link onClick={() => routeToTab({ tabName: 'Documentation' })}>
-                                Read More
-                            </Typography.Link>
-                        }
-                    >
-                        {description}
-                    </StripMarkdownText>
-                </DescriptionTypography>
-            )}
-
-            <SidebarHeader title="Source" />
-            {source && (
-                <DescriptionTypography>
-                    {sourceUrl ? (
-                        <a href={sourceUrl} target="_blank" rel="noreferrer">
-                            {source}
-                        </a>
-                    ) : (
-                        {
-                            source,
-                        }
-                    )}
-                </DescriptionTypography>
-            )}
-        </div>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/SchemaView.tsx b/datahub-web-react/src/app/entityV2/glossaryTerm/profile/SchemaView.tsx
deleted file mode 100644
index e004c9d1c597a3..00000000000000
--- a/datahub-web-react/src/app/entityV2/glossaryTerm/profile/SchemaView.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Empty, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-export type Props = {
-    rawSchema: string | null;
-};
-
-const Content = styled.div`
-    margin-left: 32px;
-    flex-grow: 1;
-`;
-
-export default function SchemaView({ rawSchema }: Props) {
-    return (
-        <>
-            {rawSchema && rawSchema.length > 0 ? (
-                <Typography.Text data-testid="schema-raw-view">
-                    <pre>
-                        <code>{rawSchema}</code>
-                    </pre>
-                </Typography.Text>
-            ) : (
-                <Content>
-                    <Empty description="No Schema" image={Empty.PRESENTED_IMAGE_SIMPLE} />
-                </Content>
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/group/GroupEditModal.tsx b/datahub-web-react/src/app/entityV2/group/GroupEditModal.tsx
index 97b47d9b1dca96..ed58bd6c415d65 100644
--- a/datahub-web-react/src/app/entityV2/group/GroupEditModal.tsx
+++ b/datahub-web-react/src/app/entityV2/group/GroupEditModal.tsx
@@ -19,8 +19,6 @@ type Props = {
     editModalData: PropsData;
     updateName?: (name: string) => void; // TODO: Add name to the update mutation for groups to avoid 2 calls.
 };
-/** Regex Validations */
-export const USER_NAME_REGEX = new RegExp('^[a-zA-Z ]*$');
 
 export default function GroupEditModal({
     canEditGroupName,
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DomainParentSelect.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DomainParentSelect.tsx
index c467a47102631a..a48acd56080fc5 100644
--- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DomainParentSelect.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/DomainParentSelect.tsx
@@ -14,7 +14,7 @@ import { useDomainsContext } from '@src/app/domainV2/DomainsContext';
 import { Domain, EntityType } from '@types';
 
 // filter out entity itself and its children
-export function filterResultsForMove(entity: Domain, entityUrn: string) {
+function filterResultsForMove(entity: Domain, entityUrn: string) {
     return (
         entity.urn !== entityUrn &&
         entity.__typename === 'Domain' &&
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx
index b6e868ac8d172c..e2e4c92ac95d21 100644
--- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx
@@ -46,7 +46,7 @@ const MenuItems = styled.div<{ $shouldFillAllAvailableSpace?: boolean }>`
 
 const MoreOptionsContainer = styled.div``;
 
-export interface Options {
+interface Options {
     hideDeleteMessage?: boolean;
     skipDeleteWait?: boolean;
 }
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/index.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/index.tsx
deleted file mode 100644
index c048ca17aa97b0..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/index.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import EntityMenuActions from '@app/entityV2/shared/EntityDropdown/EntityMenuActions';
-
-export default EntityMenuActions;
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteGlossaryEntity.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteGlossaryEntity.tsx
deleted file mode 100644
index 8edca65fe0250f..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/useDeleteGlossaryEntity.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Modal, message } from 'antd';
-import { useState } from 'react';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useDeleteGlossaryEntityMutation } from '@graphql/glossary.generated';
-
-function useDeleteGlossaryEntity() {
-    const [hasBeenDeleted, setHasBeenDeleted] = useState(false);
-    const { entityData, urn: entityDataUrn, entityType } = useEntityData();
-    const entityRegistry = useEntityRegistry();
-
-    const [deleteGlossaryEntity] = useDeleteGlossaryEntityMutation();
-
-    function handleDeleteGlossaryEntity() {
-        deleteGlossaryEntity({
-            variables: {
-                urn: entityDataUrn,
-            },
-            fetchPolicy: 'cache-first',
-        })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to delete: \n ${e.message || ''}`, duration: 3 });
-            })
-            .finally(() => {
-                message.loading({
-                    content: 'Deleting...',
-                    duration: 2,
-                });
-                setHasBeenDeleted(true);
-                message.success({
-                    content: `Deleted ${entityRegistry.getEntityName(entityType)}!`,
-                    duration: 2,
-                });
-            });
-    }
-
-    function onDeleteEntity() {
-        Modal.confirm({
-            title: `Delete ${entityRegistry.getDisplayName(entityType, entityData)}`,
-            content: `Are you sure you want to remove this ${entityRegistry.getEntityName(entityType)}?`,
-            onOk() {
-                handleDeleteGlossaryEntity();
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    }
-
-    return { onDeleteEntity, hasBeenDeleted };
-}
-
-export default useDeleteGlossaryEntity;
diff --git a/datahub-web-react/src/app/entityV2/shared/EntityGroups.tsx b/datahub-web-react/src/app/entityV2/shared/EntityGroups.tsx
deleted file mode 100644
index 944d7c498ab6dd..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/EntityGroups.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Tag } from 'antd';
-import React from 'react';
-import { Link } from 'react-router-dom';
-
-import { EmptyValue, GroupsSeeMoreText, Tags, TagsSection } from '@app/entityV2/shared/SidebarStyledComponents';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityRelationship, EntityType } from '@types';
-
-type Props = {
-    readMore: boolean;
-    setReadMore: (readMore: boolean) => void;
-    groupMemberRelationships: Array<EntityRelationship>;
-};
-
-/**
- * EntityGroups- to display the groups category in sidebar section
- */
-export default function EntityGroups({ readMore, setReadMore, groupMemberRelationships }: Props) {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <TagsSection>
-            {groupMemberRelationships?.length === 0 && <EmptyValue />}
-            {!readMore &&
-                groupMemberRelationships?.slice(0, 2).map((item) => {
-                    if (!item?.entity?.urn) return null;
-                    const entityUrn = entityRegistry.getEntityUrl(EntityType.CorpGroup, item?.entity?.urn);
-                    return (
-                        <Link to={entityUrn} key={entityUrn}>
-                            <Tags>
-                                <Tag>{entityRegistry.getDisplayName(EntityType.CorpGroup, item.entity)}</Tag>
-                            </Tags>
-                        </Link>
-                    );
-                })}
-            {readMore &&
-                groupMemberRelationships?.length > 2 &&
-                groupMemberRelationships?.map((item) => {
-                    if (!item?.entity?.urn) return null;
-                    const entityUrn = entityRegistry.getEntityUrl(EntityType.CorpGroup, item.entity.urn);
-                    return (
-                        <Link to={entityUrn} key={entityUrn}>
-                            <Tags>
-                                <Tag>{entityRegistry.getDisplayName(EntityType.CorpGroup, item.entity)}</Tag>
-                            </Tags>
-                        </Link>
-                    );
-                })}
-            {!readMore && groupMemberRelationships?.length > 2 && (
-                <GroupsSeeMoreText onClick={() => setReadMore(!readMore)}>
-                    {`+${groupMemberRelationships?.length - 2} more`}
-                </GroupsSeeMoreText>
-            )}
-        </TagsSection>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInput.tsx b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInput.tsx
deleted file mode 100644
index 4451d8d2a35449..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInput.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-import { Tooltip } from '@components';
-import { Select, Tag } from 'antd';
-import React, { useEffect, useState } from 'react';
-
-import EntitySearchInputResultV2 from '@app/entityV2/shared/EntitySearchInput/EntitySearchInputResultV2';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetEntitiesLazyQuery } from '@graphql/entity.generated';
-import { useGetSearchResultsForMultipleLazyQuery } from '@graphql/search.generated';
-import { Entity, EntityType } from '@types';
-
-type Props = {
-    selectedUrns: string[];
-    entityTypes: EntityType[];
-    placeholder?: string;
-    mode?: 'multiple' | 'single';
-    style?: any;
-    tagStyle?: React.CSSProperties;
-    optionStyle?: React.CSSProperties;
-    onChangeSelectedUrns: (newUrns: string[]) => void;
-};
-
-const addToCache = (cache: Map<string, Entity>, entity: Entity) => {
-    cache.set(entity.urn, entity);
-    return cache;
-};
-
-const buildCache = (entities: Entity[]) => {
-    const cache = new Map();
-    entities.forEach((entity) => cache.set(entity.urn, entity));
-    return cache;
-};
-
-const isResolutionRequired = (urns: string[], cache: Map<string, Entity>) => {
-    const uncachedUrns = urns.filter((urn) => !cache.has(urn));
-    return uncachedUrns.length > 0;
-};
-
-/**
- * This component allows you to search and select entities. It will handle everything, including
- * resolving the entities to their display name when required.
- *
- * TODO: Ideally an initial entity cache could be injected into the component when it's created.
- */
-export const EntitySearchInput = ({
-    selectedUrns,
-    entityTypes,
-    placeholder,
-    style,
-    tagStyle,
-    optionStyle,
-    mode,
-    onChangeSelectedUrns,
-}: Props) => {
-    const entityRegistry = useEntityRegistry();
-    const [entityCache, setEntityCache] = useState<Map<string, Entity>>(new Map());
-
-    /**
-     * Bootstrap by resolving all URNs that are not in the cache yet.
-     */
-    const [getEntities, { data: resolvedEntitiesData }] = useGetEntitiesLazyQuery();
-    useEffect(() => {
-        if (isResolutionRequired(selectedUrns, entityCache)) {
-            // Resolve urns to their full entities
-            getEntities({ variables: { urns: selectedUrns } });
-        }
-    }, [selectedUrns, entityCache, getEntities]);
-
-    /**
-     * If some entities need to be resolved, simply build the cache from them.
-     * This should only happen once at component bootstrap. Typically
-     * all URNs will be missing from the cache.
-     */
-    useEffect(() => {
-        if (resolvedEntitiesData && resolvedEntitiesData.entities?.length) {
-            const entities: Entity[] = (resolvedEntitiesData?.entities as Entity[]) || [];
-            setEntityCache(buildCache(entities));
-        }
-    }, [resolvedEntitiesData]);
-
-    /**
-     * Response to user typing with search.
-     */
-    const [searchResources, { data: resourcesSearchData }] = useGetSearchResultsForMultipleLazyQuery();
-    const searchResults = resourcesSearchData?.searchAcrossEntities?.searchResults || [];
-    const searchResultEntities = searchResults.map((result) => result.entity) as Entity[];
-    const urnToSearchResultEntity = new Map();
-    searchResults.forEach((result) => {
-        urnToSearchResultEntity[result.entity.urn] = {
-            urn: result.entity.urn,
-            type: result.entity.type,
-            displayName: entityRegistry.getDisplayName(result.entity.type, result.entity),
-        };
-    });
-
-    const onSelect = (newUrn) => {
-        const newEntity = searchResultEntities.find((entity) => entity.urn === newUrn);
-        if (newEntity) {
-            setEntityCache(addToCache(entityCache, newEntity));
-            if (mode === 'single') {
-                onChangeSelectedUrns([newUrn]);
-            } else {
-                const newUrns = [...selectedUrns, newUrn];
-                onChangeSelectedUrns(newUrns);
-            }
-        }
-    };
-
-    const onDeselect = (urn) => {
-        if (mode === 'single') {
-            onChangeSelectedUrns([]);
-        } else {
-            onChangeSelectedUrns(selectedUrns.filter((u) => u !== urn));
-        }
-    };
-
-    const onSearch = (text: string) => {
-        searchResources({
-            variables: {
-                input: {
-                    types: entityTypes,
-                    query: text,
-                    start: 0,
-                    count: 10,
-                },
-            },
-        });
-    };
-
-    /**
-     * Issue a star search on component mount to provide a default set of results.
-     */
-    useEffect(() => {
-        searchResources({
-            variables: {
-                input: {
-                    types: entityTypes,
-                    query: '*',
-                    start: 0,
-                    count: 10,
-                },
-            },
-        });
-    }, [entityTypes, searchResources]);
-
-    return (
-        <Select
-            value={selectedUrns}
-            mode="multiple"
-            style={style}
-            filterOption={false}
-            placeholder={placeholder || 'Search for entities...'}
-            onSelect={onSelect}
-            onDeselect={onDeselect}
-            onSearch={onSearch}
-            data-testid="entity-search-input"
-            tagRender={(tagProps) => {
-                let displayName = tagProps.value;
-                if (entityCache.has(tagProps.value as string)) {
-                    const entity = entityCache.get(tagProps.value as string) as Entity;
-                    displayName = entityRegistry.getDisplayName(entity?.type, entity) || displayName;
-                }
-                return (
-                    <Tag closable={tagProps.closable} onClose={tagProps.onClose} style={tagStyle}>
-                        <Tooltip title={displayName}>{displayName}</Tooltip>
-                    </Tag>
-                );
-            }}
-        >
-            {searchResults?.map((result) => (
-                <Select.Option
-                    value={result.entity.urn}
-                    style={optionStyle}
-                    data-testid={`${result.entity.urn}-entity-search-input-result`}
-                >
-                    <EntitySearchInputResultV2 entity={result.entity} />
-                </Select.Option>
-            ))}
-        </Select>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResult.tsx b/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResult.tsx
deleted file mode 100644
index d95864cded9a23..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/EntitySearchInput/EntitySearchInputResult.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { IconStyleType } from '@app/entityV2/Entity';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-type Props = {
-    entity: any;
-};
-
-const Container = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-    padding: 12px;
-`;
-
-const IconContainer = styled.div`
-    margin-right: 8px;
-`;
-
-export const EntitySearchInputResult = ({ entity }: Props) => {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <Container>
-            <IconContainer>{entityRegistry.getIcon(entity.type, 12, IconStyleType.ACCENT)}</IconContainer>
-            {entityRegistry.getDisplayName(entity.type, entity)}
-        </Container>
-    );
-};
-
-export default EntitySearchInputResult;
diff --git a/datahub-web-react/src/app/entityV2/shared/EntitySearchSelect/EntitySearchSelect.tsx b/datahub-web-react/src/app/entityV2/shared/EntitySearchSelect/EntitySearchSelect.tsx
deleted file mode 100644
index 4c1a798bbae973..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/EntitySearchSelect/EntitySearchSelect.tsx
+++ /dev/null
@@ -1,342 +0,0 @@
-import { LoadingOutlined } from '@ant-design/icons';
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import styled from 'styled-components';
-
-import Dropdown from '@components/components/Dropdown/Dropdown';
-import { Input } from '@components/components/Input/Input';
-import {
-    Container,
-    DropdownContainer,
-    LabelContainer,
-    OptionContainer,
-    OptionLabel,
-    OptionList,
-    SelectBase,
-    SelectLabel,
-    SelectLabelContainer,
-    StyledCheckbox,
-    StyledIcon,
-} from '@components/components/Select/components';
-import SelectActionButtons from '@components/components/Select/private/SelectActionButtons';
-import SelectLabelRenderer from '@components/components/Select/private/SelectLabelRenderer/SelectLabelRenderer';
-import useSelectDropdown from '@components/components/Select/private/hooks/useSelectDropdown';
-import { SelectOption, SelectSizeOptions } from '@components/components/Select/types';
-
-import EntitySearchInputResultV2 from '@app/entityV2/shared/EntitySearchInput/EntitySearchInputResultV2';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetEntitiesLazyQuery } from '@graphql/entity.generated';
-import { useGetSearchResultsForMultipleLazyQuery } from '@graphql/search.generated';
-import { Entity, EntityType } from '@types';
-
-const EmptyState = styled.div`
-    padding: 16px 12px;
-    text-align: center;
-    color: #8c8c8c;
-    font-style: italic;
-`;
-
-const LoadingState = styled.div`
-    padding: 16px 12px;
-    text-align: center;
-    color: #8c8c8c;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 8px;
-`;
-
-const SearchInputContainer = styled.div`
-    padding: 8px 12px;
-    border-bottom: 1px solid #f0f0f0;
-`;
-
-const EntityOptionContainer = styled.div`
-    width: 100%;
-`;
-
-export interface EntitySearchSelectProps {
-    selectedUrns?: string[];
-    entityTypes: EntityType[];
-    placeholder?: string;
-    size?: SelectSizeOptions;
-    isMultiSelect?: boolean;
-    isDisabled?: boolean;
-    isReadOnly?: boolean;
-    label?: string;
-    width?: number | 'full' | 'fit-content';
-    onUpdate?: (selectedUrns: string[]) => void;
-    showClear?: boolean;
-    isRequired?: boolean;
-    icon?: any;
-}
-
-interface EntityOption extends SelectOption {
-    entity: Entity;
-}
-
-const addToCache = (cache: Map<string, Entity>, entity: Entity) => {
-    cache.set(entity.urn, entity);
-    return cache;
-};
-
-const buildCache = (entities: Entity[]) => {
-    const cache = new Map();
-    entities.forEach((entity) => cache.set(entity.urn, entity));
-    return cache;
-};
-
-const isResolutionRequired = (urns: string[], cache: Map<string, Entity>) => {
-    const uncachedUrns = urns.filter((urn) => !cache.has(urn));
-    return uncachedUrns.length > 0;
-};
-
-/**
- * A standardized entity search and selection component that allows users to search
- * for DataHub entities and select one or multiple entities. Built on top of the
- * Select component library infrastructure for consistency.
- */
-export const EntitySearchSelect: React.FC<EntitySearchSelectProps> = ({
-    selectedUrns = [],
-    entityTypes,
-    placeholder = 'Search for entities...',
-    size = 'md',
-    isMultiSelect = false,
-    isDisabled = false,
-    isReadOnly = false,
-    label,
-    width = 255,
-    onUpdate,
-    showClear = true,
-    isRequired = false,
-    icon,
-}) => {
-    const entityRegistry = useEntityRegistry();
-    const [entityCache, setEntityCache] = useState<Map<string, Entity>>(new Map());
-    const [searchQuery, setSearchQuery] = useState('');
-    const selectRef = useRef<HTMLDivElement>(null);
-    const dropdownRef = useRef<HTMLDivElement>(null);
-
-    const {
-        isOpen,
-        isVisible,
-        close: closeDropdown,
-        toggle: toggleDropdown,
-    } = useSelectDropdown(false, selectRef, dropdownRef);
-
-    /**
-     * Bootstrap by resolving all URNs that are not in the cache yet.
-     */
-    const [getEntities, { data: resolvedEntitiesData, loading: entitiesLoading }] = useGetEntitiesLazyQuery();
-    useEffect(() => {
-        if (isResolutionRequired(selectedUrns, entityCache)) {
-            getEntities({ variables: { urns: selectedUrns } });
-        }
-    }, [selectedUrns, entityCache, getEntities]);
-
-    /**
-     * Build cache from resolved entities
-     */
-    useEffect(() => {
-        if (resolvedEntitiesData && resolvedEntitiesData.entities?.length) {
-            const entities: Entity[] = (resolvedEntitiesData?.entities as Entity[]) || [];
-            setEntityCache(buildCache(entities));
-        }
-    }, [resolvedEntitiesData]);
-
-    /**
-     * Search functionality
-     */
-    const [searchResources, { data: resourcesSearchData, loading: searchLoading }] =
-        useGetSearchResultsForMultipleLazyQuery();
-
-    const entityOptions: EntityOption[] = useMemo(() => {
-        const results = resourcesSearchData?.searchAcrossEntities?.searchResults || [];
-        return results.map((result) => ({
-            label: entityRegistry.getDisplayName(result.entity.type, result.entity),
-            value: result.entity.urn,
-            entity: result.entity as Entity,
-        }));
-    }, [resourcesSearchData, entityRegistry]);
-
-    const handleSelectClick = useCallback(() => {
-        if (!isDisabled && !isReadOnly) {
-            toggleDropdown();
-        }
-    }, [toggleDropdown, isDisabled, isReadOnly]);
-
-    const handleOptionClick = useCallback(
-        (option: EntityOption) => {
-            // Add entity to cache
-            setEntityCache(addToCache(entityCache, option.entity));
-
-            let newUrns: string[];
-            if (isMultiSelect) {
-                newUrns = selectedUrns.includes(option.value)
-                    ? selectedUrns.filter((urn) => urn !== option.value)
-                    : [...selectedUrns, option.value];
-            } else {
-                newUrns = [option.value];
-                closeDropdown();
-            }
-
-            onUpdate?.(newUrns);
-        },
-        [selectedUrns, isMultiSelect, onUpdate, closeDropdown, entityCache],
-    );
-
-    const handleSearchChange = useCallback(
-        (value: string) => {
-            setSearchQuery(value);
-            searchResources({
-                variables: {
-                    input: {
-                        types: entityTypes,
-                        query: value || '*',
-                        start: 0,
-                        count: 10,
-                    },
-                },
-            });
-        },
-        [entityTypes, searchResources],
-    );
-
-    const handleClearSelection = useCallback(() => {
-        onUpdate?.([]);
-    }, [onUpdate]);
-
-    const removeOption = useCallback(
-        (option: SelectOption) => {
-            const newUrns = selectedUrns.filter((urn) => urn !== option.value);
-            onUpdate?.(newUrns);
-        },
-        [selectedUrns, onUpdate],
-    );
-
-    /**
-     * Issue a default search on component mount
-     */
-    useEffect(() => {
-        searchResources({
-            variables: {
-                input: {
-                    types: entityTypes,
-                    query: '*',
-                    start: 0,
-                    count: 10,
-                },
-            },
-        });
-    }, [entityTypes, searchResources]);
-
-    // Create options for selected values from cache
-    const selectedOptions: SelectOption[] = useMemo(() => {
-        return selectedUrns.map((urn) => {
-            const entity = entityCache.get(urn);
-            return {
-                label: entity ? entityRegistry.getDisplayName(entity.type, entity) : urn,
-                value: urn,
-            };
-        });
-    }, [selectedUrns, entityCache, entityRegistry]);
-
-    const isLoading = entitiesLoading || searchLoading;
-
-    return (
-        <Container ref={selectRef} size={size} width={width}>
-            {label && <SelectLabel onClick={handleSelectClick}>{label}</SelectLabel>}
-            {isVisible && (
-                <Dropdown
-                    open={isOpen}
-                    disabled={isDisabled}
-                    placement="bottomRight"
-                    dropdownRender={() => (
-                        <DropdownContainer ref={dropdownRef}>
-                            <SearchInputContainer>
-                                <Input
-                                    label=""
-                                    value={searchQuery}
-                                    setValue={(value) => {
-                                        const newValue = typeof value === 'function' ? value(searchQuery) : value;
-                                        handleSearchChange(newValue);
-                                    }}
-                                    placeholder="Search..."
-                                    icon={{ icon: 'Search' }}
-                                    data-testid="entity-search-select-input"
-                                />
-                            </SearchInputContainer>
-                            <OptionList>
-                                {isLoading && (
-                                    <LoadingState>
-                                        <LoadingOutlined />
-                                    </LoadingState>
-                                )}
-                                {!isLoading && entityOptions.length === 0 && <EmptyState>No entities found</EmptyState>}
-                                {!isLoading &&
-                                    entityOptions.map((option) => (
-                                        <OptionLabel
-                                            key={option.value}
-                                            onClick={() => !isMultiSelect && handleOptionClick(option)}
-                                            isSelected={selectedUrns.includes(option.value)}
-                                            isMultiSelect={isMultiSelect}
-                                            data-testid={`entity-search-option-${option.entity.urn.split(':').pop()}`}
-                                        >
-                                            {isMultiSelect ? (
-                                                <LabelContainer>
-                                                    <EntityOptionContainer>
-                                                        <EntitySearchInputResultV2 entity={option.entity} />
-                                                    </EntityOptionContainer>
-                                                    <StyledCheckbox
-                                                        onClick={() => handleOptionClick(option)}
-                                                        checked={selectedUrns.includes(option.value)}
-                                                    />
-                                                </LabelContainer>
-                                            ) : (
-                                                <OptionContainer>
-                                                    <EntitySearchInputResultV2 entity={option.entity} />
-                                                </OptionContainer>
-                                            )}
-                                        </OptionLabel>
-                                    ))}
-                            </OptionList>
-                        </DropdownContainer>
-                    )}
-                >
-                    <SelectBase
-                        isDisabled={isDisabled}
-                        isReadOnly={isReadOnly}
-                        isRequired={isRequired}
-                        isOpen={isOpen}
-                        onClick={handleSelectClick}
-                        fontSize={size}
-                        width={width}
-                        data-testid="entity-search-select-select"
-                    >
-                        <SelectLabelContainer>
-                            {icon && <StyledIcon icon={icon} size="lg" />}
-                            <SelectLabelRenderer
-                                selectedValues={selectedUrns}
-                                options={selectedOptions}
-                                placeholder={placeholder}
-                                isMultiSelect={isMultiSelect}
-                                removeOption={removeOption}
-                                disabledValues={[]}
-                                showDescriptions={false}
-                            />
-                        </SelectLabelContainer>
-                        <SelectActionButtons
-                            hasSelectedValues={selectedUrns.length > 0}
-                            isOpen={isOpen}
-                            isDisabled={!!isDisabled}
-                            isReadOnly={!!isReadOnly}
-                            handleClearSelection={handleClearSelection}
-                            fontSize={size}
-                            showClear={!!showClear}
-                        />
-                    </SelectBase>
-                </Dropdown>
-            )}
-        </Container>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/GlossaryEntityContext.tsx b/datahub-web-react/src/app/entityV2/shared/GlossaryEntityContext.tsx
index 27a7e18b9f1acb..8b1c123bb5cb8e 100644
--- a/datahub-web-react/src/app/entityV2/shared/GlossaryEntityContext.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/GlossaryEntityContext.tsx
@@ -3,7 +3,7 @@ import React, { useContext } from 'react';
 import { GenericEntityProperties } from '@app/entity/shared/types';
 import { Entity } from '@src/types.generated';
 
-export interface GlossaryEntityContextType {
+interface GlossaryEntityContextType {
     isInGlossaryContext: boolean;
     entityData: GenericEntityProperties | null;
     setEntityData: (entityData: GenericEntityProperties | null) => void;
diff --git a/datahub-web-react/src/app/entityV2/shared/SidebarStyledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/SidebarStyledComponents.tsx
index d0fbdaaf4578cb..059ebe9003cae3 100644
--- a/datahub-web-react/src/app/entityV2/shared/SidebarStyledComponents.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/SidebarStyledComponents.tsx
@@ -33,24 +33,6 @@ export const SideBar = styled.div`
     }
 `;
 
-export const SideBarSubSection = styled.div`
-    height: calc(100vh - 135px);
-    overflow: auto;
-    padding-right: 18px;
-    &.fullView {
-        height: calc(100vh - 70px);
-    }
-    &::-webkit-scrollbar {
-        height: 12px;
-        width: 1px;
-        background: #d6d6d6;
-    }
-    &::-webkit-scrollbar-thumb {
-        background: #d6d6d6;
-        -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);
-    }
-`;
-
 export const EmptyValue = styled.div<{ color?: string }>`
     &:after {
         content: 'None';
@@ -105,12 +87,6 @@ export const RoleName = styled.div`
     }
 `;
 
-export const Team = styled.div`
-    font-size: 12px;
-    line-height: 20px;
-    color: #8c8c8c;
-`;
-
 export const SocialDetails = styled.div`
     display: flex;
     align-items: center;
@@ -130,24 +106,6 @@ export const SocialDetails = styled.div`
     }
 `;
 
-export const EditButton = styled.div`
-    bottom: 24px;
-    position: absolute;
-    right: 27px;
-    width: 80%;
-    left: 50%;
-    -webkit-transform: translateX(-50%);
-    -moz-transform: translateX(-50%);
-    transform: translateX(-50%);
-
-    button {
-        width: 100%;
-        font-size: 12px;
-        line-height: 20px;
-        color: #262626;
-    }
-`;
-
 export const AboutSection = styled.div`
     text-align: left;
     font-weight: bold;
@@ -187,41 +145,6 @@ export const TagsSection = styled.div`
     align-self: start;
 `;
 
-export const NoDataFound = styled.span`
-    font-size: 12px;
-    color: #262626;
-    font-weight: 100;
-`;
-
-export const Tags = styled.div`
-    margin-top: 5px;
-`;
-
-export const GroupsSeeMoreText = styled.span`
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 20px;
-    color: #1890ff;
-    cursor: pointer;
-`;
-
-export const DisplayCount = styled.span`
-    font-family: Mulish;
-    font-style: normal;
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 20px;
-    color: #8c8c8c;
-`;
-
-export const GroupSectionTitle = styled.span`
-    margin-right: 8px;
-`;
-
-export const GroupSectionHeader = styled.div`
-    padding-bottom: 12px;
-`;
-
 export const Content = styled.div`
     display: flex;
     flex-direction: column;
@@ -343,25 +266,11 @@ export const DraftsOutlinedIconStyle = styled(DraftsOutlinedIcon)`
     font-size: 12px !important;
 `;
 
-export const SubscriptionContainer = styled(Row)`
-    display: flex;
-    gap: 0.5rem;
-`;
-
 export const OwnershipContainer = styled(Row)`
     display: flex;
     gap: 0.5rem;
 `;
 
-export const DisplayNameText = styled.span`
-    color: ${ANTD_GRAY_V2[12]};
-    font-family: Mulish;
-    font-size: 12px;
-    font-style: normal;
-    font-weight: 600;
-    line-height: normal;
-`;
-
 export const NameTitleContainer = styled.div`
     display: flex;
     flex-direction: column;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/legacy/Properties.tsx b/datahub-web-react/src/app/entityV2/shared/components/legacy/Properties.tsx
index 075c458e0a49c9..78e37c2de082af 100644
--- a/datahub-web-react/src/app/entityV2/shared/components/legacy/Properties.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/components/legacy/Properties.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 
 import { StringMapEntry } from '@types';
 
-export type Props = {
+type Props = {
     properties: StringMapEntry[];
 };
 
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/DemoButton.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/DemoButton.tsx
deleted file mode 100644
index 63a9ff061dc782..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/components/styled/DemoButton.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Button } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const StyledButton = styled(Button)`
-    padding: 8px;
-    font-size: 14px;
-    margin-left: 18px;
-`;
-
-export default function DemoButton() {
-    return (
-        <StyledButton
-            type="primary"
-            href="https://www.datahub.com/demo?utm_source=datahub&utm_medium=referral&utm_campaign=acryl_signup"
-            target="_blank"
-            rel="noopener noreferrer"
-        >
-            Schedule a Demo
-        </StyledButton>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/OwnerContent.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/OwnerContent.tsx
deleted file mode 100644
index da921695060bcc..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/components/styled/ExpandedOwner/OwnerContent.tsx
+++ /dev/null
@@ -1,148 +0,0 @@
-import { Popover } from '@components';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-import {
-    getDescriptionFromType,
-    getNameFromType,
-} from '@app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils';
-import { CustomAvatar } from '@app/shared/avatar';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Owner } from '@types';
-
-const TextWrapper = styled.span<{ fontSize?: number }>`
-    ${(props) => props.fontSize && `font-size: ${props.fontSize}px;`}
-    color: ${REDESIGN_COLORS.DARK_GREY};
-
-    max-width: 150px;
-    text-overflow: ellipsis;
-    overflow: hidden;
-`;
-
-const ContentWrapper = styled.span`
-    display: flex;
-    align-items: center;
-    gap: 4px;
-
-    max-width: inherit;
-`;
-
-const AvatarWrapper = styled.div`
-    min-width: 24px;
-`;
-
-const OwnerPopoverTitleContainer = styled.div`
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: flex-start;
-    gap: 6px;
-`;
-
-const OwnerEntityTypeText = styled(Typography.Text)`
-    font-family: 'Mulish', sans-serif;
-    font-weight: 500;
-    font-size: 14px;
-    line-height: 19px;
-`;
-
-const OwnerPopoverContentContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-
-    text-overflow: ellipsis;
-    overflow: hidden;
-`;
-
-const OwnerNameText = styled(Typography.Text)`
-    font-family: 'Mulish', sans-serif;
-    font-weight: 700;
-    font-size: 12px;
-    line-height: 16px;
-    margin-bottom: 4px;
-`;
-
-const OwnershipTypeText = styled(Typography.Text)`
-    font-family: 'Mulish', sans-serif;
-    font-weight: 700;
-    font-size: 10px;
-    line-height: 14px;
-`;
-
-const OwnwershipTypeDescriptionText = styled(Typography.Text)`
-    font-family: 'Mulish', sans-serif;
-    font-weight: 500;
-    font-size: 10px;
-    line-height: 14px;
-`;
-
-interface Props {
-    name: string;
-    owner: Owner;
-    hidePopOver?: boolean;
-    pictureLink?: string;
-    fontSize?: number;
-}
-
-export default function OwnerContent({ name, owner, hidePopOver, pictureLink, fontSize }: Props) {
-    const entityRegistry = useEntityRegistry();
-    const ownerEntity = owner.owner;
-    const ownerEntityType = owner.owner.type;
-    const ownerEntityTypeDisplayName = entityRegistry.getEntityName(ownerEntityType);
-    const ownerDisplayName = entityRegistry.getDisplayName(ownerEntityType, ownerEntity);
-    let ownershipTypeName;
-    let ownershipTypeDescription;
-    if (owner.ownershipType && owner.ownershipType.info) {
-        ownershipTypeName = owner.ownershipType.info.name;
-        ownershipTypeDescription = owner.ownershipType.info.description;
-    } else if (owner.type) {
-        ownershipTypeName = getNameFromType(owner.type);
-        ownershipTypeDescription = getDescriptionFromType(owner.type);
-    }
-
-    const avatar: React.ReactNode = (
-        <CustomAvatar
-            name={name}
-            photoUrl={pictureLink}
-            useDefaultAvatar={false}
-            hideTooltip
-            style={{ marginRight: 0 }}
-        />
-    );
-
-    /* TODO: We probably do not want render if ownership type has been soft deleted */
-
-    return (
-        <ContentWrapper>
-            <AvatarWrapper>{avatar}</AvatarWrapper>
-            {hidePopOver ? (
-                <TextWrapper fontSize={fontSize}>{name}</TextWrapper>
-            ) : (
-                <Popover
-                    overlayStyle={{ maxWidth: 200 }}
-                    placement="left"
-                    showArrow={false}
-                    title={
-                        <OwnerPopoverTitleContainer>
-                            {avatar}
-                            <OwnerEntityTypeText>{ownerEntityTypeDisplayName}</OwnerEntityTypeText>
-                        </OwnerPopoverTitleContainer>
-                    }
-                    content={
-                        <OwnerPopoverContentContainer>
-                            <OwnerNameText>{ownerDisplayName}</OwnerNameText>
-                            <OwnershipTypeText>{ownershipTypeName}</OwnershipTypeText>
-                            <OwnwershipTypeDescriptionText>{ownershipTypeDescription}</OwnwershipTypeDescriptionText>
-                        </OwnerPopoverContentContainer>
-                    }
-                >
-                    <TextWrapper fontSize={fontSize}>{name}</TextWrapper>
-                </Popover>
-            )}
-        </ContentWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton.tsx
index c350c682fb8f0c..dffe2816037177 100644
--- a/datahub-web-react/src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/MarkAsDeprecatedButton.tsx
@@ -35,7 +35,7 @@ type MarkAsDeprecatedButtonContentsProps = {
     internalText?: string;
 };
 
-export const MarkAsDeprecatedButtonContents = ({ internalText }: MarkAsDeprecatedButtonContentsProps) => {
+const MarkAsDeprecatedButtonContents = ({ internalText }: MarkAsDeprecatedButtonContentsProps) => {
     return (
         <FlexContainer>
             <StyledDeprecatedIcon />
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/SeeMore.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/SeeMore.tsx
deleted file mode 100644
index fa7b726c63d18b..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/components/styled/SeeMore.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Button } from 'antd';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-
-export const SeeMore = styled(Button)`
-    margin-top: -20px;
-    background-color: ${ANTD_GRAY[4]};
-    padding: 8px;
-    border: none;
-    line-height: 8px;
-    height: 20px;
-`;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/StripMarkdownText.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/StripMarkdownText.tsx
index 370e1c547786a0..b7ffc7f564940e 100644
--- a/datahub-web-react/src/app/entityV2/shared/components/styled/StripMarkdownText.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/StripMarkdownText.tsx
@@ -10,7 +10,7 @@ const RemoveMarkdownContainer = styled.div<{ shouldWrap: boolean }>`
     text-overflow: ellipsis;
 `;
 
-export type Props = {
+type Props = {
     children: string | undefined | null;
     readMore?: JSX.Element;
     suffix?: JSX.Element;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledButton.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledButton.tsx
deleted file mode 100644
index b3e744a5aac728..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledButton.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Button } from 'antd';
-import styled from 'styled-components';
-
-export default styled(Button)`
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-right: 16px;
-    padding-left: 16px;
-    box-shadow: 0px 0px 4px 0px #0000001a;
-    border: 1px solid #d9d9d9;
-
-    font-size: 12px;
-    font-weight: 500;
-    line-height: 20px;
-    vertical-align: top;
-    border-radius: 5px;
-`;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledMDEditor.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledMDEditor.tsx
deleted file mode 100644
index d0453ec8539420..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledMDEditor.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import MDEditor from '@uiw/react-md-editor';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-
-export default styled(MDEditor)`
-    height: calc(100% - 46px) !important;
-    z-index: 0;
-    box-shadow: none;
-    border-radius: 0;
-    font-weight: 400;
-    .w-md-editor-toolbar {
-        border-color: ${ANTD_GRAY[4]};
-        background: white;
-        padding: 0 20px;
-        height: 46px !important;
-        li {
-            button {
-                height: 100%;
-                margin: 0 5px;
-            }
-            svg {
-                width: 16px;
-                height: 16px;
-            }
-            &.active > button {
-                color: ${(props) => props.theme.styles['primary-color']};
-                background-color: ${ANTD_GRAY[3]};
-            }
-        }
-    }
-    .w-md-editor-preview {
-        box-shadow: inset 1px 0 0 0 ${ANTD_GRAY[4]};
-    }
-    .w-md-editor-content {
-        height: calc(100% - 46px) !important;
-    }
-`;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTable.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTable.tsx
index 5ea962bcdd5e72..69b42a1b16f4e6 100644
--- a/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTable.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/StyledTable.tsx
@@ -37,30 +37,3 @@ export const StyledTable = styled(Table)`
         background-color: inherit;
     }
 ` as typeof Table;
-// this above line preserves the Table component's generic-ness
-
-export const CompactStyledTable = styled(Table)`
-    overflow: inherit;
-    height: inherit;
-
-    &&& .ant-table-cell {
-        background-color: #fff;
-    }
-    &&& .ant-table-thead .ant-table-cell {
-        font-weight: 600;
-        font-size: 12px;
-        color: ${ANTD_GRAY[8]};
-    }
-    &&
-        .ant-table-thead
-        > tr
-        > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not(
-            [colspan]
-        )::before {
-        border: 1px solid ${ANTD_GRAY[4]};
-    }
-
-    &&& td {
-        background-color: inherit;
-    }
-` as typeof Table;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearch.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearch.tsx
index f032a56ba4d2a0..884361245eb87f 100644
--- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearch.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EmbeddedListSearch.tsx
@@ -61,7 +61,7 @@ function useWrappedSearchResults(params: GetSearchResultsParams) {
 }
 
 // the addFixedQuery checks and generate the query as per params pass to embeddedListSearch
-export const addFixedQuery = (baseQuery: string, fixedQuery: string, emptyQuery: string) => {
+const addFixedQuery = (baseQuery: string, fixedQuery: string, emptyQuery: string) => {
     let finalQuery = ``;
     if (baseQuery && fixedQuery) {
         finalQuery = baseQuery.includes(fixedQuery) ? `${baseQuery}` : `(*${baseQuery}*) AND (${fixedQuery})`;
@@ -77,7 +77,7 @@ export const addFixedQuery = (baseQuery: string, fixedQuery: string, emptyQuery:
 
 // Simply remove the fields that were marked as fixed from the facets that the server
 // responds.
-export const removeFixedFiltersFromFacets = (fixedFilters: FilterSet, facets: FacetMetadata[]) => {
+const removeFixedFiltersFromFacets = (fixedFilters: FilterSet, facets: FacetMetadata[]) => {
     const fixedFields = fixedFilters.filters.map((filter) => filter.field);
     return facets.filter((facet) => !fixedFields.includes(facet.field));
 };
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EntitySearchResults.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EntitySearchResults.tsx
index bc584d910ff94f..c7171de6bc5101 100644
--- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/EntitySearchResults.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/EntitySearchResults.tsx
@@ -11,7 +11,7 @@ import { useEntityRegistry } from '@app/useEntityRegistry';
 
 import { Entity, EntityPath, EntityType, SearchResult } from '@types';
 
-export const StyledList = styled(List)`
+const StyledList = styled(List)`
     height: 100%;
     flex: 1;
     overflow: auto;
@@ -37,7 +37,7 @@ const StyledCheckbox = styled(Checkbox)`
     margin-right: 12px;
 `;
 
-export const ListItem = styled.div<{ isSelectMode: boolean; areMatchesExpanded; compactUserSearchCardStyle: boolean }>`
+const ListItem = styled.div<{ isSelectMode: boolean; areMatchesExpanded; compactUserSearchCardStyle: boolean }>`
     padding: 20px;
     display: flex;
     align-items: center;
diff --git a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/ActionDropdown.tsx b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/ActionDropdown.tsx
index 5b826f8059d132..53651109c316f9 100644
--- a/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/ActionDropdown.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/components/styled/search/action/ActionDropdown.tsx
@@ -37,7 +37,7 @@ const DropdownWrapper = styled.div<{
     margin-right: 12px;
 `;
 
-export type Action = {
+type Action = {
     title: React.ReactNode;
     onClick: () => void;
 };
diff --git a/datahub-web-react/src/app/entityV2/shared/components/subtypes.tsx b/datahub-web-react/src/app/entityV2/shared/components/subtypes.tsx
index 461bb3e5cc1282..d21c767e0f2170 100644
--- a/datahub-web-react/src/app/entityV2/shared/components/subtypes.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/components/subtypes.tsx
@@ -18,12 +18,10 @@ export enum SubType {
     Dataset = 'Dataset',
     Project = 'Project',
     View = 'View',
-    Table = 'Table',
     TableauWorksheet = 'Worksheet',
     TableauWorkbook = 'Workbook',
     TableauPublishedDataSource = 'Published Data Source',
     TableauEmbeddedDataSource = 'Embedded Data Source',
-    LookerExplore = 'Explore',
     Looker = 'Look',
     DbtSource = 'Source',
     VertexAIPipelineTask = 'Pipeline Task',
diff --git a/datahub-web-react/src/app/entityV2/shared/constants.ts b/datahub-web-react/src/app/entityV2/shared/constants.ts
index 64c13cfd0eeb8a..ab9327864c2686 100644
--- a/datahub-web-react/src/app/entityV2/shared/constants.ts
+++ b/datahub-web-react/src/app/entityV2/shared/constants.ts
@@ -198,16 +198,6 @@ export const EMPTY_MESSAGES = {
     },
 };
 
-export const ELASTIC_MAX_COUNT = 10000;
-
-export const getElasticCappedTotalValueText = (count: number) => {
-    if (count === ELASTIC_MAX_COUNT) {
-        return `${ELASTIC_MAX_COUNT}+`;
-    }
-
-    return `${count}`;
-};
-
 export const ENTITY_TYPES_WITH_MANUAL_LINEAGE = new Set([
     EntityType.Dashboard,
     EntityType.Chart,
@@ -217,8 +207,6 @@ export const ENTITY_TYPES_WITH_MANUAL_LINEAGE = new Set([
 
 export const GLOSSARY_ENTITY_TYPES = [EntityType.GlossaryTerm, EntityType.GlossaryNode];
 
-export const DEFAULT_SYSTEM_ACTOR_URNS = ['urn:li:corpuser:__datahub_system', 'urn:li:corpuser:unknown'];
-
 export const VIEW_ENTITY_PAGE = 'VIEW_ENTITY_PAGE';
 
 // only values for Domain Entity for custom configurable default tab
@@ -233,10 +221,6 @@ export const EDITING_DOCUMENTATION_URL_PARAM = 'editing';
 
 export const UNKNOWN_DATA_PLATFORM = 'urn:li:dataPlatform:unknown';
 
-export const SMART_ASSERTION_STALE_IN_DAYS = 3;
-
-export const TITLE_CASE_EXCEPTION_WORDS = ['of', 'the', 'in', 'on', 'and', 'a', 'an', 'to', 'for', 'at', 'by'];
-
 export const RECOMMENDATION_MODULE_ID_RECENTLY_VIEWED_ENTITIES = 'RecentlyViewedEntities';
 export const RECOMMENDATION_MODULE_ID_RECENTLY_EDITED_ENTITIES = 'RecentlyEditedEntities';
 export const RECOMMENDATION_MODULE_ID_RECENT_SEARCHES = 'RecentSearches';
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityHeader.test.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityHeader.test.tsx
deleted file mode 100644
index 251aed0bdfd4b7..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityHeader.test.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import { getCanEditName } from '@app/entityV2/shared/containers/profile/header/EntityHeader';
-import { platformPrivileges } from '@src/Mocks';
-
-import { EntityType } from '@types';
-
-describe('getCanEditName', () => {
-    const entityDataWithManagePrivileges = { privileges: { canManageEntity: true } };
-    const entityDataWithoutManagePrivileges = { privileges: { canManageEntity: false } };
-
-    it('should return true for Terms if manageGlossaries privilege is true', () => {
-        const canEditName = getCanEditName(
-            EntityType.GlossaryTerm,
-            entityDataWithoutManagePrivileges,
-            platformPrivileges,
-        );
-
-        expect(canEditName).toBe(true);
-    });
-
-    it('should return false for Terms if manageGlossaries privilege and canManageEntity is false', () => {
-        const privilegesWithoutGlossaries = { ...platformPrivileges, manageGlossaries: false };
-        const canEditName = getCanEditName(
-            EntityType.GlossaryTerm,
-            entityDataWithoutManagePrivileges,
-            privilegesWithoutGlossaries,
-        );
-
-        expect(canEditName).toBe(false);
-    });
-
-    it('should return true for Terms if manageGlossaries privilege is false but canManageEntity is true', () => {
-        const privilegesWithoutGlossaries = { ...platformPrivileges, manageGlossaries: false };
-        const canEditName = getCanEditName(
-            EntityType.GlossaryTerm,
-            entityDataWithManagePrivileges,
-            privilegesWithoutGlossaries,
-        );
-
-        expect(canEditName).toBe(true);
-    });
-
-    it('should return true for Nodes if manageGlossaries privilege is true', () => {
-        const canEditName = getCanEditName(
-            EntityType.GlossaryNode,
-            entityDataWithoutManagePrivileges,
-            platformPrivileges,
-        );
-
-        expect(canEditName).toBe(true);
-    });
-
-    it('should return false for Nodes if manageGlossaries privilege and canManageEntity is false', () => {
-        const privilegesWithoutGlossaries = { ...platformPrivileges, manageGlossaries: false };
-        const canEditName = getCanEditName(
-            EntityType.GlossaryNode,
-            entityDataWithoutManagePrivileges,
-            privilegesWithoutGlossaries,
-        );
-
-        expect(canEditName).toBe(false);
-    });
-
-    it('should return true for Nodes if manageGlossaries privilege is false but canManageEntity is true', () => {
-        const privilegesWithoutGlossaries = { ...platformPrivileges, manageGlossaries: false };
-        const canEditName = getCanEditName(
-            EntityType.GlossaryNode,
-            entityDataWithManagePrivileges,
-            privilegesWithoutGlossaries,
-        );
-
-        expect(canEditName).toBe(true);
-    });
-
-    it('should return true for Domains if manageDomains privilege is true', () => {
-        const canEditName = getCanEditName(EntityType.Domain, entityDataWithoutManagePrivileges, platformPrivileges);
-
-        expect(canEditName).toBe(true);
-    });
-
-    it('should return false for Domains if manageDomains privilege is false', () => {
-        const privilegesWithoutDomains = { ...platformPrivileges, manageDomains: false };
-        const canEditName = getCanEditName(
-            EntityType.Domain,
-            entityDataWithoutManagePrivileges,
-            privilegesWithoutDomains,
-        );
-
-        expect(canEditName).toBe(false);
-    });
-
-    it('should return false for an unsupported entity', () => {
-        const canEditName = getCanEditName(EntityType.Chart, entityDataWithManagePrivileges, platformPrivileges);
-
-        expect(canEditName).toBe(false);
-    });
-});
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityProfile.test.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityProfile.test.tsx
deleted file mode 100644
index 884a35a816eebe..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/EntityProfile.test.tsx
+++ /dev/null
@@ -1,472 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { fireEvent, render, waitFor } from '@testing-library/react';
-import React from 'react';
-
-import { EntityProfile } from '@app/entityV2/shared/containers/profile/EntityProfile';
-import { SidebarAboutSection } from '@app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection';
-import { SidebarStatsSection } from '@app/entityV2/shared/containers/profile/sidebar/Dataset/StatsSidebarSection';
-import { SidebarOwnerSection } from '@app/entityV2/shared/containers/profile/sidebar/Ownership/sidebar/SidebarOwnerSection';
-import { SidebarTagsSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarTagsSection';
-import QueriesTab from '@app/entityV2/shared/tabs/Dataset/Queries/QueriesTab';
-import { SchemaTab } from '@app/entityV2/shared/tabs/Dataset/Schema/SchemaTab';
-import StatsTab from '@app/entityV2/shared/tabs/Dataset/Stats/StatsTab';
-import { DocumentationTab } from '@app/entityV2/shared/tabs/Documentation/DocumentationTab';
-import { LineageTab } from '@app/entityV2/shared/tabs/Lineage/LineageTab';
-import { PropertiesTab } from '@app/entityV2/shared/tabs/Properties/PropertiesTab';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-import { GetDatasetQuery, useGetDatasetQuery, useUpdateDatasetMutation } from '@graphql/dataset.generated';
-import { EntityType } from '@types';
-
-describe('EntityProfile', () => {
-    it('renders dataset page', async () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
-                    <EntityProfile
-                        urn="urn:li:dataset:3"
-                        entityType={EntityType.Dataset}
-                        useEntityQuery={useGetDatasetQuery}
-                        useUpdateQuery={useUpdateDatasetMutation}
-                        getOverrideProperties={() => ({})}
-                        tabs={[
-                            {
-                                name: 'Schema',
-                                component: SchemaTab,
-                            },
-                            {
-                                name: 'Documentation',
-                                component: DocumentationTab,
-                            },
-                            {
-                                name: 'Properties',
-                                component: PropertiesTab,
-                            },
-                            {
-                                name: 'Lineage',
-                                component: LineageTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 ||
-                                        ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0,
-                                },
-                            },
-                            {
-                                name: 'Queries',
-                                component: QueriesTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
-                                },
-                            },
-                            {
-                                name: 'Stats',
-                                component: StatsTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                        ]}
-                        sidebarSections={[
-                            {
-                                component: SidebarAboutSection,
-                            },
-                            {
-                                component: SidebarStatsSection,
-                                display: {
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                            {
-                                component: SidebarTagsSection,
-                            },
-                            {
-                                component: SidebarOwnerSection,
-                            },
-                        ]}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        await waitFor(() => expect(getByText('Yet Another Dataset')).toBeInTheDocument());
-        await waitFor(() =>
-            expect(getByText('This and here we have yet another Dataset (YAN). Are there more?')).toBeInTheDocument(),
-        );
-    }, 20_000);
-
-    it('renders tab content', async () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
-                    <EntityProfile
-                        urn="urn:li:dataset:3"
-                        entityType={EntityType.Dataset}
-                        useEntityQuery={useGetDatasetQuery}
-                        useUpdateQuery={useUpdateDatasetMutation}
-                        getOverrideProperties={() => ({})}
-                        tabs={[
-                            {
-                                name: 'Schema',
-                                component: SchemaTab,
-                            },
-                            {
-                                name: 'Documentation',
-                                component: DocumentationTab,
-                            },
-                            {
-                                name: 'Properties',
-                                component: PropertiesTab,
-                            },
-                            {
-                                name: 'Lineage',
-                                component: LineageTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 ||
-                                        ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0,
-                                },
-                            },
-                            {
-                                name: 'Queries',
-                                component: QueriesTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
-                                },
-                            },
-                            {
-                                name: 'Stats',
-                                component: StatsTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                        ]}
-                        sidebarSections={[
-                            {
-                                component: SidebarAboutSection,
-                            },
-                            {
-                                component: SidebarStatsSection,
-                                display: {
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                            {
-                                component: SidebarTagsSection,
-                            },
-                            {
-                                component: SidebarOwnerSection,
-                            },
-                        ]}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        // find the schema fields in the schema table
-        await waitFor(() => expect(getByText('user_name')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('user_id')).toBeInTheDocument());
-    }, 20_000);
-
-    it('switches tab content', async () => {
-        const { getByText, queryByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
-                    <EntityProfile
-                        urn="urn:li:dataset:3"
-                        entityType={EntityType.Dataset}
-                        useEntityQuery={useGetDatasetQuery}
-                        useUpdateQuery={useUpdateDatasetMutation}
-                        getOverrideProperties={() => ({})}
-                        tabs={[
-                            {
-                                name: 'Schema',
-                                component: SchemaTab,
-                            },
-                            {
-                                name: 'Documentation',
-                                component: DocumentationTab,
-                            },
-                            {
-                                name: 'Properties',
-                                component: PropertiesTab,
-                            },
-                            {
-                                name: 'Lineage',
-                                component: LineageTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 ||
-                                        ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0,
-                                },
-                            },
-                            {
-                                name: 'Queries',
-                                component: QueriesTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
-                                },
-                            },
-                            {
-                                name: 'Stats',
-                                component: StatsTab,
-                                display: {
-                                    enabled: (_, _1) => true,
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                        ]}
-                        sidebarSections={[
-                            {
-                                component: SidebarAboutSection,
-                            },
-                            {
-                                component: SidebarStatsSection,
-                                display: {
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                            {
-                                component: SidebarTagsSection,
-                            },
-                            {
-                                component: SidebarOwnerSection,
-                            },
-                        ]}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        // find the schema fields in the schema table
-        await waitFor(() => expect(getByText('user_name')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('user_id')).toBeInTheDocument());
-        expect(queryByText('propertyAKey')).not.toBeInTheDocument();
-
-        fireEvent(
-            getByText('Properties'),
-            new MouseEvent('click', {
-                bubbles: true,
-                cancelable: true,
-            }),
-        );
-
-        await waitFor(() => expect(getByText('propertyAKey')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('propertyAValue')).toBeInTheDocument());
-        expect(queryByText('user_name')).not.toBeInTheDocument();
-    }, 20_000);
-
-    it('renders sidebar content', async () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
-                    <EntityProfile
-                        urn="urn:li:dataset:3"
-                        entityType={EntityType.Dataset}
-                        useEntityQuery={useGetDatasetQuery}
-                        useUpdateQuery={useUpdateDatasetMutation}
-                        getOverrideProperties={() => ({})}
-                        tabs={[
-                            {
-                                name: 'Schema',
-                                component: SchemaTab,
-                            },
-                            {
-                                name: 'Documentation',
-                                component: DocumentationTab,
-                            },
-                            {
-                                name: 'Properties',
-                                component: PropertiesTab,
-                            },
-                            {
-                                name: 'Lineage',
-                                component: LineageTab,
-                            },
-                            {
-                                name: 'Queries',
-                                component: QueriesTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
-                                },
-                            },
-                            {
-                                name: 'Stats',
-                                component: StatsTab,
-                                display: {
-                                    enabled: (_, _1) => true,
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                        ]}
-                        sidebarSections={[
-                            {
-                                component: SidebarAboutSection,
-                            },
-                            {
-                                component: SidebarStatsSection,
-                                display: {
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                            {
-                                component: SidebarTagsSection,
-                            },
-                            {
-                                component: SidebarOwnerSection,
-                            },
-                        ]}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        // find the tags
-        await waitFor(() => expect(getByText('Tags')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('abc-sample-tag')).toBeInTheDocument());
-    }, 20_000);
-
-    it('renders autorender aspects', async () => {
-        const { getByText } = render(
-            <MockedProvider mocks={mocks} addTypename={false}>
-                <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
-                    <EntityProfile
-                        urn="urn:li:dataset:3"
-                        entityType={EntityType.Dataset}
-                        useEntityQuery={useGetDatasetQuery}
-                        useUpdateQuery={useUpdateDatasetMutation}
-                        getOverrideProperties={() => ({})}
-                        tabs={[
-                            {
-                                name: 'Schema',
-                                component: SchemaTab,
-                            },
-                            {
-                                name: 'Documentation',
-                                component: DocumentationTab,
-                            },
-                            {
-                                name: 'Properties',
-                                component: PropertiesTab,
-                            },
-                            {
-                                name: 'Lineage',
-                                component: LineageTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 ||
-                                        ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0,
-                                },
-                            },
-                            {
-                                name: 'Queries',
-                                component: QueriesTab,
-                                display: {
-                                    visible: (_, _1) => true,
-                                    enabled: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) || false,
-                                },
-                            },
-                            {
-                                name: 'Stats',
-                                component: StatsTab,
-                                display: {
-                                    enabled: (_, _1) => true,
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                        ]}
-                        sidebarSections={[
-                            {
-                                component: SidebarAboutSection,
-                            },
-                            {
-                                component: SidebarStatsSection,
-                                display: {
-                                    visible: (_, dataset: GetDatasetQuery) =>
-                                        (dataset?.dataset?.latestFullTableProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.latestPartitionProfile?.length || 0) > 0 ||
-                                        (dataset?.dataset?.usageStats?.buckets?.length && true) ||
-                                        false,
-                                },
-                            },
-                            {
-                                component: SidebarTagsSection,
-                            },
-                            {
-                                component: SidebarOwnerSection,
-                            },
-                        ]}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        // find the tab name
-        await waitFor(() => expect(getByText('Auto Render Aspect Custom Tab Name')).toBeInTheDocument());
-
-        // open the custom tab
-        fireEvent(
-            getByText('Auto Render Aspect Custom Tab Name'),
-            new MouseEvent('click', {
-                bubbles: true,
-                cancelable: true,
-            }),
-        );
-
-        // find the tab contents
-        await waitFor(() => expect(getByText('autoField1')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('autoValue1')).toBeInTheDocument());
-    });
-}, 20_000);
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/PlatformContent.test.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/PlatformContent.test.tsx
deleted file mode 100644
index a3ba0838b510e0..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/PlatformContent.test.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import React from 'react';
-import { BrowserRouter } from 'react-router-dom';
-
-import PlatformContentView, {
-    getParentContainerNames,
-} from '@app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView';
-import { container1, container2 } from '@src/Mocks';
-
-import { EntityType } from '@types';
-
-vi.mock('../../../../../useEntityRegistry', () => ({
-    useEntityRegistry: () => ({
-        getEntityUrl: vi.fn(() => 'test'),
-        getDisplayName: vi.fn(() => 'database1'),
-    }),
-}));
-
-describe('PlatformContent', () => {
-    const defaultProps = {
-        platformName: 'mysql',
-        entityLogoComponent: <></>,
-        typeIcon: <></>,
-        entityType: EntityType.Dataset,
-        parentContainers: [],
-        parentContainersRef: React.createRef<HTMLDivElement>(),
-        areContainersTruncated: false,
-    };
-
-    it('should not render any containers if there are none in parentContainers', () => {
-        const { queryAllByTestId } = render(<PlatformContentView {...defaultProps} />);
-
-        expect(queryAllByTestId('container')).toHaveLength(0);
-        expect(queryAllByTestId('divider')).toHaveLength(0);
-    });
-
-    it('should render a direct parent container correctly when there is only one container', () => {
-        const { queryAllByTestId, getByText } = render(
-            <BrowserRouter>
-                <PlatformContentView {...defaultProps} parentContainers={[container1]} />
-            </BrowserRouter>,
-        );
-
-        expect(queryAllByTestId('container')).toHaveLength(1);
-        expect(queryAllByTestId('divider')).toHaveLength(1);
-        expect(getByText('database1')).toBeInTheDocument();
-    });
-
-    it('should render all parent containers properly', () => {
-        const { queryAllByTestId } = render(
-            <BrowserRouter>
-                <PlatformContentView {...defaultProps} parentContainers={[container1, container2]} />
-            </BrowserRouter>,
-        );
-
-        expect(queryAllByTestId('container')).toHaveLength(2);
-        expect(queryAllByTestId('divider')).toHaveLength(2);
-    });
-
-    it('should render the correct number of right arrows with no containers and an instanceId', () => {
-        render(
-            <BrowserRouter>
-                <PlatformContentView {...defaultProps} instanceId="mysql1" />
-            </BrowserRouter>,
-        );
-        expect(screen.queryAllByTestId('divider')).toHaveLength(1);
-    });
-
-    it('should render the correct number of right arrows with multiple containers and an instanceId', () => {
-        render(
-            <BrowserRouter>
-                <PlatformContentView
-                    {...defaultProps}
-                    instanceId="mysql1"
-                    parentContainers={[container1, container2]}
-                />
-            </BrowserRouter>,
-        );
-        expect(screen.queryAllByTestId('divider')).toHaveLength(3);
-    });
-
-    it('should render the correct number of right arrows with one containers and an instanceId', () => {
-        render(
-            <BrowserRouter>
-                <PlatformContentView {...defaultProps} instanceId="mysql1" parentContainers={[container2]} />
-            </BrowserRouter>,
-        );
-        expect(screen.queryAllByTestId('divider')).toHaveLength(2);
-    });
-
-    it('should render the correct number of right arrows with multiple containers and no instanceId', () => {
-        render(
-            <BrowserRouter>
-                <PlatformContentView {...defaultProps} parentContainers={[container1, container2]} />
-            </BrowserRouter>,
-        );
-        expect(screen.queryAllByTestId('divider')).toHaveLength(2);
-    });
-
-    it('should render the correct number of right arrows with one container and no instanceId', () => {
-        render(
-            <BrowserRouter>
-                <PlatformContentView {...defaultProps} parentContainers={[container1]} />
-            </BrowserRouter>,
-        );
-        expect(screen.queryAllByTestId('divider')).toHaveLength(1);
-    });
-
-    it('should render the correct number of right arrows with no containers and no instanceID', () => {
-        render(
-            <BrowserRouter>
-                <PlatformContentView {...defaultProps} parentContainers={[]} />
-            </BrowserRouter>,
-        );
-        expect(screen.queryAllByTestId('divider')).toHaveLength(0);
-    });
-});
-
-describe('getParentContainerNames', () => {
-    it('should return an empty string if there are no parent containers', () => {
-        const parentContainerNames = getParentContainerNames([]);
-        expect(parentContainerNames).toBe('');
-    });
-
-    it('should return the name of the parent container if there is only one', () => {
-        const parentContainerNames = getParentContainerNames([container1]);
-        expect(parentContainerNames).toBe(container1.properties?.name);
-    });
-
-    it('should return the names of the parents in reverse order, separated by cright arrows if there are multiple without manipulating the original array', () => {
-        const parentContainers = [container1, container2];
-        const parentContainersCopy = [...parentContainers];
-        const parentContainerNames = getParentContainerNames(parentContainers);
-
-        expect(parentContainerNames).toBe(`${container2.properties?.name} > ${container1.properties?.name}`);
-        expect(parentContainers).toMatchObject(parentContainersCopy);
-    });
-});
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/utils.test.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/utils.test.tsx
deleted file mode 100644
index 9588d1130c4cfd..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/__tests__/utils.test.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { getEntityPath } from '@app/entityV2/shared/containers/profile/utils';
-
-import { EntityType } from '@types';
-
-// Mock the entity registry
-const mockEntityRegistry = {
-    getEntityUrl: vi.fn().mockImplementation((entityType, urn, params) => {
-        const pathName = entityType.toLowerCase();
-        const queryString = params
-            ? `?${Object.entries(params)
-                  .sort(([keyA], [keyB]) => keyA.localeCompare(keyB))
-                  .map(([key, value]) => `${key}=${value}`)
-                  .join('&')}`
-            : '';
-        return `/${pathName}/${urn}${queryString}`;
-    }),
-};
-
-describe('getEntityPath', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    it('should return schema field parent link for SchemaField entity type', () => {
-        const result = getEntityPath(
-            EntityType.SchemaField,
-            'urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:snowflake,test_dataset,PROD),test)',
-            mockEntityRegistry as any,
-            false,
-            false,
-        );
-
-        expect(result).toBe(
-            '/dataset/urn:li:dataset:(urn:li:dataPlatform:snowflake,test_dataset,PROD)/Columns?highlightedPath=test',
-        );
-    });
-
-    it('should construct URL with lineage mode parameter when no tab name is provided', () => {
-        const result = getEntityPath(
-            EntityType.Dataset,
-            'urn:li:dataset:(urn:li:dataPlatform:snowflake,test_dataset,PROD)',
-            mockEntityRegistry as any,
-            true,
-            false,
-        );
-
-        expect(result).toBe(
-            '/dataset/urn:li:dataset:(urn:li:dataPlatform:snowflake,test_dataset,PROD)?is_lineage_mode=true',
-        );
-    });
-
-    it('should construct URL with tab name and lineage mode parameter', () => {
-        const result = getEntityPath(
-            EntityType.Dataset,
-            'urn:li:dataset:(urn:li:dataPlatform:snowflake,test_dataset,PROD)',
-            mockEntityRegistry as any,
-            true,
-            false,
-            'properties',
-        );
-
-        expect(result).toBe(
-            '/dataset/urn:li:dataset:(urn:li:dataPlatform:snowflake,test_dataset,PROD)/properties?is_lineage_mode=true',
-        );
-    });
-
-    it('should include hide sibling mode parameter when enabled', () => {
-        const result = getEntityPath(
-            EntityType.Dataset,
-            'urn:li:dataset:(urn:li:dataPlatform:snowflake,test_dataset,PROD)',
-            mockEntityRegistry as any,
-            true,
-            true,
-            'properties',
-        );
-
-        expect(result).toBe(
-            '/dataset/urn:li:dataset:(urn:li:dataPlatform:snowflake,test_dataset,PROD)/properties?is_lineage_mode=true&separate_siblings=true',
-        );
-    });
-
-    it('should include additional tab parameters when provided', () => {
-        const tabParams = {
-            view: 'list',
-            sort: 'name',
-        };
-
-        const result = getEntityPath(
-            EntityType.Dataset,
-            'urn:li:dataset:(urn:li:dataPlatform:snowflake,test_dataset,PROD)',
-            mockEntityRegistry as any,
-            true,
-            false,
-            'properties',
-            tabParams,
-        );
-
-        expect(result).toBe(
-            '/dataset/urn:li:dataset:(urn:li:dataPlatform:snowflake,test_dataset,PROD)/properties?is_lineage_mode=true&sort=name&view=list',
-        );
-    });
-
-    it('should handle all parameters together', () => {
-        const tabParams = {
-            view: 'list',
-            sort: 'name',
-        };
-
-        const result = getEntityPath(
-            EntityType.Dataset,
-            'urn:li:dataset:(urn:li:dataPlatform:snowflake,test_dataset,PROD)',
-            mockEntityRegistry as any,
-            true,
-            true,
-            'properties',
-            tabParams,
-        );
-
-        expect(result).toBe(
-            '/dataset/urn:li:dataset:(urn:li:dataPlatform:snowflake,test_dataset,PROD)/properties?is_lineage_mode=true&separate_siblings=true&sort=name&view=list',
-        );
-    });
-});
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx
index 9315026f119107..e27dd94ff40f6f 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/DefaultEntityHeader.tsx
@@ -23,7 +23,7 @@ import { useEntityRegistry } from '@app/useEntityRegistry';
 
 import { DataPlatform, DisplayProperties, Domain, EntityType, Post } from '@types';
 
-export const TitleWrapper = styled.div`
+const TitleWrapper = styled.div`
     max-width: 100%;
 
     display: flex;
@@ -55,7 +55,7 @@ const TitleRow = styled(HeaderRow)`
     font-size: 16px;
 `;
 
-export const Row = styled.div`
+const Row = styled.div`
     padding: 18px;
     display: flex;
     flex-direction: row;
@@ -65,7 +65,7 @@ export const Row = styled.div`
     overflow: hidden;
 `;
 
-export const LeftColumn = styled.div`
+const LeftColumn = styled.div`
     min-width: 0;
 
     display: flex;
@@ -73,7 +73,7 @@ export const LeftColumn = styled.div`
     align-items: center;
 `;
 
-export const RightColumn = styled.div`
+const RightColumn = styled.div`
     flex-shrink: 0;
     display: flex;
     flex-direction: column;
@@ -83,7 +83,7 @@ export const RightColumn = styled.div`
     padding-left: 8px;
 `;
 
-export const TopButtonsWrapper = styled.div`
+const TopButtonsWrapper = styled.div`
     display: flex;
     justify-content: flex-end;
     gap: 8px;
@@ -95,7 +95,7 @@ const HeaderIconsWrapper = styled.span`
     margin-right: 8px;
 `;
 
-export type Props = {
+type Props = {
     urn: string;
     entityType: EntityType;
     entityUrl: string;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityCount.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityCount.tsx
index 451cbf05926ad7..a394be680181a0 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityCount.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityCount.tsx
@@ -4,7 +4,7 @@ import styled from 'styled-components';
 
 import { ANTD_GRAY } from '@app/entityV2/shared/constants';
 
-export const EntityCountText = styled(Typography.Text)`
+const EntityCountText = styled(Typography.Text)`
     display: inline-block;
     font-size: 12px;
     line-height: 20px;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeader.tsx
index 8bb0792f64c3d2..bb967a22cbd05d 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeader.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHeader.tsx
@@ -13,7 +13,7 @@ import { DisplayProperties, EntityType, PlatformPrivileges } from '@types';
 
 const Container = styled.div``;
 
-export function getCanEditName(
+function getCanEditName(
     entityType: EntityType,
     entityData: GenericEntityProperties | null,
     privileges?: PlatformPrivileges,
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthPopover.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthPopover.tsx
deleted file mode 100644
index a3020322626596..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthPopover.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { Popover } from '@components';
-import { Divider } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import { EntityHealthStatus } from '@app/entityV2/shared/containers/profile/header/EntityHealthStatus';
-import { HealthSummaryIconType, getHealthSummaryIcon, getHealthSummaryMessage } from '@app/shared/health/healthUtils';
-
-import { Health } from '@types';
-
-const Header = styled.span`
-    display: flex;
-    align-items: center;
-    justify-content: left;
-`;
-
-const Icon = styled.span`
-    margin-right: 8px;
-    display: flex;
-    align-items: center;
-`;
-
-const Title = styled.span`
-    font-weight: bold;
-    color: ${ANTD_GRAY[1]};
-    padding-top: 4px;
-    padding-bottom: 4px;
-    font-size: 14px;
-`;
-
-const StatusContainer = styled.div`
-    margin-bottom: 8px;
-`;
-
-const StyledDivider = styled(Divider)`
-    &&& {
-        margin: 0px;
-        padding: 0px;
-        padding-right: 8px;
-        padding-left: 8px;
-        margin-top: 8px;
-        margin-bottom: 8px;
-        border-color: ${ANTD_GRAY[5]};
-    }
-`;
-
-type Props = {
-    health: Health[];
-    baseUrl: string;
-    children: React.ReactNode;
-    fontSize?: number;
-    placement?: any;
-};
-
-export const EntityHealthPopover = ({ health, baseUrl, children, fontSize, placement = 'right' }: Props) => {
-    return (
-        <Popover
-            showArrow={false}
-            content={
-                <>
-                    <Header>
-                        <Icon>{getHealthSummaryIcon(health, HealthSummaryIconType.OUTLINED, fontSize)}</Icon>{' '}
-                        <Title>{getHealthSummaryMessage(health)}</Title>
-                    </Header>
-                    <StyledDivider />
-                    {health.map((h) => (
-                        <StatusContainer key={h.type}>
-                            <EntityHealthStatus type={h.type} message={h.message || undefined} baseUrl={baseUrl} />
-                        </StatusContainer>
-                    ))}
-                </>
-            }
-            color="#262626"
-            placement={placement}
-            zIndex={10000000}
-        >
-            {children}
-        </Popover>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthStatus.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthStatus.tsx
deleted file mode 100644
index 8c500caba4405b..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityHealthStatus.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-import { getHealthRedirectPath, getHealthTypeName } from '@app/shared/health/healthUtils';
-
-import { HealthStatusType } from '@types';
-
-const StatusContainer = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-    color: ${ANTD_GRAY[1]};
-    font-size: 14px;
-`;
-
-const Title = styled.span`
-    display: flex;
-    align-items: center;
-    font-weight: bold;
-    margin-right: 8px;
-    width: 72px;
-`;
-
-const RedirectLink = styled(Link)`
-    margin-left: 4px;
-    color: ${REDESIGN_COLORS.BLUE};
-`;
-
-type Props = {
-    type: HealthStatusType;
-    message?: string | undefined;
-    baseUrl: string;
-};
-
-export const EntityHealthStatus = ({ type, message, baseUrl }: Props) => {
-    const title = getHealthTypeName(type);
-    const redirectPath = getHealthRedirectPath(type);
-    const fullPath = `${baseUrl}/${redirectPath}`;
-    return (
-        <StatusContainer>
-            <Title>{title}</Title> {message}
-            {redirectPath && (
-                <RedirectLink to={fullPath} data-testid={`${title.toLowerCase()}-details`}>
-                    details
-                </RedirectLink>
-            )}
-        </StatusContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityPlatformLoadingSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityPlatformLoadingSection.tsx
deleted file mode 100644
index 8a8aae53be1ebb..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/EntityPlatformLoadingSection.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Skeleton, Space } from 'antd';
-import * as React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-
-const ContextSkeleton = styled(Skeleton.Input)`
-    && {
-        width: 320px;
-        border-radius: 4px;
-        background-color: ${ANTD_GRAY[3]};
-    }
-`;
-
-export default function EntityPlatformLoadingSection() {
-    return (
-        <Space direction="vertical">
-            <ContextSkeleton active size="small" />
-        </Space>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration.tsx
index 5340458a0160bc..463f7309bfb696 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/GlossaryPreviewCardDecoration.tsx
@@ -16,7 +16,7 @@ interface GlossaryItemRibbonProps {
     color: string;
 }
 
-export const GLOSSARY_RIBBON_SIZE = 8;
+const GLOSSARY_RIBBON_SIZE = 8;
 
 const GlossaryItemRibbon = styled.span<GlossaryItemRibbonProps>`
     position: absolute;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerLink.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerLink.tsx
deleted file mode 100644
index a53c2deafd7ccf..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ContainerLink.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Maybe } from 'graphql/jsutils/Maybe';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import ContainerIcon from '@app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon';
-import { useEmbeddedProfileLinkProps } from '@app/shared/useEmbeddedProfileLinkProps';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Container, EntityType } from '@types';
-
-const ContainerText = styled.span`
-    font-size: 14px;
-    line-height: 20px;
-    margin-left: 6px;
-`;
-
-const StyledLink = styled(Link)`
-    white-space: nowrap;
-    :hover {
-        background-color: ${ANTD_GRAY[3]};
-    }
-    border-radius: 4px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-`;
-
-interface Props {
-    container: Maybe<Container>;
-}
-
-function ContainerLink(props: Props) {
-    const { container } = props;
-    const entityRegistry = useEntityRegistry();
-    const linkProps = useEmbeddedProfileLinkProps();
-
-    if (!container) return null;
-
-    const containerUrl = entityRegistry.getEntityUrl(EntityType.Container, container.urn);
-    const containerName = entityRegistry.getDisplayName(EntityType.Container, container);
-
-    return (
-        <StyledLink to={containerUrl} data-testid="container" {...linkProps}>
-            <ContainerIcon container={props.container} />
-            <ContainerText>{containerName}</ContainerText>
-        </StyledLink>
-    );
-}
-
-export default ContainerLink;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx
deleted file mode 100644
index 404c235fd520e7..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { FolderOutlined, RightOutlined } from '@ant-design/icons';
-import { Tooltip } from '@components';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import useContentTruncation from '@app/shared/useContentTruncation';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType, GlossaryNode } from '@types';
-
-export const StyledRightOutlined = styled(RightOutlined)`
-    color: ${ANTD_GRAY[7]};
-    font-size: 8px;
-    margin: 0 4px;
-`;
-
-// must display content in reverse to have ellipses at the beginning of content
-export const ParentNodesWrapper = styled.div`
-    align-items: center;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    flex-direction: row-reverse;
-    display: flex;
-    max-width: 460px;
-    text-overflow: ellipsis;
-    overflow: hidden;
-`;
-
-export const Ellipsis = styled.span<{ $color?: string }>`
-    color: ${(props) => props.$color ?? ANTD_GRAY[7]};
-    margin-right: 2px;
-`;
-
-export const StyledTooltip = styled(Tooltip)<{ maxWidth?: number }>`
-    display: flex;
-    white-space: nowrap;
-    overflow: hidden;
-    ${(props) => (props.maxWidth ? `max-width: ${props.maxWidth}px;` : '')}
-`;
-
-const GlossaryNodeText = styled(Typography.Text)<{ color: string }>`
-    font-size: 12px;
-    line-height: 20px;
-    color: ${(props) => props.color};
-`;
-
-const GlossaryNodeIcon = styled(FolderOutlined)<{ color: string }>`
-    color: ${(props) => props.color};
-
-    &&& {
-        font-size: 12px;
-        margin-right: 4px;
-    }
-`;
-
-interface Props {
-    parentNodes?: GlossaryNode[] | null;
-}
-
-export default function ParentNodesView({ parentNodes }: Props) {
-    const entityRegistry = useEntityRegistry();
-    const { contentRef, isContentTruncated } = useContentTruncation(parentNodes);
-
-    return (
-        <StyledTooltip
-            title={
-                <>
-                    {[...(parentNodes || [])]?.reverse()?.map((parentNode, idx) => (
-                        <>
-                            <GlossaryNodeIcon color="white" />
-                            <GlossaryNodeText color="white">
-                                {entityRegistry.getDisplayName(EntityType.GlossaryNode, parentNode)}
-                            </GlossaryNodeText>
-                            {idx + 1 !== parentNodes?.length && <StyledRightOutlined data-testid="right-arrow" />}
-                        </>
-                    ))}
-                </>
-            }
-            overlayStyle={isContentTruncated ? {} : { display: 'none' }}
-            maxWidth={580}
-        >
-            {isContentTruncated && <Ellipsis>...</Ellipsis>}
-            <ParentNodesWrapper ref={contentRef}>
-                {[...(parentNodes || [])]?.map((parentNode, idx) => (
-                    <>
-                        <GlossaryNodeText color={ANTD_GRAY[7]}>
-                            {entityRegistry.getDisplayName(EntityType.GlossaryNode, parentNode)}
-                        </GlossaryNodeText>
-                        <GlossaryNodeIcon color={ANTD_GRAY[7]} />
-                        {idx + 1 !== parentNodes?.length && <StyledRightOutlined data-testid="right-arrow" />}
-                    </>
-                ))}
-            </ParentNodesWrapper>
-        </StyledTooltip>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesViewForSearchRedesign.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesViewForSearchRedesign.tsx
deleted file mode 100644
index 56b0414b6e3907..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesViewForSearchRedesign.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { FolderOutlined, RightOutlined } from '@ant-design/icons';
-import { Tooltip } from '@components';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import useContentTruncation from '@app/shared/useContentTruncation';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType, GlossaryNode } from '@types';
-
-export const StyledRightOutlined = styled(RightOutlined)`
-    color: ${ANTD_GRAY[7]};
-    font-size: 8px;
-    margin: 0 4px;
-`;
-
-// must display content in reverse to have ellipses at the beginning of content
-export const ParentNodesWrapper = styled.div`
-    align-items: center;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    flex-direction: row-reverse;
-    display: flex;
-`;
-
-export const Ellipsis = styled.span`
-    color: ${ANTD_GRAY[7]};
-    margin-right: 2px;
-`;
-
-export const StyledTooltip = styled(Tooltip)`
-    display: flex;
-    white-space: nowrap;
-    overflow: hidden;
-`;
-
-const GlossaryNodeText = styled(Typography.Text)<{ color: string }>`
-    color: #56668e;
-
-    font-family: Mulish;
-    font-size: 10px;
-    font-style: normal;
-    font-weight: 500;
-    line-height: normal;
-`;
-
-const GlossaryNodeIcon = styled(FolderOutlined)<{ color: string }>`
-    color: ${(props) => props.color};
-
-    &&& {
-        font-size: 12px;
-        margin-right: 4px;
-    }
-`;
-
-interface Props {
-    parentNodes?: GlossaryNode[] | null;
-}
-
-export default function ParentNodesView({ parentNodes }: Props) {
-    const entityRegistry = useEntityRegistry();
-    const { contentRef, isContentTruncated } = useContentTruncation(parentNodes);
-
-    return (
-        <StyledTooltip
-            title={
-                <>
-                    {[...(parentNodes || [])]?.reverse()?.map((parentNode, idx) => (
-                        <>
-                            <GlossaryNodeIcon color="white" />
-                            <GlossaryNodeText color="white">
-                                {entityRegistry.getDisplayName(EntityType.GlossaryNode, parentNode)}
-                            </GlossaryNodeText>
-                            {idx + 1 !== parentNodes?.length && <StyledRightOutlined data-testid="right-arrow" />}
-                        </>
-                    ))}
-                </>
-            }
-            overlayStyle={isContentTruncated ? {} : { display: 'none' }}
-        >
-            {isContentTruncated && <Ellipsis>...</Ellipsis>}
-            <ParentNodesWrapper ref={contentRef}>
-                {[...(parentNodes || [])]?.map((parentNode, idx) => (
-                    <>
-                        hihihihi
-                        <GlossaryNodeText color={ANTD_GRAY[7]}>
-                            {entityRegistry.getDisplayName(EntityType.GlossaryNode, parentNode)}
-                        </GlossaryNodeText>
-                        <GlossaryNodeIcon color={ANTD_GRAY[7]} />
-                        {idx + 1 !== parentNodes?.length && <StyledRightOutlined data-testid="right-arrow" />}
-                    </>
-                ))}
-            </ParentNodesWrapper>
-        </StyledTooltip>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx
deleted file mode 100644
index e0aaab988113f9..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentContainer.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from 'react';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { IconStyleType } from '@app/entityV2/Entity';
-import ContainerIcon from '@app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon';
-import PlatformContentView from '@app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView';
-import { getDisplayedEntityType } from '@app/entityV2/shared/containers/profile/header/utils';
-import { getPlatformNameFromEntityData } from '@app/entityV2/shared/utils';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import useContentTruncation from '@app/shared/useContentTruncation';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Container, EntityType } from '@types';
-
-function PlatformContentContainer() {
-    const { entityType, entityData } = useEntityData();
-    const entityRegistry = useEntityRegistry();
-    const platformName = getPlatformNameFromEntityData(entityData);
-    const platformLogoUrl = entityData?.platform?.properties?.logoUrl;
-    const entityLogoComponent = entityRegistry.getIcon(entityType, 12, IconStyleType.ACCENT);
-    const typeIcon =
-        entityType === EntityType.Container ? (
-            <ContainerIcon container={entityData as Container} />
-        ) : (
-            entityRegistry.getIcon(entityType, 12, IconStyleType.ACCENT)
-        );
-    const displayedEntityType = getDisplayedEntityType(entityData, entityRegistry, entityType);
-    const instanceId = entityData?.dataPlatformInstance?.instanceId;
-
-    const { contentRef, isContentTruncated } = useContentTruncation(entityData);
-
-    return (
-        <PlatformContentView
-            platformName={platformName}
-            platformLogoUrl={platformLogoUrl}
-            platformNames={entityData?.siblingPlatforms?.map(
-                (platform) => platform.properties?.displayName || capitalizeFirstLetterOnly(platform.name),
-            )}
-            platformLogoUrls={entityData?.siblingPlatforms?.map((platform) => platform.properties?.logoUrl)}
-            entityLogoComponent={entityLogoComponent}
-            instanceId={instanceId}
-            typeIcon={typeIcon}
-            entityType={displayedEntityType}
-            parentContainers={entityData?.parentContainers?.containers}
-            parentContainersRef={contentRef}
-            areContainersTruncated={isContentTruncated}
-            parentEntities={entityData?.parentDomains?.domains}
-        />
-    );
-}
-
-export default PlatformContentContainer;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx
deleted file mode 100644
index d804b6d7d79b69..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentView.tsx
+++ /dev/null
@@ -1,163 +0,0 @@
-import { Image, Typography } from 'antd';
-import { Maybe } from 'graphql/jsutils/Maybe';
-import React from 'react';
-import styled from 'styled-components';
-
-import ContainerLink from '@app/entityV2/shared/containers/profile/header/PlatformContent/ContainerLink';
-import {
-    Ellipsis,
-    ParentNodesWrapper as ParentContainersWrapper,
-    StyledTooltip,
-} from '@app/entityV2/shared/containers/profile/header/PlatformContent/ParentNodesView';
-import ParentEntities from '@app/search/filters/ParentEntities';
-import { useIsShowSeparateSiblingsEnabled } from '@src/app/useAppConfig';
-
-import { Container, Entity } from '@types';
-
-const LogoIcon = styled.span`
-    display: flex;
-    gap: 4px;
-    margin-right: 4px;
-`;
-
-const PreviewImage = styled(Image)`
-    max-height: 17px;
-    width: auto;
-    object-fit: contain;
-    background-color: transparent;
-`;
-
-const PlatformContentWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    margin: 0px 8px 0px 0;
-    flex-wrap: nowrap;
-    flex: 1;
-`;
-
-const PlatformText = styled(Typography.Text)`
-    font-size: 10px;
-    font-weight: 400;
-    color: #6c6b88;
-    text-transform: capitalize;
-    white-space: nowrap;
-`;
-
-const PlatformDivider = styled.div`
-    display: inline-block;
-    margin: 0 10px;
-    border-left: 1px solid #d5d5d5;
-    height: 16px;
-    vertical-align: text-top;
-`;
-
-export function getParentContainerNames(containers?: Maybe<Container>[] | null) {
-    let parentNames = '';
-    if (containers) {
-        [...containers].reverse().forEach((container, index) => {
-            if (container?.properties) {
-                if (index !== 0) {
-                    parentNames += ' > ';
-                }
-                parentNames += container.properties.name;
-            }
-        });
-    }
-    return parentNames;
-}
-
-interface Props {
-    platformName?: string;
-    platformLogoUrl?: Maybe<string>;
-    platformNames?: Maybe<string>[];
-    platformLogoUrls?: Maybe<string>[];
-    entityLogoComponent?: JSX.Element;
-    instanceId?: string;
-    typeIcon?: JSX.Element;
-    entityType?: string;
-    parentContainers?: Maybe<Container>[] | null;
-    parentEntities?: Entity[] | null;
-    parentContainersRef: React.RefObject<HTMLDivElement>;
-    areContainersTruncated: boolean;
-}
-
-function PlatformContentView(props: Props) {
-    const {
-        parentEntities,
-        platformName,
-        platformLogoUrl,
-        platformNames,
-        platformLogoUrls,
-        entityLogoComponent,
-        instanceId,
-        typeIcon,
-        entityType,
-        parentContainers,
-        parentContainersRef,
-        areContainersTruncated,
-    } = props;
-
-    const directParentContainer = parentContainers && parentContainers[0];
-    const remainingParentContainers = parentContainers && parentContainers.slice(1, parentContainers.length);
-
-    const shouldShowSeparateSiblings = useIsShowSeparateSiblingsEnabled();
-    const showSiblingPlatformLogos = !shouldShowSeparateSiblings && !!platformLogoUrls;
-    const showSiblingPlatformNames = !shouldShowSeparateSiblings && !!platformNames;
-
-    return (
-        <PlatformContentWrapper>
-            {platformName && (
-                <>
-                    <LogoIcon>
-                        {!platformLogoUrl && !platformLogoUrls && entityLogoComponent}
-                        {!!platformLogoUrl && !showSiblingPlatformLogos && (
-                            <PreviewImage preview={false} src={platformLogoUrl} alt={platformName} />
-                        )}
-                        {!!showSiblingPlatformLogos &&
-                            platformLogoUrls.slice(0, 2).map((platformLogoUrlsEntry) => (
-                                <>
-                                    <PreviewImage
-                                        preview={false}
-                                        src={platformLogoUrlsEntry || ''}
-                                        alt={platformName}
-                                    />
-                                </>
-                            ))}
-                    </LogoIcon>
-                    <PlatformText>
-                        <span>{showSiblingPlatformNames ? platformNames.join(' & ') : platformName}</span>
-                    </PlatformText>
-                    <PlatformDivider data-testid="platform-divider" />
-                </>
-            )}
-            {instanceId && (
-                <PlatformText>
-                    {instanceId}
-                    <PlatformDivider data-testid="divider" />
-                </PlatformText>
-            )}
-            {typeIcon && <LogoIcon>{typeIcon}</LogoIcon>}
-            <PlatformText>{entityType}</PlatformText>
-            {(!!parentContainers?.length || !!parentEntities?.length) && <PlatformDivider data-testid="divider" />}
-            <StyledTooltip
-                title={getParentContainerNames(parentContainers)}
-                overlayStyle={areContainersTruncated ? {} : { display: 'none' }}
-            >
-                {areContainersTruncated && <Ellipsis>...</Ellipsis>}
-                <ParentContainersWrapper ref={parentContainersRef}>
-                    {remainingParentContainers &&
-                        remainingParentContainers.map((container) => (
-                            <span key={container?.urn}>
-                                <ContainerLink container={container} />
-                                <PlatformDivider data-testid="divider" />
-                            </span>
-                        ))}
-                </ParentContainersWrapper>
-                {directParentContainer && <ContainerLink container={directParentContainer} />}
-            </StyledTooltip>
-            <ParentEntities parentEntities={parentEntities || []} numVisible={3} />
-        </PlatformContentWrapper>
-    );
-}
-
-export default PlatformContentView;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/constants.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/constants.ts
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/index.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/index.ts
deleted file mode 100644
index c55502225183f0..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/PlatformContent/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import PlatformContentContainer from '@app/entityV2/shared/containers/profile/header/PlatformContent/PlatformContentContainer';
-
-export default PlatformContentContainer;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx
index a35a15b4d0c0d2..6dc65c393df01d 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/header/StructuredPropertyBadge.tsx
@@ -9,7 +9,7 @@ import { getStructuredPropertyValue } from '@src/app/entity/shared/utils';
 import { getDisplayName } from '@src/app/govern/structuredProperties/utils';
 import { StructuredProperties } from '@src/types.generated';
 
-export const MAX_PROP_BADGE_WIDTH = 150;
+const MAX_PROP_BADGE_WIDTH = 150;
 
 const StyledTooltip = styled(Tooltip)`
     .ant-tooltip-inner {
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx
deleted file mode 100644
index 97d8cf479fbdeb..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/EmptyContentSection.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useRouteToTab } from '@app/entity/shared/EntityContext';
-import { EMPTY_MESSAGES } from '@app/entityV2/shared/constants';
-
-const EmptyContentWrapper = styled.div`
-    font-size: 12px;
-    display: flex;
-    justify-content: start;
-    align-items: start;
-`;
-
-const EmptyContentMessage = styled(Typography.Text)`
-    font-size: 12px;
-`;
-
-const AddButton = styled.div`
-    margin: 0px;
-    padding: 0px;
-    margin-left: 12px;
-    :hover {
-        cursor: pointer;
-    }
-`;
-
-interface Props {
-    readOnly?: boolean;
-}
-
-export default function EmptyContentSection({ readOnly }: Props) {
-    const routeToTab = useRouteToTab();
-
-    return (
-        <EmptyContentWrapper>
-            <EmptyContentMessage type="secondary">{EMPTY_MESSAGES.documentation.title}</EmptyContentMessage>
-            {!readOnly && (
-                <AddButton onClick={() => routeToTab({ tabName: 'Documentation', tabParams: { editing: true } })}>
-                    <PlusOutlined style={{ fontSize: 10, marginRight: 6 }} /> Add docs
-                </AddButton>
-            )}
-        </EmptyContentWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx
index 95123fadf20ceb..2fc97e70b7f55f 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/AboutSection/SidebarAboutSection.tsx
@@ -116,4 +116,3 @@ export const SidebarAboutSection = ({ properties, readOnly }: Props) => {
     );
 };
 
-export default SidebarAboutSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/utils.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/utils.ts
deleted file mode 100644
index bb00fa32517c50..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Chart/Header/utils.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { ChartProperties } from '@types';
-
-// This util is used for Charts and Dashboards who get last updated differently than others
-export function getLastUpdatedMs(
-    properties: Pick<ChartProperties, 'lastModified' | 'lastRefreshed'> | null | undefined,
-): number | undefined {
-    return properties?.lastRefreshed || properties?.lastModified?.time || undefined;
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx
deleted file mode 100644
index 15af098bb9b767..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/ContainerSelectModal.tsx
+++ /dev/null
@@ -1,192 +0,0 @@
-import { Tooltip } from '@components';
-import { Button, Form, Modal, Select, Tag } from 'antd';
-import React, { ReactNode, useRef, useState } from 'react';
-import styled from 'styled-components/macro';
-
-import { useEnterKeyListener } from '@app/shared/useEnterKeyListener';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetSearchResultsLazyQuery } from '@graphql/search.generated';
-import { Container, Entity, EntityType } from '@types';
-
-type Props = {
-    onCloseModal: () => void;
-    defaultValues?: { urn: string; entity?: Entity | null }[];
-    onOkOverride?: (result: string[]) => void;
-    titleOverride?: string;
-};
-
-type SelectedContainer = {
-    entity?: Entity | null;
-    urn: string;
-};
-
-const StyleTag = styled(Tag)`
-    padding: 0px 7px;
-    margin-right: 3px;
-    display: flex;
-    justify-content: start;
-    align-items: center;
-`;
-
-const PreviewImage = styled.img`
-    max-height: 18px;
-    width: auto;
-    object-fit: contain;
-    background-color: transparent;
-    margin-right: 4px;
-`;
-
-export const ContainerSelectModal = ({ onCloseModal, defaultValues, onOkOverride, titleOverride }: Props) => {
-    const [containerSearch, { data: platforSearchData }] = useGetSearchResultsLazyQuery();
-    const entityRegistry = useEntityRegistry();
-
-    const containerSearchResults =
-        platforSearchData?.search?.searchResults?.map((searchResult) => searchResult.entity) || [];
-
-    const [selectedContainers, setSelectedContainers] = useState<SelectedContainer[]>(defaultValues || []);
-
-    const inputEl = useRef(null);
-
-    const onModalClose = () => {
-        onCloseModal();
-    };
-
-    const handleSearch = (text: string) => {
-        containerSearch({
-            variables: {
-                input: {
-                    type: EntityType.Container,
-                    query: text,
-                    start: 0,
-                    count: 5,
-                },
-            },
-        });
-    };
-
-    // Renders a search result in the select dropdown.
-    const renderSearchResult = (entity: Container) => {
-        const displayName = entityRegistry.getDisplayName(EntityType.Container, entity);
-
-        const truncatedDisplayName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
-        return (
-            <Tooltip title={displayName}>
-                <PreviewImage src={entity.platform?.properties?.logoUrl || undefined} alt={entity.properties?.name} />
-                <span>{truncatedDisplayName}</span>
-            </Tooltip>
-        );
-    };
-
-    const containerSearchOptions = containerSearchResults?.map((result) => {
-        return (
-            <Select.Option value={result.urn} key={result.urn}>
-                {renderSearchResult(result as Container)}
-            </Select.Option>
-        );
-    });
-
-    const onSelectContainer = (newValue: { value: string; label: ReactNode }) => {
-        const newUrn = newValue.value;
-
-        if (inputEl && inputEl.current) {
-            (inputEl.current as any).blur();
-        }
-
-        const filteredContainer = containerSearchResults?.find((entity) => entity.urn === newUrn);
-
-        if (filteredContainer) {
-            const container = filteredContainer as Container;
-            setSelectedContainers([
-                ...(selectedContainers || []),
-                {
-                    entity: container,
-                    urn: newUrn,
-                },
-            ]);
-        }
-    };
-
-    const onDeselectContainer = (val) => {
-        setSelectedContainers(selectedContainers?.filter((container) => container.urn !== val.value));
-    };
-
-    const onOk = () => {
-        if (!selectedContainers) {
-            return;
-        }
-
-        if (onOkOverride) {
-            onOkOverride(selectedContainers?.map((container) => container.urn));
-        }
-    };
-
-    // Handle the Enter press
-    useEnterKeyListener({
-        querySelectorToExecuteClick: '#setContainerButton',
-    });
-
-    const tagRender = (props) => {
-        // eslint-disable-next-line react/prop-types
-        const { label, closable, onClose } = props;
-        const onPreventMouseDown = (event) => {
-            event.preventDefault();
-            event.stopPropagation();
-        };
-        return (
-            <StyleTag onMouseDown={onPreventMouseDown} closable={closable} onClose={onClose}>
-                {label}
-            </StyleTag>
-        );
-    };
-
-    return (
-        <Modal
-            title={titleOverride || 'Select Container'}
-            visible
-            onCancel={onModalClose}
-            footer={
-                <>
-                    <Button onClick={onModalClose} type="text">
-                        Cancel
-                    </Button>
-                    <Button id="setContainerButton" disabled={selectedContainers?.length === 0} onClick={onOk}>
-                        Add
-                    </Button>
-                </>
-            }
-        >
-            <Form component={false}>
-                <Form.Item>
-                    <Select
-                        autoFocus
-                        filterOption={false}
-                        showSearch
-                        mode="multiple"
-                        defaultActiveFirstOption={false}
-                        placeholder="Search for Containers..."
-                        onSelect={(containerUrn: any) => onSelectContainer(containerUrn)}
-                        onDeselect={onDeselectContainer}
-                        onSearch={(value: string) => {
-                            // eslint-disable-next-line react/prop-types
-                            handleSearch(value.trim());
-                        }}
-                        ref={inputEl}
-                        labelInValue
-                        value={selectedContainers?.map((container) => ({
-                            value: container.urn,
-                            label: container.entity ? (
-                                renderSearchResult(container.entity as Container)
-                            ) : (
-                                <span>{container.urn}</span>
-                            ),
-                        }))}
-                        tagRender={tagRender}
-                    >
-                        {containerSearchOptions}
-                    </Select>
-                </Form.Item>
-            </Form>
-        </Modal>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/utils.tsx
index 29b11988eb8dd2..c2d81693b11668 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/utils.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Container/utils.tsx
@@ -13,13 +13,13 @@ const SummaryText = styled.span`
     color: ${ANTD_GRAY[7]};
 `;
 
-export type ContentTypeSummary = {
+type ContentTypeSummary = {
     type: string;
     count: number;
     isEntityType: boolean; // If false, this represents a sub-type.
 };
 
-export type ContentsSummary = {
+type ContentsSummary = {
     total: number;
     types: ContentTypeSummary[];
 };
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx
deleted file mode 100644
index af2564d642cca4..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Dataset/StatsSidebarSection.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-import { Button, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useBaseEntity, useRouteToTab } from '@app/entity/shared/EntityContext';
-import UsageFacepile from '@app/entityV2/dataset/profile/UsageFacepile';
-import { InfoItem } from '@app/entityV2/shared/components/styled/InfoItem';
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import { SidebarHeader } from '@app/entityV2/shared/containers/profile/sidebar/SidebarHeader';
-import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber';
-
-import { GetDatasetQuery } from '@graphql/dataset.generated';
-import { Operation, UsageQueryResult } from '@types';
-
-const HeaderInfoBody = styled(Typography.Text)`
-    font-size: 16px;
-    color: ${ANTD_GRAY[9]};
-`;
-
-const HeaderContainer = styled.div`
-    justify-content: space-between;
-    display: flex;
-`;
-
-const StatsButton = styled(Button)`
-    margin-top: -4px;
-`;
-
-const StatsRow = styled.div`
-    padding-top: 12px;
-    padding-bottom: 12px;
-`;
-
-const INFO_ITEM_WIDTH_PX = '150px';
-const LAST_UPDATED_WIDTH_PX = '220px';
-
-export const SidebarStatsSection = () => {
-    const baseEntity = useBaseEntity<GetDatasetQuery>();
-
-    const toLocalDateTimeString = (time: number) => {
-        const date = new Date(time);
-        return date.toLocaleString([], {
-            year: 'numeric',
-            month: 'numeric',
-            day: 'numeric',
-            hour: '2-digit',
-            minute: '2-digit',
-            timeZoneName: 'short',
-        });
-    };
-
-    const latestFullTableProfile = baseEntity?.dataset?.latestFullTableProfile?.[0];
-    const latestPartitionProfile = baseEntity?.dataset?.latestPartitionProfile?.[0];
-
-    const hasUsageStats = baseEntity?.dataset?.usageStats !== undefined;
-    const hasOperations = (baseEntity?.dataset?.operations?.length || 0) > 0;
-
-    const usageStats = (hasUsageStats && (baseEntity?.dataset?.usageStats as UsageQueryResult)) || undefined;
-    const latestProfile = latestFullTableProfile || latestPartitionProfile;
-
-    const operations = (hasOperations && (baseEntity?.dataset?.operations as Array<Operation>)) || undefined;
-    const latestOperation = operations && operations[0];
-
-    const lastUpdatedTime = latestOperation && toLocalDateTimeString(latestOperation?.lastUpdatedTimestamp);
-
-    const hasUsageStatsAggregations =
-        usageStats?.aggregations?.totalSqlQueries || (usageStats?.aggregations?.users?.length || 0) > 0;
-    const hasLatestProfiles = latestProfile?.rowCount || latestProfile?.columnCount;
-    const hasLatestOperation = latestOperation?.timestampMillis;
-    const routeToTab = useRouteToTab();
-
-    return (
-        <div>
-            <HeaderContainer>
-                <SidebarHeader title="Stats" />
-                <StatsButton onClick={() => routeToTab({ tabName: 'Stats' })} type="link">
-                    More stats &gt;
-                </StatsButton>
-            </HeaderContainer>
-            {/* Dataset Profile Entry */}
-            {hasLatestProfiles && (
-                <StatsRow>
-                    {latestProfile?.rowCount ? (
-                        <InfoItem
-                            title="Rows"
-                            onClick={() => routeToTab({ tabName: 'Queries' })}
-                            width={INFO_ITEM_WIDTH_PX}
-                        >
-                            <HeaderInfoBody>{formatNumberWithoutAbbreviation(latestProfile?.rowCount)}</HeaderInfoBody>
-                        </InfoItem>
-                    ) : null}
-                    {latestProfile?.columnCount ? (
-                        <InfoItem title="Columns" width={INFO_ITEM_WIDTH_PX}>
-                            <HeaderInfoBody>{latestProfile?.columnCount}</HeaderInfoBody>
-                        </InfoItem>
-                    ) : null}
-                </StatsRow>
-            )}
-            {/* Usage Stats Entry */}
-            {hasUsageStatsAggregations && (
-                <StatsRow>
-                    {usageStats?.aggregations?.totalSqlQueries ? (
-                        <InfoItem
-                            title="Monthly Queries"
-                            onClick={() => routeToTab({ tabName: 'Queries' })}
-                            width={INFO_ITEM_WIDTH_PX}
-                        >
-                            <HeaderInfoBody>
-                                {usageStats?.aggregations?.totalSqlQueries
-                                    ? formatNumberWithoutAbbreviation(usageStats?.aggregations?.totalSqlQueries)
-                                    : null}
-                            </HeaderInfoBody>
-                        </InfoItem>
-                    ) : null}
-                    {(usageStats?.aggregations?.users?.length || 0) > 0 ? (
-                        <InfoItem title="Top Users" width={INFO_ITEM_WIDTH_PX}>
-                            <UsageFacepile users={usageStats?.aggregations?.users} maxNumberDisplayed={10} />
-                        </InfoItem>
-                    ) : null}
-                </StatsRow>
-            )}
-            {/* Operation Entry */}
-            {hasLatestOperation ? (
-                <StatsRow>
-                    <InfoItem
-                        title="Last Updated"
-                        onClick={() => routeToTab({ tabName: 'Queries' })}
-                        width={LAST_UPDATED_WIDTH_PX}
-                    >
-                        <HeaderInfoBody>{lastUpdatedTime}</HeaderInfoBody>
-                    </InfoItem>
-                </StatsRow>
-            ) : null}
-        </div>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDataProductsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDataProductsSection.tsx
deleted file mode 100644
index 43bf91432b4f29..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/SidebarDataProductsSection.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import React from 'react';
-import { useHistory } from 'react-router';
-import styled from 'styled-components/macro';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-import { navigateToDomainDataProducts } from '@app/entityV2/shared/containers/profile/sidebar/Domain/utils';
-import EmptySectionText from '@app/entityV2/shared/containers/profile/sidebar/EmptySectionText';
-import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection';
-import { pluralize } from '@app/shared/textUtil';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-const Section = styled.div`
-    display: flex;
-    align-items: start;
-    justify-content: start;
-    flex-wrap: wrap;
-    text-wrap: wrap;
-`;
-
-const SummaryText = styled.div``;
-
-const ViewAllButton = styled.div`
-    display: flex;
-    align-items: center;
-    font-weight: bold;
-    padding: 0px 2px;
-    margin-left: 8px;
-    color: ${REDESIGN_COLORS.DARK_GREY};
-    :hover {
-        cursor: pointer;
-    }
-`;
-
-const SidebarDataProductsSection = () => {
-    const { urn, entityType, entityData } = useEntityData();
-    const entityRegistry = useEntityRegistry();
-    const history = useHistory();
-
-    const domain = entityData as any;
-    const productsCount = domain?.dataProducts?.total || 0;
-    const hasProducts = productsCount > 0;
-
-    if (!hasProducts) {
-        return null;
-    }
-
-    return (
-        <SidebarSection
-            title="Data Products"
-            key="Data Products"
-            content={
-                <>
-                    {(hasProducts && (
-                        <>
-                            <Section>
-                                <SummaryText>
-                                    {productsCount}
-                                    {pluralize(productsCount, 'data product')}
-                                </SummaryText>
-                                <ViewAllButton
-                                    onClick={() =>
-                                        navigateToDomainDataProducts(urn, entityType, history, entityRegistry)
-                                    }
-                                >
-                                    View all
-                                </ViewAllButton>
-                            </Section>
-                        </>
-                    )) || <EmptySectionText message="No products yet" />}
-                </>
-            }
-        />
-    );
-};
-
-export default SidebarDataProductsSection;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/utils.tsx
index 8f1fea31cca888..f58d557de2c939 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/utils.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Domain/utils.tsx
@@ -15,13 +15,13 @@ const SummaryText = styled.span`
     color: ${ANTD_GRAY[7]};
 `;
 
-export type ContentTypeSummary = {
+type ContentTypeSummary = {
     entityType: EntityType;
     type?: string;
     count: number;
 };
 
-export type ContentsSummary = {
+type ContentsSummary = {
     total: number;
     types: ContentTypeSummary[];
 };
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx
deleted file mode 100644
index a4dbce6eb9471b..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityInfo/EntityInfo.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import Link from 'antd/lib/typography/Link';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { DatasetStatsSummarySubHeader } from '@app/entityV2/dataset/profile/stats/stats/DatasetStatsSummarySubHeader';
-import PlatformContent from '@app/entityV2/shared/containers/profile/header/PlatformContent';
-import FormInfo from '@app/entityV2/shared/containers/profile/sidebar/FormInfo/FormInfo';
-import { StyledDivider } from '@app/entityV2/shared/containers/profile/sidebar/FormInfo/components';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import LinkOut from '@images/link-out.svg?react';
-
-const EntityName = styled.div`
-    font-size: 16px;
-    font-weight: 700;
-    line-height: 24px;
-    margin-bottom: 8px;
-`;
-
-const EntityInfoWrapper = styled.div`
-    padding-top: 20px;
-`;
-
-const StyledLink = styled(Link)`
-    font-size: 14px;
-    line-height: 18px;
-    display: inline-flex;
-    align-items: center;
-
-    svg {
-        height: 14px;
-        width: 14px;
-    }
-`;
-
-const FormInfoWrapper = styled.div`
-    margin-top: 12px;
-`;
-
-interface Props {
-    formUrn: string;
-}
-
-export default function EntityInfo({ formUrn }: Props) {
-    const entityRegistry = useEntityRegistry();
-    const { entityType, entityData } = useEntityData();
-    const entityName = entityData ? entityRegistry.getDisplayName(entityType, entityData) : '';
-
-    return (
-        <EntityInfoWrapper>
-            <PlatformContent />
-            <EntityName>{entityName}</EntityName>
-            <StyledLink
-                href={`${entityRegistry.getEntityUrl(entityType, entityData?.urn || '')}/`}
-                target="_blank"
-                rel="noreferrer noopener"
-            >
-                View Profile <LinkOut style={{ marginLeft: '4px' }} />
-            </StyledLink>
-            <DatasetStatsSummarySubHeader />
-            <FormInfoWrapper>
-                <FormInfo formUrn={formUrn} />
-            </FormInfoWrapper>
-            <StyledDivider />
-        </EntityInfoWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebarSearchHeader.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebarSearchHeader.tsx
deleted file mode 100644
index 52b07a9b40c7c0..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntityProfileSidebarSearchHeader.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Button } from 'antd';
-import React, { useContext } from 'react';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { useCustomTheme } from '@src/customThemeContext';
-
-import SidebarBackArrow from '@images/sidebarBackArrow.svg?react';
-
-const Container = styled.div`
-    display: flex;
-    flex-direction: horizontal;
-    justify-content: space-between;
-    padding-left: 20px;
-    padding-right: 20px;
-    padding-top: 12px;
-    padding-bottom: 4px;
-    align-items: center;
-`;
-
-const StyledSidebarBackArrow = styled(SidebarBackArrow)`
-    cursor: pointer;
-`;
-
-type Props = {
-    showViewDetails?: boolean;
-};
-
-export default function EntityProfileSidebarSearchHeader({ showViewDetails = true }: Props) {
-    const { theme } = useCustomTheme();
-    const entitySidebarContext = useContext(EntitySidebarContext);
-    const entityRegistry = useEntityRegistry();
-    const { urn, entityType } = useEntityData();
-
-    return (
-        <Container>
-            <StyledSidebarBackArrow
-                onClick={() => {
-                    entitySidebarContext.setSidebarClosed(true);
-                }}
-            />
-            {showViewDetails && (
-                <Button
-                    size="small"
-                    type="primary"
-                    color={theme?.styles['primary-color']}
-                    href={entityRegistry.getEntityUrl(entityType, urn)}
-                >
-                    View more
-                </Button>
-            )}
-        </Container>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab.tsx
index f6e11ce9cdf569..c7d7a40a18e219 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/EntitySidebarSectionsTab.tsx
@@ -22,13 +22,6 @@ interface Props {
     renderType: TabRenderType;
 }
 
-export const contextsWithoutLastSynchronized = [
-    TabContextType.CHROME_SIDEBAR,
-    TabContextType.SEARCH_SIDEBAR,
-    TabContextType.LINEAGE_SIDEBAR,
-    TabContextType.FORM_SIDEBAR,
-];
-
 export default function EntitySidebarSectionsTab({ properties, contextType, renderType }: Props) {
     const sections = properties?.sections || [];
 
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/components.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/components.ts
index 7985c2ac5d9f45..6bf25ad2424d21 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/components.ts
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/FormInfo/components.ts
@@ -1,7 +1,5 @@
-import { ReadFilled, ReadOutlined } from '@ant-design/icons';
-import Icon from '@ant-design/icons/lib/components/Icon';
+import { ReadOutlined } from '@ant-design/icons';
 import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined';
-import { Divider } from 'antd';
 import styled from 'styled-components';
 
 export const FlexWrapper = styled.div`
@@ -9,19 +7,6 @@ export const FlexWrapper = styled.div`
     line-height: 18px;
 `;
 
-export const StyledIcon = styled(Icon)<{ addLineHeight?: boolean }>`
-    font-size: 18px;
-    margin-right: 8px;
-    ${(props) => props.addLineHeight && `line-height: 24px;`}
-`;
-
-export const SubTitle = styled.div<{ addMargin?: boolean }>`
-    font-weight: 600;
-    margin-bottom: 4px;
-    ${(props) => props.addMargin && `margin-top: 8px;`}
-    text-wrap: wrap;
-`;
-
 export const Title = styled.div`
     font-size: 16px;
     font-weight: 600;
@@ -29,10 +14,6 @@ export const Title = styled.div`
     align-items: center;
 `;
 
-export const StyledDivider = styled(Divider)`
-    margin: 12px 0 0 0;
-`;
-
 export const StyledReadOutlined = styled(ReadOutlined)<{ color?: string; addLineHeight?: boolean }>`
     margin-right: 8px;
     height: 18px;
@@ -42,15 +23,6 @@ export const StyledReadOutlined = styled(ReadOutlined)<{ color?: string; addLine
     ${(props) => props.color && `color: ${props.color};`}
 `;
 
-export const StyledReadFilled = styled(ReadFilled)<{ color: string; addLineHeight?: boolean }>`
-    margin-right: 8px;
-    height: 18px;
-    width: 18px;
-    color: #7532a4;
-    ${(props) => props.addLineHeight && `line-height: 24px;`}
-    ${(props) => props.color && `color: ${props.color};`}
-`;
-
 export const CTAWrapper = styled.div<{ backgroundColor?: string; borderColor?: string; padding?: string }>`
     color: #373d44;
     font-size: 14px;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/HeaderAndTabs.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/HeaderAndTabs.tsx
deleted file mode 100644
index e1fa4129c2df1e..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/HeaderAndTabs.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import React, { useCallback, useState } from 'react';
-import styled from 'styled-components';
-
-let isResizing = false;
-
-export type Props = {
-    children: React.ReactNode;
-};
-
-const ResizableDiv = styled.div<{ width }>`
-    width: ${(props) => props.width}px;
-    min-width: 440px;
-    display: flex;
-    justify-content: space-between;
-`;
-
-const HeaderAndTabs = ({ children }: Props) => {
-    const initialWidth = 70 / (100 / document.documentElement.clientWidth);
-
-    const [sidebarWidth, setSidebarWidth] = useState(initialWidth);
-
-    const cbHandleMouseMove = useCallback((e) => {
-        const offsetRight = e.clientX - document.body.offsetLeft;
-
-        const minWidthVw = 70;
-        const minWidthPx = minWidthVw / (100 / document.documentElement.clientWidth);
-
-        const maxWidthVw = 98;
-        const maxWidthPx = maxWidthVw / (100 / document.documentElement.clientWidth);
-
-        if (offsetRight > minWidthPx && offsetRight < maxWidthPx) {
-            setSidebarWidth(offsetRight);
-        }
-    }, []);
-
-    const cbHandleMouseUp = useCallback(
-        (_) => {
-            if (!isResizing) {
-                return;
-            }
-            isResizing = false;
-            document.removeEventListener('mousemove', cbHandleMouseMove);
-            document.removeEventListener('mouseup', cbHandleMouseUp);
-        },
-        [cbHandleMouseMove],
-    );
-
-    function handleMousedown(e) {
-        e.stopPropagation();
-        e.preventDefault();
-        // we will only add listeners when needed, and remove them afterward
-        document.addEventListener('mousemove', cbHandleMouseMove);
-        document.addEventListener('mouseup', cbHandleMouseUp);
-        isResizing = true;
-    }
-
-    return (
-        <ResizableDiv width={sidebarWidth}>
-            {children}
-            {/* eslint-disable jsx-a11y/no-static-element-interactions */}
-            <div onMouseDown={handleMousedown} style={{ backgroundColor: 'black', width: '5px', height: '100px' }}>
-                header
-            </div>
-        </ResizableDiv>
-    );
-};
-
-export default HeaderAndTabs;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LastIngested.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LastIngested.tsx
index 4301fb0d88046b..f313197519e768 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LastIngested.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/LastIngested.tsx
@@ -1,108 +1,5 @@
 import { green, orange, red } from '@ant-design/colors';
-import { QuestionCircleOutlined } from '@ant-design/icons';
-import { Popover } from '@components';
-import { Image } from 'antd';
 import moment from 'moment-timezone';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-import { getDisplayedEntityType } from '@app/entityV2/shared/containers/profile/header/utils';
-import { getPlatformNameFromEntityData } from '@app/entityV2/shared/utils';
-import { toLocalDateTimeString, toRelativeTimeString } from '@app/shared/time/timeUtils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-const StyledDot = styled.div<{ color: string }>`
-    border: 1px solid ${ANTD_GRAY[5]};
-    border-radius: 50%;
-    background-color: ${(props) => props.color};
-    width: 5px;
-    height: 5px;
-    margin-right: 5px;
-    vertical-align: middle;
-`;
-
-const Title = styled.div`
-    font-size: 12px;
-    font-weight: bold;
-    display: flex;
-    align-items: center;
-    margin-bottom: 5px;
-
-    ${StyledDot} {
-        margin: 0 8px 0 0;
-    }
-`;
-
-const PopoverContentWrapper = styled.div``;
-
-const MainContent = styled.div`
-    align-items: center;
-    display: flex;
-    color: ${REDESIGN_COLORS.HEADING_COLOR};
-    font-size: 10px;
-    font-weight: 400;
-    line-height: 20px;
-`;
-
-const RelativeDescription = styled.div`
-    align-items: center;
-    display: flex;
-    margin-bottom: 5px;
-`;
-
-const SubText = styled.div`
-    color: ${ANTD_GRAY[7]};
-    font-size: 10px;
-    font-style: italic;
-`;
-
-const HelpIcon = styled(QuestionCircleOutlined)`
-    color: ${ANTD_GRAY[7]};
-    margin-left: 7px;
-    font-size: 10px;
-`;
-
-const HelpHeader = styled.div`
-    margin-bottom: 5px;
-    max-width: 250px;
-`;
-
-const LastIngestedWrapper = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const TooltipSection = styled.div`
-    align-items: center;
-    display: flex;
-    margin-bottom: 5px;
-`;
-
-const PreviewImage = styled(Image)`
-    max-height: 9px;
-    width: auto;
-    object-fit: contain;
-    background-color: transparent;
-    padding-left: 1px;
-`;
-
-function TooltipContent() {
-    return (
-        <div>
-            <TooltipSection>
-                <StyledDot color={green[5]} /> Synchronized in the&nbsp;<b>past week</b>
-            </TooltipSection>
-            <TooltipSection>
-                <StyledDot color={orange[5]} /> Synchronized in the&nbsp;<b>past month</b>
-            </TooltipSection>
-            <TooltipSection>
-                <StyledDot color={red[5]} /> Synchronized&nbsp;<b>more than a month ago</b>
-            </TooltipSection>
-        </div>
-    );
-}
 
 export function getLastIngestedColor(lastIngested: number) {
     const lastIngestedDate = moment(lastIngested);
@@ -115,68 +12,3 @@ export function getLastIngestedColor(lastIngested: number) {
     return red[5];
 }
 
-interface Props {
-    lastIngested: number;
-}
-
-function LastIngested({ lastIngested }: Props) {
-    const { entityData, entityType } = useEntityData();
-    const entityRegistry = useEntityRegistry();
-    const displayedEntityType = getDisplayedEntityType(entityData, entityRegistry, entityType);
-    const lastIngestedColor = getLastIngestedColor(lastIngested);
-    const platformName = getPlatformNameFromEntityData(entityData);
-    const platformLogoUrl = entityData?.platform?.properties?.logoUrl;
-
-    return (
-        <LastIngestedWrapper>
-            <Popover
-                placement="left"
-                content={
-                    <PopoverContentWrapper>
-                        <Title>
-                            <StyledDot color={lastIngestedColor} />
-                            Last Synchronized
-                        </Title>
-                        <RelativeDescription>
-                            This {displayedEntityType.toLocaleLowerCase()} was last synchronized&nbsp;
-                            <b>{toRelativeTimeString(lastIngested)}</b>
-                        </RelativeDescription>
-                        <SubText>Synchronized on {toLocalDateTimeString(lastIngested)}</SubText>
-                    </PopoverContentWrapper>
-                }
-            >
-                <MainContent>
-                    <StyledDot color={lastIngestedColor} />
-                    Last synchronized&nbsp;
-                    <b>{toRelativeTimeString(lastIngested)}</b>
-                </MainContent>
-            </Popover>
-            <Popover
-                title={
-                    <HelpHeader>
-                        This represents the time that the entity was last synchronized with&nbsp;
-                        {platformName ? (
-                            <strong>
-                                {platformLogoUrl && (
-                                    <>
-                                        <PreviewImage preview={false} src={platformLogoUrl} alt={platformName} />
-                                        &nbsp;
-                                    </>
-                                )}
-                                {platformName}
-                            </strong>
-                        ) : (
-                            <>the source platform</>
-                        )}
-                    </HelpHeader>
-                }
-                content={TooltipContent}
-                placement="bottom"
-            >
-                <HelpIcon />
-            </Popover>
-        </LastIngestedWrapper>
-    );
-}
-
-export default LastIngested;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/utils.tsx
index f13b0878e0ef5c..0d96dad2772a1b 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/utils.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Lineage/utils.tsx
@@ -12,13 +12,13 @@ const SummaryText = styled.span`
     font-weight: bold;
 `;
 
-export type LineageDirectionTypeSummary = {
+type LineageDirectionTypeSummary = {
     type: string;
     count: number;
     isEntityType: boolean; // If false, this represents a sub-type.
 };
 
-export type LineageDirectionSummary = {
+type LineageDirectionSummary = {
     total: number;
     types: LineageDirectionTypeSummary[];
 };
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx
deleted file mode 100644
index c0c1ed4f1653dd..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/LdapFormItem.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { AutoComplete, Form } from 'antd';
-import { FormInstance } from 'antd/es/form/Form';
-import React, { useState } from 'react';
-
-import { useGetAutoCompleteResultsLazyQuery } from '@graphql/search.generated';
-import { EntityType } from '@types';
-
-const OWNER_SEARCH_PLACEHOLDER = 'Search an LDAP';
-
-type Props = {
-    form: FormInstance<any>;
-};
-
-export const LdapFormItem = ({ form }: Props) => {
-    const [getOwnerAutoCompleteResults, { data: searchOwnerSuggestionsData }] = useGetAutoCompleteResultsLazyQuery();
-    const [ownerQuery, setOwnerQuery] = useState('');
-
-    const onSelectSuggestion = (ldap: string) => {
-        setOwnerQuery(ldap);
-    };
-
-    const onChangeOwnerQuery = async (query: string) => {
-        const row = await form.validateFields();
-
-        if (query && query.trim() !== '') {
-            getOwnerAutoCompleteResults({
-                variables: {
-                    input: {
-                        type: row.type,
-                        query,
-                        field: row.type === EntityType.CorpUser ? 'ldap' : 'name',
-                    },
-                },
-            });
-        }
-        setOwnerQuery(query);
-    };
-
-    return (
-        <Form.Item
-            name="ldap"
-            rules={[
-                {
-                    required: true,
-                    type: 'string',
-                    message: `Please provide a valid LDAP!`,
-                },
-            ]}
-        >
-            <AutoComplete
-                options={
-                    (searchOwnerSuggestionsData &&
-                        searchOwnerSuggestionsData.autoComplete &&
-                        searchOwnerSuggestionsData.autoComplete.suggestions.map((suggestion: string) => ({
-                            value: suggestion,
-                        }))) ||
-                    []
-                }
-                value={ownerQuery}
-                onSelect={onSelectSuggestion}
-                onSearch={onChangeOwnerQuery}
-                placeholder={OWNER_SEARCH_PLACEHOLDER}
-            />
-        </Form.Item>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts
index 77eb6e37cf7e57..0ab6264f87dbb4 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Ownership/ownershipUtils.ts
@@ -6,7 +6,7 @@ import { OwnershipType, OwnershipTypeEntity } from '@types';
  * A mapping from OwnershipType to it's display name & description. In the future,
  * we intend to make this configurable.
  */
-export const OWNERSHIP_DISPLAY_TYPES = [
+const OWNERSHIP_DISPLAY_TYPES = [
     {
         type: OwnershipType.TechnicalOwner,
         name: 'Technical Owner',
@@ -38,10 +38,6 @@ export const getNameFromType = (type: OwnershipType) => {
     return ownershipTypeToDetails.get(type)?.name || type;
 };
 
-export const getDescriptionFromType = (type: OwnershipType) => {
-    return ownershipTypeToDetails.get(type)?.description || 'No description';
-};
-
 export function getOwnershipTypeName(ownershipType?: OwnershipTypeEntity | null) {
     return (ownershipType?.info?.name && forcePluralize(ownershipType?.info?.name)) || 'Other';
 }
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx
deleted file mode 100644
index f5e2a5241a0504..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Platform/SelectPlatformModal.tsx
+++ /dev/null
@@ -1,189 +0,0 @@
-import { Tooltip } from '@components';
-import { Button, Form, Modal, Select, Tag } from 'antd';
-import React, { ReactNode, useRef, useState } from 'react';
-import styled from 'styled-components/macro';
-
-import { useEnterKeyListener } from '@app/shared/useEnterKeyListener';
-
-import { useGetSearchResultsLazyQuery } from '@graphql/search.generated';
-import { DataPlatform, Entity, EntityType } from '@types';
-
-type Props = {
-    onCloseModal: () => void;
-    defaultValues?: { urn: string; entity?: Entity | null }[];
-    onOk?: (result: string[]) => void;
-    titleOverride?: string;
-};
-
-type SelectedPlatform = {
-    entity?: Entity | null;
-    urn: string;
-};
-
-const StyleTag = styled(Tag)`
-    padding: 0px 7px;
-    margin-right: 3px;
-    display: flex;
-    justify-content: start;
-    align-items: center;
-`;
-
-const PreviewImage = styled.img`
-    max-height: 18px;
-    width: auto;
-    object-fit: contain;
-    background-color: transparent;
-    margin-right: 4px;
-`;
-
-export const SelectPlatformModal = ({ onCloseModal, defaultValues, onOk, titleOverride }: Props) => {
-    const [platformSearch, { data: platforSearchData }] = useGetSearchResultsLazyQuery();
-    const platformSearchResults =
-        platforSearchData?.search?.searchResults?.map((searchResult) => searchResult.entity) || [];
-
-    const [selectedPlatforms, setSelectedPlatforms] = useState<SelectedPlatform[] | undefined>(defaultValues);
-
-    const inputEl = useRef(null);
-
-    const onModalClose = () => {
-        onCloseModal();
-    };
-
-    const handleSearch = (text: string) => {
-        platformSearch({
-            variables: {
-                input: {
-                    type: EntityType.DataPlatform,
-                    query: text,
-                    start: 0,
-                    count: 5,
-                },
-            },
-        });
-    };
-
-    // Renders a search result in the select dropdown.
-    const renderSearchResult = (entity: DataPlatform) => {
-        const displayName = entity.properties?.displayName || entity.name;
-        const truncatedDisplayName = displayName.length > 25 ? `${displayName.slice(0, 25)}...` : displayName;
-        return (
-            <Tooltip title={displayName}>
-                {!!entity.properties?.logoUrl && <PreviewImage src={entity?.properties?.logoUrl} alt={entity?.name} />}
-                <span>{truncatedDisplayName}</span>
-            </Tooltip>
-        );
-    };
-
-    const platformSearchOptions = platformSearchResults?.map((result) => {
-        return (
-            <Select.Option value={result.urn} key={result.urn}>
-                {renderSearchResult(result as DataPlatform)}
-            </Select.Option>
-        );
-    });
-
-    const onSelectPlatform = (newValue: { value: string; label: ReactNode }) => {
-        const newUrn = newValue.value;
-
-        if (inputEl && inputEl.current) {
-            (inputEl.current as any).blur();
-        }
-
-        const filteredPlatforms =
-            platformSearchResults?.filter((entity) => entity.urn === newUrn).map((entity) => entity) || [];
-
-        if (filteredPlatforms.length) {
-            const platform = filteredPlatforms[0] as DataPlatform;
-            setSelectedPlatforms([
-                ...(selectedPlatforms || []),
-                {
-                    entity: platform,
-                    urn: newUrn,
-                },
-            ]);
-        }
-    };
-
-    const onDeselectPlatform = (val) => {
-        setSelectedPlatforms(selectedPlatforms?.filter((platform) => platform.urn !== val.value));
-    };
-
-    const handleOk = () => {
-        if (!selectedPlatforms) {
-            return;
-        }
-
-        if (onOk) {
-            onOk(selectedPlatforms?.map((platform) => platform.urn));
-        }
-    };
-
-    // Handle the Enter press
-    useEnterKeyListener({
-        querySelectorToExecuteClick: '#setPlatformButton',
-    });
-
-    const tagRender = (props) => {
-        // eslint-disable-next-line react/prop-types
-        const { label, closable, onClose } = props;
-        const onPreventMouseDown = (event) => {
-            event.preventDefault();
-            event.stopPropagation();
-        };
-        return (
-            <StyleTag onMouseDown={onPreventMouseDown} closable={closable} onClose={onClose}>
-                {label}
-            </StyleTag>
-        );
-    };
-
-    return (
-        <Modal
-            title={titleOverride || 'Select Platform'}
-            visible
-            onCancel={onModalClose}
-            footer={
-                <>
-                    <Button onClick={onModalClose} type="text">
-                        Cancel
-                    </Button>
-                    <Button id="setPlatformButton" disabled={selectedPlatforms?.length === 0} onClick={handleOk}>
-                        Add
-                    </Button>
-                </>
-            }
-        >
-            <Form component={false}>
-                <Form.Item>
-                    <Select
-                        autoFocus
-                        filterOption={false}
-                        showSearch
-                        mode="multiple"
-                        defaultActiveFirstOption={false}
-                        placeholder="Search for Platforms..."
-                        onSelect={(platformUrn: any) => onSelectPlatform(platformUrn)}
-                        onDeselect={onDeselectPlatform}
-                        onSearch={(value: string) => {
-                            // eslint-disable-next-line react/prop-types
-                            handleSearch(value.trim());
-                        }}
-                        ref={inputEl}
-                        labelInValue
-                        value={selectedPlatforms?.map((platform) => ({
-                            value: platform.urn,
-                            label: platform.entity ? (
-                                renderSearchResult(platform.entity as DataPlatform)
-                            ) : (
-                                <span>{platform.urn}</span>
-                            ),
-                        }))}
-                        tagRender={tagRender}
-                    >
-                        {platformSearchOptions}
-                    </Select>
-                </Form.Item>
-            </Form>
-        </Modal>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryCreatedAtSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryCreatedAtSection.tsx
deleted file mode 100644
index 7a691599fc085f..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Query/SidebarQueryCreatedAtSection.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-
-// import styled from 'styled-components/macro';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection';
-import { toRelativeTimeString } from '@app/shared/time/timeUtils';
-
-import { QueryEntity } from '@types';
-
-export default function SidebarQueryUpdatedAtSection() {
-    const baseEntity = useBaseEntity<{ entity: QueryEntity }>();
-
-    return (
-        <SidebarSection
-            title="First Seen"
-            content={<>{toRelativeTimeString(baseEntity?.entity?.properties?.created?.time || 0)}</>}
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx
deleted file mode 100644
index 697eaaf7f12a90..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { SidebarHeader } from '@app/entityV2/shared/containers/profile/sidebar/SidebarHeader';
-import { RecommendationModule } from '@app/recommendations/RecommendationModule';
-import { RecommendationDisplayType } from '@app/recommendations/types';
-
-import { useListRecommendationsQuery } from '@graphql/recommendations.generated';
-import { EntityType, RecommendationModule as RecommendationModuleType, ScenarioType } from '@types';
-
-const RecommendationsContainer = styled.div``;
-
-const RecommendationContainer = styled.div`
-    margin-bottom: 20px;
-`;
-
-export const SidebarEntityRecommendations = ({
-    userUrn,
-    entityUrn,
-    entityType,
-}: {
-    userUrn: string;
-    entityUrn: string;
-    entityType: EntityType;
-}) => {
-    const scenario = ScenarioType.EntityProfile;
-    const { data } = useListRecommendationsQuery({
-        variables: {
-            input: {
-                userUrn,
-                requestContext: {
-                    scenario,
-                    entityRequestContext: {
-                        urn: entityUrn,
-                        type: entityType,
-                    },
-                },
-                limit: 3,
-            },
-        },
-    });
-    const recommendationModules = data?.listRecommendations?.modules;
-    return (
-        <RecommendationsContainer>
-            {recommendationModules &&
-                recommendationModules.map((module) => (
-                    <RecommendationContainer>
-                        <SidebarHeader title={module.title} />
-                        <RecommendationModule
-                            key={module.moduleId}
-                            module={module as RecommendationModuleType}
-                            scenarioType={scenario}
-                            showTitle={false}
-                            displayType={RecommendationDisplayType.COMPACT}
-                        />
-                    </RecommendationContainer>
-                ))}
-        </RecommendationsContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx
deleted file mode 100644
index 20b551065817fa..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarRecommendationsSection.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { useUserContext } from '@app/context/useUserContext';
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { SidebarEntityRecommendations } from '@app/entityV2/shared/containers/profile/sidebar/Recommendations/SidebarEntityRecommendations';
-
-const RecommendationsContainer = styled.div``;
-
-export const SidebarRecommendationsSection = () => {
-    const { urn, entityType } = useEntityData();
-    const authenticatedUserUrn = useUserContext()?.user?.urn;
-    return (
-        <RecommendationsContainer>
-            {authenticatedUserUrn && (
-                <SidebarEntityRecommendations userUrn={authenticatedUserUrn} entityUrn={urn} entityType={entityType} />
-            )}
-        </RecommendationsContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapseIcon.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapseIcon.tsx
deleted file mode 100644
index 6a6afa71692fe4..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCollapseIcon.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Tooltip } from '@components';
-import { ArrowLeft, ArrowRight } from '@phosphor-icons/react';
-import React, { useContext } from 'react';
-import styled from 'styled-components';
-
-import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-import EntitySidebarContext from '@app/sharedV2/EntitySidebarContext';
-import { getColor } from '@src/alchemy-components/theme/utils';
-
-const Container = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 56px;
-    padding: 8px;
-`;
-
-const IconWrapper = styled.div<{ direction: 'left' | 'right' }>`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-`;
-
-const CloseButton = styled.div<{ $isClosed: boolean }>`
-    cursor: pointer;
-    margin: 0px;
-    padding: 2px 6px;
-    display: flex;
-    align-items: center;
-    height: 40px;
-    width: 40px;
-    border-radius: 6px;
-    justify-content: center;
-    color: ${(p) => p.theme.styles['primary-color']};
-    ${(props) =>
-        props.$isClosed &&
-        `
-        background-color: ${getColor('primary', 600, props.theme)};
-        color: ${REDESIGN_COLORS.WHITE};  
-    `}
-    :hover {
-        background-color: ${(p) => getColor('primary', 600, p.theme)};
-        color: ${REDESIGN_COLORS.WHITE};
-    }
-`;
-
-export default function SidebarCollapseIcon() {
-    const { isClosed, setSidebarClosed } = useContext(EntitySidebarContext);
-
-    return (
-        <Container>
-            <Tooltip placement="left" showArrow={false} title={!isClosed ? 'Close sidebar' : 'Open sidebar'}>
-                <CloseButton
-                    $isClosed={isClosed}
-                    onClick={() => setSidebarClosed(!isClosed)}
-                    data-testid="toggleSidebar"
-                >
-                    <IconWrapper direction={isClosed ? 'left' : 'right'}>
-                        {isClosed ? <ArrowRight size={20} /> : <ArrowLeft size={20} />}
-                    </IconWrapper>
-                </CloseButton>
-            </Tooltip>
-        </Container>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCompactSchemaSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCompactSchemaSection.tsx
deleted file mode 100644
index 2e8e423b3a67d1..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarCompactSchemaSection.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-
-import { SidebarSection } from '@app/entityV2/shared/containers/profile/sidebar/SidebarSection';
-import { SchemaTab } from '@app/entityV2/shared/tabs/Dataset/Schema/SchemaTab';
-import { TabRenderType } from '@app/entityV2/shared/types';
-import { ENTITY_PROFILE_SCHEMA_ID } from '@app/onboarding/config/EntityProfileOnboardingConfig';
-
-export const SidebarCompactSchemaSection = () => {
-    return (
-        <div id={ENTITY_PROFILE_SCHEMA_ID}>
-            <SidebarSection title="Fields" content={<SchemaTab renderType={TabRenderType.COMPACT} />} />
-        </div>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection.tsx
index 6a37418238f7b4..31b757aa634f96 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/SidebarLogicSection.tsx
@@ -87,7 +87,7 @@ interface HelperProps {
 }
 
 // exported for testing only
-export function SidebarLogicSection({ title, statement, highlightedStrings, externalUrl }: HelperProps) {
+function SidebarLogicSection({ title, statement, highlightedStrings, externalUrl }: HelperProps) {
     const [showFullContentModal, setShowFullContentModal] = useState(false);
     const isEmbeddedProfile = useIsEmbeddedProfile();
 
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/StatusSection.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/StatusSection.tsx
index 60d4de0045638c..e6e3bee134500e 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/StatusSection.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/StatusSection.tsx
@@ -20,7 +20,7 @@ const SyncedAssetContainer = styled.div`
     flex-direction: column;
 `;
 
-export const StyledCollapse = styled(Collapse)`
+const StyledCollapse = styled(Collapse)`
     text-wrap: wrap;
     .ant-collapse-header {
         padding: 0px 0px !important;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TopUsersFacepile.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TopUsersFacepile.tsx
index a178e2900d1a56..2f507086baceb2 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TopUsersFacepile.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/TopUsersFacepile.tsx
@@ -8,7 +8,7 @@ import { useEntityRegistry } from '@app/useEntityRegistry';
 
 import { CorpUser, EntityType } from '@types';
 
-export type Props = {
+type Props = {
     users: Array<CorpUser>;
     max?: number;
     checkExistence?: boolean;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIcon.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIcon.tsx
deleted file mode 100644
index 67653f4b23679c..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIcon.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Group } from '@visx/group';
-import React from 'react';
-
-import PopularityIconBar from '@app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIconBar';
-import { PopularityTier } from '@app/entityV2/shared/containers/profile/sidebar/shared/utils';
-
-type Props = {
-    tier: PopularityTier;
-    width?: number;
-    height?: number;
-};
-
-const PopularityIcon = ({ tier, width = 38, height = 32 }: Props) => {
-    return (
-        <svg width={width} height={height}>
-            <Group>
-                <PopularityIconBar index={0} active={tier < 3} opacity={0.6} />
-                <PopularityIconBar index={1} active={tier < 2} opacity={0.8} />
-                <PopularityIconBar index={2} active={tier < 1} opacity={1} />
-            </Group>
-        </svg>
-    );
-};
-
-export default PopularityIcon;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIconBar.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIconBar.tsx
deleted file mode 100644
index 99eb5fa97ed60f..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/popularity/PopularityIconBar.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Bar } from '@visx/shape';
-import React from 'react';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-
-const ACTIVE_COLOR = '#3F54D1';
-const INACTIVE_COLOR = ANTD_GRAY[5];
-
-type Props = {
-    index: number;
-    active: boolean;
-    opacity: number;
-};
-
-const PopularityIconBar = ({ index, active, opacity }: Props) => {
-    return (
-        <Bar
-            rx={2}
-            ry={2}
-            key={index}
-            x={4 + 12 * index}
-            y={14 - 6 * index}
-            width={6}
-            height={12 + index * 6}
-            opacity={active ? opacity : 1}
-            stroke={active ? ACTIVE_COLOR : INACTIVE_COLOR}
-            fill={active ? ACTIVE_COLOR : INACTIVE_COLOR}
-        />
-    );
-};
-
-export default PopularityIconBar;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/styledComponents.ts b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/styledComponents.ts
index 9ac394234db709..82770f93fde073 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/styledComponents.ts
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/styledComponents.ts
@@ -23,24 +23,3 @@ export const LabelText = styled(Typography.Text)`
     font-weight: 500;
     color: ${REDESIGN_COLORS.BODY_TEXT};
 `;
-
-export const InstanceIcon = styled.div`
-    height: 22px;
-    width: 22px;
-    background-color: #c9fff2;
-    border-radius: 6px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    svg {
-        padding: 3px;
-        height: 20px;
-        width: 20px;
-    }
-`;
-
-export const StyledLabel = styled.span`
-    font-size: 16px;
-    font-weight: 400;
-    color: ${REDESIGN_COLORS.BODY_TEXT};
-`;
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx
index dcd8d734709584..2f4ead3437dcdf 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/shared/utils.tsx
@@ -14,8 +14,6 @@ export enum PopularityTier {
     TIER_4, // Least Popular
 }
 
-export const ACRYL_PLATFORM = 'DataHub Core';
-
 export enum ActionType {
     SHARE,
     SYNC,
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/tagRenderer.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/tagRenderer.tsx
deleted file mode 100644
index ed8dd44d155bfb..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/sidebar/tagRenderer.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Tag } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const StyleTag = styled(Tag)`
-    padding: 0px 7px;
-    margin-right: 3px;
-    display: flex;
-    justify-content: start;
-    align-items: center;
-`;
-
-export const tagRender = (props) => {
-    // eslint-disable-next-line react/prop-types
-    const { label, closable, onClose } = props;
-    const onPreventMouseDown = (event) => {
-        event.preventDefault();
-        event.stopPropagation();
-    };
-    return (
-        <StyleTag onMouseDown={onPreventMouseDown} closable={closable} onClose={onClose}>
-            {label}
-        </StyleTag>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/containers/profile/utils.tsx b/datahub-web-react/src/app/entityV2/shared/containers/profile/utils.tsx
index dea4055abe8b18..54c7a042bc5e31 100644
--- a/datahub-web-react/src/app/entityV2/shared/containers/profile/utils.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/containers/profile/utils.tsx
@@ -16,7 +16,6 @@ import {
 } from '@app/entityV2/shared/containers/profile/sidebar/shared/utils';
 import { EntitySidebarSection, EntitySidebarTab, EntityTab } from '@app/entityV2/shared/types';
 import { SEPARATE_SIBLINGS_URL_PARAM, useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode';
-import useIsLineageMode from '@app/lineage/utils/useIsLineageMode';
 import {
     ENTITY_PROFILE_DOMAINS_ID,
     ENTITY_PROFILE_GLOSSARY_TERMS_ID,
@@ -39,7 +38,6 @@ import {
     ENTITY_SIDEBAR_V2_PROPERTIES_ID,
 } from '@app/onboarding/configV2/EntityProfileOnboardingConfig';
 import usePrevious from '@app/shared/usePrevious';
-import { useEntityRegistry } from '@app/useEntityRegistry';
 import { EntityRegistry } from '@src/entityRegistryContext';
 
 import { EntityType, FeatureFlagsConfig } from '@types';
@@ -135,13 +133,6 @@ export function getEntityPath(
     }${tabParamsString}`;
 }
 
-export function useEntityPath(entityType: EntityType, urn: string, tabName?: string, tabParams?: Record<string, any>) {
-    const isLineageMode = useIsLineageMode();
-    const isHideSiblingMode = useIsSeparateSiblingsMode();
-    const entityRegistry = useEntityRegistry();
-    return getEntityPath(entityType, urn, entityRegistry, isLineageMode, isHideSiblingMode, tabName, tabParams);
-}
-
 export function useRoutedTab(tabs: EntityTab[]): EntityTab | undefined {
     const { pathname } = useLocation();
     const trimmedPathName = pathname.endsWith('/') ? pathname.slice(0, pathname.length - 1) : pathname;
@@ -156,19 +147,6 @@ export function useRoutedTab(tabs: EntityTab[]): EntityTab | undefined {
     return undefined;
 }
 
-export function useIsOnTab(tabName: string): boolean {
-    const { pathname } = useLocation();
-    const trimmedPathName = pathname.endsWith('/') ? pathname.slice(0, pathname.length - 1) : pathname;
-    // Match against the regex
-    const match = trimmedPathName.match(ENTITY_TAB_NAME_REGEX_PATTERN);
-    if (match && match[1]) {
-        const selectedTabPath = match[1];
-        return selectedTabPath === tabName;
-    }
-    // No match found!
-    return false;
-}
-
 export function useGlossaryActiveTabPath(): string {
     const { pathname, search } = useLocation();
     const trimmedPathName = pathname.endsWith('/') ? pathname.slice(0, pathname.length - 1) : pathname;
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHeader.tsx b/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHeader.tsx
deleted file mode 100644
index b08b798f6d6890..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHeader.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import { ArrowRightOutlined } from '@ant-design/icons';
-import { Image, Typography } from 'antd';
-import Link from 'antd/lib/typography/Link';
-import React from 'react';
-import styled, { useTheme } from 'styled-components/macro';
-
-import { EventType } from '@app/analytics';
-import analytics from '@app/analytics/analytics';
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { IconStyleType } from '@app/entityV2/Entity';
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import { getDisplayedEntityType } from '@app/entityV2/shared/containers/profile/header/utils';
-import { useAppConfig } from '@app/useAppConfig';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { DEFAULT_APP_CONFIG } from '@src/appConfigContext';
-
-const HeaderWrapper = styled.div`
-    display: flex;
-`;
-
-const LogoImage = styled(Image)`
-    display: inline-block;
-    height: 40px;
-    width: auto;
-`;
-
-const EntityContent = styled.div`
-    margin-left: 16px;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-`;
-
-const EntityTypeWrapper = styled.div`
-    font-size: 12px;
-    color: ${ANTD_GRAY[8]};
-`;
-
-const TypeIcon = styled.span`
-    margin-right: 5px;
-`;
-
-const EntityName = styled(Typography.Text)`
-    font-size: 16px;
-    font-weight: 700;
-    line-height: 24px;
-`;
-
-const StyledLink = styled(Link)`
-    font-size: 10px;
-    font-weight: 700;
-    line-height: 22px;
-    margin-left: 8px;
-`;
-
-const EntityNameWrapper = styled.div`
-    display: flex;
-    align-items: baseline;
-`;
-
-export default function EmbeddedHeader() {
-    const entityRegistry = useEntityRegistry();
-    const { entityData, entityType } = useEntityData();
-    const appConfig = useAppConfig();
-    const themeConfig = useTheme();
-
-    function trackClickViewInDataHub() {
-        analytics.event({
-            type: EventType.EmbedProfileViewInDataHubEvent,
-            entityType,
-            entityUrn: entityData?.urn || '',
-        });
-    }
-
-    const typeIcon = entityRegistry.getIcon(entityType, 12, IconStyleType.ACCENT, ANTD_GRAY[8]);
-    const displayedEntityType = getDisplayedEntityType(entityData, entityRegistry, entityType);
-    const entityName = entityRegistry.getDisplayName(entityType, entityData);
-    const entityTypePathName = entityRegistry.getPathName(entityType);
-    const logoUrl =
-        appConfig.config !== DEFAULT_APP_CONFIG
-            ? appConfig.config.visualConfig.logoUrl || themeConfig.assets.logoUrl
-            : undefined;
-
-    return (
-        <HeaderWrapper>
-            <LogoImage src={logoUrl} preview={false} />
-            <EntityContent>
-                <EntityTypeWrapper>
-                    <TypeIcon>{typeIcon}</TypeIcon>
-                    {displayedEntityType}
-                </EntityTypeWrapper>
-                <EntityNameWrapper>
-                    <EntityName ellipsis={{ tooltip: entityName }} style={{ maxWidth: '75%' }}>
-                        {entityName}
-                    </EntityName>
-                    <StyledLink
-                        href={`${window.location.origin}/${entityTypePathName}/${entityData?.urn}`}
-                        target="_blank"
-                        rel="noreferrer noopener"
-                        onClick={trackClickViewInDataHub}
-                    >
-                        view in DataHub <ArrowRightOutlined />
-                    </StyledLink>
-                </EntityNameWrapper>
-            </EntityContent>
-        </HeaderWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHealthIcon.tsx b/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHealthIcon.tsx
deleted file mode 100644
index f612a16629d13d..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/embed/EmbeddedHealthIcon.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import { orange } from '@ant-design/colors';
-import { WarningFilled } from '@ant-design/icons';
-import { Tooltip } from '@components';
-import React from 'react';
-import { useParams } from 'react-router';
-import styled from 'styled-components';
-
-import { generateQueryVariables } from '@app/entityV2/shared/embed/UpstreamHealth/utils';
-import { decodeUrn } from '@app/entityV2/shared/utils';
-import { useGetDefaultLineageStartTimeMillis } from '@app/lineage/utils/useGetLineageTimeParams';
-import { getEntityTypeFromEntityUrn } from '@app/lineageV3/utils/lineageUtils';
-import { HAS_ACTIVE_INCIDENTS_FILTER_NAME, HAS_FAILING_ASSERTIONS_FILTER_NAME } from '@app/search/utils/constants';
-import { useUrlQueryParam } from '@app/shared/useUrlQueryParam';
-import { useAppConfig } from '@app/useAppConfig';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useSearchAcrossLineageQuery } from '@graphql/search.generated';
-
-// Do not update unless you update the reference to this ID in our Chrome extension code
-const ICON_ID = 'embedded-datahub-health-icon';
-
-// Default size for the warning icon in pixels
-const DEFAULT_ICON_SIZE = 16;
-
-const StyledWarning = styled(WarningFilled)<{ size: number }>`
-    color: ${orange[5]};
-    font-size: ${({ size }) => size}px;
-`;
-
-interface RouteParams {
-    urn: string;
-}
-
-// Used by our Chrome Extension to show a warning health icon if there are unhealthy upstreams
-export default function EmbeddedHealthIcon() {
-    const entityRegistry = useEntityRegistry();
-    const { urn: encodedUrn } = useParams<RouteParams>();
-    const { value: showTooltipParam } = useUrlQueryParam('show-tooltip', 'false');
-    const { value: sizeParam } = useUrlQueryParam('size', DEFAULT_ICON_SIZE.toString());
-    const showTooltip = showTooltipParam === 'true';
-    const iconSize = parseInt(sizeParam || DEFAULT_ICON_SIZE.toString(), 10);
-    const urn = decodeUrn(encodedUrn);
-    const entityType = getEntityTypeFromEntityUrn(urn, entityRegistry);
-    const [, , entityTypeFallback] = urn.split(':');
-
-    const appConfig = useAppConfig();
-    const lineageEnabled: boolean = appConfig?.config?.chromeExtensionConfig?.lineageEnabled || false;
-    const startTimeMillis = useGetDefaultLineageStartTimeMillis();
-
-    const { data: incidentsData } = useSearchAcrossLineageQuery(
-        generateQueryVariables({
-            urn,
-            startTimeMillis,
-            filterField: HAS_ACTIVE_INCIDENTS_FILTER_NAME,
-            start: 0,
-            includeAssertions: false,
-            includeIncidents: true,
-            skip: !lineageEnabled,
-            count: 0,
-        }),
-    );
-
-    const { data: assertionsData } = useSearchAcrossLineageQuery(
-        generateQueryVariables({
-            urn,
-            startTimeMillis,
-            filterField: HAS_FAILING_ASSERTIONS_FILTER_NAME,
-            start: 0,
-            includeAssertions: true,
-            includeIncidents: false,
-            skip: !lineageEnabled,
-            count: 0,
-        }),
-    );
-
-    if (incidentsData?.searchAcrossLineage?.total || assertionsData?.searchAcrossLineage?.total) {
-        const warningIcon = <StyledWarning id={ICON_ID} size={iconSize} />;
-
-        if (showTooltip) {
-            const title =
-                "Some upstream entities are unhealthy, which may impact this entity. Expand the DataHub browser extension's side panel for more details.";
-            return (
-                <Tooltip title={title}>
-                    <a
-                        href={`${window.location.origin}${entityType ? entityRegistry.getEntityUrl(entityType, urn) : `/${entityTypeFallback}/${encodeURIComponent(urn)}`}`}
-                        target="_blank"
-                        rel="noreferrer noopener"
-                    >
-                        {warningIcon}
-                    </a>
-                </Tooltip>
-            );
-        }
-
-        return warningIcon;
-    }
-
-    return null;
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/ActiveIncidents.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/ActiveIncidents.tsx
deleted file mode 100644
index 191fdae207dbef..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/ActiveIncidents.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { LoadingOutlined } from '@ant-design/icons';
-import React from 'react';
-
-import {
-    FailingDataWrapper,
-    FailingSectionWrapper,
-    LoadMoreButton,
-    LoadingWrapper,
-} from '@app/entityV2/shared/embed/UpstreamHealth/FailingAssertions';
-import FailingEntity from '@app/entityV2/shared/embed/UpstreamHealth/FailingEntity';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Dataset } from '@types';
-
-interface Props {
-    datasetsWithActiveIncidents: Dataset[];
-    totalDatasetsWithActiveIncidents: number;
-    fetchMoreIncidentsData: () => void;
-    isLoadingIncidents: boolean;
-}
-
-export default function ActiveIncidents({
-    datasetsWithActiveIncidents,
-    totalDatasetsWithActiveIncidents,
-    fetchMoreIncidentsData,
-    isLoadingIncidents,
-}: Props) {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <FailingSectionWrapper>
-            {totalDatasetsWithActiveIncidents} data source{totalDatasetsWithActiveIncidents > 1 && 's'} with active
-            incidents
-            <FailingDataWrapper>
-                {datasetsWithActiveIncidents.map((dataset) => {
-                    const numActiveIncidents = (dataset as any).activeIncidents.total;
-
-                    return (
-                        <FailingEntity
-                            key={dataset.urn}
-                            link={entityRegistry.getEntityUrl(dataset.type, dataset.urn)}
-                            displayName={entityRegistry.getDisplayName(dataset.type, dataset)}
-                            contentText={`${numActiveIncidents} active incident${numActiveIncidents > 1 ? 's' : ''}`}
-                        />
-                    );
-                })}
-                {totalDatasetsWithActiveIncidents > datasetsWithActiveIncidents.length && (
-                    <>
-                        {isLoadingIncidents && (
-                            <LoadingWrapper>
-                                <LoadingOutlined />
-                            </LoadingWrapper>
-                        )}
-                        {!isLoadingIncidents && (
-                            <LoadMoreButton onClick={fetchMoreIncidentsData}>+ Load more</LoadMoreButton>
-                        )}
-                    </>
-                )}
-            </FailingDataWrapper>
-        </FailingSectionWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingAssertions.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingAssertions.tsx
deleted file mode 100644
index 01331b780d8bc3..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingAssertions.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import { LoadingOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import FailingEntity from '@app/entityV2/shared/embed/UpstreamHealth/FailingEntity';
-import { getNumAssertionsFailing } from '@app/entityV2/shared/embed/UpstreamHealth/utils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Dataset } from '@types';
-
-export const FailingSectionWrapper = styled.div`
-    margin: 8px 0 0 34px;
-    font-size: 14px;
-    color: black;
-`;
-
-export const FailingDataWrapper = styled.div`
-    margin-left: 20px;
-`;
-
-export const LoadMoreButton = styled(Button)`
-    border: none;
-    padding: 0;
-    box-shadow: none;
-`;
-
-export const LoadingWrapper = styled.div`
-    // set width and height to what our load more button is
-    width: 68px;
-    height: 32px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-`;
-
-interface Props {
-    datasetsWithFailingAssertions: Dataset[];
-    totalDatasetsWithFailingAssertions: number;
-    fetchMoreAssertionsData: () => void;
-    isLoadingAssertions: boolean;
-}
-
-export default function FailingAssertions({
-    datasetsWithFailingAssertions,
-    totalDatasetsWithFailingAssertions,
-    fetchMoreAssertionsData,
-    isLoadingAssertions,
-}: Props) {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <FailingSectionWrapper>
-            {totalDatasetsWithFailingAssertions} data source{totalDatasetsWithFailingAssertions > 1 && 's'} with failing
-            assertions
-            <FailingDataWrapper>
-                {datasetsWithFailingAssertions.map((dataset) => {
-                    const totalNumAssertions = dataset.assertions?.assertions?.length;
-                    const numAssertionsFailing = getNumAssertionsFailing(dataset);
-
-                    return (
-                        <FailingEntity
-                            link={entityRegistry.getEntityUrl(dataset.type, dataset.urn)}
-                            displayName={entityRegistry.getDisplayName(dataset.type, dataset)}
-                            contentText={`${numAssertionsFailing} of ${totalNumAssertions} failing`}
-                        />
-                    );
-                })}
-                {totalDatasetsWithFailingAssertions > datasetsWithFailingAssertions.length && (
-                    <>
-                        {isLoadingAssertions && (
-                            <LoadingWrapper>
-                                <LoadingOutlined />
-                            </LoadingWrapper>
-                        )}
-                        {!isLoadingAssertions && (
-                            <LoadMoreButton onClick={fetchMoreAssertionsData}>+ Load more</LoadMoreButton>
-                        )}
-                    </>
-                )}
-            </FailingDataWrapper>
-        </FailingSectionWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingEntity.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingEntity.tsx
deleted file mode 100644
index 9615ad90be46f0..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingEntity.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import { red } from '@ant-design/colors';
-import Icon from '@ant-design/icons/lib/components/Icon';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import ExternalLink from '@images/link-out.svg?react';
-
-const DatasetWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    margin-top: 8px;
-    overflow: hidden;
-    justify-content: space-between;
-`;
-
-const AssertionsSummaryWrapper = styled.span`
-    font-size: 10px;
-    font-weight: 700;
-    line-height: 13px;
-    color: ${red[7]};
-    background-color: ${red[0]};
-    border-radius: 8px;
-    margin-left: 5px;
-    padding: 2px 4px;
-    letter-spacing: 0.2px;
-    white-space: nowrap;
-`;
-
-const StyledLink = styled(Typography.Link)`
-    align-items: center;
-    display: flex;
-    overflow: hidden;
-    img {
-        margin-right: 3px;
-    }
-`;
-
-const StyledIcon = styled(Icon)`
-    margin-right: 3px;
-`;
-
-interface Props {
-    link: string;
-    displayName: string;
-    contentText: string;
-}
-
-export default function FailingEntity({ link, displayName, contentText }: Props) {
-    return (
-        <DatasetWrapper>
-            <StyledLink href={link} target="_blank" rel="noopener noreferrer">
-                <StyledIcon component={ExternalLink} />
-                <Typography.Text ellipsis={{ tooltip: true }} style={{ color: 'inherit' }}>
-                    {displayName}
-                </Typography.Text>
-            </StyledLink>
-            <AssertionsSummaryWrapper>{contentText}</AssertionsSummaryWrapper>
-        </DatasetWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingInputs.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingInputs.tsx
deleted file mode 100644
index fed026c1253664..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/FailingInputs.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { orange } from '@ant-design/colors';
-import { DownOutlined, WarningFilled } from '@ant-design/icons';
-import { Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import { getDisplayedEntityType } from '@app/entityV2/shared/containers/profile/header/utils';
-import ActiveIncidents from '@app/entityV2/shared/embed/UpstreamHealth/ActiveIncidents';
-import FailingAssertions from '@app/entityV2/shared/embed/UpstreamHealth/FailingAssertions';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Dataset } from '@types';
-
-const FailingEntityTitle = styled(Typography.Text)`
-    font-size: 16px;
-    line-height: 24px;
-    margin-left: 6px;
-`;
-
-const StyledWarning = styled(WarningFilled)`
-    color: ${orange[5]};
-    font-size: 14px;
-`;
-
-const FailingDetailsWrapper = styled.span`
-    font-size: 14px;
-    color: ${ANTD_GRAY[8]};
-    margin-left: 6px;
-    white-space: nowrap;
-    &:hover {
-        cursor: pointer;
-        color: ${(props) => props.theme.styles['primary-color']};
-    }
-`;
-
-const FailingInputsHeader = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const StyledArrow = styled(DownOutlined)<{ isOpen: boolean }>`
-    font-size: 12px;
-    margin-left: 3px;
-    ${(props) =>
-        props.isOpen &&
-        `
-        transform: rotate(180deg);
-        padding-top: 1px;
-    `}
-`;
-
-interface Props {
-    datasetsWithActiveIncidents: Dataset[];
-    totalDatasetsWithActiveIncidents: number;
-    fetchMoreIncidentsData: () => void;
-    isLoadingIncidents: boolean;
-    datasetsWithFailingAssertions: Dataset[];
-    totalDatasetsWithFailingAssertions: number;
-    fetchMoreAssertionsData: () => void;
-    isLoadingAssertions: boolean;
-}
-
-export default function FailingInputs({
-    datasetsWithActiveIncidents,
-    totalDatasetsWithActiveIncidents,
-    fetchMoreIncidentsData,
-    isLoadingIncidents,
-    datasetsWithFailingAssertions,
-    totalDatasetsWithFailingAssertions,
-    fetchMoreAssertionsData,
-    isLoadingAssertions,
-}: Props) {
-    const [areFailingDetailsVisible, setAreFailingDetailsVisible] = useState(false);
-    const entityRegistry = useEntityRegistry();
-    const { entityData, entityType } = useEntityData();
-    const displayedEntityType = getDisplayedEntityType(entityData, entityRegistry, entityType);
-
-    return (
-        <div>
-            <FailingInputsHeader>
-                <StyledWarning />
-                <FailingEntityTitle ellipsis={{ tooltip: true }}>
-                    Data quality issues impacting this {displayedEntityType}
-                </FailingEntityTitle>
-                <FailingDetailsWrapper onClick={() => setAreFailingDetailsVisible(!areFailingDetailsVisible)}>
-                    details <StyledArrow isOpen={areFailingDetailsVisible} />
-                </FailingDetailsWrapper>
-            </FailingInputsHeader>
-            {areFailingDetailsVisible && (
-                <>
-                    {datasetsWithActiveIncidents.length > 0 && (
-                        <ActiveIncidents
-                            datasetsWithActiveIncidents={datasetsWithActiveIncidents}
-                            totalDatasetsWithActiveIncidents={totalDatasetsWithActiveIncidents}
-                            fetchMoreIncidentsData={fetchMoreIncidentsData}
-                            isLoadingIncidents={isLoadingIncidents}
-                        />
-                    )}
-                    {datasetsWithFailingAssertions.length > 0 && (
-                        <FailingAssertions
-                            datasetsWithFailingAssertions={datasetsWithFailingAssertions}
-                            totalDatasetsWithFailingAssertions={totalDatasetsWithFailingAssertions}
-                            fetchMoreAssertionsData={fetchMoreAssertionsData}
-                            isLoadingAssertions={isLoadingAssertions}
-                        />
-                    )}
-                </>
-            )}
-        </div>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth.tsx b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth.tsx
index 7b097461dfd146..d65b7aefeb0976 100644
--- a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth.tsx
@@ -1,5 +1,4 @@
 import { ErrorRounded } from '@mui/icons-material';
-import { Divider } from 'antd';
 import React, { useEffect, useState } from 'react';
 import styled from 'styled-components';
 
@@ -21,10 +20,6 @@ import { useEntityRegistry } from '@src/app/useEntityRegistry';
 import { useSearchAcrossLineageQuery } from '@graphql/search.generated';
 import { FilterOperator, LineageDirection } from '@types';
 
-export const StyledDivider = styled(Divider)`
-    margin: 16px 0;
-`;
-
 const Title = styled.div`
     font-size: 14px;
     font-weight: 600;
diff --git a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/utils.ts b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/utils.ts
index 99d69463784993..da4b3125d1df51 100644
--- a/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/utils.ts
+++ b/datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/utils.ts
@@ -1,4 +1,4 @@
-import { Dataset, EntityType, FilterOperator, LineageDirection } from '@types';
+import { Dataset } from '@types';
 
 export function getNumAssertionsFailing(dataset: Dataset) {
     let numFailing = 0;
@@ -13,50 +13,3 @@ export function getNumAssertionsFailing(dataset: Dataset) {
 }
 
 export const DATASET_COUNT = 5;
-
-interface Arguments {
-    urn: string;
-    filterField: string;
-    start: number;
-    includeAssertions: boolean;
-    includeIncidents: boolean;
-    startTimeMillis: number | null;
-    skip?: boolean;
-    count?: number;
-}
-
-export function generateQueryVariables({
-    urn,
-    startTimeMillis,
-    filterField,
-    start,
-    includeAssertions,
-    includeIncidents,
-    skip,
-    count,
-}: Arguments) {
-    return {
-        skip,
-        variables: {
-            input: {
-                urn,
-                startTimeMillis,
-                query: '*',
-                types: [EntityType.Dataset],
-                start,
-                count: count !== undefined ? count : DATASET_COUNT,
-                direction: LineageDirection.Upstream,
-                orFilters: [
-                    {
-                        and: [
-                            { field: 'degree', condition: FilterOperator.Equal, values: ['1', '2', '3+'] },
-                            { field: filterField, condition: FilterOperator.Equal, values: ['true'] },
-                        ],
-                    },
-                ],
-            },
-            includeAssertions,
-            includeIncidents,
-        },
-    };
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreviewAddDataProduct.tsx b/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreviewAddDataProduct.tsx
deleted file mode 100644
index 0aeb2eda021330..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/links/DataProductMiniPreviewAddDataProduct.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY, ANTD_GRAY_V2, REDESIGN_COLORS } from '@app/entity/shared/constants';
-
-const DomainInfoContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-`;
-
-const DataProductDescription = styled.div`
-    font-size: 14px;
-    font-weight: 400;
-    color: ${ANTD_GRAY[7]};
-    font-family: Mulish;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    max-width: 200px;
-`;
-
-const DataProductTitle = styled.div`
-    font-size: 16px;
-    font-weight: 400;
-    color: ${REDESIGN_COLORS.BLUE};
-    font-family: Mulish;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    max-width: 200px;
-`;
-
-const Card = styled.div`
-    align-self: stretch;
-    align-items: center;
-    background-color: ${ANTD_GRAY[1]};
-    border: 1.5px solid ${ANTD_GRAY_V2[5]};
-    border-radius: 10px;
-    display: flex;
-    justify-content: start;
-    min-width: 160px;
-    padding: 16px;
-    height: 100%;
-    :hover {
-        border: 1.5px solid ${REDESIGN_COLORS.BLUE};
-        cursor: pointer;
-    }
-`;
-
-export const DataProductMiniPreviewAddDataProduct = ({ onAdd }: { onAdd: () => void }): JSX.Element => {
-    return (
-        <Card onClick={onAdd}>
-            <DomainInfoContainer>
-                <DataProductTitle>
-                    <PlusOutlined style={{ marginRight: 4 }} />
-                    Add Data Product
-                </DataProductTitle>
-                <DataProductDescription>Share your knowledge</DataProductDescription>
-            </DomainInfoContainer>
-        </Card>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/links/EntityExternalLink.tsx b/datahub-web-react/src/app/entityV2/shared/links/EntityExternalLink.tsx
deleted file mode 100644
index defdf717eb7e4f..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/links/EntityExternalLink.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React, { ReactNode } from 'react';
-
-interface Props {
-    url: string | null | undefined;
-    children: ReactNode;
-}
-
-const EntityExternalLink: React.FC<Props> = ({ url, children }) => (
-    <a href={url || undefined} target="blank">
-        {children}
-    </a>
-);
-
-export default EntityExternalLink;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessButtonHelpers.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessButtonHelpers.tsx
index 6511b9ea10e55f..11f2ea5dadf42f 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessButtonHelpers.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessButtonHelpers.tsx
@@ -7,13 +7,13 @@ import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants';
 /**
  * Tooltip message for when user already has access
  */
-export const ACCESS_GRANTED_TOOLTIP = 'You already have access to this role';
+const ACCESS_GRANTED_TOOLTIP = 'You already have access to this role';
 
 /**
  * Styled button component for access management actions.
  * Supports both enabled (request) and disabled (granted) states.
  */
-export const AccessButton = styled(Button)`
+const AccessButton = styled(Button)`
     background-color: ${REDESIGN_COLORS.BLUE};
     color: ${REDESIGN_COLORS.WHITE};
     width: 80px;
@@ -56,7 +56,7 @@ export interface RoleAccessData {
  * Handles the click event for access request buttons.
  * Only opens the URL if the user doesn't already have access.
  */
-export const handleAccessButtonClick = (hasAccess: boolean, url?: string) => (e: React.MouseEvent) => {
+const handleAccessButtonClick = (hasAccess: boolean, url?: string) => (e: React.MouseEvent) => {
     if (!hasAccess && url) {
         e.preventDefault();
         window.open(url);
@@ -94,13 +94,3 @@ export const renderAccessButton = (roleData: RoleAccessData): React.ReactElement
         button
     );
 };
-
-/**
- * Determines the button text based on access status
- */
-export const getAccessButtonText = (hasAccess: boolean): string => (hasAccess ? 'Granted' : 'Request');
-
-/**
- * Determines if the button should be disabled
- */
-export const isAccessButtonDisabled = (hasAccess: boolean): boolean => hasAccess;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx
index 06b55b67c6ee79..527a97ce5ef41c 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/AccessManagement/AccessManagerDescription.tsx
@@ -2,7 +2,7 @@ import { Typography } from 'antd';
 import React, { useState } from 'react';
 import styled from 'styled-components';
 
-export type Props = {
+type Props = {
     description: any;
 };
 
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResults.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResults.tsx
deleted file mode 100644
index 7b4fc7fd273fcb..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResults.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-
-import { TestResultsList } from '@app/entityV2/shared/tabs/Dataset/Governance/TestResultsList';
-import { TestResultsSummary } from '@app/entityV2/shared/tabs/Dataset/Governance/TestResultsSummary';
-
-import { TestResult } from '@types';
-
-type Props = {
-    passing: Array<TestResult>;
-    failing: Array<TestResult>;
-};
-
-export const TestResults = ({ passing, failing }: Props) => {
-    const filteredPassing = passing.filter((testResult) => testResult.test !== null);
-    const filteredFailing = failing.filter((testResult) => testResult.test !== null);
-    const totalTests = filteredPassing.length + filteredFailing.length;
-
-    return (
-        <>
-            <TestResultsSummary
-                summary={{
-                    passing: filteredPassing.length,
-                    failing: filteredFailing.length,
-                    total: totalTests,
-                }}
-            />
-            {totalTests > 0 && (
-                <TestResultsList title="Test Results" results={[...filteredFailing, ...filteredPassing]} />
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsList.tsx
deleted file mode 100644
index 841f7681b1bfb7..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsList.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import { CopyOutlined, StopOutlined } from '@ant-design/icons';
-import { Button, Tooltip } from '@components';
-import { Divider, Empty, Tag, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { StyledTable } from '@app/entityV2/shared/components/styled/StyledTable';
-import { getResultColor, getResultIcon, getResultText } from '@app/entityV2/shared/tabs/Dataset/Governance/testUtils';
-
-import { TestResult } from '@types';
-
-const ResultContainer = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: left;
-`;
-
-const TestResultsContainer = styled.div`
-    padding: 20px;
-`;
-
-const TestName = styled(Typography.Title)`
-    margin: 0px;
-    padding: 0px;
-
-    && {
-        margin-bottom: 4px;
-    }
-`;
-
-const TestCategory = styled(Typography.Text)`
-    margin: 0px;
-    padding: 0px;
-`;
-
-const ResultTypeText = styled(Typography.Text)`
-    margin-left: 8px;
-`;
-
-const CopyButton = styled(Button)`
-    padding: 0px 8px 0px 8px;
-    margin: 0px;
-    height: 32px;
-`;
-
-type Props = {
-    title: string;
-    results: Array<TestResult>;
-};
-
-export const TestResultsList = ({ title, results }: Props) => {
-    const resultsTableData = results.map((result) => ({
-        urn: result.test?.urn,
-        name: result?.test?.name,
-        category: result?.test?.category,
-        description: result?.test?.description,
-        resultType: result.type,
-    }));
-
-    const resultsTableCols = [
-        {
-            title: '',
-            dataIndex: '',
-            key: '',
-            render: (_, record: any) => {
-                const resultColor = (record.resultType && getResultColor(record.resultType)) || 'default';
-                const resultText = (record.resultType && getResultText(record.resultType)) || 'No Evaluations';
-                const resultIcon = (record.resultType && getResultIcon(record.resultType)) || <StopOutlined />;
-                return (
-                    <ResultContainer>
-                        <div>
-                            <Tag style={{ borderColor: resultColor }}>
-                                {resultIcon}
-                                <ResultTypeText style={{ color: resultColor }}>{resultText}</ResultTypeText>
-                            </Tag>
-                        </div>
-                        <div style={{ width: '100%', display: 'flex', justifyContent: 'space-between' }}>
-                            <div style={{ marginLeft: 8 }}>
-                                <div>
-                                    <TestName level={5}>{record.name}</TestName>
-                                    <TestCategory type="secondary">{record.category}</TestCategory>
-                                    <Divider type="vertical" />
-                                    <Typography.Text type={record.description ? undefined : 'secondary'}>
-                                        {record.description || 'No description'}
-                                    </Typography.Text>
-                                </div>
-                            </div>
-                            {navigator.clipboard && (
-                                <Tooltip title="Copy URN. An URN uniquely identifies an entity on DataHub.">
-                                    <CopyButton
-                                        variant="outline"
-                                        size="sm"
-                                        color="gray"
-                                        onClick={() => {
-                                            navigator.clipboard.writeText(record.urn);
-                                        }}
-                                    >
-                                        <CopyOutlined />
-                                    </CopyButton>
-                                </Tooltip>
-                            )}
-                        </div>
-                    </ResultContainer>
-                );
-            },
-        },
-    ];
-
-    return (
-        <TestResultsContainer>
-            <Typography.Title level={5}>{title}</Typography.Title>
-            <StyledTable
-                columns={resultsTableCols}
-                dataSource={resultsTableData}
-                rowKey="urn"
-                locale={{
-                    emptyText: <Empty description="No Tests Found :(" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
-                }}
-                showHeader={false}
-                pagination={false}
-            />
-        </TestResultsContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsSummary.tsx
deleted file mode 100644
index 301cee4362656a..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/TestResultsSummary.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { CheckCircleFilled, CloseCircleFilled, StopOutlined } from '@ant-design/icons';
-import { Tooltip } from '@components';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@components/theme/foundations/colors';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-
-const SummaryHeader = styled.div`
-    width: 100%;
-    padding-left: 40px;
-    padding-top: 20px;
-    padding-bottom: 20px;
-    display: flex;
-    align-items: center;
-    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
-`;
-
-const SummaryContainer = styled.div``;
-
-const SummaryMessage = styled.div`
-    display: inline-block;
-    margin-left: 20px;
-`;
-
-const SummaryTitle = styled(Typography.Title)`
-    && {
-        padding-bottom: 0px;
-        margin-bottom: 0px;
-    }
-`;
-
-export type TestsSummary = {
-    failing: number;
-    passing: number;
-    total: number;
-};
-
-type Props = {
-    summary: TestsSummary;
-};
-
-const getSummaryIcon = (summary: TestsSummary) => {
-    if (summary.total === 0) {
-        return <StopOutlined style={{ color: ANTD_GRAY[6], fontSize: 28 }} />;
-    }
-    if (summary.passing === summary.total) {
-        return <CheckCircleFilled style={{ color: SUCCESS_COLOR_HEX, fontSize: 28 }} />;
-    }
-    return <CloseCircleFilled style={{ color: FAILURE_COLOR_HEX, fontSize: 28 }} />;
-};
-
-const getSummaryMessage = (summary: TestsSummary) => {
-    if (summary.total === 0) {
-        return 'No tests have run';
-    }
-    if (summary.passing === summary.total) {
-        return 'All tests are passing';
-    }
-    if (summary.failing === summary.total) {
-        return 'All tests are failing';
-    }
-    return 'Some tests are failing';
-};
-
-export const TestResultsSummary = ({ summary }: Props) => {
-    const summaryIcon = getSummaryIcon(summary);
-    const summaryMessage = getSummaryMessage(summary);
-    const subtitleMessage = `${summary.passing} passing tests, ${summary.failing} failing tests`;
-    return (
-        <SummaryHeader>
-            <SummaryContainer>
-                <Tooltip title="This status is based on the most recent run of each test.">
-                    <div style={{ display: 'flex', alignItems: 'center' }}>
-                        {summaryIcon}
-                        <SummaryMessage>
-                            <SummaryTitle level={5}>{summaryMessage}</SummaryTitle>
-                            <Typography.Text type="secondary">{subtitleMessage}</Typography.Text>
-                        </SummaryMessage>
-                    </div>
-                </Tooltip>
-            </SummaryContainer>
-        </SummaryHeader>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/testUtils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/testUtils.tsx
deleted file mode 100644
index 04f60877ab17b6..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Governance/testUtils.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons';
-import React from 'react';
-
-import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@components/theme/foundations/colors';
-
-import { TestResultType } from '@types';
-
-/**
- * Returns the display text assoociated with an Test Result Type
- */
-export const getResultText = (result: TestResultType) => {
-    switch (result) {
-        case TestResultType.Success:
-            return 'Passing';
-        case TestResultType.Failure:
-            return 'Failing';
-        default:
-            throw new Error(`Unsupported Test Result Type ${result} provided.`);
-    }
-};
-
-/**
- * Returns the display color assoociated with an TestResultType
- */
-
-export const getResultColor = (result: TestResultType) => {
-    switch (result) {
-        case TestResultType.Success:
-            return SUCCESS_COLOR_HEX;
-        case TestResultType.Failure:
-            return FAILURE_COLOR_HEX;
-        default:
-            throw new Error(`Unsupported Test Result Type ${result} provided.`);
-    }
-};
-
-/**
- * Returns the display icon assoociated with an TestResultType
- */
-export const getResultIcon = (result: TestResultType) => {
-    const resultColor = getResultColor(result);
-    switch (result) {
-        case TestResultType.Success:
-            return <CheckCircleOutlined style={{ color: resultColor }} />;
-        case TestResultType.Failure:
-            return <CloseCircleOutlined style={{ color: resultColor }} />;
-        default:
-            throw new Error(`Unsupported Test Result Type ${result} provided.`);
-    }
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/CopyQuery.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/CopyQuery.tsx
index 890d3b027803ae..51589eb1deba82 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/CopyQuery.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/CopyQuery.tsx
@@ -3,7 +3,7 @@ import { Tooltip } from '@components';
 import { Button } from 'antd';
 import React, { useState } from 'react';
 
-export type Props = {
+type Props = {
     query: string;
     showCopyText?: boolean;
     style?: any;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/Query.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/Query.tsx
index 700588554f8562..f034a8cb8786d9 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/Query.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/Query.tsx
@@ -4,7 +4,7 @@ import QueryBuilderModal from '@app/entityV2/shared/tabs/Dataset/Queries/QueryBu
 import QueryCard from '@app/entityV2/shared/tabs/Dataset/Queries/QueryCard';
 import QueryModal from '@app/entityV2/shared/tabs/Dataset/Queries/QueryModal';
 
-export type Props = {
+type Props = {
     urn?: string;
     query: string;
     title?: string;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCard.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCard.tsx
index 89b4fcb258fd3f..e5df2272aaeaaa 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCard.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCard.tsx
@@ -16,7 +16,7 @@ const Card = styled.div<{ isCompact?: boolean }>`
     ${(props) => props.isCompact && `max-width: 650px;`}
 `;
 
-export type Props = {
+type Props = {
     urn?: string;
     query: string;
     title?: string;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetails.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetails.tsx
index cca46cc1ff0fc7..e5ed47069faba9 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetails.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetails.tsx
@@ -68,7 +68,7 @@ const EmptyText = styled.div`
     }
 `;
 
-export type Props = {
+type Props = {
     urn?: string;
     title?: string;
     description?: string;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx
index 8ca40ca1492ece..6f8d2dbd8a1a7d 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardDetailsMenu.tsx
@@ -9,7 +9,7 @@ const StyledMoreOutlined = styled(MoreOutlined)`
     font-size: 14px;
 `;
 
-export type Props = {
+type Props = {
     urn: string;
     onDeleted?: (urn: string) => void;
     index?: number;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx
index 79451ec9ebf064..9ef76bbb4587af 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardEditButton.tsx
@@ -10,7 +10,7 @@ const EditQueryActionButton = styled(Button)`
     }
 `;
 
-export type Props = {
+type Props = {
     onClickEdit?: () => void;
     index?: number;
 };
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardHeader.tsx
index dd0ddb6edf5ee4..b6216e6f5bcde7 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardHeader.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardHeader.tsx
@@ -22,7 +22,7 @@ const ExpandButton = styled(Button)`
     margin-left: 8px;
 `;
 
-export type Props = {
+type Props = {
     query: string;
     focused: boolean;
     onClickExpand?: (newQuery) => void;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardQuery.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardQuery.tsx
index e681e2fa4cbbc0..6d067fcac1c353 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardQuery.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/QueryCardQuery.tsx
@@ -40,7 +40,7 @@ const NestedSyntax = styled(StyledSyntaxHighlighter)<{ isCompact?: boolean }>`
     `}
 `;
 
-export type Props = {
+type Props = {
     query: string;
     showDetails: boolean;
     onClickExpand?: (newQuery) => void;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/constants.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/constants.ts
index fd3b8fbe062317..26eeb28d3b1b2f 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/constants.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/constants.ts
@@ -6,10 +6,6 @@ export const MAX_QUERIES_COUNT = 25;
  * Default page size for Queries Tab Section
  */
 export const DEFAULT_PAGE_SIZE = 5;
-/**
- * The Max number of "Recent Queries" to surface.
- */
-export const DEFAULT_MAX_RECENT_QUERIES = 9;
 
 /**
  * Searching Queries
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getCurrentPage.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getCurrentPage.ts
deleted file mode 100644
index 2931de97e69aca..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Queries/utils/getCurrentPage.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Returns the queries for the current page
- */
-export const getQueriesForPage = (queries: any, page: number, pageSize: number) => {
-    const start = (page - 1) * pageSize;
-    const end = start + pageSize;
-    return queries.length >= end ? queries.slice(start, end) : queries.slice(start, queries.length);
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/CompactSchemaTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/CompactSchemaTable.tsx
index bf592655333906..73fd8c2060262b 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/CompactSchemaTable.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/CompactSchemaTable.tsx
@@ -21,7 +21,7 @@ import { resolveRuntimePath } from '@utils/runtimeBasePath';
 
 import { EditableSchemaMetadata, EntityType, SchemaField, SchemaMetadata, UsageQueryResult } from '@types';
 
-export type Props = {
+type Props = {
     rows: Array<ExtendedSchemaFields>;
     schemaMetadata: SchemaMetadata | undefined | null;
     editableSchemaMetadata?: EditableSchemaMetadata | null;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTable.tsx
index 45eb4168a6a917..23b2e482bf88a3 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTable.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/SchemaTable.tsx
@@ -142,7 +142,7 @@ const TableContainer = styled.div<{ isSearchActive: boolean; hasRowWithDepth: bo
     }
 `;
 
-export type Props = {
+type Props = {
     rows: Array<ExtendedSchemaFields>;
     schemaMetadata: SchemaMetadata | undefined | null;
     editableSchemaMetadata?: EditableSchemaMetadata | null;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/MenuColumn.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/MenuColumn.tsx
index 5ac4d969922453..cad69e831211f9 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/MenuColumn.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/MenuColumn.tsx
@@ -15,7 +15,7 @@ export const ImpactAnalysisIcon = styled(VscGraphLeft)`
     font-size: 18px;
 `;
 
-export const CopyOutlinedIcon = styled(CopyOutlined)`
+const CopyOutlinedIcon = styled(CopyOutlined)`
     transform: scaleX(-1);
     font-size: 16px;
 `;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/NestedRowIcon.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/NestedRowIcon.tsx
deleted file mode 100644
index c9d1e3f804a15e..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/NestedRowIcon.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-
-import RowIcon from '@images/row-icon.svg?react';
-
-const RowIconContainer = styled.div`
-    position: relative;
-    display: flex;
-    align-items: center;
-`;
-const DepthContainer = styled.div`
-    height: 13px;
-    width: 13px;
-    border-radius: 50%;
-    background: ${REDESIGN_COLORS.WHITE};
-    margin-left: -7px;
-    margin-top: -12px;
-    display: flex;
-    align-items: center;
-`;
-
-const DepthNumber = styled(Typography.Text)`
-    margin-left: 4px;
-    background: transparent;
-    color: ${REDESIGN_COLORS.PRIMARY_PURPLE};
-    font-size: 10px;
-    font-weight: 400;
-`;
-
-type Props = {
-    depth: number;
-};
-
-export default function NestedRowIcon({ depth }: Props) {
-    return (
-        <RowIconContainer className="row-icon">
-            <RowIcon height={16} width={16} />
-            <DepthContainer className="depth-container">
-                <DepthNumber className="depth-text">{depth}</DepthNumber>
-            </DepthContainer>
-        </RowIconContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTitle.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTitle.tsx
deleted file mode 100644
index c1c55f766e1b52..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldTitle.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-
-const FieldName = styled(Typography.Text)`
-    color: ${REDESIGN_COLORS.WHITE_WIRE};
-    font-size: 16px;
-    font-weight: 700;
-    line-height: 24px;
-    overflow: hidden;
-    display: block;
-    cursor: pointer;
-    :hover {
-        font-weight: bold;
-    }
-`;
-
-interface Props {
-    displayName: string;
-}
-
-export default function FieldTitle({ displayName }: Props) {
-    const name = displayName.split('.').pop();
-    return <FieldName>{name}</FieldName>;
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx
deleted file mode 100644
index 32ae7e2f4e6c81..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/FieldUsageStats.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import React, { useMemo } from 'react';
-import styled from 'styled-components';
-
-import { useBaseEntity } from '@app/entity/shared/EntityContext';
-import { pathMatchesNewPath } from '@app/entityV2/dataset/profile/schema/utils/utils';
-import { ANTD_GRAY_V2 } from '@app/entityV2/shared/constants';
-import { SectionHeader } from '@app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components';
-import { UsageBar } from '@app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer';
-import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber';
-
-import { GetDatasetQuery } from '@graphql/dataset.generated';
-import { SchemaField } from '@types';
-
-const USAGE_BAR_MAX_WIDTH = 100;
-
-const UsageBarWrapper = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const UsageBarBackground = styled.div`
-    background-color: ${ANTD_GRAY_V2[3]};
-    border-radius: 2px;
-    height: 4px;
-    width: ${USAGE_BAR_MAX_WIDTH}px;
-`;
-
-const UsageTextWrapper = styled.span`
-    margin-left: 8px;
-`;
-
-const UsageSection = styled.div`
-    margin-bottom: 24px;
-`;
-
-interface Props {
-    expandedField: SchemaField;
-}
-
-export default function FieldUsageStats({ expandedField }: Props) {
-    const baseEntity = useBaseEntity<GetDatasetQuery>();
-    const usageStats = baseEntity?.dataset?.usageStats;
-    const hasUsageStats = useMemo(() => (usageStats?.aggregations?.fields?.length || 0) > 0, [usageStats]);
-    const maxFieldUsageCount = useMemo(
-        () => Math.max(...(usageStats?.aggregations?.fields?.map((field) => field?.count || 0) || [])),
-        [usageStats],
-    );
-    const relevantUsageStats = usageStats?.aggregations?.fields?.find((fieldStats) =>
-        pathMatchesNewPath(fieldStats?.fieldName, expandedField.fieldPath),
-    );
-
-    if (!hasUsageStats || !relevantUsageStats) return null;
-
-    return (
-        <UsageSection>
-            <SectionHeader>Usage</SectionHeader>
-            <UsageBarWrapper>
-                <UsageBarBackground>
-                    <UsageBar width={((relevantUsageStats.count || 0) / maxFieldUsageCount) * USAGE_BAR_MAX_WIDTH} />
-                </UsageBarBackground>
-                <UsageTextWrapper>
-                    {formatNumberWithoutAbbreviation(relevantUsageStats.count || 0)} queries / month
-                </UsageTextWrapper>
-            </UsageBarWrapper>
-        </UsageSection>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts
index 9195eab6d450cf..2e730483991421 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/components/SchemaFieldDrawer/components.ts
@@ -1,18 +1,7 @@
 import { Divider } from 'antd';
 import styled from 'styled-components';
-
-import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
 import { colors } from '@src/alchemy-components';
 
-export const SectionHeader = styled.div`
-    margin-bottom: 8px;
-    color: ${REDESIGN_COLORS.DARK_GREY};
-    font-size: 14px;
-    font-style: normal;
-    font-weight: 700;
-    line-height: 24px;
-`;
-
 export const StyledDivider = styled(Divider)`
     border-color: ${colors.gray[100]};
     border-style: solid;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx
deleted file mode 100644
index 3a3ab7a62d6fbb..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useTagsAndTermsRendererFeatureTable.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from 'react';
-
-import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext';
-import { pathMatchesExact } from '@app/entityV2/dataset/profile/schema/utils/utils';
-import TagTermGroup from '@app/sharedV2/tags/TagTermGroup';
-
-import { EditableSchemaMetadata, EntityType, GlobalTags, SchemaField } from '@types';
-
-export default function useTagsAndTermsRendererFeatureTable(
-    editableSchemaMetadata: EditableSchemaMetadata | null | undefined,
-    tagHoveredIndex: string | undefined,
-    setTagHoveredIndex: (index: string | undefined) => void,
-    options: { showTags: boolean; showTerms: boolean },
-) {
-    const { urn } = useEntityData();
-    const refetch = useRefetch();
-
-    const tagAndTermRender = (tags: GlobalTags, record: SchemaField, rowIndex: number | undefined) => {
-        const relevantEditableFieldInfo = editableSchemaMetadata?.editableSchemaFieldInfo?.find(
-            (candidateEditableFieldInfo) => pathMatchesExact(candidateEditableFieldInfo.fieldPath, record.fieldPath),
-        );
-
-        return (
-            <div data-testid={`schema-field-${record.fieldPath}-${options.showTags ? 'tags' : 'terms'}`}>
-                <TagTermGroup
-                    uneditableTags={options.showTags ? tags : null}
-                    editableTags={options.showTags ? relevantEditableFieldInfo?.globalTags : null}
-                    uneditableGlossaryTerms={options.showTerms ? record.glossaryTerms : null}
-                    editableGlossaryTerms={options.showTerms ? relevantEditableFieldInfo?.glossaryTerms : null}
-                    canRemove
-                    buttonProps={{ size: 'small' }}
-                    canAddTag={tagHoveredIndex === `${record.fieldPath}-${rowIndex}` && options.showTags}
-                    canAddTerm={tagHoveredIndex === `${record.fieldPath}-${rowIndex}` && options.showTerms}
-                    onOpenModal={() => setTagHoveredIndex(undefined)}
-                    entityUrn={urn}
-                    entityType={EntityType.Dataset}
-                    entitySubresource={record.fieldPath}
-                    refetch={refetch}
-                />
-            </div>
-        );
-    };
-    return tagAndTermRender;
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx
index e9f6f05aea6f0d..a9c2781015fabb 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Schema/utils/useUsageStatsRenderer.tsx
@@ -1,4 +1,4 @@
-import { geekblue } from '@ant-design/colors';
+
 import { Tooltip } from '@components';
 import QueryStatsOutlinedIcon from '@mui/icons-material/QueryStatsOutlined';
 import React from 'react';
@@ -10,13 +10,6 @@ import { useBaseEntity } from '@src/app/entity/shared/EntityContext';
 import { GetDatasetQuery } from '@graphql/dataset.generated';
 import { UsageQueryResult } from '@types';
 
-export const UsageBar = styled.div<{ width: number }>`
-    width: ${(props) => props.width}px;
-    height: 4px;
-    background-color: ${geekblue[3]};
-    border-radius: 2px;
-`;
-
 const IconsContainer = styled.div`
     display: flex;
     gap: 3px;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsSection.tsx
deleted file mode 100644
index 32244ee67cc374..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsSection.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Divider, Row, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const Section = styled.div`
-    padding-top: 24px;
-    padding-bottom: 40px;
-    margin-bottom: 20px;
-    width: 100%;
-`;
-
-const ThinDivider = styled(Divider)`
-    margin-top: 8px;
-    margin-bottom: 8px;
-`;
-
-export type Props = {
-    children: React.ReactNode;
-    title: string;
-    rightFloatView?: React.ReactNode;
-};
-
-export default function StatsSection({ children, title, rightFloatView }: Props) {
-    return (
-        <Section>
-            <Row justify="space-between">
-                <Typography.Title level={3}>{title}</Typography.Title>
-                {rightFloatView || <span />}
-            </Row>
-            <ThinDivider />
-            {children}
-        </Section>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTabV2/graphs/ChangeHistoryGraph/constants.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTabV2/graphs/ChangeHistoryGraph/constants.ts
index b083b132c0c2ae..b0f643af0c5e08 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTabV2/graphs/ChangeHistoryGraph/constants.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTabV2/graphs/ChangeHistoryGraph/constants.ts
@@ -1,7 +1,7 @@
 import { AggregationGroup } from '@app/entityV2/shared/tabs/Dataset/Stats/StatsTabV2/graphs/ChangeHistoryGraph/types';
 import { OperationType } from '@src/types.generated';
 
-export const AVAILABLE_OPERATION_TYPES = [
+const AVAILABLE_OPERATION_TYPES = [
     OperationType.Insert,
     OperationType.Update,
     OperationType.Delete,
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTabV2/graphs/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTabV2/graphs/utils.ts
index 8bdcd476b1f135..a16e64bab3b2ff 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTabV2/graphs/utils.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTabV2/graphs/utils.ts
@@ -7,7 +7,7 @@ import { DateInterval, TimeRange } from '@src/types.generated';
 
 dayjs.extend(utc);
 
-export type TimeSeriesDatum = {
+type TimeSeriesDatum = {
     time: number;
     value: number;
 };
@@ -15,8 +15,7 @@ export type TimeSeriesDatum = {
 export type AggregationFunction = (values: number[]) => number | undefined;
 
 export const MAX_VALUE_AGGREGATION: AggregationFunction = (values) => Math.max(...values);
-export const MIN_VALUE_AGGREGATION: AggregationFunction = (values) => Math.min(...values);
-export const LATEST_VALUE_AGGREGATION: AggregationFunction = (values) => values.at(-1);
+const LATEST_VALUE_AGGREGATION: AggregationFunction = (values) => values.at(-1);
 export const SUM_VALUES_AGGREGATION: AggregationFunction = (values) => values.reduce((sum, val) => sum + val, 0);
 
 /**
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTabV2/highlights/styledComponents.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTabV2/highlights/styledComponents.ts
index f4ba2593d282ff..2396a6bd92d88d 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTabV2/highlights/styledComponents.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/StatsTabV2/highlights/styledComponents.ts
@@ -8,7 +8,7 @@ const NUM_CARDS_LATEST_STATS = 2;
 const NUM_CARDS_LAST_MONTH_STATS = 3;
 const LATEST_STATS_MAX_WIDTH = 470;
 
-export const highlightsSectionStyles = css`
+const highlightsSectionStyles = css`
     display: flex;
     flex-direction: column;
     gap: 8px;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx
index 32eee24009dadf..b5c189fc17b470 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/HistoricalStats.tsx
@@ -49,7 +49,7 @@ const getLookbackWindowSize = (window: LookbackWindow) => {
     return window.windowSize;
 };
 
-export type Props = {
+type Props = {
     urn: string;
     lookbackWindow: LookbackWindow;
 };
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx
index 45ce5add432b53..2ae74ff5c89057 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/ProfilingRunsChart.tsx
@@ -9,11 +9,11 @@ import { formatBytes, formatNumberWithoutAbbreviation } from '@app/shared/format
 
 import { DatasetProfile } from '@types';
 
-export const ChartTable = styled(Table)`
+const ChartTable = styled(Table)`
     margin-top: 16px;
 `;
 
-export type Props = {
+type Props = {
     profiles: Array<DatasetProfile>;
     areAllProfilesPartitioned: boolean;
 };
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx
index e6f8b1381bc044..1e7bbe7347e1e6 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Stats/historical/charts/StatChart.tsx
@@ -34,7 +34,7 @@ type AxisConfig = {
     formatter: (tick: number) => string;
 };
 
-export type Props = {
+type Props = {
     title: string;
     values: Array<Point>;
     tickInterval: DateInterval;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetails.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetails.tsx
deleted file mode 100644
index 52da589febf2fb..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetails.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { AcrylAssertionDetailsHeader } from '@app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetailsHeader';
-import { AcrylAssertionResultsChart } from '@app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChart';
-
-import { CronSchedule } from '@types';
-
-const Container = styled.div`
-    width: 100%;
-    padding-left: 52px;
-`;
-
-type Props = {
-    urn: string;
-    schedule?: CronSchedule;
-    lastEvaluatedAtMillis?: number | undefined;
-    nextEvaluatedAtMillis?: number | undefined;
-    isStopped?: boolean;
-};
-
-export const AcrylAssertionDetails = ({
-    urn,
-    schedule,
-    lastEvaluatedAtMillis,
-    nextEvaluatedAtMillis,
-    isStopped = false,
-}: Props) => {
-    return (
-        <Container>
-            <AcrylAssertionDetailsHeader
-                schedule={schedule}
-                lastEvaluatedAtMillis={lastEvaluatedAtMillis}
-                nextEvaluatedAtMillis={nextEvaluatedAtMillis}
-                isStopped={isStopped}
-            />
-            <AcrylAssertionResultsChart urn={urn} />
-        </Container>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetailsHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetailsHeader.tsx
deleted file mode 100644
index 87be3a8dee9742..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionDetailsHeader.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { ClockCircleOutlined } from '@ant-design/icons';
-import { Tooltip } from '@components';
-import { Divider, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import { getCronAsText } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils';
-import { TruncatedTextWithTooltip } from '@app/shared/TruncatedTextWithTooltip';
-import { getLocaleTimezone } from '@app/shared/time/timeUtils';
-
-import { CronSchedule } from '@types';
-
-const TimeLabel = styled.div`
-    max-width: 280px;
-    padding: 0;
-    margin: 0;
-    display: flex;
-    align-items: center;
-    color: ${ANTD_GRAY[7]};
-`;
-
-const Schedule = styled.span`
-    display: flex;
-    align-items: center;
-    justify-content: left;
-`;
-
-const StyledTruncatedText = styled(TruncatedTextWithTooltip)`
-    color: ${ANTD_GRAY[7]};
-`;
-
-const StyledClockCircleOutlined = styled(ClockCircleOutlined)`
-    margin-right: 8px;
-`;
-
-type Props = {
-    schedule?: CronSchedule;
-    lastEvaluatedAtMillis?: number | undefined;
-    nextEvaluatedAtMillis?: number | undefined;
-    isStopped?: boolean;
-};
-
-/**
- * Renders the header of the Assertion Details card, which displays the run schedule for the assertion.
- */
-export const AcrylAssertionDetailsHeader = ({
-    schedule,
-    lastEvaluatedAtMillis,
-    nextEvaluatedAtMillis,
-    isStopped = false,
-}: Props) => {
-    const localeTimezone = getLocaleTimezone();
-
-    /**
-     * Last evaluated timestamp
-     */
-    const lastEvaluatedAt = lastEvaluatedAtMillis && new Date(lastEvaluatedAtMillis);
-    const lastEvaluatedTimeLocal = lastEvaluatedAt
-        ? `Last evaluated on ${lastEvaluatedAt.toLocaleDateString()} at ${lastEvaluatedAt.toLocaleTimeString()} (${localeTimezone})`
-        : null;
-    const lastEvaluatedTimeGMT = lastEvaluatedAt ? lastEvaluatedAt.toUTCString() : null;
-
-    /**
-     * Next evaluated timestamp
-     */
-    const nextEvaluatedAt = nextEvaluatedAtMillis && new Date(nextEvaluatedAtMillis);
-    const nextEvaluatedTimeLocal = nextEvaluatedAt
-        ? `Next evaluation at ${nextEvaluatedAt.toLocaleDateString()} at ${nextEvaluatedAt.toLocaleTimeString()} (${localeTimezone})`
-        : null;
-    const nextEvaluatedTimeGMT = nextEvaluatedAt ? nextEvaluatedAt.toUTCString() : null;
-
-    /**
-     * Cron String - This will not be present for external assertions.
-     */
-    const interval = schedule?.cron?.replaceAll(', ', '');
-    const timezone = schedule?.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone;
-    const cronAsText = interval && getCronAsText(interval);
-    const scheduleText = schedule && cronAsText && !cronAsText.error && cronAsText.text;
-
-    return (
-        <div>
-            <Typography.Title level={5}>Evaluations</Typography.Title>
-            {(!isStopped && (
-                <Schedule>
-                    {scheduleText && (
-                        <TimeLabel>
-                            <StyledClockCircleOutlined />
-                            <StyledTruncatedText text={`Runs ${scheduleText} (${timezone})`} maxLength={80} />
-                            {lastEvaluatedTimeLocal && <Divider type="vertical" />}
-                        </TimeLabel>
-                    )}
-                    <Tooltip placement="topLeft" title={lastEvaluatedTimeGMT}>
-                        <TimeLabel>
-                            {lastEvaluatedTimeLocal} {nextEvaluatedAtMillis ? <Divider type="vertical" /> : true}
-                        </TimeLabel>
-                    </Tooltip>
-                    <Tooltip placement="topLeft" title={nextEvaluatedTimeGMT}>
-                        {nextEvaluatedTimeLocal && <TimeLabel>{nextEvaluatedTimeLocal}</TimeLabel>}
-                    </Tooltip>
-                </Schedule>
-            )) || <Typography.Text type="secondary">This assertion is not actively running.</Typography.Text>}
-        </div>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChart.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChart.tsx
deleted file mode 100644
index 5c57e2159e9a0e..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChart.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import { LOOKBACK_WINDOWS } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows';
-import { AcrylAssertionResultsChartHeader } from '@app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartHeader';
-import { AcrylAssertionResultsChartTimeline } from '@app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartTimeline';
-import { getFixedLookbackWindow } from '@app/shared/time/timeUtils';
-
-import { useGetAssertionRunsLazyQuery } from '@graphql/assertion.generated';
-
-const RESULT_CHART_WIDTH_PX = 800;
-
-const Container = styled.div`
-    width: ${RESULT_CHART_WIDTH_PX}px;
-    padding-top: 12px;
-`;
-
-type Props = {
-    urn: string;
-};
-
-export const AcrylAssertionResultsChart = ({ urn }: Props) => {
-    /**
-     * Retrieve a specific assertion's evaluations between a particular start and end time.
-     */
-    const [getAssertionRuns, { data }] = useGetAssertionRunsLazyQuery({ fetchPolicy: 'cache-first' });
-
-    /**
-     * Set default window for fetching assertion history.
-     */
-    const [lookbackWindow, setLookbackWindow] = useState(LOOKBACK_WINDOWS.WEEK);
-
-    /**
-     * Whenever the selected lookback window changes (via user selection), then
-     * refetch the runs for the assertion.
-     */
-    useEffect(() => {
-        getAssertionRuns({
-            variables: { assertionUrn: urn, ...getFixedLookbackWindow(lookbackWindow.windowSize) },
-        });
-    }, [urn, lookbackWindow, getAssertionRuns]);
-
-    const selectedWindow = getFixedLookbackWindow(lookbackWindow.windowSize);
-    const selectedWindowTimeRange = {
-        startMs: selectedWindow.startTime,
-        endMs: selectedWindow.endTime,
-    };
-
-    return (
-        <Container>
-            <AcrylAssertionResultsChartHeader
-                timeRange={selectedWindowTimeRange}
-                results={data?.assertion?.runEvents as any}
-                lookbackWindow={lookbackWindow}
-                setLookbackWindow={setLookbackWindow}
-            />
-            <AcrylAssertionResultsChartTimeline
-                timeRange={selectedWindowTimeRange}
-                results={data?.assertion?.runEvents as any}
-                platform={data?.assertion?.platform as any}
-            />
-        </Container>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartHeader.tsx
deleted file mode 100644
index a09cd8a8a88b0b..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartHeader.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import { Typography } from 'antd';
-import { SelectValue } from 'antd/lib/select';
-import React from 'react';
-import styled from 'styled-components';
-
-import PrefixedSelect from '@app/entityV2/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect';
-import { LOOKBACK_WINDOWS, LookbackWindow } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows';
-import { TimeRange } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline';
-import { getResultColor } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils';
-import { formatNumber } from '@app/shared/formatNumber';
-
-import { AssertionResultType, AssertionRunEventsResult } from '@types';
-
-const Header = styled.div`
-    display: flex;
-    justify-content: space-between;
-`;
-
-const EvaluationsSummary = styled.div`
-    width: 300px;
-    display: flex;
-    align-items: center;
-    justify-content: left;
-`;
-
-const EvaluationDateRange = styled(Typography.Text)`
-    margin-right: 20px;
-`;
-
-const EvaluationResults = styled.div``;
-
-const ResultTypeCount = styled.span`
-    margin-right: 12px;
-`;
-
-const ErrorEvaluationsCount = styled(Typography.Text)`
-    font-weight: 600;
-    color: ${getResultColor(AssertionResultType.Error)};
-`;
-
-type Props = {
-    timeRange: TimeRange;
-    results?: AssertionRunEventsResult | null;
-    lookbackWindow: LookbackWindow;
-    setLookbackWindow: (newWindow: LookbackWindow) => void;
-};
-
-export const AcrylAssertionResultsChartHeader = ({ timeRange, lookbackWindow, setLookbackWindow, results }: Props) => {
-    /**
-     * Start and end dates being observed in the chart.
-     */
-    const startDate = new Date(timeRange.startMs).toLocaleDateString('en-us', {
-        month: 'short',
-        day: 'numeric',
-    });
-    const endDate = new Date(timeRange.endMs).toLocaleDateString('en-us', {
-        month: 'short',
-        day: 'numeric',
-    });
-
-    /**
-     * Success / Failure summary
-     */
-    const succeededCount = results?.succeeded;
-    const failedCount = results?.failed;
-    const errorCount = results?.errored;
-
-    /**
-     * Invoked when user selects new lookback window (e.g. 1 year)
-     */
-    const onChangeLookbackWindow = (value: SelectValue) => {
-        const newLookbackWindow = Object.values(LOOKBACK_WINDOWS).filter((window) => window.text === value?.valueOf());
-        setLookbackWindow(newLookbackWindow[0]);
-    };
-
-    return (
-        <Header>
-            <EvaluationsSummary>
-                <EvaluationDateRange strong>
-                    {startDate} - {endDate}
-                </EvaluationDateRange>
-                <EvaluationResults>
-                    <ResultTypeCount>
-                        <Typography.Text
-                            style={{ color: getResultColor(AssertionResultType.Success), fontWeight: 600 }}
-                        >
-                            {formatNumber(succeededCount)}
-                        </Typography.Text>{' '}
-                        passed
-                    </ResultTypeCount>
-                    <ResultTypeCount>
-                        <Typography.Text
-                            style={{ color: getResultColor(AssertionResultType.Failure), fontWeight: 600 }}
-                        >
-                            {formatNumber(failedCount)}
-                        </Typography.Text>{' '}
-                        failed
-                    </ResultTypeCount>
-                    {errorCount ? (
-                        <ResultTypeCount>
-                            <ErrorEvaluationsCount>{formatNumber(errorCount)}</ErrorEvaluationsCount> error
-                            {errorCount > 1 ? 's' : ''}
-                        </ResultTypeCount>
-                    ) : null}
-                </EvaluationResults>
-            </EvaluationsSummary>
-            <PrefixedSelect
-                prefixText="Show "
-                values={Object.values(LOOKBACK_WINDOWS).map((window) => window.text)}
-                value={lookbackWindow.text}
-                setValue={onChangeLookbackWindow}
-            />
-        </Header>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartTimeline.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartTimeline.tsx
deleted file mode 100644
index 66bace47cfd2af..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AcrylAssertionResultsChartTimeline.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import { ArrowRightOutlined } from '@ant-design/icons';
-import { Tooltip } from '@components';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import {
-    AssertionResultTimeline,
-    TimeRange,
-} from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline';
-import { DatasetAssertionResultDetails } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails';
-import {
-    getResultErrorMessage,
-    getResultIcon,
-    getResultText,
-} from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils';
-import { LinkWrapper } from '@app/shared/LinkWrapper';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { AssertionResultType, AssertionRunEventsResult, AssertionRunStatus, DataPlatform, EntityType } from '@types';
-
-const RESULT_CHART_WIDTH_PX = 800;
-
-const AssertionResultIcon = styled.span`
-    margin-right: 8px;
-`;
-
-const AssertionResultDetailsContainer = styled.div`
-    margin-bottom: 4px;
-`;
-
-const AssertionResultErrorMessage = styled.div`
-    max-width: 250px;
-    margin-bottom: 4px;
-`;
-
-const AssertionResultInitializingMessage = styled.div`
-    max-width: 250px;
-    margin-bottom: 4px;
-`;
-
-type Props = {
-    timeRange: TimeRange;
-    results?: AssertionRunEventsResult | null;
-    platform?: DataPlatform | null;
-};
-
-export const AcrylAssertionResultsChartTimeline = ({ results, platform, timeRange }: Props) => {
-    const entityRegistry = useEntityRegistry();
-    const completedRuns =
-        results?.runEvents?.filter((runEvent) => runEvent.status === AssertionRunStatus.Complete) || [];
-
-    /**
-     * Data for the timeline of assertion results.
-     */
-    const timelineData =
-        completedRuns
-            .filter((runEvent) => !!runEvent.result)
-            .map((runEvent) => {
-                const { result } = runEvent;
-
-                if (!result) throw new Error('Completed assertion run event does not have a result.');
-
-                const resultTime = new Date(runEvent.timestampMillis);
-                const localTime = resultTime.toLocaleString();
-                const gmtTime = resultTime.toUTCString();
-                const resultUrl = result.externalUrl;
-                const isInitializing = result.type === AssertionResultType.Init;
-                const errorMessage = getResultErrorMessage(result);
-                const platformName =
-                    (platform && entityRegistry.getDisplayName(EntityType.DataPlatform, platform)) || undefined;
-
-                /**
-                 * Create a "result" to render in the timeline chart.
-                 */
-                return {
-                    time: runEvent.timestampMillis,
-                    result: {
-                        type: result.type,
-                        resultUrl,
-                        title: (
-                            <>
-                                <AssertionResultIcon>{getResultIcon(result.type)}</AssertionResultIcon>
-                                <Typography.Text strong>{getResultText(result.type)}</Typography.Text>
-                            </>
-                        ),
-                        content: (
-                            <>
-                                <AssertionResultDetailsContainer>
-                                    <DatasetAssertionResultDetails result={result} />
-                                </AssertionResultDetailsContainer>
-                                {isInitializing && (
-                                    <AssertionResultInitializingMessage>
-                                        Collecting the information required to evaluate this assertion.
-                                    </AssertionResultInitializingMessage>
-                                )}
-                                {errorMessage && (
-                                    <AssertionResultErrorMessage>{errorMessage}</AssertionResultErrorMessage>
-                                )}
-                                <div>
-                                    <Tooltip title={`${gmtTime}`}>
-                                        <Typography.Text type="secondary">{localTime}</Typography.Text>
-                                    </Tooltip>
-                                </div>
-                                {resultUrl && (
-                                    <LinkWrapper to={resultUrl} target="_blank">
-                                        {platformName ? `View in ${platformName}` : 'View results'}{' '}
-                                        <ArrowRightOutlined />
-                                    </LinkWrapper>
-                                )}
-                            </>
-                        ),
-                    },
-                };
-            }) || [];
-
-    return <AssertionResultTimeline width={RESULT_CHART_WIDTH_PX} data={timelineData} timeRange={timeRange} />;
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionGroupHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionGroupHeader.tsx
deleted file mode 100644
index 81b4ef8462405f..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionGroupHeader.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { AssertionGroup } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylTypes';
-import { getAssertionGroupSummaryIcon } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylUtils';
-
-const Container = styled.div`
-    display: flex;
-    align-items: center;
-    padding: 4px 0px;
-    &:hover {
-        cursor: pointer;
-    }
-`;
-
-const TextContainer = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: left;
-    font-size: 14px;
-`;
-
-const Title = styled(Typography.Text)`
-    && {
-        padding-bottom: 0px;
-        margin-bottom: 0px;
-    }
-`;
-
-const Message = styled(Typography.Text)`
-    && {
-        font-size: 12px;
-        margin-left: 8px;
-    }
-`;
-
-const SummaryIcon = styled.div`
-    margin-right: 16px;
-`;
-
-type Props = {
-    group: AssertionGroup;
-};
-
-export const AssertionGroupHeader = ({ group }: Props) => {
-    const { summary } = group;
-    const summaryIcon = getAssertionGroupSummaryIcon(summary);
-    const inactiveCount = summary.totalAssertions - summary.total;
-    const summaryMessage = `${summary.passing} passing, ${summary.failing} failing${
-        summary.erroring ? `, ${summary.erroring} errors` : ''
-    }${inactiveCount ? `, ${inactiveCount} inactive` : ''}`;
-    return (
-        <Container>
-            {summaryIcon && <SummaryIcon>{summaryIcon}</SummaryIcon>}
-            <TextContainer>
-                {group.icon}
-                <Title strong>{group.name}</Title>
-                <Message type="secondary">{summaryMessage}</Message>
-            </TextContainer>
-        </Container>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcryAssertionTypeSelect.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcryAssertionTypeSelect.tsx
deleted file mode 100644
index 9f387c7fd77195..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/AcryAssertionTypeSelect.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react';
-
-import { SimpleSelect } from '@src/alchemy-components';
-
-type Option = {
-    label: string;
-    value: string;
-};
-
-type Props = {
-    options: Option[];
-    selectedValue: string | undefined;
-    onSelect: (value: string) => void;
-};
-
-export function AcryAssertionTypeSelect({ options, selectedValue, onSelect }: Props) {
-    const selectedOption = options.find((option) => option.value === selectedValue) || { label: undefined };
-
-    const displayValue = selectedOption.label ? `Group ${selectedOption.label}` : 'Group';
-
-    return (
-        <SimpleSelect
-            options={options}
-            values={selectedValue ? [selectedValue] : []}
-            selectLabelProps={{ variant: 'labeled', label: 'Group' }}
-            onUpdate={(value) => {
-                if (value.length) {
-                    onSelect(value[0]);
-                } else {
-                    onSelect('');
-                }
-            }}
-            placeholder={displayValue}
-            size="md"
-            showClear={false}
-            optionSwitchable
-            width={50}
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/GroupByTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/GroupByTable.tsx
deleted file mode 100644
index 05a7774f6ad977..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/GroupByTable.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { AssertionListTableRow } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types';
-import { ANTD_GRAY } from '@src/app/entityV2/shared/constants';
-
-const GroupContainer = styled.div`
-    background: #fafafa;
-    &&& .acryl-selected-assertions-table-row {
-        background-color: ${ANTD_GRAY[4]};
-    }
-`;
-
-const Row = styled.div`
-    display: flex;
-    width: 100%;
-    border-bottom: 1px solid #f0f0f0;
-    padding: 16px;
-`;
-
-const Cell = styled.div<{ width?: string; minWidth?: string | null; paddingRight?: string | number }>`
-    width: ${(props) => props.width || 'auto'};
-    min-width: ${(props) => props.minWidth || null};
-    padding-right: ${(props) => props.paddingRight || '20px'};
-    text-overflow: ellipsis;
-    overflow-wrap: break-word;
-`;
-
-type AcrylAssertionGroupByComponentProps = {
-    groupData: AssertionListTableRow[];
-    columns: any[];
-    onRow: (record: any) => {
-        onClick: (_: any) => void;
-    };
-    focusUrn?: string;
-    entityType: string;
-};
-
-export const GroupByTable = ({
-    groupData,
-    columns,
-    onRow,
-    focusUrn,
-    entityType,
-}: AcrylAssertionGroupByComponentProps) => {
-    return (
-        <GroupContainer>
-            {groupData?.map((item) => (
-                <Row
-                    key={item.name}
-                    onClick={(event) => {
-                        onRow(item)?.onClick(event);
-                    }}
-                    className={
-                        focusUrn === item.urn
-                            ? `acryl-selected-${entityType}s-table-row`
-                            : `acryl-${entityType}s-table-row`
-                    }
-                >
-                    {columns.map((column) => {
-                        const isNameColumn = column?.key === 'name';
-                        const isActionColumn = column?.key === 'actions';
-                        const minWidth = isNameColumn ? 'min-content' : null;
-                        return (
-                            column?.width &&
-                            column?.key && (
-                                <Cell
-                                    key={column.key}
-                                    width={column.width}
-                                    style={{ display: !isNameColumn ? 'flex' : 'block', alignItems: 'center' }}
-                                    minWidth={minWidth}
-                                    paddingRight={isActionColumn ? '0px' : undefined}
-                                >
-                                    {column.render
-                                        ? column.render(item[column.dataIndex], item)
-                                        : item[column.dataIndex]}
-                                </Cell>
-                            )
-                        );
-                    })}
-                </Row>
-            ))}
-        </GroupContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/StyledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/StyledComponents.tsx
deleted file mode 100644
index fee7afaa05de0c..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/StyledComponents.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@src/app/entityV2/shared/constants';
-
-export const StyledTableContainer = styled.div`
-    table tr.acryl-selected-table-row {
-        background-color: ${ANTD_GRAY[4]};
-    }
-    margin: 0px 12px 12px 12px;
-`;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant.ts
index c8812129eb3402..0848c9224d1226 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant.ts
@@ -14,11 +14,6 @@ export const ASSERTION_DEFAULT_FILTERS = {
     },
 };
 
-export const ASSERTION_GROUP_BY_FILTER_OPTIONS = [
-    { label: 'Type', value: 'type' },
-    { label: 'Status', value: 'status' },
-];
-
 export const ASSERTION_SUMMARY_CARD_STATUSES = ['failing', 'passing', 'erroring'];
 
 export const NO_RUNNING_STATE = 'notRunning';
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/hooks.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/hooks.tsx
index 69cea262aff84c..d7f25b3cb677e3 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/hooks.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/hooks.tsx
@@ -1,6 +1,6 @@
 import { Typography } from 'antd';
 import { ColumnsType } from 'antd/es/table';
-import React, { Dispatch, SetStateAction, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { Dispatch, SetStateAction, useCallback, useEffect, useMemo } from 'react';
 import { useHistory, useLocation } from 'react-router';
 import styled from 'styled-components';
 
@@ -39,8 +39,6 @@ const LastRun = styled(Typography.Text)`
     display: inline-block;
 `;
 
-const TABLE_HEADER_HEIGHT = 50;
-
 export const useAssertionsTableColumns = ({ contract, refetch }) => {
     const renderAssertionName = useCallback(
         (_, record) => (
@@ -166,30 +164,6 @@ export const useAssertionsTableColumns = ({ contract, refetch }) => {
     }, [renderAssertionName, renderCategory, renderLastRun, renderTags, renderActions]);
 };
 
-export const usePinnedAssertionTableHeaderProps = () => {
-    // Dynamic height calculation
-    const tableContainerRef = useRef<HTMLDivElement>(null);
-    const [scrollY, setScrollY] = useState<number>(0);
-
-    useEffect(() => {
-        const handleResize = () => {
-            if (tableContainerRef.current) {
-                const containerHeight = tableContainerRef.current.getBoundingClientRect().height;
-                setScrollY(containerHeight - TABLE_HEADER_HEIGHT);
-            }
-        };
-
-        handleResize();
-        window.addEventListener('resize', handleResize);
-
-        return () => {
-            window.removeEventListener('resize', handleResize);
-        };
-    }, []);
-
-    return { tableContainerRef, scrollY };
-};
-
 /** set filter as per the params we are getting from URL set assertion type and status as per the url */
 export const useSetFilterFromURLParams = (
     filter: AssertionListFilter,
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types.ts
index 8b11bd39a730e4..110de65af83168 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/types.ts
@@ -1,4 +1,4 @@
-import { AssertionGroup } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylTypes';
+
 import {
     Assertion,
     AssertionResultType,
@@ -8,21 +8,9 @@ import {
     AssertionType,
     AuditStamp,
     DataPlatform,
-    EntityType,
     TagAssociation,
 } from '@src/types.generated';
 
-export type EntityStagedForAssertion = {
-    urn: string;
-    platform: DataPlatform;
-    entityType: EntityType;
-};
-
-export type AssertionBuilderSiblingOptions = {
-    title: string;
-    disabled?: boolean;
-} & Partial<EntityStagedForAssertion>;
-
 export type AssertionListFilter = {
     sortBy: string;
     groupBy: string;
@@ -54,11 +42,6 @@ export type AssertionListTableRow = {
     name?: string;
 };
 
-export type AssertionGroupExtended = Omit<AssertionGroup, 'assertions'> & {
-    assertions: AssertionListTableRow[];
-    groupName?: JSX.Element;
-};
-
 export type AssertionStatusGroup = {
     name: string;
     assertions: AssertionListTableRow[];
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils.tsx
index a7f7a15ec09e0a..dfda4c66cdf411 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionList/utils.tsx
@@ -9,7 +9,6 @@ import {
     ASSERTION_SOURCES,
 } from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionList/constant';
 import {
-    AssertionBuilderSiblingOptions,
     AssertionColumnGroup,
     AssertionFilterOptions,
     AssertionListFilter,
@@ -28,8 +27,6 @@ import {
 import { isExternalAssertion } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/shared/isExternalAssertion';
 import { getPlainTextDescriptionFromAssertion } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils';
 import { AssertionGroup } from '@src/app/entity/shared/tabs/Dataset/Validations/acrylTypes';
-import { GenericEntityProperties } from '@src/app/entity/shared/types';
-import { getPlatformNameFromEntityData } from '@src/app/entityV2/shared/utils';
 import {
     Assertion,
     AssertionInfo,
@@ -39,7 +36,6 @@ import {
     AssertionSourceType,
     AssertionType,
     AuditStamp,
-    EntityType,
     TagAssociation,
 } from '@src/types.generated';
 
@@ -109,54 +105,6 @@ const getGroupNameBySummary = (record) => {
     );
 };
 
-/**
- * Gets sibling options that a user can author assertions with
- * This includes direct links that will open the respective siblings' assertion builder UI
- * @param entityData
- * @param urn
- * @param entityType
- * @returns {AssertionBuilderSiblingOptions[]}
- */
-export const useSiblingOptionsForAssertionBuilder = (
-    entityData: GenericEntityProperties | null,
-    urn: string,
-    entityType: EntityType,
-): AssertionBuilderSiblingOptions[] => {
-    const optionsToAuthorOn: AssertionBuilderSiblingOptions[] = [];
-    // push main entity data
-    optionsToAuthorOn.push({
-        title:
-            entityData?.platform?.properties?.displayName ??
-            entityData?.platform?.name ??
-            entityData?.dataPlatformInstance?.platform.name ??
-            entityData?.platform?.urn ??
-            urn,
-        disabled: true,
-        urn,
-        platform: entityData?.platform ?? entityData?.dataPlatformInstance?.platform,
-        entityType,
-    });
-    // push siblings data
-    const siblings: GenericEntityProperties[] = entityData?.siblingsSearch?.searchResults?.map((r) => r.entity) || [];
-    siblings.forEach((sibling) => {
-        if (sibling.urn === urn || !sibling.urn) {
-            return;
-        }
-        optionsToAuthorOn.push({
-            urn: sibling.urn,
-            title:
-                getPlatformNameFromEntityData(sibling) ??
-                sibling?.dataPlatformInstance?.platform?.name ??
-                sibling?.platform?.urn ??
-                sibling.urn,
-            disabled: true,
-            platform: sibling?.platform ?? sibling?.dataPlatformInstance?.platform,
-            entityType: sibling.type,
-        });
-    });
-    return optionsToAuthorOn;
-};
-
 // transform assertions into table data
 const mapAssertionData = (assertions: Assertion[]): AssertionListTableRow[] => {
     return assertions.map((assertion: Assertion) => {
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionMenu.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionMenu.tsx
deleted file mode 100644
index e526176c0b7acb..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionMenu.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Menu } from 'antd';
-import React from 'react';
-
-import CopyUrnMenuItem from '@app/shared/share/items/CopyUrnMenuItem';
-
-interface AssertionMenuProps {
-    urn: string;
-}
-
-export default function AssertionMenu({ urn }: AssertionMenuProps) {
-    return (
-        <Menu>
-            <CopyUrnMenuItem key="1" urn={urn} type="Assertion" />
-        </Menu>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline.tsx
deleted file mode 100644
index f2d6de3169130a..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/AssertionResultTimeline.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import { Popover } from '@components';
-import { AxisBottom } from '@visx/axis';
-import { Group } from '@visx/group';
-import { scaleUtc } from '@visx/scale';
-import { Bar } from '@visx/shape';
-import { Maybe } from 'graphql/jsutils/Maybe';
-import React, { useMemo } from 'react';
-
-import { ERROR_COLOR_HEX, FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@components/theme/foundations/colors';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import { LinkWrapper } from '@app/shared/LinkWrapper';
-
-import { AssertionResultType } from '@types';
-
-export type AssertionResult = {
-    type: AssertionResultType;
-    title: React.ReactNode;
-    content: React.ReactNode;
-    resultUrl?: Maybe<string>;
-};
-
-export type AssertionDataPoint = {
-    time: number;
-    result: AssertionResult;
-};
-
-export type TimeRange = {
-    startMs: number;
-    endMs: number;
-};
-
-type Props = {
-    data: Array<AssertionDataPoint>;
-    timeRange: TimeRange;
-    width: number;
-};
-
-const INIT_COLOR_HEX = '#8C8C8C';
-
-const getFillColor = (type: AssertionResultType) => {
-    switch (type) {
-        case AssertionResultType.Success:
-            return SUCCESS_COLOR_HEX;
-        case AssertionResultType.Failure:
-            return FAILURE_COLOR_HEX;
-        case AssertionResultType.Error:
-            return ERROR_COLOR_HEX;
-        case AssertionResultType.Init:
-            return INIT_COLOR_HEX;
-        default:
-            throw new Error(`Unsupported Assertion Result Type ${type} provided.`);
-    }
-};
-
-/**
- * Assertion run results displayed on a horizontal timeline.
- */
-export const AssertionResultTimeline = ({ data, timeRange, width }: Props) => {
-    const yMax = 60;
-    const left = 0;
-
-    const xScale = useMemo(
-        () =>
-            scaleUtc({
-                domain: [new Date(timeRange.startMs), new Date(timeRange.endMs + 600000)],
-                range: [0, width],
-            }),
-        [timeRange, width],
-    );
-
-    const transformedData = data.map((result, i) => {
-        return {
-            index: i,
-            title: result.result.title,
-            content: result.result.content,
-            type: result.result.type,
-            time: result.time,
-            url: result.result.resultUrl,
-        };
-    });
-
-    return (
-        <>
-            <svg width={width} height={88}>
-                <Group>
-                    {transformedData.map((d) => {
-                        const barWidth = 8;
-                        const barHeight = 18;
-                        const barX = xScale(new Date(d.time));
-                        const barY = yMax - barHeight;
-                        const fillColor = getFillColor(d.type);
-                        return (
-                            <LinkWrapper to={d.url} target="_blank">
-                                <Popover
-                                    key={d.time}
-                                    title={d.title}
-                                    overlayStyle={{
-                                        maxWidth: 440,
-                                        wordWrap: 'break-word',
-                                    }}
-                                    content={d.content}
-                                >
-                                    <Bar
-                                        key={`bar-${d.time}`}
-                                        x={barX}
-                                        y={barY}
-                                        stroke="white"
-                                        width={barWidth}
-                                        height={barHeight}
-                                        fill={fillColor}
-                                    />
-                                </Popover>
-                            </LinkWrapper>
-                        );
-                    })}
-                </Group>
-                <AxisBottom
-                    top={yMax}
-                    left={left}
-                    scale={xScale}
-                    numTicks={7}
-                    stroke={ANTD_GRAY[5]}
-                    tickFormat={(v: any) => v.toLocaleDateString('en-us', { month: 'short', day: 'numeric' })}
-                    tickLabelProps={(_) => ({
-                        fontSize: 11,
-                        angle: 0,
-                        textAnchor: 'middle',
-                    })}
-                />
-            </svg>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/Assertions.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/Assertions.tsx
deleted file mode 100644
index a96c426c151f6f..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/Assertions.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import React, { useState } from 'react';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import { combineEntityDataWithSiblings } from '@app/entity/shared/siblingUtils';
-import { DatasetAssertionsList } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsList';
-import { DatasetAssertionsSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsSummary';
-import { sortAssertions } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils';
-import { useIsSeparateSiblingsMode } from '@app/entityV2/shared/useIsSeparateSiblingsMode';
-
-import { useGetDatasetAssertionsQuery } from '@graphql/dataset.generated';
-import { Assertion, AssertionResultType } from '@types';
-
-/**
- * Returns a status summary for the assertions associated with a Dataset.
- */
-const getAssertionsStatusSummary = (assertions: Array<Assertion>) => {
-    const summary = {
-        failedRuns: 0,
-        succeededRuns: 0,
-        erroredRuns: 0,
-        totalRuns: 0,
-        totalAssertions: assertions.length,
-    };
-    assertions.forEach((assertion) => {
-        if ((assertion.runEvents?.runEvents?.length || 0) > 0) {
-            const mostRecentRun = assertion.runEvents?.runEvents?.[0];
-            const resultType = mostRecentRun?.result?.type;
-            if (AssertionResultType.Success === resultType) {
-                summary.succeededRuns++;
-            }
-            if (AssertionResultType.Failure === resultType) {
-                summary.failedRuns++;
-            }
-            if (AssertionResultType.Error === resultType) {
-                summary.erroredRuns++;
-            }
-            if (AssertionResultType.Init !== resultType) {
-                summary.totalRuns++; // only count assertions for which there is one completed run event, ignoring INIT statuses!
-            }
-        }
-    });
-    return summary;
-};
-
-/**
- * Component used for rendering the Validations Tab on the Dataset Page.
- *
- * TODO: Note that only the legacy DATASET assertions are supported for viewing as of today.
- */
-// CAN DELETE
-export const Assertions = () => {
-    const { urn, entityData } = useEntityData();
-    const { data, refetch } = useGetDatasetAssertionsQuery({ variables: { urn }, fetchPolicy: 'cache-first' });
-    const isHideSiblingMode = useIsSeparateSiblingsMode();
-
-    const combinedData = isHideSiblingMode ? data : combineEntityDataWithSiblings(data);
-    const [removedUrns, setRemovedUrns] = useState<string[]>([]);
-
-    const assertions =
-        (combinedData && combinedData.dataset?.assertions?.assertions?.map((assertion) => assertion as Assertion)) ||
-        [];
-    const filteredAssertions = assertions.filter(
-        (assertion) => !removedUrns.includes(assertion.urn) && !!assertion.info?.datasetAssertion,
-    );
-
-    // Pre-sort the list of assertions based on which has been most recently executed.
-    assertions.sort(sortAssertions);
-
-    return (
-        <>
-            <DatasetAssertionsSummary summary={getAssertionsStatusSummary(filteredAssertions)} />
-            {entityData && (
-                <DatasetAssertionsList
-                    assertions={filteredAssertions}
-                    onDelete={(assertionUrn) => {
-                        // Hack to deal with eventual consistency.
-                        setRemovedUrns([...removedUrns, assertionUrn]);
-                        setTimeout(() => refetch(), 3000);
-                    }}
-                />
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/BooleanTimeline.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/BooleanTimeline.tsx
deleted file mode 100644
index 4718bd5dadd26f..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/BooleanTimeline.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import { Popover } from '@components';
-import { AxisBottom } from '@visx/axis';
-import { Group } from '@visx/group';
-import { scaleUtc } from '@visx/scale';
-import { Bar } from '@visx/shape';
-import React, { useMemo } from 'react';
-
-import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@components/theme/foundations/colors';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-
-export type BooleanResult = {
-    isSuccess: boolean;
-    title: React.ReactNode;
-    content: React.ReactNode;
-    resultUrl?: string;
-};
-
-export type BooleanDataPoint = {
-    time: number;
-    result: BooleanResult;
-};
-
-export type TimeRange = {
-    startMs: number;
-    endMs: number;
-};
-
-type Props = {
-    data: Array<BooleanDataPoint>;
-    timeRange: TimeRange;
-    width: number;
-};
-
-/**
- * True / false results displayed on a horizontal timeline.
- */
-export const BooleanTimeline = ({ data, timeRange, width }: Props) => {
-    const yMax = 60;
-    const left = 0;
-
-    const xScale = useMemo(
-        () =>
-            scaleUtc({
-                domain: [new Date(timeRange.startMs), new Date(timeRange.endMs + 600000)],
-                range: [0, width],
-            }),
-        [timeRange, width],
-    );
-
-    const transformedData = data.map((result, i) => {
-        return {
-            index: i,
-            title: result.result.title,
-            content: result.result.content,
-            isSuccess: result.result.isSuccess,
-            time: result.time,
-        };
-    });
-
-    return (
-        <>
-            <svg width={width} height={88}>
-                <Group>
-                    {transformedData.map((d) => {
-                        const barWidth = 8;
-                        const barHeight = 18;
-                        const barX = xScale(new Date(d.time));
-                        const barY = yMax - barHeight;
-                        const fillColor = d.isSuccess ? SUCCESS_COLOR_HEX : FAILURE_COLOR_HEX;
-                        return (
-                            <Popover
-                                key={d.time}
-                                title={d.title}
-                                overlayStyle={{
-                                    maxWidth: 440,
-                                    wordWrap: 'break-word',
-                                }}
-                                content={d.content}
-                            >
-                                <Bar
-                                    key={`bar-${d.time}`}
-                                    x={barX}
-                                    y={barY}
-                                    stroke="white"
-                                    width={barWidth}
-                                    height={barHeight}
-                                    fill={fillColor}
-                                />
-                            </Popover>
-                        );
-                    })}
-                </Group>
-                <AxisBottom
-                    top={yMax}
-                    left={left}
-                    scale={xScale}
-                    numTicks={7}
-                    stroke={ANTD_GRAY[5]}
-                    tickFormat={(v: any) => v.toLocaleDateString('en-us', { month: 'short', day: 'numeric' })}
-                    tickLabelProps={(_) => ({
-                        fontSize: 11,
-                        angle: 0,
-                        textAnchor: 'middle',
-                    })}
-                />
-            </svg>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx
deleted file mode 100644
index a47696623f7917..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDetails.tsx
+++ /dev/null
@@ -1,266 +0,0 @@
-import { ArrowRightOutlined } from '@ant-design/icons';
-import { Tooltip } from '@components';
-import { Typography } from 'antd';
-import { SelectValue } from 'antd/lib/select';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import PrefixedSelect from '@app/entityV2/shared/tabs/Dataset/Stats/historical/shared/PrefixedSelect';
-import { LOOKBACK_WINDOWS } from '@app/entityV2/shared/tabs/Dataset/Stats/lookbackWindows';
-import { BooleanDataPoint, BooleanTimeline } from '@app/entityV2/shared/tabs/Dataset/Validations/BooleanTimeline';
-import { DatasetAssertionResultDetails } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails';
-import {
-    getResultColor,
-    getResultErrorMessage,
-    getResultIcon,
-    getResultText,
-} from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils';
-import { LinkWrapper } from '@app/shared/LinkWrapper';
-import { formatNumber } from '@app/shared/formatNumber';
-import { getFixedLookbackWindow, getLocaleTimezone } from '@app/shared/time/timeUtils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetAssertionRunsLazyQuery } from '@graphql/assertion.generated';
-import { AssertionResultType, AssertionRunStatus, EntityType } from '@types';
-
-const RESULT_CHART_WIDTH_PX = 800;
-
-const LastEvaluatedAtLabel = styled.div`
-    padding: 0;
-    margin: 0;
-    display: flex;
-    align-items: center;
-    color: ${ANTD_GRAY[7]};
-`;
-
-const AssertionResultIcon = styled.span`
-    margin-right: 8px;
-`;
-
-const AssertionResultDetailsContainer = styled.div`
-    margin-bottom: 4px;
-`;
-
-const AssertionResultErrorMessage = styled.div`
-    max-width: 250px;
-    margin-bottom: 4px;
-`;
-
-const AssertionResultInitializingMessage = styled.div`
-    max-width: 250px;
-    margin-bottom: 4px;
-`;
-
-const ContentContainer = styled.div`
-    width: 100%;
-    padding-left: 52px;
-`;
-
-const EvaluationsDetails = styled.div`
-    width: ${RESULT_CHART_WIDTH_PX}px;
-    padding-top: 12px;
-`;
-
-const EvaluationsHeader = styled.div`
-    display: flex;
-    justify-content: space-between;
-`;
-
-const EvaluationsSummary = styled.div`
-    width: 300px;
-    display: flex;
-    align-items: center;
-    justify-content: left;
-`;
-
-const EvaluationDateRange = styled(Typography.Text)`
-    margin-right: 20px;
-`;
-
-const SucceededEvaluationsCount = styled.span`
-    margin-right: 12px;
-`;
-
-const FailedEvaluationsCount = styled.span`
-    margin-right: 12px;
-`;
-
-type Props = {
-    urn: string;
-    lastEvaluatedAtMillis?: number | undefined;
-};
-
-export const DatasetAssertionDetails = ({ urn, lastEvaluatedAtMillis }: Props) => {
-    const [getAssertionRuns, { data }] = useGetAssertionRunsLazyQuery({ fetchPolicy: 'cache-first' });
-    const entityRegistry = useEntityRegistry();
-
-    /**
-     * Set default window for fetching assertion history.
-     */
-    const [lookbackWindow, setLookbackWindow] = useState(LOOKBACK_WINDOWS.WEEK);
-    useEffect(() => {
-        getAssertionRuns({
-            variables: { assertionUrn: urn, ...getFixedLookbackWindow(lookbackWindow.windowSize) },
-        });
-    }, [urn, lookbackWindow, getAssertionRuns]);
-
-    /**
-     * Invoked when user selects new lookback window (e.g. 1 year)
-     */
-    const onChangeLookbackWindow = (value: SelectValue) => {
-        const newLookbackWindow = Object.values(LOOKBACK_WINDOWS).filter((window) => window.text === value?.valueOf());
-        setLookbackWindow(newLookbackWindow[0]);
-    };
-    const selectedWindow = getFixedLookbackWindow(lookbackWindow.windowSize);
-    const selectedWindowTimeRange = {
-        startMs: selectedWindow.startTime,
-        endMs: selectedWindow.endTime,
-    };
-
-    const completeAssertionRunEvents =
-        data?.assertion?.runEvents?.runEvents?.filter(
-            (runEvent) => runEvent.status === AssertionRunStatus.Complete && runEvent.result,
-        ) || [];
-
-    /**
-     * Last evaluated timestamp
-     */
-    const lastEvaluatedAt = lastEvaluatedAtMillis
-        ? new Date(lastEvaluatedAtMillis)
-        : completeAssertionRunEvents.length > 0 && new Date(completeAssertionRunEvents[0].timestampMillis);
-    const localeTimezone = getLocaleTimezone();
-    const lastEvaluatedTimeLocal =
-        (lastEvaluatedAt &&
-            `Last evaluated on ${lastEvaluatedAt.toLocaleDateString()} at ${lastEvaluatedAt.toLocaleTimeString()} (${localeTimezone})`) ||
-        'No evaluations found';
-    const lastEvaluatedTimeGMT = lastEvaluatedAt && lastEvaluatedAt.toUTCString();
-
-    /**
-     * Start and end date bounds for Chart
-     */
-    const startDate = new Date(selectedWindowTimeRange.startMs).toLocaleDateString('en-us', {
-        month: 'short',
-        day: 'numeric',
-    });
-    const endDate = new Date(selectedWindowTimeRange.endMs).toLocaleDateString('en-us', {
-        month: 'short',
-        day: 'numeric',
-    });
-
-    /**
-     * Success / Failure summary
-     */
-    const succeededCount = data?.assertion?.runEvents?.succeeded;
-    const failedCount = data?.assertion?.runEvents?.failed;
-
-    /**
-     * Data for the chart of assertion results.
-     */
-    const assertionResultsChartData: BooleanDataPoint[] =
-        completeAssertionRunEvents.map((runEvent) => {
-            const { result } = runEvent;
-
-            if (!result) throw new Error('Completed assertion run event does not have a result.');
-
-            const resultTime = new Date(runEvent.timestampMillis);
-            const localTime = resultTime.toLocaleString();
-            const gmtTime = resultTime.toUTCString();
-            const resultUrl: string | undefined = result.externalUrl?.valueOf();
-            const isInitializing = result.type === AssertionResultType.Init;
-            const errorMessage = getResultErrorMessage(result);
-            const platformName = data?.assertion?.platform
-                ? entityRegistry.getDisplayName(EntityType.DataPlatform, data?.assertion?.platform)
-                : undefined;
-
-            /**
-             * Create a "result" to render in the timeline chart.
-             */
-            return {
-                time: runEvent.timestampMillis,
-                result: {
-                    type: result.type,
-                    isSuccess: result.type === AssertionResultType.Success,
-                    resultUrl,
-                    title: (
-                        <>
-                            <AssertionResultIcon>{getResultIcon(result.type)}</AssertionResultIcon>
-                            <Typography.Text strong>{getResultText(result.type)}</Typography.Text>
-                        </>
-                    ),
-                    content: (
-                        <>
-                            <AssertionResultDetailsContainer>
-                                <DatasetAssertionResultDetails result={result} />
-                            </AssertionResultDetailsContainer>
-                            {isInitializing && (
-                                <AssertionResultInitializingMessage>
-                                    Collecting the information required to evaluate this assertion.
-                                </AssertionResultInitializingMessage>
-                            )}
-                            {errorMessage && <AssertionResultErrorMessage>{errorMessage}</AssertionResultErrorMessage>}
-                            <div>
-                                <Tooltip title={`${gmtTime}`}>
-                                    <Typography.Text type="secondary">{localTime}</Typography.Text>
-                                </Tooltip>
-                            </div>
-                            {resultUrl && (
-                                <LinkWrapper to={resultUrl} target="_blank">
-                                    {platformName ? `View in ${platformName}` : 'View results'} <ArrowRightOutlined />
-                                </LinkWrapper>
-                            )}
-                        </>
-                    ),
-                },
-            };
-        }) || [];
-
-    return (
-        <ContentContainer>
-            <div>
-                <Typography.Title level={5}>Evaluations</Typography.Title>
-                <Tooltip placement="topLeft" title={lastEvaluatedTimeGMT}>
-                    <LastEvaluatedAtLabel>{lastEvaluatedTimeLocal}</LastEvaluatedAtLabel>
-                </Tooltip>
-                <EvaluationsDetails>
-                    <EvaluationsHeader>
-                        <EvaluationsSummary>
-                            <EvaluationDateRange strong>
-                                {startDate} - {endDate}
-                            </EvaluationDateRange>
-                            <div>
-                                <SucceededEvaluationsCount>
-                                    <Typography.Text
-                                        style={{ color: getResultColor(AssertionResultType.Success), fontWeight: 600 }}
-                                    >
-                                        {formatNumber(succeededCount)}
-                                    </Typography.Text>{' '}
-                                    passed
-                                </SucceededEvaluationsCount>
-                                <FailedEvaluationsCount>
-                                    <Typography.Text
-                                        style={{ color: getResultColor(AssertionResultType.Failure), fontWeight: 600 }}
-                                    >
-                                        {formatNumber(failedCount)}
-                                    </Typography.Text>{' '}
-                                    failed
-                                </FailedEvaluationsCount>
-                            </div>
-                        </EvaluationsSummary>
-                        <PrefixedSelect
-                            prefixText="Show "
-                            values={Object.values(LOOKBACK_WINDOWS).map((window) => window.text)}
-                            value={lookbackWindow.text}
-                            setValue={onChangeLookbackWindow}
-                        />
-                    </EvaluationsHeader>
-                    <BooleanTimeline
-                        width={RESULT_CHART_WIDTH_PX}
-                        data={assertionResultsChartData}
-                        timeRange={selectedWindowTimeRange}
-                    />
-                </EvaluationsDetails>
-            </div>
-        </ContentContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx
index 68d71d0b6891d6..992f31e65e6095 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionLogicModal.tsx
@@ -3,13 +3,6 @@ import React from 'react';
 
 import Query from '@app/entityV2/shared/tabs/Dataset/Queries/Query';
 
-export type AssertionsSummary = {
-    totalAssertions: number;
-    totalRuns: number;
-    failedRuns: number;
-    succeededRuns: number;
-};
-
 type Props = {
     logic: string;
     visible: boolean;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx
deleted file mode 100644
index 1edde5647f9d2f..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionResultDetails.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-
-import { AssertionResult } from '@types';
-
-type Props = {
-    result: AssertionResult;
-};
-
-export const DatasetAssertionResultDetails = ({ result }: Props) => {
-    const maybeActualValue = result.actualAggValue;
-    const maybeUnexpectedCount = result.unexpectedCount;
-    const maybeRowCount = result.rowCount;
-    const maybeNativeResults = result.nativeResults;
-    return (
-        <>
-            {maybeActualValue !== null && maybeActualValue !== undefined && (
-                <div>
-                    <Typography.Text strong>Actual</Typography.Text>: {maybeActualValue}
-                </div>
-            )}
-            {maybeUnexpectedCount !== null && maybeUnexpectedCount !== undefined && (
-                <div>
-                    <Typography.Text strong>Invalid Count</Typography.Text>: {maybeUnexpectedCount}
-                </div>
-            )}
-            {maybeRowCount !== null && maybeRowCount !== undefined && (
-                <div>
-                    <Typography.Text strong>Row Count</Typography.Text>: {maybeRowCount}
-                </div>
-            )}
-            {maybeNativeResults && (
-                <div>
-                    {maybeNativeResults.map((entry) => (
-                        <div>
-                            <Typography.Text strong>{entry.key}</Typography.Text>: {entry.value}
-                        </div>
-                    ))}
-                </div>
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx
deleted file mode 100644
index 305562eaf8b1e4..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsList.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-import { DeleteOutlined, DownOutlined, MoreOutlined, RightOutlined, StopOutlined } from '@ant-design/icons';
-import { Tooltip } from '@components';
-import { Button, Dropdown, Empty, Image, Modal, Tag, Typography, message } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { StyledTable } from '@app/entityV2/shared/components/styled/StyledTable';
-import AssertionMenu from '@app/entityV2/shared/tabs/Dataset/Validations/AssertionMenu';
-import { DatasetAssertionDescription } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDescription';
-import { DatasetAssertionDetails } from '@app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionDetails';
-import {
-    getResultColor,
-    getResultIcon,
-    getResultText,
-} from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-
-import { useDeleteAssertionMutation } from '@graphql/assertion.generated';
-import { Assertion, AssertionRunStatus } from '@types';
-
-const ResultContainer = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: left;
-`;
-
-const ResultTypeText = styled(Typography.Text)`
-    margin-left: 8px;
-`;
-
-const ActionButtonContainer = styled.div`
-    display: flex;
-    justify-content: right;
-    align-items: center;
-`;
-
-const PlatformContainer = styled.div`
-    margin-right: 8px;
-`;
-
-const StyledMoreOutlined = styled(MoreOutlined)`
-    font-size: 18px;
-`;
-
-type Props = {
-    assertions: Array<Assertion>;
-    onDelete?: (urn: string) => void;
-};
-
-/**
- * A list of assertions displaying their most recent run status, their human-readable
- * description, and platform.
- *
- * Currently this component supports rendering Dataset Assertions only.
- */
-export const DatasetAssertionsList = ({ assertions, onDelete }: Props) => {
-    const [deleteAssertionMutation] = useDeleteAssertionMutation();
-
-    const deleteAssertion = async (urn: string) => {
-        try {
-            await deleteAssertionMutation({
-                variables: { urn },
-            });
-            message.success({ content: 'Removed assertion.', duration: 2 });
-        } catch (e: unknown) {
-            message.destroy();
-            if (e instanceof Error) {
-                message.error({ content: `Failed to remove assertion: \n ${e.message || ''}`, duration: 3 });
-            }
-        }
-        onDelete?.(urn);
-    };
-
-    const onDeleteAssertion = (urn: string) => {
-        Modal.confirm({
-            title: `Confirm Assertion Removal`,
-            content: `Are you sure you want to remove this assertion from the dataset?`,
-            onOk() {
-                deleteAssertion(urn);
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    const assertionsTableData = assertions.map((assertion) => ({
-        urn: assertion.urn,
-        type: assertion.info?.type,
-        platform: assertion.platform,
-        datasetAssertionInfo: assertion.info?.datasetAssertion,
-        description: assertion.info?.description,
-        lastExecTime: assertion.runEvents?.runEvents?.length && assertion.runEvents.runEvents[0].timestampMillis,
-        lastExecResult:
-            assertion.runEvents?.runEvents?.length &&
-            assertion.runEvents.runEvents[0].status === AssertionRunStatus.Complete &&
-            assertion.runEvents.runEvents[0].result?.type,
-    }));
-
-    const assertionsTableCols = [
-        {
-            title: '',
-            dataIndex: '',
-            key: '',
-            render: (_, record: any) => {
-                const executionDate = record.lastExecTime && new Date(record.lastExecTime);
-                const localTime = executionDate && `${executionDate.toLocaleDateString()}`;
-                const resultColor = (record.lastExecResult && getResultColor(record.lastExecResult)) || 'default';
-                const resultText = (record.lastExecResult && getResultText(record.lastExecResult)) || 'No Evaluations';
-                const resultIcon = (record.lastExecResult && getResultIcon(record.lastExecResult)) || <StopOutlined />;
-                const { description } = record;
-                return (
-                    <ResultContainer>
-                        <div>
-                            <Tooltip title={(localTime && `Last evaluated on ${localTime}`) || 'No Evaluations'}>
-                                <Tag style={{ borderColor: resultColor }}>
-                                    {resultIcon}
-                                    <ResultTypeText style={{ color: resultColor }}>{resultText}</ResultTypeText>
-                                </Tag>
-                            </Tooltip>
-                        </div>
-                        <DatasetAssertionDescription
-                            description={description}
-                            assertionInfo={record.datasetAssertionInfo}
-                            lastEvaluation={record.lastEvaluation}
-                        />
-                    </ResultContainer>
-                );
-            },
-        },
-        {
-            title: '',
-            dataIndex: '',
-            key: '',
-            render: (_, record: any) => (
-                <ActionButtonContainer>
-                    <Tooltip
-                        title={
-                            record.platform.properties?.displayName || capitalizeFirstLetterOnly(record.platform.name)
-                        }
-                    >
-                        <PlatformContainer>
-                            {(record.platform.properties?.logoUrl && (
-                                <Image
-                                    preview={false}
-                                    height={20}
-                                    width={20}
-                                    src={record.platform.properties?.logoUrl}
-                                />
-                            )) || (
-                                <Typography.Text>
-                                    {record.platform.properties?.displayName ||
-                                        capitalizeFirstLetterOnly(record.platform.name)}
-                                </Typography.Text>
-                            )}
-                        </PlatformContainer>
-                    </Tooltip>
-                    <Button onClick={() => onDeleteAssertion(record.urn)} type="text" shape="circle" danger>
-                        <DeleteOutlined />
-                    </Button>
-                    <Dropdown overlay={<AssertionMenu urn={record.urn} />} trigger={['click']}>
-                        <StyledMoreOutlined />
-                    </Dropdown>
-                </ActionButtonContainer>
-            ),
-        },
-    ];
-
-    return (
-        <>
-            <StyledTable
-                columns={assertionsTableCols}
-                dataSource={assertionsTableData}
-                rowKey="urn"
-                locale={{
-                    emptyText: <Empty description="No Assertions Found :(" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
-                }}
-                expandable={{
-                    defaultExpandAllRows: false,
-                    expandRowByClick: true,
-                    expandedRowRender: (record) => {
-                        return <DatasetAssertionDetails urn={record.urn} lastEvaluatedAtMillis={record.lastExecTime} />;
-                    },
-                    expandIcon: ({ expanded, onExpand, record }: any) =>
-                        expanded ? (
-                            <DownOutlined style={{ fontSize: 8 }} onClick={(e) => onExpand(record, e)} />
-                        ) : (
-                            <RightOutlined style={{ fontSize: 8 }} onClick={(e) => onExpand(record, e)} />
-                        ),
-                }}
-                showHeader={false}
-                pagination={false}
-            />
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx
deleted file mode 100644
index 3ef24da77bbb42..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/DatasetAssertionsSummary.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import { CheckCircleFilled, CloseCircleFilled, ExclamationCircleFilled, StopOutlined } from '@ant-design/icons';
-import { Tooltip } from '@components';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ERROR_COLOR_HEX, FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@components/theme/foundations/colors';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-
-const SummaryHeader = styled.div`
-    width: 100%;
-    padding-left: 40px;
-    padding-top: 20px;
-    padding-bottom: 20px;
-    display: flex;
-    align-items: center;
-    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
-`;
-
-const SummaryContainer = styled.div``;
-
-const SummaryMessage = styled.div`
-    display: inline-block;
-    margin-left: 20px;
-`;
-
-const SummaryTitle = styled(Typography.Title)`
-    && {
-        padding-bottom: 0px;
-        margin-bottom: 0px;
-    }
-`;
-
-export type AssertionsSummary = {
-    totalAssertions: number;
-    totalRuns: number;
-    failedRuns: number;
-    succeededRuns: number;
-    erroredRuns: number;
-};
-
-type Props = {
-    summary: AssertionsSummary;
-};
-
-const getSummaryIcon = (summary: AssertionsSummary) => {
-    if (summary.totalRuns === 0) {
-        return <StopOutlined style={{ color: ANTD_GRAY[6], fontSize: 28 }} />;
-    }
-    if (summary.succeededRuns === summary.totalRuns) {
-        return <CheckCircleFilled style={{ color: SUCCESS_COLOR_HEX, fontSize: 28 }} />;
-    }
-    if (summary.erroredRuns > 0) {
-        return <ExclamationCircleFilled style={{ color: ERROR_COLOR_HEX, fontSize: 28 }} />;
-    }
-    return <CloseCircleFilled style={{ color: FAILURE_COLOR_HEX, fontSize: 28 }} />;
-};
-
-const getSummaryMessage = (summary: AssertionsSummary) => {
-    if (summary.totalRuns === 0) {
-        return 'No assertions have run';
-    }
-    if (summary.succeededRuns === summary.totalRuns) {
-        return 'All assertions are passing';
-    }
-    if (summary.erroredRuns > 0) {
-        return 'An error is preventing some assertions from running';
-    }
-    if (summary.failedRuns === summary.totalRuns) {
-        return 'All assertions are failing';
-    }
-    return 'Some assertions are failing';
-};
-
-export const DatasetAssertionsSummary = ({ summary }: Props) => {
-    const summaryIcon = getSummaryIcon(summary);
-    const summaryMessage = getSummaryMessage(summary);
-    const errorMessage = summary.erroredRuns
-        ? `, ${summary.erroredRuns} error${summary.erroredRuns > 1 ? 's' : ''}`
-        : '';
-    const inactiveAssertionsCount = summary.totalAssertions - summary.totalRuns;
-    const inactiveAssertionsMessage = inactiveAssertionsCount ? `, ${inactiveAssertionsCount} inactive.` : '.';
-    const subtitleMessage = `${summary.succeededRuns} successful assertions, ${summary.failedRuns} failed assertions`;
-    return (
-        <SummaryHeader>
-            <SummaryContainer>
-                <Tooltip title="This status is based on the most recent result of each assertion.">
-                    <div style={{ display: 'flex', alignItems: 'center' }}>
-                        {summaryIcon}
-                        <SummaryMessage>
-                            <SummaryTitle level={5}>{summaryMessage}</SummaryTitle>
-                            <Typography.Text type="secondary">
-                                {subtitleMessage}
-                                {errorMessage}
-                                {inactiveAssertionsMessage}
-                            </Typography.Text>
-                        </SummaryMessage>
-                    </div>
-                </Tooltip>
-            </SummaryContainer>
-        </SummaryHeader>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FreshnessAssertionDescription.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FreshnessAssertionDescription.tsx
index 8b5bf837259e1c..fa4eee45d08539 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FreshnessAssertionDescription.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/FreshnessAssertionDescription.tsx
@@ -16,7 +16,7 @@ type Props = {
     monitorSchedule?: Maybe<CronSchedule>;
 };
 
-export const getCronAsLabel = (cronSchedule: CronSchedule) => {
+const getCronAsLabel = (cronSchedule: CronSchedule) => {
     const { cron, timezone } = cronSchedule;
     if (!cron) {
         return '';
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/ValidationsTab.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/ValidationsTab.tsx
deleted file mode 100644
index 23579643231e1a..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/ValidationsTab.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import { FileDoneOutlined, FileProtectOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React, { useEffect } from 'react';
-import { useHistory, useLocation } from 'react-router';
-import styled from 'styled-components';
-
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import TabToolbar from '@app/entityV2/shared/components/styled/TabToolbar';
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import { TestResults } from '@app/entityV2/shared/tabs/Dataset/Governance/TestResults';
-import { Assertions } from '@app/entityV2/shared/tabs/Dataset/Validations/Assertions';
-import { useGetValidationsTab } from '@app/entityV2/shared/tabs/Dataset/Validations/useGetValidationsTab';
-
-const TabTitle = styled.span`
-    margin-left: 4px;
-`;
-
-const TabButton = styled(Button)<{ selected: boolean }>`
-    background-color: ${(props) => (props.selected && ANTD_GRAY[3]) || 'none'};
-    margin-left: 4px;
-`;
-
-enum TabPaths {
-    ASSERTIONS = 'Assertions',
-    TESTS = 'Tests',
-}
-
-const DEFAULT_TAB = TabPaths.ASSERTIONS;
-
-/**
- * Component used for rendering the Entity Validations Tab.
- */
-
-// CAN DELETE
-export const ValidationsTab = () => {
-    const { entityData } = useEntityData();
-    const history = useHistory();
-    const { pathname } = useLocation();
-
-    const totalAssertions = (entityData as any)?.assertions?.total;
-    const passingTests = (entityData as any)?.testResults?.passing || [];
-    const maybeFailingTests = (entityData as any)?.testResults?.failing || [];
-    const totalTests = maybeFailingTests.length + passingTests.length;
-
-    const { selectedTab, basePath } = useGetValidationsTab(pathname, Object.values(TabPaths));
-
-    // If no tab was selected, select a default tab.
-    useEffect(() => {
-        if (!selectedTab) {
-            // Route to the default tab.
-            history.replace(`${basePath}/${DEFAULT_TAB}`);
-        }
-    }, [selectedTab, basePath, history]);
-
-    /**
-     * The top-level Toolbar tabs to display.
-     */
-    const tabs = [
-        {
-            title: (
-                <>
-                    <FileProtectOutlined />
-                    <TabTitle>Assertions ({totalAssertions})</TabTitle>
-                </>
-            ),
-            path: TabPaths.ASSERTIONS,
-            disabled: false,
-            content: <Assertions />,
-        },
-        {
-            title: (
-                <>
-                    <FileDoneOutlined />
-                    <TabTitle>Tests ({totalTests})</TabTitle>
-                </>
-            ),
-            path: TabPaths.TESTS,
-            disabled: totalTests === 0,
-            content: <TestResults passing={passingTests} failing={maybeFailingTests} />,
-        },
-    ];
-
-    return (
-        <>
-            <TabToolbar>
-                <div>
-                    {tabs.map((tab) => (
-                        <TabButton
-                            type="text"
-                            disabled={tab.disabled}
-                            selected={selectedTab === tab.path}
-                            onClick={() => history.replace(`${basePath}/${tab.path}`)}
-                        >
-                            {tab.title}
-                        </TabButton>
-                    ))}
-                </div>
-            </TabToolbar>
-            {tabs.filter((tab) => tab.path === selectedTab).map((tab) => tab.content)}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylUtils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylUtils.tsx
index 047bfd5f15c783..d93737a774f7f6 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylUtils.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/acrylUtils.tsx
@@ -1,12 +1,8 @@
-import { ApiOutlined, CheckOutlined, CloseOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
-import * as cronParser from 'cron-parser';
+import { ApiOutlined } from '@ant-design/icons';
 import cronstrue from 'cronstrue';
-import * as moment from 'moment-timezone';
 import React from 'react';
 import styled from 'styled-components';
 
-import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX, WARNING_COLOR_HEX } from '@components/theme/foundations/colors';
-
 import { GenericEntityProperties } from '@app/entity/shared/types';
 import { AssertionGroup, AssertionStatusSummary } from '@app/entityV2/shared/tabs/Dataset/Validations/acrylTypes';
 import { sortAssertions } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils';
@@ -14,7 +10,7 @@ import { lowerFirstLetter } from '@app/shared/textUtil';
 import { ASSERTION_TYPE_TO_ICON_MAP } from '@src/app/entityV2/shared/tabs/Dataset/Validations/shared/constant';
 import { GetDatasetAssertionsWithRunEventsQuery } from '@src/graphql/dataset.generated';
 
-import { Assertion, AssertionResultType, AssertionType, CronSchedule, EntityType } from '@types';
+import { Assertion, AssertionResultType, AssertionType, EntityType } from '@types';
 
 const StyledApiOutlined = styled(ApiOutlined)`
     && {
@@ -25,33 +21,6 @@ const StyledApiOutlined = styled(ApiOutlined)`
     }
 `;
 
-const StyledCheckOutlined = styled(CheckOutlined)`
-    && {
-        color: ${SUCCESS_COLOR_HEX};
-        font-size: 14px;
-        padding: 0px;
-        margin: 0px;
-    }
-`;
-
-const StyledCloseOutlined = styled(CloseOutlined)`
-    && {
-        color: ${FAILURE_COLOR_HEX};
-        font-size: 14px;
-        padding: 0px;
-        margin: 0px;
-    }
-`;
-
-const StyledExclamationOutlined = styled(ExclamationCircleOutlined)`
-    && {
-        color: ${WARNING_COLOR_HEX};
-        font-size: 14px;
-        padding: 0px;
-        margin: 0px;
-    }
-`;
-
 const getStyledIconComponent = (type: AssertionType) => {
     const IconComponent = ASSERTION_TYPE_TO_ICON_MAP[type];
 
@@ -137,7 +106,7 @@ export const getAssertionGroupName = (type: string): string => {
     return ASSERTION_TYPE_TO_INFO.has(type) ? ASSERTION_TYPE_TO_INFO.get(type).name : type;
 };
 
-export const getAssertionGroupTypeIcon = (type: string) => {
+const getAssertionGroupTypeIcon = (type: string) => {
     return ASSERTION_TYPE_TO_INFO.has(type) ? ASSERTION_TYPE_TO_INFO.get(type).icon : <StyledApiOutlined />;
 };
 
@@ -183,21 +152,6 @@ export const getAssertionsSummary = (assertions: Assertion[]): AssertionStatusSu
     return summary;
 };
 
-/**
- * TODO: We will remove this mapping code once we replace the OSS legacy assertions summary with the new
- * format.
- */
-export const getLegacyAssertionsSummary = (assertions: Assertion[]) => {
-    const newSummary = getAssertionsSummary(assertions);
-    return {
-        failedRuns: newSummary.failing,
-        succeededRuns: newSummary.passing,
-        erroredRuns: newSummary.erroring,
-        totalRuns: newSummary.total,
-        totalAssertions: newSummary.totalAssertions,
-    };
-};
-
 export const getAssertionType = (assertion: Assertion): string | undefined => {
     return assertion?.info?.customAssertion?.type?.toUpperCase() || assertion?.info?.type?.toUpperCase();
 };
@@ -240,83 +194,6 @@ export const createAssertionGroups = (assertions: Array<Assertion>): AssertionGr
     return assertionGroups;
 };
 
-// TODO: Make this the default inside DatasetAssertionsSummary.tsx.
-export const getAssertionGroupSummaryIcon = (summary: AssertionStatusSummary) => {
-    if (summary.total === 0) {
-        return null;
-    }
-    if (summary.passing === summary.total) {
-        return <StyledCheckOutlined />;
-    }
-    if (summary.erroring > 0) {
-        return <StyledExclamationOutlined />;
-    }
-    return <StyledCloseOutlined />;
-};
-
-// TODO: Make this the default inside DatasetAssertionsSummary.tsx.
-export const getAssertionGroupSummaryMessage = (summary: AssertionStatusSummary) => {
-    if (summary.total === 0) {
-        return 'No assertions have run';
-    }
-    if (summary.passing === summary.total) {
-        return 'All assertions are passing';
-    }
-    if (summary.erroring > 0) {
-        return 'An error is preventing some assertions from running';
-    }
-    if (summary.failing === summary.total) {
-        return 'All assertions are failing';
-    }
-    return 'Some assertions are failing';
-};
-
-/**
- * Returns the next scheduled run of a cron schedule, in the local timezone of the user.
- *
- * @param schedule a cron schedule
- */
-export const getNextScheduleEvaluationTimeMs = (schedule: CronSchedule) => {
-    try {
-        const interval = cronParser.parseExpression(schedule.cron, { tz: schedule.timezone });
-        const nextDate = interval.next().toDate(); // Get next date as JavaScript Date object
-        const userTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-        const nextDateInUserTz = moment.tz(nextDate, userTimezone); // Convert to user's timezone
-        return nextDateInUserTz.valueOf();
-    } catch (e) {
-        console.log('Failed to parse cron expression', e);
-        return undefined;
-    }
-};
-
-/**
- * Returns the previously scheduled run of a cron schedule, in the local timezone of the user.
- *
- * @param schedule a cron schedule
- * @param maybeFromDateTS
- */
-export const getPreviousScheduleEvaluationTimeMs = (schedule: CronSchedule, maybeFromDateTS?: number) => {
-    try {
-        const interval = cronParser.parseExpression(schedule.cron, { tz: schedule.timezone });
-        if (typeof maybeFromDateTS !== 'undefined') {
-            interval.reset(maybeFromDateTS);
-        }
-        const prevDate = interval.prev().toDate(); // Get prev date as JavaScript Date object
-        const userTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-        const prevDateInUserTz = moment.tz(prevDate, userTimezone); // Convert to user's timezone
-        return prevDateInUserTz.valueOf();
-    } catch (e) {
-        console.log('Failed to parse cron expression', e);
-        return undefined;
-    }
-};
-export const getAssertionTypesForEntityType = (entityType: EntityType, monitorsConnectionForEntityExists: boolean) => {
-    return ASSERTION_INFO.filter((type) => type.entityTypes.includes(entityType)).map((type) => ({
-        ...type,
-        enabled: type.enabled && (!type.requiresConnectionSupportedByMonitors || monitorsConnectionForEntityExists),
-    }));
-};
-
 export const getCronAsText = (interval: string, options: { verbose: boolean } = { verbose: false }) => {
     const { verbose } = options;
     if (interval) {
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks.ts
index 5f6553c692920b..8a8db27f89d6c0 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/hooks.ts
@@ -1,5 +1,5 @@
 import { message } from 'antd';
-import { useEffect, useState } from 'react';
+import { useEffect } from 'react';
 import { useHistory, useLocation } from 'react-router';
 
 import { getQueryParams } from '@app/entityV2/shared/tabs/Dataset/Validations/assertionUtils';
@@ -60,81 +60,3 @@ export const useOpenAssertionDetailModal = (setFocusAssertionUrn) => {
 
     return { assertionUrnParam };
 };
-
-const OPEN_ASSERTION_BUILDER_QUERY_PARAM = 'open_assertion_builder';
-
-/**
- * Hook to automatically open up assertion authoring on mount.
- *
- * @param {Function} onOpenAssertionBuilder - Function to open assertion builder.
- * @returns {Object} Object containing the 'open_assertion_builder' from the URL.
- */
-export const useOpenAssertionBuilder = (onOpenAssertionBuilder: () => void) => {
-    const location = useLocation();
-    const history = useHistory();
-    const openBuilderParam = getQueryParams(OPEN_ASSERTION_BUILDER_QUERY_PARAM, location);
-
-    useEffect(() => {
-        if (openBuilderParam) {
-            const decodedOpenAssertionBuilder = decodeURIComponent(openBuilderParam);
-
-            if (decodedOpenAssertionBuilder === 'true') {
-                onOpenAssertionBuilder();
-            }
-
-            // Remove the query parameter from the URL
-            const newUrlParams = new URLSearchParams(location.search);
-            newUrlParams.delete(OPEN_ASSERTION_BUILDER_QUERY_PARAM);
-            const newUrl = `${location.pathname}?${newUrlParams.toString()}`;
-
-            // Use React Router's history.replace to replace the current URL
-            history.replace(newUrl);
-        }
-    }, [openBuilderParam, onOpenAssertionBuilder, location.search, location.pathname, history]);
-
-    return { openBuilderParam };
-};
-
-/**
- * Hook for managing the expanded row keys based on the `assertion_urn` query parameter.
- *
- * This hook ensures that relevant rows are expanded if an `assertion_urn` is present in the URL query parameters.
- * If no `assertion_urn` is provided, it expands all groups initially.
- *
- * @param {Array} groups - Array of assertion groups, where each group contains a list of assertions.
- * @returns {Object} - Object containing the expanded row keys and a function to update them.
- *  - expandedRowKeys: Array of currently expanded row keys.
- *  - setExpandedRowKeys: Function to manually set the expanded row keys.
- */
-export const useExpandedRowKeys = (groups, { isGroupBy }: { isGroupBy: boolean }) => {
-    const location = useLocation();
-    const assertionUrnParam = new URLSearchParams(location.search).get('assertion_urn');
-    const [expandedRowKeys, setExpandedRowKeys] = useState<string[]>([]);
-    const [processed, setProcessed] = useState(false);
-
-    useEffect(() => {
-        if (isGroupBy) {
-            if (assertionUrnParam) {
-                const decodedAssertionUrn = decodeURIComponent(assertionUrnParam);
-
-                // Find the row key to expand based on the assertion URN
-                const rowKeyToExpand = groups.find((group) =>
-                    group.assertions.some((assertion) => assertion.urn === decodedAssertionUrn),
-                )?.name;
-
-                if (rowKeyToExpand) {
-                    setExpandedRowKeys((prevKeys) => [...prevKeys, rowKeyToExpand]);
-                }
-
-                setProcessed(true);
-            } else if (!processed) {
-                // If no assertion URN is present initially, set expandedRowKeys from groups
-                const allGroupKeys = groups.map((group) => group.name);
-                setExpandedRowKeys(allGroupKeys);
-                setProcessed(true);
-            }
-        }
-    }, [groups, assertionUrnParam, processed, isGroupBy]);
-
-    return { expandedRowKeys, setExpandedRowKeys };
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/styledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/styledComponents.tsx
deleted file mode 100644
index 5316a8f0c00d77..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/actions/styledComponents.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import styled from 'styled-components';
-
-// Helper functions to simplify logic
-const getBackgroundColor = ({ isExpandedView, primary }: { isExpandedView?: boolean; primary?: boolean }) => {
-    if (isExpandedView) return 'inherit';
-    return primary ? '#5280e8' : '#ffffff';
-};
-
-const getColor = ({ isExpandedView, primary }: { isExpandedView?: boolean; primary?: boolean }) => {
-    if (primary) return '#fff';
-    return isExpandedView ? '#000' : '#5280e8';
-};
-
-const getBorder = ({ isExpandedView, primary }: { isExpandedView?: boolean; primary?: boolean }) => {
-    if (isExpandedView) return 'none';
-    return primary ? '1px solid #5280e8' : '1px solid #f0f0f0';
-};
-
-export const ActionItemButton = styled.button<{ disabled?: boolean; primary?: boolean; isExpandedView?: boolean }>`
-    border-radius: ${(props) => (props.isExpandedView ? `0px` : `20px`)};
-    width: 28px;
-    height: 28px;
-    margin: ${(props) => (props.isExpandedView ? `0px` : `0px 4px`)};
-    padding: 0px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    overflow: hidden;
-    background-color: ${(props) => getBackgroundColor(props)};
-    color: ${(props) => getColor(props)};
-    box-shadow: none;
-    cursor: ${(props) => (props.disabled ? 'not-allowed' : 'pointer')};
-    &&:hover {
-        ${(props) => !props.disabled && 'opacity: 0.8;'}
-    }
-    ${(props) => props.disabled && 'opacity: 0.5'};
-    border: ${(props) => getBorder(props)};
-`;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/popoverUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/popoverUtils.ts
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/ColumnMetricAssertionsResultsGraph.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/ColumnMetricAssertionsResultsGraph.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/ColumnValueAssertionsResultsGraph.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/ColumnValueAssertionsResultsGraph.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/CustomSqlAssertionsResultsGraph.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/CustomSqlAssertionsResultsGraph.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/FreshnessAssertionsResultsGraph.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/FreshnessAssertionsResultsGraph.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/VolumeAssertionResultsGraph.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/VolumeAssertionResultsGraph.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types.ts
index 62814249ba71e3..c3034fd10e6c6d 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types.ts
@@ -2,7 +2,7 @@ import { Maybe } from 'graphql/jsutils/Maybe';
 
 import { Assertion, AssertionResultType, AssertionRunEvent } from '@types';
 
-export type AssertionResult = {
+type AssertionResult = {
     type: AssertionResultType;
     resultUrl?: Maybe<string>;
     yValue?: number; // for checks with varying y-values
@@ -26,9 +26,3 @@ export type TimeRange = {
     startMs: number;
     endMs: number;
 };
-
-export enum AssertionChartType {
-    ValuesOverTime,
-    StatusOverTime,
-    Freshness,
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/utils.ts
index 639d73309609df..4d5089a52d6360 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/utils.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/utils.ts
@@ -1,19 +1,12 @@
 import _ from 'lodash';
 
-import {
-    AssertionChartType,
-    AssertionDataPoint,
-} from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/charts/types';
-
-import { AssertionInfo, AssertionResultType, AssertionType, Maybe } from '@types';
+import { AssertionResultType } from '@types';
 
 export const ACCENT_COLOR_HEX = '#222222';
-export const EXTRA_HIGHLIGHT_COLOR_HEX = '#4050E7';
-export const SUCCESS_COLOR_HEX = '#52C41A';
-export const FAILURE_COLOR_HEX = '#F5222D';
-export const ERROR_COLOR_HEX = '#FAAD14';
-export const INIT_COLOR_HEX = '#8C8C8C';
-export const EXPECTED_RANGE_SHADE_COLOR = '#11d469';
+const SUCCESS_COLOR_HEX = '#52C41A';
+const FAILURE_COLOR_HEX = '#F5222D';
+const ERROR_COLOR_HEX = '#FAAD14';
+const INIT_COLOR_HEX = '#8C8C8C';
 
 export const getFillColor = (type: AssertionResultType) => {
     switch (type) {
@@ -30,16 +23,6 @@ export const getFillColor = (type: AssertionResultType) => {
     }
 };
 
-/**
- * For now we're keeping it simple by only showing the range of values being displayed on the chart
- * @param minY
- * @param maxY
- * @returns {number[]}
- */
-export function generateYScaleTickValues(minY: number, maxY: number): number[] {
-    return [minY, maxY];
-}
-
 export function generateTimeScaleTickValues(startMs: number, endMs: number): Date[] {
     const ticks: Date[] = [];
     const minDate = new Date(startMs);
@@ -108,40 +91,3 @@ export function getCustomTimeScaleTickValue(v, timeRange) {
     // Format as month and day if the range is more than one day
     return v.toLocaleDateString('en-us', { month: 'short', day: 'numeric' });
 }
-
-export const getBestChartTypeForAssertion = (
-    assertionInfo?: AssertionInfo | Maybe<AssertionInfo>,
-): AssertionChartType => {
-    switch (assertionInfo?.type) {
-        case AssertionType.Freshness:
-            return AssertionChartType.Freshness;
-        case AssertionType.Field:
-            return AssertionChartType.ValuesOverTime;
-        case AssertionType.Sql:
-            return AssertionChartType.ValuesOverTime;
-        case AssertionType.Volume:
-            return AssertionChartType.ValuesOverTime;
-        default:
-            break;
-    }
-    return AssertionChartType.StatusOverTime; // safest catch-all fallback
-};
-
-/**
- * Duplicates a datapoint with +- a certain amount of buffer on the timestamp
- * Useful to extend a line with some buffer to the left and right
- * @param dataPoint
- * @param timestampMillisModifiers
- * @returns {AssertionDataPoint[]}
- */
-export const duplicateDataPointsAcrossBufferedTimeRange = (
-    dataPoint: AssertionDataPoint,
-    timestampMillisBuffer: number,
-): AssertionDataPoint[] => {
-    const timestampMillisModifiers = [-timestampMillisBuffer, 0, timestampMillisBuffer];
-    const points: AssertionDataPoint[] = timestampMillisModifiers.map((tsModifier) => ({
-        ...dataPoint,
-        time: dataPoint.time + tsModifier,
-    }));
-    return points;
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/transformers.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/transformers.ts
index f0ded496291551..7c007160301920 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/transformers.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/transformers.ts
@@ -21,7 +21,7 @@ import {
  * @param runEvent
  * @returns {number | undefined}
  */
-export const tryGetYValueForChartFromAssertionRunEvent = (): number | undefined => {
+const tryGetYValueForChartFromAssertionRunEvent = (): number | undefined => {
     return tryGetPrimaryMetricValueFromAssertionRunEvent();
 };
 
@@ -30,7 +30,7 @@ export const tryGetYValueForChartFromAssertionRunEvent = (): number | undefined
  * @param runEvents
  * @returns {AssertionDataPoint[]}
  */
-export const getAssertionDataPointsFromRunEvents = (runEvents: AssertionRunEvent[]): AssertionDataPoint[] => {
+const getAssertionDataPointsFromRunEvents = (runEvents: AssertionRunEvent[]): AssertionDataPoint[] => {
     return (
         runEvents
             .filter((runEvent) => !!runEvent.result)
@@ -62,7 +62,7 @@ export const getAssertionDataPointsFromRunEvents = (runEvents: AssertionRunEvent
  * @param assertionInfo
  * @returns {number | undefined}
  */
-export const tryGetYAxisLabelForChartFromAssertionInfo = (
+const tryGetYAxisLabelForChartFromAssertionInfo = (
     assertionInfo?: AssertionInfo | Maybe<AssertionInfo>,
 ): string | undefined => {
     let label: string | undefined;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils.ts
index 1c8471f56e9199..8ef72581138ce7 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/result/timeline/utils.ts
@@ -6,15 +6,15 @@ const ONE_HOUR_IN_MS = 60 * 60 * 1000; // Milliseconds in one hour
 const ONE_DAY_IN_MS = 24 * ONE_HOUR_IN_MS; // Milliseconds in one day
 const ONE_WEEK_IN_MS = 7 * ONE_DAY_IN_MS; // Milliseconds in one week
 
-export function isLessThanOneDay(timeRange) {
+function isLessThanOneDay(timeRange) {
     return timeRange.endMs - timeRange.startMs <= ONE_DAY_IN_MS;
 }
 
-export function isLessThanOneHour(timeRange) {
+function isLessThanOneHour(timeRange) {
     return timeRange.endMs - timeRange.startMs <= ONE_HOUR_IN_MS;
 }
 
-export function isGreaterThanOneYear(timeRange) {
+function isGreaterThanOneYear(timeRange) {
     return timeRange.endMs - timeRange.startMs >= 365 * ONE_DAY_IN_MS;
 }
 
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessage.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessage.tsx
deleted file mode 100644
index d95b5c75050fef..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessage.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import { getDetailedErrorMessage } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultMessageUtils';
-
-import { AssertionRunEvent } from '@types';
-
-const Container = styled.div`
-    padding: 4px;
-`;
-
-const Row = styled.div`
-    display: flex;
-    align-items: start;
-    justify-content: start;
-    padding: 4px 8px;
-`;
-
-const Title = styled.div`
-    font-weight: bold;
-    margin-right: 8px;
-    font-size: 16px;
-`;
-
-const Message = styled.div`
-    color: ${ANTD_GRAY[8]};
-`;
-
-type Props = {
-    run: AssertionRunEvent;
-};
-
-export const DetailedErrorMessage = ({ run }: Props) => {
-    const type = run?.result?.error?.type;
-    const message = getDetailedErrorMessage(run);
-    return (
-        <Container>
-            <Row>
-                <Title>{type} </Title>
-            </Row>
-            {message && (
-                <Row>
-                    <Message>{message}</Message>
-                </Row>
-            )}
-        </Container>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessageTooltip.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessageTooltip.tsx
deleted file mode 100644
index bc150f1b3844d5..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessageTooltip.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { InfoCircleOutlined } from '@ant-design/icons';
-import { Popover } from '@components';
-import { TooltipPlacement } from 'antd/lib/tooltip';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import { DetailedErrorMessage } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/DetailedErrorMessage';
-
-import { AssertionRunEvent } from '@types';
-
-const StyledInfoCircleOutlined = styled(InfoCircleOutlined)`
-    margin-left: 8px;
-    font-size: 12px;
-    color: ${ANTD_GRAY[7]};
-`;
-
-type Props = {
-    run: AssertionRunEvent;
-    placement?: TooltipPlacement;
-};
-
-export const DetailedErrorMessageTooltip = ({ run, placement = 'bottom' }: Props) => {
-    return (
-        <Popover
-            overlayStyle={{ maxWidth: 500 }}
-            showArrow={false}
-            placement={placement}
-            content={<DetailedErrorMessage run={run} />}
-        >
-            <StyledInfoCircleOutlined />
-        </Popover>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/assertionUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/assertionUtils.ts
deleted file mode 100644
index 4d92f119be5bcb..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/assertionUtils.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { Assertion, AssertionSourceType, AssertionType } from '@types';
-
-export enum AssertionEditabilityScopeType {
-    FULL = 'FULL',
-    ACTIONS_AND_DESCRIPTION = 'ACTIONS_AND_DESCRIPTION',
-    ACTIONS_ONLY = 'ACTIONS_ONLY',
-    NONE = 'NONE',
-}
-
-// ------- NOTE: we take the lowest permission of the union of (AssertType, AssertionSourceType) from the maps below ------- //
-const ASSERTION_TYPE_TO_EDITING_SCOPE: { [type in AssertionType]: AssertionEditabilityScopeType } = {
-    [AssertionType.Custom]: AssertionEditabilityScopeType.FULL,
-    [AssertionType.Field]: AssertionEditabilityScopeType.FULL,
-    [AssertionType.Freshness]: AssertionEditabilityScopeType.FULL,
-    [AssertionType.Sql]: AssertionEditabilityScopeType.FULL,
-    [AssertionType.Volume]: AssertionEditabilityScopeType.FULL,
-    [AssertionType.DataSchema]: AssertionEditabilityScopeType.FULL,
-    [AssertionType.Dataset]: AssertionEditabilityScopeType.ACTIONS_AND_DESCRIPTION,
-    [AssertionType.Custom]: AssertionEditabilityScopeType.ACTIONS_AND_DESCRIPTION,
-};
-const SOURCE_TYPE_TO_EDITING_SCOPE: { [type in AssertionSourceType]: AssertionEditabilityScopeType } = {
-    [AssertionSourceType.Native]: AssertionEditabilityScopeType.FULL,
-    [AssertionSourceType.External]: AssertionEditabilityScopeType.ACTIONS_AND_DESCRIPTION,
-    [AssertionSourceType.Inferred]: AssertionEditabilityScopeType.ACTIONS_ONLY,
-};
-
-// Scope types that unlock the certain editing abilities (broadest to narrowest)
-const TIERED_SCOPE_TYPES_MAP = {
-    FULL: [AssertionEditabilityScopeType.FULL],
-    ACTIONS_AND_DESCRIPTION: [
-        AssertionEditabilityScopeType.ACTIONS_AND_DESCRIPTION,
-        AssertionEditabilityScopeType.FULL,
-    ],
-    ACTIONS_ONLY: [
-        AssertionEditabilityScopeType.ACTIONS_ONLY,
-        AssertionEditabilityScopeType.ACTIONS_AND_DESCRIPTION,
-        AssertionEditabilityScopeType.FULL,
-    ],
-};
-
-/**
- * Gets the edabilityType of an asseriton
- * @param assertion
- * @returns {AssertionEditabilityScopeType}
- */
-export const getAssertionEditabilityType = (assertion: Assertion): AssertionEditabilityScopeType => {
-    const assertionType = assertion.info?.type;
-    const assertionSourceType = assertion.info?.source?.type ?? AssertionSourceType.External; // NOTE: null==External since some of our integration connectors actually do not and historically have not produced this field
-    if (!assertionType) {
-        return AssertionEditabilityScopeType.NONE;
-    }
-
-    // 1. Full editing
-    const isSourceTypeValidForFullEditing = TIERED_SCOPE_TYPES_MAP.FULL.includes(
-        SOURCE_TYPE_TO_EDITING_SCOPE[assertionSourceType],
-    );
-    const isAssertionTypeValidForFullEditing = TIERED_SCOPE_TYPES_MAP.FULL.includes(
-        ASSERTION_TYPE_TO_EDITING_SCOPE[assertionType],
-    );
-    if (isSourceTypeValidForFullEditing && isAssertionTypeValidForFullEditing) {
-        return AssertionEditabilityScopeType.FULL;
-    }
-
-    // 2. Actions and description editing
-    const isSourceTypeValidForActionAndDescriptionEditing = TIERED_SCOPE_TYPES_MAP.ACTIONS_AND_DESCRIPTION.includes(
-        SOURCE_TYPE_TO_EDITING_SCOPE[assertionSourceType],
-    );
-    const isAssertionTypeValidForActionAndDescriptionEditing = TIERED_SCOPE_TYPES_MAP.ACTIONS_AND_DESCRIPTION.includes(
-        ASSERTION_TYPE_TO_EDITING_SCOPE[assertionType],
-    );
-    if (isSourceTypeValidForActionAndDescriptionEditing && isAssertionTypeValidForActionAndDescriptionEditing) {
-        return AssertionEditabilityScopeType.ACTIONS_AND_DESCRIPTION;
-    }
-
-    // 3. Actions only editing
-    const isSourceTypeValidForActionOnlyEditing = TIERED_SCOPE_TYPES_MAP.ACTIONS_ONLY.includes(
-        SOURCE_TYPE_TO_EDITING_SCOPE[assertionSourceType],
-    );
-    const isAssertionTypeValidForActionOnlyEditing = TIERED_SCOPE_TYPES_MAP.ACTIONS_ONLY.includes(
-        ASSERTION_TYPE_TO_EDITING_SCOPE[assertionType],
-    );
-    if (isSourceTypeValidForActionOnlyEditing && isAssertionTypeValidForActionOnlyEditing) {
-        return AssertionEditabilityScopeType.ACTIONS_ONLY;
-    }
-
-    return AssertionEditabilityScopeType.NONE;
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants.ts
index b8884a7e6e35b4..41039819abfa86 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants.ts
@@ -1,49 +1,5 @@
 import { AssertionStdOperator } from '@types';
 
-// We hard code this here because there's no set schema NativeResults on the AssertionResult document
-// - it's a generic map.
-export const ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE = {
-    FIELD_ASSERTIONS: {
-        FIELD_VALUES: {
-            Y_VALUE_KEY_NAME: 'Invalid Rows',
-            THRESHOLD_VALUE_KEY_NAME: 'Threshold Value', // NOTE: we're better off accessing this from the assertionInfo directly
-        },
-        METRIC_VALUES: {
-            Y_VALUE_KEY_NAME: 'Metric Value',
-            COMPARED_VALUE_KEY_NAME: 'Compared Value', // NOTE: we're better off accessing this from the assertionInfo directly
-            COMPARED_MIN_VALUE_KEY_NAME: 'Compared Min Value', // ^
-            COMPARED_MAX_VALUE_KEY_NAME: 'Compared Max Value', // ^
-        },
-    },
-    SQL_ASSERTIONS: {
-        Y_VALUE_KEY_NAME: 'Value',
-        PREVIOUS_Y_VALUE_KEY_NAME: 'Previous Value',
-    },
-    VOLUME_ASSERTIONS: {
-        PREVIOUS_Y_VALUE_KEY_NAME: 'Previous Row Count',
-    },
-    SCHEMA_ASSERTIONS: {
-        EXTRA_FIELDS_IN_ACTUAL_KEY_NAME: 'Extra Fields in Actual',
-        EXTRA_FIELDS_IN_EXPECTED_KEY_NAME: 'Extra Fields in Expected',
-        MISMATCHED_TYPE_FIELDS_KEY_NAME: 'Mismatched Type Fields',
-    },
-    FRESHNESS_ASSERTIONS: {
-        EVALUATION_WINDOW_START_TIME: 'Window Start Time',
-        EVALUATION_WINDOW_END_TIME: 'Window End Time',
-    },
-};
-
-export const ASSERTION_OPERATOR_DESCRIPTIONS_REQUIRING_SUFFIX = [
-    AssertionStdOperator.EqualTo,
-    AssertionStdOperator.NotEqualTo,
-    AssertionStdOperator.Contain,
-    AssertionStdOperator.RegexMatch,
-    AssertionStdOperator.StartWith,
-    AssertionStdOperator.EndWith,
-    AssertionStdOperator.In,
-    AssertionStdOperator.NotIn,
-];
-
 export const GET_ASSERTION_OPERATOR_TO_DESCRIPTION_MAP = ({ isPlural }) => ({
     [AssertionStdOperator.EqualTo]: `${isPlural ? 'are' : 'Is'} equal to`,
     [AssertionStdOperator.NotEqualTo]: `${isPlural ? 'are' : 'Is'} not equal to`,
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultExtractionUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultExtractionUtils.ts
index 93b2933234aa93..501b2e1e7ef02d 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultExtractionUtils.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/resultExtractionUtils.ts
@@ -1,160 +1,4 @@
-import { Maybe } from 'graphql/jsutils/Maybe';
 
-import { ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE } from '@app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/shared/constants';
-import { parseJsonArrayOrDefault, parseMaybeStringAsFloatOrDefault } from '@app/shared/numberUtil';
-
-import {
-    AssertionResult,
-    AssertionResultType,
-    AssertionStdOperator,
-    AssertionStdParameter,
-    AssertionStdParameterType,
-    AssertionValueChangeType,
-    FieldMetricAssertion,
-    FieldValuesAssertion,
-    FieldValuesFailThresholdType,
-    IncrementingSegmentRowCountChange,
-    IncrementingSegmentRowCountTotal,
-    RowCountChange,
-    RowCountTotal,
-    SqlAssertionInfo,
-    StringMapEntry,
-} from '@types';
-
-/**
- * Calculates expected value of an assertion given previous value and change modifier details
- * ie. { previous row count = 1000, changeType=%, modifier=100 } | expectedOutput=2000
- * @param previousValue
- * @param changeType
- * @param expectedChangeModifier
- * @returns {number | undefined}
- */
-const calculateExpectedNumericalValueWithPreviousNumericalValue = (
-    previousValue: number,
-    changeType: AssertionValueChangeType,
-    expectedChangeModifier: number,
-): number | undefined => {
-    let expectedRowCount: undefined | number;
-    switch (changeType) {
-        case AssertionValueChangeType.Absolute:
-            expectedRowCount = previousValue + expectedChangeModifier;
-            break;
-        case AssertionValueChangeType.Percentage:
-            expectedRowCount = previousValue * (1 + expectedChangeModifier / 100);
-            break;
-        default:
-            break;
-    }
-    return expectedRowCount;
-};
-
-/**
- * Attempts to extract a numerical value from native results with a given key
- * @param nativeResults
- * @param key
- * @returns {number | undefined}
- */
-export function tryExtractNumericalValueFromNativeResults(
-    nativeResults: Maybe<StringMapEntry[]> | undefined,
-    key: string,
-): number | undefined {
-    const maybeValue = nativeResults?.find((result) => result.key === key)?.value;
-    return parseMaybeStringAsFloatOrDefault(maybeValue, undefined);
-}
-
-/**
- * Attempts to extract a JSON array value from native results with a given key
- * @param nativeResults
- * @param key
- * @returns {number | undefined}
- */
-export function tryExtractArrayValueFromNativeResults(
-    nativeResults: Maybe<StringMapEntry[]> | undefined,
-    key: string,
-): any[] | undefined {
-    const maybeValue = nativeResults?.find((result) => result.key === key)?.value;
-    return parseJsonArrayOrDefault(maybeValue, undefined);
-}
-
-export function tryExtractNumericalValueFromAssertionStdParameter(
-    param?: Maybe<AssertionStdParameter>,
-): number | undefined {
-    let maybeNumber: undefined | number;
-    if (param?.type === AssertionStdParameterType.Number) {
-        maybeNumber = parseFloat(param.value);
-        maybeNumber = !Number.isNaN(maybeNumber) ? maybeNumber : undefined;
-    }
-    return maybeNumber;
-}
-
-export const tryGetFieldMetricAssertionNumericalResult = (result?: Maybe<AssertionResult>): number | undefined => {
-    return tryExtractNumericalValueFromNativeResults(
-        result?.nativeResults,
-        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.FIELD_ASSERTIONS.METRIC_VALUES.Y_VALUE_KEY_NAME,
-    );
-};
-export const tryGetFieldValueAssertionNumericalResult = (result?: Maybe<AssertionResult>) => {
-    if (result?.type === AssertionResultType.Init) return 0;
-    return tryExtractNumericalValueFromNativeResults(
-        result?.nativeResults,
-        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.FIELD_ASSERTIONS.FIELD_VALUES.Y_VALUE_KEY_NAME,
-    );
-};
-
-export const tryGetSqlAssertionNumericalResult = (result?: Maybe<AssertionResult>) => {
-    return tryExtractNumericalValueFromNativeResults(
-        result?.nativeResults,
-        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.SQL_ASSERTIONS.Y_VALUE_KEY_NAME,
-    );
-};
-
-export const tryGetPreviousSqlAssertionNumericalResult = (result?: Maybe<AssertionResult>) => {
-    return tryExtractNumericalValueFromNativeResults(
-        result?.nativeResults,
-        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.SQL_ASSERTIONS.PREVIOUS_Y_VALUE_KEY_NAME,
-    );
-};
-
-export const tryGetAbsoluteVolumeAssertionNumericalResult = (result?: Maybe<AssertionResult>) => {
-    const rowCount = result?.rowCount;
-    return rowCount || undefined;
-};
-
-export const tryGetPreviousVolumeAssertionNumericalResult = (result?: Maybe<AssertionResult>) => {
-    return tryExtractNumericalValueFromNativeResults(
-        result?.nativeResults,
-        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.VOLUME_ASSERTIONS.PREVIOUS_Y_VALUE_KEY_NAME,
-    );
-};
-export const tryGetActualUpdatedTimestampFromAssertionResult = (result?: Maybe<AssertionResult>) => {
-    const eventsArrString = result?.nativeResults?.find((pair) => pair.key === 'events')?.value;
-    const eventsArr = eventsArrString ? JSON.parse(eventsArrString) : [];
-    const timestamps = eventsArr.map((event) => event.time);
-    const sortedTimestampsDescending = timestamps.sort((a, b) => b - a);
-    const maxTimestamp = sortedTimestampsDescending[0];
-    return maxTimestamp;
-};
-
-export const tryGetExtraFieldsInActual = (result?: AssertionResult | null) => {
-    return tryExtractArrayValueFromNativeResults(
-        result?.nativeResults,
-        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.SCHEMA_ASSERTIONS.EXTRA_FIELDS_IN_ACTUAL_KEY_NAME,
-    );
-};
-
-export const tryGetExtraFieldsInExpected = (result?: AssertionResult | null) => {
-    return tryExtractArrayValueFromNativeResults(
-        result?.nativeResults,
-        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.SCHEMA_ASSERTIONS.EXTRA_FIELDS_IN_EXPECTED_KEY_NAME,
-    );
-};
-
-export const tryGetMismatchedTypeFields = (result?: AssertionResult | null) => {
-    return tryExtractArrayValueFromNativeResults(
-        result?.nativeResults,
-        ASSERTION_NATIVE_RESULTS_KEYS_BY_ASSERTION_TYPE.SCHEMA_ASSERTIONS.MISMATCHED_TYPE_FIELDS_KEY_NAME,
-    );
-};
 
 /**
  * Gets the main metric on an assertion's results that are being monitored over time
@@ -164,203 +8,3 @@ export const tryGetMismatchedTypeFields = (result?: AssertionResult | null) => {
 export const tryGetPrimaryMetricValueFromAssertionRunEvent = (): number | undefined => {
     return undefined;
 };
-
-// This captures context around the expected range of values
-export type AssertionRangeEndType = 'inclusive' | 'exclusive';
-export type AssertionExpectedRange = {
-    // These are the actual values we expect (ie. actual row count)
-    high?: number;
-    low?: number;
-    // This contains extra context about this range
-    context?: {
-        highType?: AssertionRangeEndType;
-        lowType?: AssertionRangeEndType;
-        // This contains context for relative assertions (ie. grows by max 10%, min 5%)
-        relativeModifiers?: {
-            type: AssertionValueChangeType; // percent vs absolute
-            high?: number;
-            low?: number;
-        };
-    };
-};
-
-/**
- * Tries to calculate expected result ranges for assertions that have fixed numerical expectations
- * ie. handles 'RowCount should be between 10k and 50k'
- * @param totals
- * @returns
- */
-export function tryGetExpectedRangeFromAssertionAgainstAbsoluteValues(
-    totals?:
-        | Maybe<IncrementingSegmentRowCountTotal>
-        | Maybe<RowCountTotal>
-        | Maybe<SqlAssertionInfo>
-        | Maybe<FieldValuesAssertion>
-        | Maybe<FieldMetricAssertion>,
-): AssertionExpectedRange {
-    if (!totals?.parameters) {
-        return {};
-    }
-    let high: undefined | number;
-    let low: undefined | number;
-    let highType: undefined | AssertionRangeEndType;
-    let lowType: undefined | AssertionRangeEndType;
-    switch (totals?.operator) {
-        case AssertionStdOperator.Between:
-            high = tryExtractNumericalValueFromAssertionStdParameter(totals.parameters.maxValue);
-            low = tryExtractNumericalValueFromAssertionStdParameter(totals.parameters.minValue);
-            highType = 'inclusive';
-            lowType = 'inclusive';
-            break;
-        case AssertionStdOperator.GreaterThan:
-            low = tryExtractNumericalValueFromAssertionStdParameter(totals.parameters.value);
-            lowType = 'exclusive';
-            break;
-        case AssertionStdOperator.GreaterThanOrEqualTo:
-            low = tryExtractNumericalValueFromAssertionStdParameter(totals.parameters.value);
-            lowType = 'inclusive';
-            break;
-        case AssertionStdOperator.LessThan:
-            high = tryExtractNumericalValueFromAssertionStdParameter(totals.parameters.value);
-            highType = 'exclusive';
-            break;
-        case AssertionStdOperator.LessThanOrEqualTo:
-            high = tryExtractNumericalValueFromAssertionStdParameter(totals.parameters.value);
-            highType = 'inclusive';
-            break;
-        default:
-            break;
-    }
-    return {
-        high,
-        low,
-        context: {
-            highType,
-            lowType,
-        },
-    };
-}
-/**
- * Tries to calculate expected result ranges for assertions that have expectations defined relative to previous runs
- * ie. handles 'RowCount should not grow by more than 50%'
- * @param changingInfo
- * @param changeType
- * @param previousCount
- * @returns {AssertionExpectedRange}
- */
-export function tryGetExpectedRangeFromAssertionAgainstRelativeValues(
-    changingInfo?: Maybe<RowCountChange | IncrementingSegmentRowCountChange | SqlAssertionInfo>,
-    changeType?: Maybe<AssertionValueChangeType>,
-    previousCount?: Maybe<number>,
-): AssertionExpectedRange {
-    if (
-        !changingInfo?.parameters ||
-        typeof previousCount !== 'number' ||
-        typeof changeType === 'undefined' ||
-        changeType === null
-    ) {
-        return {};
-    }
-
-    let high: undefined | number;
-    let low: undefined | number;
-    let highType: undefined | AssertionRangeEndType;
-    let lowType: undefined | AssertionRangeEndType;
-    let modifierHigh: undefined | number;
-    let modifierLow: undefined | number;
-
-    switch (changingInfo?.operator) {
-        case AssertionStdOperator.Between: {
-            modifierHigh = tryExtractNumericalValueFromAssertionStdParameter(changingInfo.parameters.maxValue);
-            modifierLow = tryExtractNumericalValueFromAssertionStdParameter(changingInfo.parameters.minValue);
-            high =
-                typeof modifierHigh === 'number'
-                    ? calculateExpectedNumericalValueWithPreviousNumericalValue(previousCount, changeType, modifierHigh)
-                    : undefined;
-            low =
-                typeof modifierLow === 'number'
-                    ? calculateExpectedNumericalValueWithPreviousNumericalValue(previousCount, changeType, modifierLow)
-                    : undefined;
-
-            highType = 'inclusive';
-            lowType = 'inclusive';
-            break;
-        }
-        case AssertionStdOperator.GreaterThan: {
-            modifierLow = tryExtractNumericalValueFromAssertionStdParameter(changingInfo.parameters.value);
-            low =
-                typeof modifierLow === 'number'
-                    ? calculateExpectedNumericalValueWithPreviousNumericalValue(previousCount, changeType, modifierLow)
-                    : undefined;
-            lowType = 'exclusive';
-            break;
-        }
-        case AssertionStdOperator.GreaterThanOrEqualTo: {
-            modifierLow = tryExtractNumericalValueFromAssertionStdParameter(changingInfo.parameters.value);
-            low =
-                typeof modifierLow === 'number'
-                    ? calculateExpectedNumericalValueWithPreviousNumericalValue(previousCount, changeType, modifierLow)
-                    : undefined;
-            lowType = 'inclusive';
-            break;
-        }
-        case AssertionStdOperator.LessThan: {
-            modifierHigh = tryExtractNumericalValueFromAssertionStdParameter(changingInfo.parameters.value);
-            high =
-                typeof modifierHigh === 'number'
-                    ? calculateExpectedNumericalValueWithPreviousNumericalValue(previousCount, changeType, modifierHigh)
-                    : undefined;
-            highType = 'exclusive';
-            break;
-        }
-        case AssertionStdOperator.LessThanOrEqualTo: {
-            modifierHigh = tryExtractNumericalValueFromAssertionStdParameter(changingInfo.parameters.value);
-            high =
-                typeof modifierHigh === 'number'
-                    ? calculateExpectedNumericalValueWithPreviousNumericalValue(previousCount, changeType, modifierHigh)
-                    : undefined;
-            highType = 'inclusive';
-            break;
-        }
-        default:
-            break;
-    }
-    return {
-        high,
-        low,
-        context: {
-            highType,
-            lowType,
-            relativeModifiers: {
-                type: changeType,
-                high: modifierHigh,
-                low: modifierLow,
-            },
-        },
-    };
-}
-
-export function tryGetExpectedRangeFromFailThreshold(
-    fieldValuesAssertion?: Maybe<FieldValuesAssertion>,
-): AssertionExpectedRange {
-    const highType: AssertionRangeEndType = 'inclusive';
-    let high: number | undefined;
-
-    const thresholdType = fieldValuesAssertion?.failThreshold?.type;
-    switch (thresholdType) {
-        case FieldValuesFailThresholdType.Count:
-            high = parseMaybeStringAsFloatOrDefault(fieldValuesAssertion?.failThreshold.value);
-            break;
-        case FieldValuesFailThresholdType.Percentage:
-            break;
-        default:
-            break;
-    }
-
-    return {
-        high,
-        context: {
-            highType,
-        },
-    };
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils.tsx
index 4b32087f80f38a..fa908aa59d29e9 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/profile/summary/utils.tsx
@@ -61,7 +61,7 @@ import { useGetUserQuery } from '@graphql/user.generated';
  * @link getOperatorText
  * Returns the Plain Text to render for the operator portion of the Assertion Description
  */
-export const getOperatorPlainText = (
+const getOperatorPlainText = (
     op: AssertionStdOperator,
     parameters: AssertionStdParameters | undefined,
     nativeType: string | undefined,
@@ -130,7 +130,7 @@ export const getOperatorPlainText = (
  *
  * Schema assertions require an aggregation.
  */
-export const getSchemaAggregationPlainText = (
+const getSchemaAggregationPlainText = (
     aggregation: AssertionStdAggregation | undefined | null,
     fields: Array<SchemaFieldRef> | undefined | null,
 ) => {
@@ -156,7 +156,7 @@ export const getSchemaAggregationPlainText = (
  *
  * Row assertions require an aggregation.
  */
-export const getRowsAggregationPlainText = (aggregation: AssertionStdAggregation | undefined | null) => {
+const getRowsAggregationPlainText = (aggregation: AssertionStdAggregation | undefined | null) => {
     switch (aggregation) {
         case AssertionStdAggregation.RowCount:
             return 'Dataset row count is';
@@ -176,7 +176,7 @@ export const getRowsAggregationPlainText = (aggregation: AssertionStdAggregation
  * Returns the Plain Text to render for the aggregation portion of the Assertion Description
  * for Assertions on Dataset Columns
  */
-export const getColumnAggregationPlainText = (
+const getColumnAggregationPlainText = (
     aggregation: AssertionStdAggregation | undefined | null,
     field: SchemaFieldRef | undefined,
 ) => {
@@ -230,7 +230,7 @@ export const getColumnAggregationPlainText = (
  * @link getAggregationText
  * Returns the Plain Text to render for the aggregation portion of the Assertion Description
  */
-export const getAggregationPlainText = (
+const getAggregationPlainText = (
     scope: DatasetAssertionScope,
     aggregation: AssertionStdAggregation | undefined | null,
     fields: Array<SchemaFieldRef> | undefined | null,
@@ -254,7 +254,7 @@ export const getAggregationPlainText = (
  * A human-readable Plain Text description of a Dataset Assertion.
  */
 
-export const getDatasetAssertionPlainTextDescription = (datasetAssertion: DatasetAssertionInfo): string => {
+const getDatasetAssertionPlainTextDescription = (datasetAssertion: DatasetAssertionInfo): string => {
     const { scope, aggregation, fields, operator, parameters, nativeType } = datasetAssertion;
     const aggregationPlainText = getAggregationPlainText(scope, aggregation, fields);
     const operatorPlainText = getOperatorPlainText(operator, parameters || undefined, nativeType || undefined);
@@ -266,7 +266,7 @@ export const getDatasetAssertionPlainTextDescription = (datasetAssertion: Datase
  * @link getAggregationText
  * A human-readable Plain Text description of a Volume Assertion.
  */
-export const getVolumeAssertionPlainTextDescription = (assertionInfo: VolumeAssertionInfo): string => {
+const getVolumeAssertionPlainTextDescription = (assertionInfo: VolumeAssertionInfo): string => {
     const volumeType = assertionInfo.type;
     const volumeTypeInfo = getVolumeTypeInfo(assertionInfo);
     const volumeTypeDescription = getVolumeTypeDescription(volumeType);
@@ -284,7 +284,7 @@ export const getVolumeAssertionPlainTextDescription = (assertionInfo: VolumeAsse
  * @link getAggregationText
  * A human-readable Plain Text description of a Field Assertion.
  */
-export const getFieldAssertionPlainTextDescription = (assertionInfo: FieldAssertionInfo) => {
+const getFieldAssertionPlainTextDescription = (assertionInfo: FieldAssertionInfo) => {
     const field = getFieldDescription(assertionInfo);
     const transform = getFieldTransformDescription(assertionInfo);
     // Do not pluralize if this is a metric assertion since you're checking one metric, not multiple values
@@ -300,7 +300,7 @@ export const getFieldAssertionPlainTextDescription = (assertionInfo: FieldAssert
  * @link getAggregationText
  * A human-readable Plain Text description of a Schema Assertion.
  */
-export const getSchemaAssertionPlainTextDescription = (assertionInfo: SchemaAssertionInfo) => {
+const getSchemaAssertionPlainTextDescription = (assertionInfo: SchemaAssertionInfo) => {
     const { compatibility } = assertionInfo;
     const matchText = compatibility === SchemaAssertionCompatibility.ExactMatch ? 'exactly match' : 'include';
     const expectedColumnCount = assertionInfo?.fields?.length || 0;
@@ -312,7 +312,7 @@ export const getSchemaAssertionPlainTextDescription = (assertionInfo: SchemaAsse
 /**
  * A human-readable Plain Text description of an Freshness Assertion.
  */
-export const getFreshnessAssertionPlainTextDescription = (
+const getFreshnessAssertionPlainTextDescription = (
     assertionInfo: FreshnessAssertionInfo,
     monitorSchedule: CronSchedule,
 ) => {
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertionUtils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertionUtils.tsx
index e4e2a938c214c3..60926109eb2cc9 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertionUtils.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertionUtils.tsx
@@ -1,4 +1,4 @@
-import { CheckCircleOutlined, CloseCircleOutlined, ExclamationCircleOutlined, StopOutlined } from '@ant-design/icons';
+
 import { Location } from 'history';
 import QueryString from 'query-string';
 import React from 'react';
@@ -14,9 +14,6 @@ import {
     AssertionResultType,
     AssertionStdParameter,
     AssertionStdParameterType,
-    DatasetAssertionInfo,
-    Maybe,
-    StringMapEntry,
 } from '@types';
 
 import AssertionErrorIcon from '@images/assertion_error_dot.svg?react';
@@ -39,24 +36,6 @@ export const sortAssertions = (a, b) => {
     return b?.runEvents?.runEvents[0]?.timestampMillis - a?.runEvents?.runEvents[0]?.timestampMillis;
 };
 
-/**
- * Returns the display text assoociated with an AssertionResultType
- */
-export const getResultText = (result: AssertionResultType) => {
-    switch (result) {
-        case AssertionResultType.Success:
-            return 'Passed';
-        case AssertionResultType.Failure:
-            return 'Failed';
-        case AssertionResultType.Error:
-            return 'Error';
-        case AssertionResultType.Init:
-            return 'Initializing';
-        default:
-            throw new Error(`Unsupported Assertion Result Type ${result} provided.`);
-    }
-};
-
 /**
  * Returns the display color associated with an AssertionResultType
  */
@@ -81,39 +60,6 @@ export const getResultColor = (result?: AssertionResultType) => {
     }
 };
 
-/**
- * Returns the display icon associated with an AssertionResultType
- */
-export const getResultIcon = (result: AssertionResultType, color?: string) => {
-    const resultColor = color || getResultColor(result);
-    switch (result) {
-        case AssertionResultType.Success:
-            return <CheckCircleOutlined style={{ color: resultColor }} />;
-        case AssertionResultType.Failure:
-            return <CloseCircleOutlined style={{ color: resultColor }} />;
-        case AssertionResultType.Error:
-            return <ExclamationCircleOutlined style={{ color: resultColor }} />;
-        case AssertionResultType.Init:
-            return <StopOutlined style={{ color: resultColor }} />;
-        default:
-            throw new Error(`Unsupported Assertion Result Type ${result} provided.`);
-    }
-};
-
-/**
- * Convert an array of StringMapEntry into a map, for easy retrieval.
- */
-export const convertNativeParametersArrayToMap = (nativeParameters: Maybe<Array<StringMapEntry>> | undefined) => {
-    if (nativeParameters) {
-        const map = new Map();
-        nativeParameters.forEach((parameter) => {
-            map.set(parameter.key, parameter.value);
-        });
-        return map;
-    }
-    return undefined;
-};
-
 export const getResultErrorMessage = (result: AssertionResult) => {
     if (result.type !== AssertionResultType.Error) {
         return undefined;
@@ -163,16 +109,6 @@ export const getFormattedParameterValue = (parameter: AssertionStdParameter | un
     }
 };
 
-/**
- * Throws if an assertion has no input fields
- */
-export const validateAssertionsHasInputFields = (info: DatasetAssertionInfo) => {
-    if (info.fields && info.fields.length === 1) {
-        return info.fields[0].path;
-    }
-    throw new Error('Failed to find field path(s) for column assertion.');
-};
-
 export const getQueryParams = (param: string, location: Location): string | null => {
     const params = QueryString.parse(location.search);
     return params[param] ? String(params[param]) : null;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/utils.ts
index 7f0277bd32528a..48a6ae4e76c1df 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/utils.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/contract/builder/utils.ts
@@ -5,29 +5,6 @@ import {
 
 import { DataContract } from '@types';
 
-/**
- * Creates a builder state instance from a Data Contract object.
- */
-export const createBuilderState = (contract?: DataContract | null): DataContractBuilderState | undefined => {
-    if (contract) {
-        return {
-            schema:
-                (contract?.properties?.schema?.length && {
-                    assertionUrn: contract?.properties?.schema[0]?.assertion?.urn,
-                }) ||
-                undefined,
-            freshness:
-                (contract?.properties?.freshness?.length && {
-                    assertionUrn: contract?.properties?.freshness[0]?.assertion?.urn,
-                }) ||
-                undefined,
-            dataQuality:
-                contract?.properties?.dataQuality?.map((c) => ({ assertionUrn: c.assertion.urn })) || undefined,
-        };
-    }
-    return undefined;
-};
-
 /**
  * Constructs the input variables required for upserting a data contract using graphql
  */
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/useGetValidationsTab.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/useGetValidationsTab.ts
index 164e8e489e3465..7fcfd2f82aed27 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/useGetValidationsTab.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/useGetValidationsTab.ts
@@ -5,7 +5,7 @@
  */
 const VALIDATION_TAB_NAME_REGEX_PATTERN = '^/[^/]+/[^/]+/[^/]+/([^/]+).*';
 
-export type SelectedTab = {
+type SelectedTab = {
     basePath: string;
     selectedTab: string | undefined;
 };
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/utils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/utils.tsx
index 683ba69cfef478..064ee5db5eb0e9 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/utils.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/utils.tsx
@@ -72,7 +72,7 @@ type VolumeTypeField =
     | 'incrementingSegmentRowCountTotal'
     | 'incrementingSegmentRowCountChange';
 
-export const getPropertyFromVolumeType = (type: VolumeAssertionType) => {
+const getPropertyFromVolumeType = (type: VolumeAssertionType) => {
     switch (type) {
         case VolumeAssertionType.RowCountTotal:
             return 'rowCountTotal' as VolumeTypeField;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx
index 01c81d3247ba4e..3b2b88bd78fa60 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer.tsx
@@ -95,7 +95,7 @@ const MoreIndicator = styled.span`
     break-word: normal;
 `;
 
-export type Props = {
+type Props = {
     content: string;
     lineLimit?: number | null;
     fixedLineHeight?: boolean;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx
deleted file mode 100644
index 8b11f02c9e6ac7..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/DiscardDescriptionModal.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Button, Modal } from 'antd';
-import React from 'react';
-
-type Props = {
-    cancelModalVisible?: boolean;
-    onDiscard?: () => void;
-    onCancel?: () => void;
-};
-
-export const DiscardDescriptionModal = ({ cancelModalVisible, onDiscard, onCancel }: Props) => {
-    return (
-        <>
-            <Modal
-                title="Exit Editor"
-                visible={cancelModalVisible}
-                destroyOnClose
-                onCancel={onCancel}
-                footer={[
-                    <Button type="text" onClick={onCancel}>
-                        Cancel
-                    </Button>,
-                    <Button onClick={onDiscard}>Yes</Button>,
-                ]}
-            >
-                <p>Are you sure you want to close the documentation editor? Any unsaved changes will be lost.</p>
-            </Modal>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/ShortMarkdownViewer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/ShortMarkdownViewer.tsx
index 3938acc4210f18..cf8ac9822897ae 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/ShortMarkdownViewer.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Documentation/components/ShortMarkdownViewer.tsx
@@ -11,7 +11,7 @@ const StyledText = styled(Text)`
     width: 100%;
 `;
 
-export type Props = {
+type Props = {
     content: string;
     clearMarkdown?: boolean;
 };
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/hooks/useIncidentHandler.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/hooks/useIncidentHandler.ts
index fc06db2fa272a3..e2f02eb12a9777 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/hooks/useIncidentHandler.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/hooks/useIncidentHandler.ts
@@ -13,7 +13,7 @@ import { EntityType, IncidentSourceType, IncidentState } from '@src/types.genera
 
 import { IncidentResultFieldsFragment } from '@graphql/incident.generated';
 
-export const getCacheIncident = ({
+const getCacheIncident = ({
     values,
     responseData,
     user,
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents.tsx
index d3b7a2643e9113..06725909889c4b 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents.tsx
@@ -1,57 +1,8 @@
-import { Form, Table } from 'antd';
+import { Form } from 'antd';
 import styled, { keyframes } from 'styled-components';
 
 import { Button, colors } from '@src/alchemy-components';
-import { ANTD_GRAY, REDESIGN_COLORS } from '@src/app/entityV2/shared/constants';
-
-export const IncidentListStyledTable = styled(Table)`
-    max-width: none;
-    &&& .ant-table-thead .ant-table-cell {
-        font-weight: 600;
-        font-size: 12px;
-        color: ${ANTD_GRAY[8]};
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-    &&& .ant-table-expanded-row > .ant-table-cell {
-        padding-left: 0px;
-    }
-    &&& .ant-table-tbody > tr > td > .ant-table-wrapper:only-child .ant-table,
-    .ant-table-tbody > tr > td > .ant-table-expanded-row-fixed > .ant-table-wrapper:only-child .ant-table {
-        margin-left: 0px;
-    }
-    &&
-        .ant-table-thead
-        > tr
-        > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not(
-            [colspan]
-        )::before {
-        border: 1px solid ${ANTD_GRAY[4]};
-    }
-    &&& .ant-table-thead > tr > th {
-        line-height: 5px;
-    }
-    &&& .ant-table-cell {
-        background-color: transparent;
-    }
-
-    &&& .acryl-selected-incidents-table-row {
-        background-color: ${ANTD_GRAY[4]};
-    }
-
-    .group-header {
-        cursor: pointer;
-        background-color: ${ANTD_GRAY[3]};
-    }
-    &&& .acryl-incidents-table-row {
-        cursor: pointer;
-        background-color: ${ANTD_GRAY[2]};
-        :hover {
-            background-color: ${ANTD_GRAY[3]};
-        }
-    }
-`;
+import { REDESIGN_COLORS } from '@src/app/entityV2/shared/constants';
 
 export const ListContainer = styled.div`
     display: flex;
@@ -154,10 +105,6 @@ export const Header = styled.div`
     margin-bottom: 1rem;
 `;
 
-export const ToggleIcon = styled.span`
-    color: #666;
-`;
-
 export const Divider = styled.div`
     border-top: 1px solid #e0e0e0;
     margin: 16px 0;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentListItem.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentListItem.tsx
deleted file mode 100644
index 406fef456057f9..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentListItem.tsx
+++ /dev/null
@@ -1,338 +0,0 @@
-import { CheckCircleFilled, CheckOutlined, MoreOutlined, WarningFilled } from '@ant-design/icons';
-import { Popover, Tooltip } from '@components';
-import { Button, Dropdown, List, Menu, Tag, Typography, message } from 'antd';
-import React, { useState } from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import analytics, { EntityActionType, EventType } from '@app/analytics';
-import { useEntityData, useRefetch } from '@app/entity/shared/EntityContext';
-import CompactMarkdownViewer from '@app/entityV2/shared/tabs/Documentation/components/CompactMarkdownViewer';
-import { ResolveIncidentModal } from '@app/entityV2/shared/tabs/Incident/components/ResolveIncidentModal';
-import {
-    FAILURE_COLOR_HEX,
-    SUCCESS_COLOR_HEX,
-    getNameFromType,
-} from '@app/entityV2/shared/tabs/Incident/incidentUtils';
-import handleGraphQLError from '@app/shared/handleGraphQLError';
-import { toLocalDateTimeString, toRelativeTimeString } from '@app/shared/time/timeUtils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useUpdateIncidentStatusMutation } from '@graphql/mutations.generated';
-import { useGetUserQuery } from '@graphql/user.generated';
-import { EntityType, Incident, IncidentState, IncidentType } from '@types';
-
-type Props = {
-    incident: Incident;
-    refetch?: () => Promise<any>;
-};
-
-const IncidentListContainer = styled(List.Item)`
-    padding-top: 20px;
-    padding-bottom: 20px;
-`;
-
-const IncidentItemContainer = styled.div`
-    display: flex;
-    justify-content: space-between;
-    padding-left: 8px;
-    padding-right: 8px;
-    width: 100%;
-`;
-
-const IncidentHeaderContainer = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-`;
-
-const DescriptionContainer = styled.div`
-    margin-top: 8px;
-`;
-
-const TitleContainer = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const IncidentTitle = styled(Typography.Text)`
-    font-size: 14px;
-    font-weight: 700;
-    margin-right: 16px;
-    color: #000000;
-    line-height: 22px;
-    text-align: justify;
-    max-width: 500px;
-`;
-
-const IncidentTypeTag = styled(Tag)`
-    width: auto;
-    height: 26px;
-    text-align: center;
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 20px;
-    color: #262626;
-    padding: 2px 15px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    max-width: 500px;
-`;
-
-const IncidentDescriptionText = styled(Typography.Text)`
-    max-width: 500px;
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 20px;
-    color: #262626;
-    display: block;
-    word-wrap: break-word;
-    white-space: normal;
-    text-align: justify;
-`;
-
-const IncidentDescriptionLabel = styled(Typography.Text)`
-    margin-top: 4px;
-    font-weight: 400;
-    font-size: 10px;
-    color: #8c8c8c;
-    display: block;
-    word-wrap: break-word;
-    white-space: normal;
-    text-align: justify;
-`;
-
-const IncidentCreatedTime = styled(Typography.Text)`
-    font-weight: 500;
-    font-size: 10px;
-    line-height: 20px;
-    color: #8c8c8c;
-`;
-
-const IncidentResolvedText = styled(Typography.Text)`
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 20px;
-    color: #8c8c8c;
-`;
-
-const IncidentResolvedTextContainer = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const IncidentResolvedContainer = styled.div`
-    display: flex;
-    align-items: center;
-    margin-right: 30px;
-`;
-
-const IncidentResolvedButton = styled(Button)`
-    background: #ffffff;
-    border: 1px solid #d9d9d9;
-    box-sizing: border-box;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
-    border-radius: 5px;
-    color: #262626;
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 20px;
-`;
-
-const MenuIcon = styled(MoreOutlined)`
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    font-size: 25px;
-    height: 28px;
-    margin-left: 5px;
-`;
-
-const MenuItem = styled.div`
-    font-size: 12px;
-    padding-left: 12px;
-    padding-right: 12px;
-    color: rgba(0, 0, 0, 0.85);
-`;
-
-export default function IncidentListItem({ incident, refetch }: Props) {
-    const { entityType } = useEntityData();
-    const refetchEntity = useRefetch();
-    const entityRegistry = useEntityRegistry();
-    const [updateIncidentStatusMutation] = useUpdateIncidentStatusMutation();
-    const [isResolvedModalVisible, setIsResolvedModalVisible] = useState(false);
-
-    // Fetching the most recent actor's data.
-    const { data: createdActor } = useGetUserQuery({
-        variables: { urn: incident.created.actor || '', groupsCount: 0 },
-        fetchPolicy: 'cache-first',
-    });
-    const { data: lastUpdatedActor } = useGetUserQuery({
-        variables: { urn: incident.incidentStatus?.lastUpdated.actor || '', groupsCount: 0 },
-        fetchPolicy: 'cache-first',
-    });
-
-    // Converting the created time into UTC
-    const createdDate = new Date(incident.created.time).getTime();
-    const lastModifiedDate = new Date(incident.incidentStatus?.lastUpdated.time || incident.created.time).getTime();
-
-    // Updating the incident status on button click
-    const updateIncidentStatus = (state: IncidentState, resolvedMessage: string) => {
-        message.loading({ content: 'Updating...' });
-        updateIncidentStatusMutation({
-            variables: { urn: incident.urn, input: { state, message: resolvedMessage } },
-        })
-            .then(() => {
-                message.destroy();
-                analytics.event({
-                    type: EventType.EntityActionEvent,
-                    entityType,
-                    entityUrn: incident.urn,
-                    actionType: EntityActionType.ResolvedIncident,
-                });
-                message.success({ content: 'Incident updated!', duration: 2 });
-                setTimeout(() => {
-                    refetchEntity?.();
-                }, 3000);
-                refetch?.();
-                setIsResolvedModalVisible(false);
-            })
-            .catch((error) => {
-                handleGraphQLError({
-                    error,
-                    defaultMessage: 'Failed to update incident! An unexpected error occurred',
-                    permissionMessage:
-                        'Unauthorized to update incident for this asset. Please contact your DataHub administrator.',
-                });
-            });
-    };
-
-    // Handle the Resolved Modal visibility
-    const handleResolved = () => {
-        setIsResolvedModalVisible(!isResolvedModalVisible);
-    };
-
-    const menu = (
-        <Menu>
-            <Menu.Item key="0">
-                <MenuItem onClick={() => updateIncidentStatus(IncidentState.Active, '')} data-testid="reopen-incident">
-                    Reopen incident
-                </MenuItem>
-            </Menu.Item>
-        </Menu>
-    );
-
-    return (
-        <>
-            <IncidentListContainer>
-                <IncidentItemContainer>
-                    <IncidentHeaderContainer>
-                        <div>
-                            <TitleContainer>
-                                <IncidentTitle>{incident.title}</IncidentTitle>
-                                <IncidentTypeTag>
-                                    {incident.incidentType === IncidentType.Custom
-                                        ? incident.customType
-                                        : getNameFromType(incident.incidentType)}
-                                </IncidentTypeTag>
-                            </TitleContainer>
-                            <DescriptionContainer>
-                                <IncidentDescriptionLabel>Description</IncidentDescriptionLabel>
-                                <CompactMarkdownViewer content={incident?.description || ''} />
-                                {incident.incidentStatus?.state === IncidentState.Resolved ? (
-                                    <>
-                                        <IncidentDescriptionLabel>Resolution Note</IncidentDescriptionLabel>
-                                        <IncidentDescriptionText>
-                                            {incident?.incidentStatus?.message || 'No additional details'}
-                                        </IncidentDescriptionText>
-                                    </>
-                                ) : null}
-                            </DescriptionContainer>
-                            <DescriptionContainer>
-                                <Tooltip placement="right" showArrow={false} title={toLocalDateTimeString(createdDate)}>
-                                    <IncidentCreatedTime>
-                                        Created {toRelativeTimeString(createdDate)} by{' '}
-                                    </IncidentCreatedTime>
-                                </Tooltip>
-                                {createdActor?.corpUser && (
-                                    <Link
-                                        to={entityRegistry.getEntityUrl(
-                                            EntityType.CorpUser,
-                                            createdActor?.corpUser?.urn,
-                                        )}
-                                    >
-                                        {entityRegistry.getDisplayName(EntityType.CorpUser, createdActor?.corpUser)}
-                                    </Link>
-                                )}
-                            </DescriptionContainer>
-                        </div>
-                    </IncidentHeaderContainer>
-                    {incident.incidentStatus?.state === IncidentState.Resolved ? (
-                        <IncidentResolvedTextContainer>
-                            <Popover
-                                overlayStyle={{ maxWidth: 240 }}
-                                placement="left"
-                                title={<Typography.Text strong>Note</Typography.Text>}
-                                content={
-                                    incident?.incidentStatus?.message === null ? (
-                                        <Typography.Text type="secondary">No additional details</Typography.Text>
-                                    ) : (
-                                        <Typography.Text type="secondary">
-                                            {incident?.incidentStatus?.message}
-                                        </Typography.Text>
-                                    )
-                                }
-                            >
-                                <IncidentResolvedText>
-                                    {incident?.incidentStatus?.lastUpdated && (
-                                        <Tooltip showArrow={false} title={toLocalDateTimeString(lastModifiedDate)}>
-                                            Resolved {toRelativeTimeString(lastModifiedDate)} by{' '}
-                                        </Tooltip>
-                                    )}
-                                    {lastUpdatedActor?.corpUser && (
-                                        <Link
-                                            to={entityRegistry.getEntityUrl(
-                                                EntityType.CorpUser,
-                                                lastUpdatedActor?.corpUser?.urn,
-                                            )}
-                                        >
-                                            {entityRegistry.getDisplayName(
-                                                EntityType.CorpUser,
-                                                lastUpdatedActor?.corpUser,
-                                            )}
-                                        </Link>
-                                    )}
-                                </IncidentResolvedText>
-                            </Popover>
-                            <CheckCircleFilled
-                                style={{ fontSize: '28px', color: SUCCESS_COLOR_HEX, marginLeft: '16px' }}
-                            />
-                            <Dropdown overlay={menu} trigger={['click']}>
-                                <MenuIcon data-testid="incident-menu" />
-                            </Dropdown>
-                        </IncidentResolvedTextContainer>
-                    ) : (
-                        <IncidentResolvedContainer>
-                            <IncidentResolvedButton
-                                icon={<CheckOutlined />}
-                                onClick={() => handleResolved()}
-                                data-testid="resolve-incident"
-                            >
-                                Resolve
-                            </IncidentResolvedButton>
-                            <WarningFilled style={{ fontSize: '28px', marginLeft: '16px', color: FAILURE_COLOR_HEX }} />
-                        </IncidentResolvedContainer>
-                    )}
-                </IncidentItemContainer>
-            </IncidentListContainer>
-            {isResolvedModalVisible && (
-                <ResolveIncidentModal
-                    handleResolved={handleResolved}
-                    isResolvedModalVisible={isResolvedModalVisible}
-                    updateIncidentStatus={updateIncidentStatus}
-                />
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentSummary.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentSummary.tsx
deleted file mode 100644
index ea8e0fa47903a1..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentSummary.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { CheckCircleFilled, StopOutlined, WarningFilled } from '@ant-design/icons';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@app/entityV2/shared/tabs/Incident/incidentUtils';
-
-const SummaryHeader = styled.div`
-    width: 100%;
-    height: 80px;
-    padding-left: 40px;
-    padding-top: 0px;
-    display: flex;
-    align-items: center;
-    padding-top: 20px;
-    padding-bottom: 20px;
-`;
-
-const SummaryContainer = styled.div``;
-
-const SummaryMessage = styled.div`
-    display: inline-block;
-    margin-left: 20px;
-`;
-
-const SummaryTitle = styled(Typography.Title)`
-    && {
-        padding-bottom: 0px;
-        margin-bottom: 0px;
-    }
-`;
-
-export type IncidentsSummary = {
-    totalIncident: number;
-    resolvedIncident: number;
-    activeIncident: number;
-};
-
-type Props = {
-    summary: IncidentsSummary;
-};
-
-const getSummaryIcon = (summary: IncidentsSummary) => {
-    if (summary.totalIncident === 0) {
-        return <StopOutlined style={{ color: ANTD_GRAY[6], fontSize: 28 }} />;
-    }
-    if (summary.resolvedIncident === summary.totalIncident) {
-        return <CheckCircleFilled style={{ color: SUCCESS_COLOR_HEX, fontSize: 28 }} />;
-    }
-    return <WarningFilled style={{ color: FAILURE_COLOR_HEX, fontSize: 28 }} />;
-};
-
-const getSummaryMessage = (summary: IncidentsSummary) => {
-    if (summary.totalIncident === 0) {
-        return 'No incidents have been raised';
-    }
-    if (summary.resolvedIncident === summary.totalIncident) {
-        return 'There are no active incidents';
-    }
-    if (summary.activeIncident === 1) {
-        return `There is ${summary.activeIncident} active incident`;
-    }
-    if (summary.activeIncident > 1) {
-        return `There are ${summary.activeIncident} active incidents`;
-    }
-    return null;
-};
-
-export const IncidentSummary = ({ summary }: Props) => {
-    const summaryIcon = getSummaryIcon(summary);
-    const summaryMessage = getSummaryMessage(summary);
-    const subtitleMessage = `${summary.activeIncident} active incidents, ${summary.resolvedIncident} resolved incidents`;
-    return (
-        <SummaryHeader>
-            <SummaryContainer>
-                <div style={{ display: 'flex', alignItems: 'center' }}>
-                    {summaryIcon}
-                    <SummaryMessage>
-                        <SummaryTitle level={5}>{summaryMessage}</SummaryTitle>
-                        <Typography.Text type="secondary">{subtitleMessage}</Typography.Text>
-                    </SummaryMessage>
-                </div>
-            </SummaryContainer>
-        </SummaryHeader>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentsLoadingSection.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentsLoadingSection.tsx
deleted file mode 100644
index e0d51502ed277b..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/IncidentsLoadingSection.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Divider, Skeleton } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const Container = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: start;
-    gap: 12px;
-    margin-top: 20px;
-`;
-
-const CardWrapper = styled.div`
-    padding: 0px 40px;
-`;
-
-const CardSkeleton = styled(Skeleton.Input)`
-    && {
-        padding: 0px 20px 20px 0px;
-        height: 100px;
-        border-radius: 8px;
-        width: 100%;
-    }
-`;
-
-export const IncidentsLoadingSection = () => {
-    return (
-        <Container>
-            <CardWrapper>
-                <CardSkeleton active size="large" />
-            </CardWrapper>
-            <Divider />
-            <CardWrapper>
-                <CardSkeleton active size="large" />
-            </CardWrapper>
-            <Divider />
-            <CardWrapper>
-                <CardSkeleton active size="large" />
-            </CardWrapper>
-            <Divider />
-        </Container>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/ResolveIncidentModal.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/ResolveIncidentModal.tsx
deleted file mode 100644
index 36da4d1458d3bf..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/components/ResolveIncidentModal.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Button, Form, Input, Modal } from 'antd';
-import React from 'react';
-
-import { IncidentState } from '@types';
-
-const { TextArea } = Input;
-
-type AddIncidentProps = {
-    handleResolved: () => void;
-    isResolvedModalVisible: boolean;
-    updateIncidentStatus: (state: IncidentState, resolvedMessage: string) => void;
-};
-
-export const ResolveIncidentModal = ({
-    handleResolved,
-    isResolvedModalVisible,
-    updateIncidentStatus,
-}: AddIncidentProps) => {
-    const [form] = Form.useForm();
-
-    const handleClose = () => {
-        form.resetFields();
-        handleResolved();
-    };
-
-    const onResolvedIncident = (formData: any) => {
-        updateIncidentStatus(IncidentState.Resolved, formData.message);
-        handleClose();
-    };
-
-    return (
-        <>
-            <Modal
-                title="Resolve Incident"
-                visible={isResolvedModalVisible}
-                destroyOnClose
-                onCancel={handleClose}
-                footer={[
-                    <Button type="text" onClick={handleClose}>
-                        Cancel
-                    </Button>,
-                    <Button form="resolveIncidentForm" key="submit" htmlType="submit" data-testid="confirm-resolve">
-                        Resolve
-                    </Button>,
-                ]}
-            >
-                <Form form={form} name="resolveIncidentForm" onFinish={onResolvedIncident} layout="vertical">
-                    <Form.Item name="message" label="Note (optional)">
-                        <TextArea rows={4} />
-                    </Form.Item>
-                </Form>
-            </Modal>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/incidentUtils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/incidentUtils.ts
index 4cb18ae8e109e6..b427bda3f30154 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/incidentUtils.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/incidentUtils.ts
@@ -1,7 +1,7 @@
 import { getExistingIncidents } from '@app/entityV2/shared/tabs/Incident/utils';
 
 import { GetEntityIncidentsDocument } from '@graphql/incident.generated';
-import { Incident, IncidentState, IncidentType } from '@types';
+import { IncidentType } from '@types';
 
 export const PAGE_SIZE = 100;
 
@@ -16,36 +16,13 @@ export const INCIDENT_DISPLAY_TYPES = [
     },
 ];
 
-export const INCIDENT_DISPLAY_STATES = [
-    {
-        type: undefined,
-        name: 'All',
-    },
-    {
-        type: IncidentState.Active,
-        name: 'Active',
-    },
-    {
-        type: IncidentState.Resolved,
-        name: 'Resolved',
-    },
-];
-
 const incidentTypeToDetails = new Map();
 INCIDENT_DISPLAY_TYPES.forEach((incidentDetails) => {
     incidentTypeToDetails.set(incidentDetails.type, incidentDetails);
 });
 
-export const getNameFromType = (type: IncidentType) => {
-    return incidentTypeToDetails.get(type)?.name || type;
-};
-
-export const SUCCESS_COLOR_HEX = '#52C41A';
-export const FAILURE_COLOR_HEX = '#F5222D';
-export const WARNING_COLOR_HEX = '#FA8C16';
-
 // apollo caching
-export const addOrUpdateIncidentInList = (existingIncidents, newIncidents) => {
+const addOrUpdateIncidentInList = (existingIncidents, newIncidents) => {
     const incidents = [...existingIncidents];
     let didUpdate = false;
     const updatedIncidents = incidents.map((incident) => {
@@ -64,7 +41,7 @@ export const addOrUpdateIncidentInList = (existingIncidents, newIncidents) => {
 /**
  * Add an entry to the ListIncident cache.
  */
-export const updateListIncidentsCache = (client, urn, incident, pageSize) => {
+const updateListIncidentsCache = (client, urn, incident, pageSize) => {
     // Read the data from our cache for this query.
     const currData: any = client.readQuery({
         query: GetEntityIncidentsDocument,
@@ -115,30 +92,6 @@ export const updateListIncidentsCache = (client, urn, incident, pageSize) => {
     });
 };
 
-/**
- * Returns a status summary for the incidents
- */
-export const getIncidentsStatusSummary = (incidents: Array<Incident>) => {
-    const summary = {
-        resolvedIncident: 0,
-        activeIncident: 0,
-        totalIncident: 0,
-    };
-    incidents.forEach((assertion) => {
-        if (incidents.length) {
-            const resultType = assertion.incidentStatus?.state;
-            if (IncidentState.Active === resultType) {
-                summary.activeIncident++;
-            }
-            if (IncidentState.Resolved === resultType) {
-                summary.resolvedIncident++;
-            }
-            summary.totalIncident++;
-        }
-    });
-    return summary;
-};
-
 /**
  * Add raised incident to cache
  */
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/styledComponents.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/styledComponents.tsx
index 00bb24b209d54b..62bd8a9b26c525 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/styledComponents.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/styledComponents.tsx
@@ -66,12 +66,6 @@ export const ModalHeading = styled.span`
     color: ${colors.gray[600]};
 `;
 
-export const ModalDescription = styled.p`
-    font-weight: 500;
-    font-size: 14px;
-    color: ${colors.gray[1700]};
-`;
-
 export const FormItem = styled(Form.Item)`
     .ant-form-item-label > label {
         color: ${colors.gray[600]} !important;
@@ -83,16 +77,6 @@ export const FormItem = styled(Form.Item)`
     }
 `;
 
-export const IconContainer = styled.div`
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    border-radius: 50%;
-    border: 1px solid #ebecf0;
-    height: 22px;
-    width: 22px;
-`;
-
 export const ResolverNameContainer = styled.div`
     display: flex;
     align-items: center;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/types.ts
index f985258984fd19..5df8de3bbdac09 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/types.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/types.ts
@@ -123,10 +123,8 @@ export interface TimelineContentDetails extends BaseItemType {
 
 export enum IncidentConstant {
     PRIORITY = 'priority',
-    STAGE = 'stage',
     CATEGORY = 'category',
-    STATE = 'state',
-}
+    }
 
 export type EntityStagedForIncident = {
     urn: string;
@@ -139,16 +137,6 @@ export type IncidentBuilderSiblingOptions = {
     disabled?: boolean;
 } & Partial<EntityStagedForIncident>;
 
-export type IncidentHandlerProps = {
-    mode: IncidentAction;
-    onSubmit?: () => void;
-    incidentUrn: string | undefined;
-    user: CorpUser | null | undefined;
-    entity: EntityStagedForIncident | undefined;
-    assignees: CorpUser[];
-    linkedAssets: string[];
-};
-
 export type CreateIncidentButtonProps = {
     privileges: EntityPrivileges;
     setShowIncidentBuilder: Dispatch<SetStateAction<boolean>>;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/utils.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/utils.tsx
index bd39efdfdae95f..43198868e8d9fe 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/utils.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/utils.tsx
@@ -126,10 +126,10 @@ const orderedIncidents = (priorityIncidentGroups) => {
     return newOrderedIncidents;
 };
 
-export const getIncidentType = (incident: Incident) =>
+const getIncidentType = (incident: Incident) =>
     incident.incidentType === IncidentType.Custom ? incident.customType : incident.incidentType;
 
-export const createIncidentGroups = (incidents: Array<Incident>): IncidentGroupBy => {
+const createIncidentGroups = (incidents: Array<Incident>): IncidentGroupBy => {
     // Pre-sort the list of incidents based on which has been most recently created.
     incidents?.sort((a, b) => a?.created?.time - b?.created?.time);
 
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTable.tsx
deleted file mode 100644
index 3ec0a297e58c19..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Lineage/LineageTable.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { List } from 'antd';
-import React from 'react';
-import VisiblitySensor from 'react-visibility-sensor';
-import styled from 'styled-components';
-
-import { PreviewType } from '@app/entityV2/Entity';
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Entity } from '@types';
-
-const LineageList = styled(List)`
-    padding-left: 40px;
-    padding-right: 40px;
-    margin-top: -1px;
-    .ant-list-items > .ant-list-item {
-        padding-right: 0px;
-        padding-left: 0px;
-    }
-    > .ant-list-header {
-        padding-right: 0px;
-        padding-left: 0px;
-        font-size: 14px;
-        font-weight: 600;
-        margin-left: -20px;
-        border-bottom: none;
-        padding-bottom: 0px;
-        padding-top: 15px;
-    }
-` as typeof List;
-
-const ItemPlaceholder = styled.div`
-    min-height: 100px;
-    width: 100%;
-    background-color: ${ANTD_GRAY[2]};
-`;
-
-const ListItem = styled(List.Item)`
-    paddingtop: 20px;
-`;
-const TableTitle = styled.span`
-    font-size: 20px;
-`;
-
-type Props = {
-    title: string;
-    data?: Entity[];
-};
-
-export const LineageTable = ({ data, title }: Props) => {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <LineageList
-            bordered
-            dataSource={data}
-            header={<TableTitle>{title}</TableTitle>}
-            renderItem={(item) => (
-                <ListItem>
-                    <VisiblitySensor partialVisibility>
-                        {({ isVisible }) =>
-                            isVisible && !!item.type ? (
-                                entityRegistry.renderPreview(item.type, PreviewType.PREVIEW, item)
-                            ) : (
-                                <ItemPlaceholder />
-                            )
-                        }
-                    </VisiblitySensor>
-                </ListItem>
-            )}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/TabHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/TabHeader.tsx
deleted file mode 100644
index 3a6b909f016df6..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/TabHeader.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Icon } from '@components';
-import { Input } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-
-const StyledInput = styled(Input)`
-    border-radius: 70px;
-    max-width: 300px;
-`;
-
-const TableHeader = styled.div`
-    padding: 8px 16px;
-    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
-`;
-
-interface Props {
-    setFilterText: (text: string) => void;
-}
-
-export default function TabHeader({ setFilterText }: Props) {
-    return (
-        <TableHeader>
-            <StyledInput
-                placeholder="Search in properties..."
-                onChange={(e) => setFilterText(e.target.value)}
-                allowClear
-                prefix={<Icon icon="MagnifyingGlass" source="phosphor" />}
-            />
-        </TableHeader>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/types.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/types.ts
index 2e6445a8c9cecc..1ced9d80ce431d 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/types.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/types.ts
@@ -5,7 +5,7 @@ export interface ValueColumnData {
     entity: Entity | null;
 }
 
-export interface TypeData {
+interface TypeData {
     type: string;
     nativeDataType: string;
 }
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useStructuredProperties.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useStructuredProperties.tsx
index 79882dc886bfb5..c6398ba7fb7a80 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useStructuredProperties.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useStructuredProperties.tsx
@@ -13,7 +13,7 @@ const typeNameToType = {
     NumberValue: { type: 'number', nativeDataType: 'float' },
 };
 
-export function mapStructuredPropertyValues(structuredPropertiesEntry: StructuredPropertiesEntry) {
+function mapStructuredPropertyValues(structuredPropertiesEntry: StructuredPropertiesEntry) {
     return structuredPropertiesEntry.values
         .filter((value) => !!value)
         .map((value) => ({
@@ -74,7 +74,7 @@ function getFieldStructuredPropertyRows(fieldPath: string, entityData?: GenericE
     return structuredPropertyRows;
 }
 
-export function findAllSubstrings(s: string): Array<string> {
+function findAllSubstrings(s: string): Array<string> {
     const substrings: Array<string> = [];
 
     for (let i = 0; i < s.length; i++) {
@@ -86,7 +86,7 @@ export function findAllSubstrings(s: string): Array<string> {
     return substrings;
 }
 
-export function createParentPropertyRow(displayName: string, qualifiedName: string): PropertyRow {
+function createParentPropertyRow(displayName: string, qualifiedName: string): PropertyRow {
     return {
         displayName,
         qualifiedName,
@@ -150,7 +150,7 @@ export function identifyAndAddParentRows(rows?: Array<PropertyRow>): Array<Prope
     return finalParents;
 }
 
-export function groupByParentProperty(rows?: Array<PropertyRow>): Array<PropertyRow> {
+function groupByParentProperty(rows?: Array<PropertyRow>): Array<PropertyRow> {
     /**
      * This function takes in an array of PropertyRow objects, representing parent and child properties. Parent properties
      * will not have values, but child properties will. It organizes the rows into the parent and child structure and
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts
deleted file mode 100644
index 9dcd33e3684233..00000000000000
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/useUpdateExpandedRowsFromFilter.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { isEqual } from 'lodash';
-import { useEffect } from 'react';
-
-import usePrevious from '@app/shared/usePrevious';
-
-interface Props {
-    expandedRowsFromFilter: Set<string>;
-    setExpandedRows: React.Dispatch<React.SetStateAction<Set<string>>>;
-}
-
-export default function useUpdateExpandedRowsFromFilter({ expandedRowsFromFilter, setExpandedRows }: Props) {
-    const previousExpandedRowsFromFilter = usePrevious(expandedRowsFromFilter);
-
-    useEffect(() => {
-        if (!isEqual(expandedRowsFromFilter, previousExpandedRowsFromFilter)) {
-            setExpandedRows((previousRows) => {
-                const finalRowsSet = new Set();
-                expandedRowsFromFilter.forEach((row) => finalRowsSet.add(row));
-                previousRows.forEach((row) => finalRowsSet.add(row));
-                return finalRowsSet as Set<string>;
-            });
-        }
-    }, [expandedRowsFromFilter, previousExpandedRowsFromFilter, setExpandedRows]);
-}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/utils.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/utils.ts
index 02c1cbe2d7f410..c2f22e02772bad 100644
--- a/datahub-web-react/src/app/entityV2/shared/tabs/Properties/utils.ts
+++ b/datahub-web-react/src/app/entityV2/shared/tabs/Properties/utils.ts
@@ -1,16 +1,7 @@
-import { GenericEntityProperties } from '@app/entity/shared/types';
+
 import EntityRegistry from '@app/entityV2/EntityRegistry';
 import { PropertyRow, ValueColumnData } from '@app/entityV2/shared/tabs/Properties/types';
 
-import { CustomPropertiesEntry } from '@types';
-
-export function mapCustomPropertiesToPropertyRows(customProperties: CustomPropertiesEntry[]) {
-    return (customProperties?.map((customProp) => ({
-        displayName: customProp.key,
-        values: [{ value: customProp.value || '' }],
-    })) || []) as PropertyRow[];
-}
-
 function matchesName(name: string, filterText: string) {
     return name.toLocaleLowerCase().includes(filterText.toLocaleLowerCase());
 }
@@ -23,12 +14,6 @@ function matchesAnyFromValues(values: ValueColumnData[], filterText: string, ent
     );
 }
 
-export function getFilteredCustomProperties(filterText: string, entityData?: GenericEntityProperties | null) {
-    return entityData?.customProperties?.filter(
-        (property) => matchesName(property.key, filterText) || matchesName(property.value || '', filterText),
-    );
-}
-
 export function filterStructuredProperties(
     entityRegistry: EntityRegistry,
     propertyRows: PropertyRow[],
diff --git a/datahub-web-react/src/app/entityV2/shared/types.ts b/datahub-web-react/src/app/entityV2/shared/types.ts
index 41f3e04b9529cc..db467374101479 100644
--- a/datahub-web-react/src/app/entityV2/shared/types.ts
+++ b/datahub-web-react/src/app/entityV2/shared/types.ts
@@ -36,7 +36,7 @@ export enum TabContextType {
     SEARCH_SIDEBAR,
 }
 
-export type EntityTabProps = {
+type EntityTabProps = {
     /**
      * The render type for the tab, e.g. whether it's full screen / horizontal or compact / vertical
      */
@@ -91,7 +91,3 @@ export type EntitySidebarSection = {
     };
     properties?: any;
 };
-
-export type ResourceType = 'incidents' | 'assertions';
-
-export type QueryType = 'incident_urn' | 'assertion_urn';
diff --git a/datahub-web-react/src/app/entityV2/shared/utils.ts b/datahub-web-react/src/app/entityV2/shared/utils.ts
index 21a3e7396c1d27..213f7b40930fff 100644
--- a/datahub-web-react/src/app/entityV2/shared/utils.ts
+++ b/datahub-web-react/src/app/entityV2/shared/utils.ts
@@ -1,7 +1,6 @@
 import { Maybe } from 'graphql/jsutils/Maybe';
 
 import { GenericEntityProperties } from '@app/entity/shared/types';
-import { TITLE_CASE_EXCEPTION_WORDS } from '@app/entityV2/shared/constants';
 import { OUTPUT_PORTS_FIELD } from '@app/search/utils/constants';
 import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
 import { TimeWindowSize } from '@app/shared/time/timeUtils';
@@ -12,7 +11,6 @@ import {
     DashboardStatsSummary,
     DataPlatform,
     DataProduct,
-    Dataset,
     DatasetProfile,
     DatasetProperties,
     DatasetStatsSummary,
@@ -121,8 +119,6 @@ export function getExternalUrlDisplayName(entity: GenericEntityProperties | null
 
 export const EDITED_DESCRIPTIONS_CACHE_NAME = 'editedDescriptions';
 
-export const FORBIDDEN_URN_CHARS_REGEX = /.*[(),\\].*/;
-
 export enum SidebarTitleActionType {
     LineageExplore = 'Lineage Explore',
 }
@@ -297,37 +293,6 @@ export function getDashboardLastUpdatedMs(
     return { property: 'lastRefreshed', lastUpdatedMs: lastRefreshed };
 }
 
-// return title case of the string with handling exceptions
-export const toProperTitleCase = (str: string) => {
-    return str
-        .toLowerCase()
-        .split(' ')
-        .map((word, index) =>
-            index === 0 || !TITLE_CASE_EXCEPTION_WORDS.includes(word)
-                ? word.charAt(0).toUpperCase() + word.slice(1)
-                : word,
-        )
-        .join(' ');
-};
-
-/**
- * Attempts to extract a description for a sub-resource of an entity, if it exists.
- * @param entity ie dataset
- * @param subResource ie field name
- * @returns the description of the sub-resource if it exists, otherwise undefined
- */
-export const tryExtractSubResourceDescription = (entity: Entity, subResource: string): string | undefined => {
-    // NOTE: we are casting to Dataset, but GlossaryTerms and more future entities can have editableSchemaMetadata
-    // We must do a ? check for editableSchemaMetadata/schemaMetadata to avoid runtime errors
-    const maybeEditableMetadataDescription = (entity as Dataset).editableSchemaMetadata?.editableSchemaFieldInfo?.find(
-        (field) => field.fieldPath === subResource,
-    )?.description;
-    const maybeSchemaMetadataDescription = (entity as Dataset).schemaMetadata?.fields?.find(
-        (field) => field.fieldPath === subResource,
-    )?.description;
-    return maybeEditableMetadataDescription?.valueOf() || maybeSchemaMetadataDescription?.valueOf();
-};
-
 /**
  * Type guard for entity type
  */
diff --git a/datahub-web-react/src/app/entityV2/summary/documentation/DescriptionActionsBar.tsx b/datahub-web-react/src/app/entityV2/summary/documentation/DescriptionActionsBar.tsx
deleted file mode 100644
index 3336a03890c4a7..00000000000000
--- a/datahub-web-react/src/app/entityV2/summary/documentation/DescriptionActionsBar.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ActionsBar, Button } from '@components';
-import React from 'react';
-
-interface Props {
-    onCancel: () => void;
-    onUpdate: () => void;
-    areActionsDisabled?: boolean;
-}
-
-export default function DescriptionActionsBar({ onCancel, onUpdate, areActionsDisabled }: Props) {
-    return (
-        <>
-            <ActionsBar>
-                <Button variant="text" color="gray" onClick={onCancel}>
-                    Cancel
-                </Button>
-                <Button onClick={onUpdate} disabled={areActionsDisabled}>
-                    Publish
-                </Button>
-            </ActionsBar>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/summary/documentation/EmptyDescription.tsx b/datahub-web-react/src/app/entityV2/summary/documentation/EmptyDescription.tsx
deleted file mode 100644
index 52557ba8321c3f..00000000000000
--- a/datahub-web-react/src/app/entityV2/summary/documentation/EmptyDescription.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Text } from '@components';
-import React from 'react';
-
-import { useDescriptionUtils } from '@app/entityV2/summary/documentation/useDescriptionUtils';
-
-export default function EmptyDescription() {
-    const { emptyDescriptionText } = useDescriptionUtils();
-
-    return (
-        <Text color="gray" colorLevel={1800}>
-            {emptyDescriptionText}
-        </Text>
-    );
-}
diff --git a/datahub-web-react/src/app/entityV2/summary/properties/property/properties/LastUpdatedProperty.tsx b/datahub-web-react/src/app/entityV2/summary/properties/property/properties/LastUpdatedProperty.tsx
deleted file mode 100644
index 1e9f1c5d06918b..00000000000000
--- a/datahub-web-react/src/app/entityV2/summary/properties/property/properties/LastUpdatedProperty.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-
-import BaseProperty from '@app/entityV2/summary/properties/property/properties/BaseProperty';
-import { PropertyComponentProps } from '@app/entityV2/summary/properties/types';
-
-export default function LastUpdatedProperty(props: PropertyComponentProps) {
-    // TODO: implement
-    return <BaseProperty {...props} values={[]} renderValue={() => null} />;
-}
diff --git a/datahub-web-react/src/app/entityV2/summary/properties/property/properties/VerificationStatusProperty.tsx b/datahub-web-react/src/app/entityV2/summary/properties/property/properties/VerificationStatusProperty.tsx
deleted file mode 100644
index 7e6a401b6d536f..00000000000000
--- a/datahub-web-react/src/app/entityV2/summary/properties/property/properties/VerificationStatusProperty.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-
-import BaseProperty from '@app/entityV2/summary/properties/property/properties/BaseProperty';
-import { PropertyComponentProps } from '@app/entityV2/summary/properties/types';
-
-export default function VerificationStatusProperty(props: PropertyComponentProps) {
-    // TODO: implement
-    return <BaseProperty {...props} values={[]} renderValue={() => null} />;
-}
diff --git a/datahub-web-react/src/app/entityV2/summary/properties/types.ts b/datahub-web-react/src/app/entityV2/summary/properties/types.ts
index 2556b158a78689..d49b35feee777f 100644
--- a/datahub-web-react/src/app/entityV2/summary/properties/types.ts
+++ b/datahub-web-react/src/app/entityV2/summary/properties/types.ts
@@ -5,10 +5,6 @@ export enum PropertyType {
     Domain = 'domain',
     Owners = 'owners',
     Tags = 'tags',
-    Terms = 'terms',
-    Created = 'created',
-    LastUpdated = 'lastUpdated',
-    VerificationStatus = 'verificationStatus',
     StructuredProperty = 'structuredProperty',
 }
 
@@ -20,18 +16,6 @@ export interface AssetProperty {
     structuredProperty?: StructuredPropertyFieldsFragment;
 }
 
-export interface AssetPropertiesContextType {
-    // Whether properties are editable
-    editable?: boolean;
-
-    properties: AssetProperty[];
-    propertiesLoading?: boolean;
-
-    replace: (newProperty: AssetProperty, position: number) => void;
-    remove: (position: number) => void;
-    add: (newProperty: AssetProperty) => void;
-}
-
 export interface PropertyComponentProps {
     property: AssetProperty;
     position: number;
diff --git a/datahub-web-react/src/app/entityV2/user/UserEditProfileModal.tsx b/datahub-web-react/src/app/entityV2/user/UserEditProfileModal.tsx
index ca6042c3482608..c3ea1cc15bda40 100644
--- a/datahub-web-react/src/app/entityV2/user/UserEditProfileModal.tsx
+++ b/datahub-web-react/src/app/entityV2/user/UserEditProfileModal.tsx
@@ -36,7 +36,7 @@ type Props = {
     editModalData: PropsData;
 };
 /** Regex Validations */
-export const USER_NAME_REGEX = new RegExp('^[a-zA-Z ]*$');
+const USER_NAME_REGEX = new RegExp('^[a-zA-Z ]*$');
 
 export default function UserEditProfileModal({ visible, onClose, onSave, editModalData }: Props) {
     const { config } = useAppConfig();
diff --git a/datahub-web-react/src/app/entityV2/user/UserProfile.tsx b/datahub-web-react/src/app/entityV2/user/UserProfile.tsx
index 5291804d6db5a0..d60e5fe7a8e351 100644
--- a/datahub-web-react/src/app/entityV2/user/UserProfile.tsx
+++ b/datahub-web-react/src/app/entityV2/user/UserProfile.tsx
@@ -31,11 +31,11 @@ import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
 import { useGetUserOwnedAssetsQuery, useGetUserQuery } from '@graphql/user.generated';
 import { EntityRelationship, EntityType } from '@types';
 
-export interface Props {
+interface Props {
     urn: string;
 }
 
-export enum TabType {
+enum TabType {
     Assets = 'Owner Of',
     Groups = 'Groups',
 }
@@ -74,15 +74,6 @@ const UserProfileWrapper = styled.div<{ $isShowNavBarRedesign?: boolean }>`
         props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
 `;
 
-export const EmptyValue = styled.div`
-    &:after {
-        content: 'None';
-        color: #b7b7b7;
-        font-style: italic;
-        font-weight: 100;
-    }
-`;
-
 const ContentContainer = styled.div<{ isVisible: boolean }>`
     flex: 1;
     ${(props) => props.isVisible && 'border-right: 1px solid #e8e8e8;'}
diff --git a/datahub-web-react/src/app/entityV2/view/builder/utils.ts b/datahub-web-react/src/app/entityV2/view/builder/utils.ts
index 131d9bc81582ca..cbc82cdf418757 100644
--- a/datahub-web-react/src/app/entityV2/view/builder/utils.ts
+++ b/datahub-web-react/src/app/entityV2/view/builder/utils.ts
@@ -6,18 +6,7 @@ import {
     UnionType,
 } from '@app/search/utils/constants';
 
-import { DataHubViewType, Entity, EntityType, FacetFilter, FacetFilterInput, LogicalOperator } from '@types';
-
-/**
- * Extract the special "Entity Type" filter values from a list
- * of filters.
- */
-export const extractEntityTypesFilterValues = (filters: Array<FacetFilterInput>) => {
-    // Currently we only support 1 entity type filter.
-    return filters
-        .filter((filter) => filter.field === ENTITY_FILTER_NAME)
-        .flatMap((filter) => filter.values as EntityType[]);
-};
+import { Entity, FacetFilterInput, LogicalOperator } from '@types';
 
 /**
  * Converts the nested subtype filter to be split into entity type filters and subType filters.
@@ -50,42 +39,6 @@ export function convertNestedSubTypeFilter(filters: Array<FacetFilterInput>) {
     return convertedFilters;
 }
 
-/**
- * Build an object representation of a View Definition, which consists of a list of entity types +
- * a set of filters joined in either conjunction or disjunction.
- *
- * @param filters a list of Facet Filter Inputs representing the view filters. This can include the entity type filter.
- * @param operatorType a logical operator to be used when joining the filters into the View definition.
- */
-export const buildViewDefinition = (filters: Array<FacetFilterInput>, operatorType: LogicalOperator) => {
-    const convertedFilters = convertNestedSubTypeFilter(filters);
-    const entityTypes = extractEntityTypesFilterValues(convertedFilters);
-    const filteredFilters = convertedFilters.filter((filter) => filter.field !== ENTITY_FILTER_NAME);
-    return {
-        entityTypes,
-        filter: {
-            operator: operatorType,
-            filters: (filteredFilters.length > 0 ? filteredFilters : []) as FacetFilter[],
-        },
-    };
-};
-
-/**
- * Build an object representation of a View Definition, which consists of a list of entity types +
- * a set of filters joined in either conjunction or disjunction.
- *
- * @param filters a list of Facet Filter Inputs representing the view filters. This can include the entity type filter.
- * @param operatorType a logical operator to be used when joining the filters into the View definition.
- */
-export const buildInitialViewState = (filters: Array<FacetFilterInput>, operatorType: LogicalOperator) => {
-    return {
-        viewType: DataHubViewType.Personal,
-        name: '',
-        description: null,
-        definition: buildViewDefinition(filters, operatorType),
-    };
-};
-
 /**
  * Convert a LogicalOperator to the equivalent UnionType.
  */
diff --git a/datahub-web-react/src/app/entityV2/view/select/ViewSelectContext.tsx b/datahub-web-react/src/app/entityV2/view/select/ViewSelectContext.tsx
index e447d63e60ce32..29b5ddf2738754 100644
--- a/datahub-web-react/src/app/entityV2/view/select/ViewSelectContext.tsx
+++ b/datahub-web-react/src/app/entityV2/view/select/ViewSelectContext.tsx
@@ -18,7 +18,7 @@ type ViewBuilderDisplayState = {
     view?: DataHubView;
 };
 
-export type ViewSelectContextType = {
+type ViewSelectContextType = {
     isInternalOpen: boolean;
     onOpenChangeHandler: () => void;
     privateView: boolean;
@@ -80,7 +80,7 @@ const DEFAULT_CONTEXT: ViewSelectContextType = {
     toggleOpenState: () => {},
 };
 
-export const ViewSelectContext = React.createContext<ViewSelectContextType>(DEFAULT_CONTEXT);
+const ViewSelectContext = React.createContext<ViewSelectContextType>(DEFAULT_CONTEXT);
 
 const DEFAULT_VIEW_BUILDER_DISPLAY_STATE = {
     mode: ViewBuilderMode.EDITOR,
diff --git a/datahub-web-react/src/app/entityV2/view/select/styledComponents.tsx b/datahub-web-react/src/app/entityV2/view/select/styledComponents.tsx
index a0e981f28c29f4..35152d3936fbb6 100644
--- a/datahub-web-react/src/app/entityV2/view/select/styledComponents.tsx
+++ b/datahub-web-react/src/app/entityV2/view/select/styledComponents.tsx
@@ -1,24 +1,10 @@
-import { RightOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
+
 import styled from 'styled-components';
 
 import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants';
 import { VIEW_CARD_MIN_WIDTH } from '@app/entityV2/view/select/constants';
 import { colors, typography } from '@src/alchemy-components';
 
-export const NoMarginButton = styled(Button)`
-    && {
-        margin: 0px;
-    }
-`;
-
-export const StyledRightOutlined = styled(RightOutlined)`
-    && {
-        font-size: 8px;
-        color: ${ANTD_GRAY[7]};
-    }
-`;
-
 export const ViewContainer = styled.div<{
     $selected?: boolean;
     $isShowNavBarRedesign?: boolean;
diff --git a/datahub-web-react/src/app/glossary/BusinessGlossaryPage.tsx b/datahub-web-react/src/app/glossary/BusinessGlossaryPage.tsx
deleted file mode 100644
index f49d732e2c7c7f..00000000000000
--- a/datahub-web-react/src/app/glossary/BusinessGlossaryPage.tsx
+++ /dev/null
@@ -1,164 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Typography } from 'antd';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components/macro';
-
-import { useUserContext } from '@app/context/useUserContext';
-import { sortGlossaryNodes } from '@app/entity/glossaryNode/utils';
-import { sortGlossaryTerms } from '@app/entity/glossaryTerm/utils';
-import CreateGlossaryEntityModal from '@app/entity/shared/EntityDropdown/CreateGlossaryEntityModal';
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext';
-import EmptyGlossarySection from '@app/glossary/EmptyGlossarySection';
-import GlossaryEntitiesList from '@app/glossary/GlossaryEntitiesList';
-import useToggleSidebar from '@app/glossary/useToggleSidebar';
-import { OnboardingTour } from '@app/onboarding/OnboardingTour';
-import {
-    BUSINESS_GLOSSARY_CREATE_TERM_GROUP_ID,
-    BUSINESS_GLOSSARY_CREATE_TERM_ID,
-    BUSINESS_GLOSSARY_INTRO_ID,
-} from '@app/onboarding/config/BusinessGlossaryOnboardingConfig';
-import ToggleSidebarButton from '@app/search/ToggleSidebarButton';
-import { Message } from '@app/shared/Message';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetRootGlossaryNodesQuery, useGetRootGlossaryTermsQuery } from '@graphql/glossary.generated';
-import { EntityType } from '@types';
-
-export const HeaderWrapper = styled(TabToolbar)`
-    padding: 15px 45px 10px 24px;
-    height: auto;
-`;
-
-const GlossaryWrapper = styled.div`
-    display: flex;
-    flex: 1;
-    max-height: inherit;
-`;
-
-const MainContentWrapper = styled.div`
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-`;
-
-const TitleContainer = styled.div`
-    display: flex;
-    align-items: center;
-    gap: 12px;
-`;
-
-export const MAX_BROWSER_WIDTH = 500;
-export const MIN_BROWSWER_WIDTH = 200;
-
-function BusinessGlossaryPage() {
-    const {
-        data: termsData,
-        refetch: refetchForTerms,
-        loading: termsLoading,
-        error: termsError,
-    } = useGetRootGlossaryTermsQuery();
-    const {
-        data: nodesData,
-        refetch: refetchForNodes,
-        loading: nodesLoading,
-        error: nodesError,
-    } = useGetRootGlossaryNodesQuery();
-    const entityRegistry = useEntityRegistry();
-    const { setEntityData } = useGlossaryEntityData();
-    const { isOpen: isSidebarOpen, toggleSidebar } = useToggleSidebar();
-
-    useEffect(() => {
-        setEntityData(null);
-    }, [setEntityData]);
-
-    const terms = termsData?.getRootGlossaryTerms?.terms?.sort((termA, termB) =>
-        sortGlossaryTerms(entityRegistry, termA, termB),
-    );
-    const nodes = nodesData?.getRootGlossaryNodes?.nodes?.sort((nodeA, nodeB) =>
-        sortGlossaryNodes(entityRegistry, nodeA, nodeB),
-    );
-
-    const hasTermsOrNodes = !!nodes?.length || !!terms?.length;
-
-    const [isCreateTermModalVisible, setIsCreateTermModalVisible] = useState(false);
-    const [isCreateNodeModalVisible, setIsCreateNodeModalVisible] = useState(false);
-
-    const user = useUserContext();
-    const canManageGlossaries = user?.platformPrivileges?.manageGlossaries;
-
-    return (
-        <>
-            <OnboardingTour
-                stepIds={[
-                    BUSINESS_GLOSSARY_INTRO_ID,
-                    BUSINESS_GLOSSARY_CREATE_TERM_ID,
-                    BUSINESS_GLOSSARY_CREATE_TERM_GROUP_ID,
-                ]}
-            />
-            <GlossaryWrapper>
-                {(termsLoading || nodesLoading) && (
-                    <Message type="loading" content="Loading Glossary..." style={{ marginTop: '10%' }} />
-                )}
-                {(termsError || nodesError) && (
-                    <Message type="error" content="Failed to load glossary! An unexpected error occurred." />
-                )}
-                <MainContentWrapper data-testid="glossary-entities-list">
-                    <HeaderWrapper>
-                        <TitleContainer>
-                            <ToggleSidebarButton isOpen={isSidebarOpen} onClick={toggleSidebar} />
-                            <Typography.Title style={{ margin: '0' }} level={3}>
-                                Business Glossary
-                            </Typography.Title>
-                        </TitleContainer>
-                        <div>
-                            <Button
-                                data-testid="add-term-button"
-                                id={BUSINESS_GLOSSARY_CREATE_TERM_ID}
-                                disabled={!canManageGlossaries}
-                                type="text"
-                                onClick={() => setIsCreateTermModalVisible(true)}
-                            >
-                                <PlusOutlined /> Add Term
-                            </Button>
-                            <Button
-                                data-testid="add-term-group-button"
-                                id={BUSINESS_GLOSSARY_CREATE_TERM_GROUP_ID}
-                                disabled={!canManageGlossaries}
-                                type="text"
-                                onClick={() => setIsCreateNodeModalVisible(true)}
-                            >
-                                <PlusOutlined /> Add Term Group
-                            </Button>
-                        </div>
-                    </HeaderWrapper>
-                    {hasTermsOrNodes && <GlossaryEntitiesList nodes={nodes || []} terms={terms || []} />}
-                    {!(termsLoading || nodesLoading) && !hasTermsOrNodes && (
-                        <EmptyGlossarySection
-                            title="Empty Glossary"
-                            description="Create Terms and Term Groups to organize data assets using a shared vocabulary."
-                            refetchForTerms={refetchForTerms}
-                            refetchForNodes={refetchForNodes}
-                        />
-                    )}
-                </MainContentWrapper>
-            </GlossaryWrapper>
-            {isCreateTermModalVisible && (
-                <CreateGlossaryEntityModal
-                    entityType={EntityType.GlossaryTerm}
-                    onClose={() => setIsCreateTermModalVisible(false)}
-                    refetchData={refetchForTerms}
-                />
-            )}
-            {isCreateNodeModalVisible && (
-                <CreateGlossaryEntityModal
-                    entityType={EntityType.GlossaryNode}
-                    onClose={() => setIsCreateNodeModalVisible(false)}
-                    refetchData={refetchForNodes}
-                />
-            )}
-        </>
-    );
-}
-
-export default BusinessGlossaryPage;
diff --git a/datahub-web-react/src/app/glossary/EmptyGlossarySection.tsx b/datahub-web-react/src/app/glossary/EmptyGlossarySection.tsx
deleted file mode 100644
index ef6eaa15633bde..00000000000000
--- a/datahub-web-react/src/app/glossary/EmptyGlossarySection.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Empty, Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components/macro';
-
-import { useUserContext } from '@app/context/useUserContext';
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import CreateGlossaryEntityModal from '@app/entity/shared/EntityDropdown/CreateGlossaryEntityModal';
-
-import { EntityType } from '@types';
-
-const StyledEmpty = styled(Empty)`
-    padding: 80px 40px;
-    .ant-empty-footer {
-        .ant-btn:not(:last-child) {
-            margin-right: 8px;
-        }
-    }
-`;
-
-const StyledButton = styled(Button)`
-    margin-right: 8px;
-`;
-
-interface Props {
-    title?: string;
-    description?: string;
-    refetchForTerms?: () => void;
-    refetchForNodes?: () => void;
-}
-
-function EmptyGlossarySection(props: Props) {
-    const { title, description, refetchForTerms, refetchForNodes } = props;
-
-    const [isCreateTermModalVisible, setIsCreateTermModalVisible] = useState(false);
-    const [isCreateNodeModalVisible, setIsCreateNodeModalVisible] = useState(false);
-
-    const user = useUserContext();
-    const canManageGlossaries = user?.platformPrivileges?.manageGlossaries;
-    const { entityData } = useEntityData();
-    const canCreateGlossaryEntity = !!entityData?.privileges?.canManageChildren || canManageGlossaries;
-
-    return (
-        <>
-            <StyledEmpty
-                description={
-                    <>
-                        <Typography.Title level={4}>{title}</Typography.Title>
-                        <Typography.Paragraph type="secondary">{description}</Typography.Paragraph>
-                    </>
-                }
-            >
-                <StyledButton disabled={!canCreateGlossaryEntity} onClick={() => setIsCreateTermModalVisible(true)}>
-                    <PlusOutlined /> Add Term
-                </StyledButton>
-                <StyledButton disabled={!canCreateGlossaryEntity} onClick={() => setIsCreateNodeModalVisible(true)}>
-                    <PlusOutlined /> Add Term Group
-                </StyledButton>
-            </StyledEmpty>
-            {isCreateTermModalVisible && (
-                <CreateGlossaryEntityModal
-                    entityType={EntityType.GlossaryTerm}
-                    onClose={() => setIsCreateTermModalVisible(false)}
-                    refetchData={refetchForTerms}
-                />
-            )}
-            {isCreateNodeModalVisible && (
-                <CreateGlossaryEntityModal
-                    entityType={EntityType.GlossaryNode}
-                    onClose={() => setIsCreateNodeModalVisible(false)}
-                    refetchData={refetchForNodes}
-                />
-            )}
-        </>
-    );
-}
-
-export default EmptyGlossarySection;
diff --git a/datahub-web-react/src/app/glossary/GloassarySearchResultItem.tsx b/datahub-web-react/src/app/glossary/GloassarySearchResultItem.tsx
deleted file mode 100644
index 0bf96126746478..00000000000000
--- a/datahub-web-react/src/app/glossary/GloassarySearchResultItem.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-// Create a new component called SearchResultItem.js
-import React from 'react';
-import Highlight from 'react-highlighter';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components/macro';
-
-import { IconStyleType } from '@app/entity/Entity';
-import EntityRegistry from '@app/entity/EntityRegistry';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { getParentGlossary } from '@app/glossary/utils';
-import ParentEntities from '@app/search/filters/ParentEntities';
-
-import { Entity } from '@types';
-
-type Props = {
-    entity: Entity;
-    entityRegistry: EntityRegistry;
-    query: string;
-    onResultClick: () => void;
-};
-
-const SearchResult = styled(Link)`
-    color: #262626;
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    height: 100%;
-    padding: 6px 8px;
-    width: 100%;
-    &:hover {
-        background-color: ${ANTD_GRAY[3]};
-        color: #262626;
-    }
-`;
-
-const IconWrapper = styled.span``;
-
-const highlightMatchStyle = {
-    fontWeight: 'bold',
-    background: 'none',
-    padding: 0,
-};
-
-function GlossarySearchResultItem({ entity, entityRegistry, query, onResultClick }: Props) {
-    return (
-        <SearchResult to={entityRegistry.getEntityUrl(entity.type, entity.urn)} onClick={onResultClick}>
-            <IconWrapper>{entityRegistry.getIcon(entity.type, 12, IconStyleType.TAB_VIEW)}</IconWrapper>
-            <div>
-                <ParentEntities parentEntities={getParentGlossary(entity, entityRegistry)} />
-                <Highlight matchStyle={highlightMatchStyle} search={query}>
-                    {entityRegistry.getDisplayName(entity.type, entity)}
-                </Highlight>
-            </div>
-        </SearchResult>
-    );
-}
-
-export default GlossarySearchResultItem;
diff --git a/datahub-web-react/src/app/glossary/GlossaryEntitiesList.tsx b/datahub-web-react/src/app/glossary/GlossaryEntitiesList.tsx
deleted file mode 100644
index 34c2e45ce4510e..00000000000000
--- a/datahub-web-react/src/app/glossary/GlossaryEntitiesList.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import GlossaryEntityItem from '@app/glossary/GlossaryEntityItem';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { GlossaryNodeFragment } from '@graphql/fragments.generated';
-import { ChildGlossaryTermFragment } from '@graphql/glossaryNode.generated';
-import { GlossaryNode, GlossaryTerm } from '@types';
-
-const EntitiesWrapper = styled.div`
-    flex: 1;
-    overflow: auto;
-    padding-bottom: 20px;
-`;
-
-interface Props {
-    nodes: (GlossaryNode | GlossaryNodeFragment)[];
-    terms: (GlossaryTerm | ChildGlossaryTermFragment)[];
-}
-
-function GlossaryEntitiesList(props: Props) {
-    const { nodes, terms } = props;
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <EntitiesWrapper>
-            {nodes.map((node) => (
-                <GlossaryEntityItem
-                    name={node.properties?.name || ''}
-                    urn={node.urn}
-                    type={node.type}
-                    count={(node as GlossaryNodeFragment).children?.total}
-                />
-            ))}
-            {terms.map((term) => (
-                <GlossaryEntityItem
-                    name={entityRegistry.getDisplayName(term.type, term)}
-                    urn={term.urn}
-                    type={term.type}
-                />
-            ))}
-        </EntitiesWrapper>
-    );
-}
-
-export default GlossaryEntitiesList;
diff --git a/datahub-web-react/src/app/glossary/GlossaryEntitiesPath.tsx b/datahub-web-react/src/app/glossary/GlossaryEntitiesPath.tsx
deleted file mode 100644
index 9b75436e2c6591..00000000000000
--- a/datahub-web-react/src/app/glossary/GlossaryEntitiesPath.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Breadcrumb } from 'antd';
-import { Maybe } from 'graphql/jsutils/Maybe';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { BreadcrumbItem } from '@app/entity/shared/containers/profile/nav/ProfileNavBrowsePath';
-import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { PageRoutes } from '@conf/Global';
-
-import { GlossaryNode, GlossaryTerm, ParentNodesResult } from '@types';
-
-const PathWrapper = styled.div`
-    border-bottom: 1px solid ${ANTD_GRAY[4.5]};
-    display: flex;
-    padding: 10px 24px;
-`;
-
-const BreadcrumbsWrapper = styled(Breadcrumb)`
-    font-size: 16px;
-`;
-
-function getGlossaryBreadcrumbs(parentNodes: Maybe<ParentNodesResult>, entity: Maybe<GlossaryNode | GlossaryTerm>) {
-    const nodes = parentNodes?.nodes;
-    const breadcrumbs: (GlossaryTerm | GlossaryNode)[] = [...(nodes || [])].reverse();
-    if (entity) breadcrumbs.push(entity);
-    return breadcrumbs;
-}
-
-function GlossaryEntitiesPath() {
-    const entityRegistry = useEntityRegistry();
-    const { entityData } = useGlossaryEntityData();
-
-    const breadcrumbs = getGlossaryBreadcrumbs(entityData?.parentNodes, entityData as GlossaryNode | GlossaryTerm);
-
-    return (
-        <PathWrapper>
-            <BreadcrumbsWrapper separator=">">
-                <BreadcrumbItem>
-                    <Link to={PageRoutes.GLOSSARY}>Glossary</Link>
-                </BreadcrumbItem>
-                {breadcrumbs &&
-                    breadcrumbs.map((node) => {
-                        return (
-                            <BreadcrumbItem key={node.urn}>
-                                <Link to={`${entityRegistry.getEntityUrl(node.type, node.urn)}`}>
-                                    {entityRegistry.getDisplayName(node.type, node)}
-                                </Link>
-                            </BreadcrumbItem>
-                        );
-                    })}
-            </BreadcrumbsWrapper>
-        </PathWrapper>
-    );
-}
-
-export default GlossaryEntitiesPath;
diff --git a/datahub-web-react/src/app/glossary/GlossaryEntityItem.tsx b/datahub-web-react/src/app/glossary/GlossaryEntityItem.tsx
deleted file mode 100644
index b7ef2f054fa510..00000000000000
--- a/datahub-web-react/src/app/glossary/GlossaryEntityItem.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { FolderOutlined, RightOutlined } from '@ant-design/icons';
-import { Maybe } from 'graphql/jsutils/Maybe';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType } from '@types';
-
-const ItemWrapper = styled.div`
-    transition: 0.15s;
-
-    &:hover {
-        background-color: ${ANTD_GRAY[3]};
-    }
-`;
-
-const GlossaryItem = styled.div`
-    align-items: center;
-    border-bottom: 1px solid ${ANTD_GRAY[4]};
-    color: #262626;
-    display: flex;
-    font-size: 14px;
-    font-weight: 700;
-    justify-content: space-between;
-    line-height: 22px;
-    margin: 0 25px;
-    padding: 16px 0;
-
-    .anticon-folder {
-        margin-right: 8px;
-    }
-`;
-
-const StyledRightOutline = styled(RightOutlined)`
-    color: ${ANTD_GRAY[7]};
-    font-size: 12px;
-    margin-right: 20px;
-`;
-
-const CountWrapper = styled.span`
-    color: ${ANTD_GRAY[7]};
-    font-size: 12px;
-    font-weight: normal;
-    margin-left: 7px;
-`;
-
-interface Props {
-    name: string;
-    urn: string;
-    type: EntityType;
-    count?: Maybe<number>;
-}
-
-function GlossaryEntityItem(props: Props) {
-    const { name, urn, type, count } = props;
-
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <Link to={`${entityRegistry.getEntityUrl(type, urn)}`}>
-            <ItemWrapper>
-                <GlossaryItem>
-                    <span>
-                        {type === EntityType.GlossaryNode && <FolderOutlined />}
-                        {name}
-                        <CountWrapper>{count}</CountWrapper>
-                    </span>
-                    {type === EntityType.GlossaryNode && <StyledRightOutline />}
-                </GlossaryItem>
-            </ItemWrapper>
-        </Link>
-    );
-}
-
-export default GlossaryEntityItem;
diff --git a/datahub-web-react/src/app/glossary/GlossaryRoutes.tsx b/datahub-web-react/src/app/glossary/GlossaryRoutes.tsx
deleted file mode 100644
index 3c98e894091ed9..00000000000000
--- a/datahub-web-react/src/app/glossary/GlossaryRoutes.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import React, { useState } from 'react';
-import { Redirect, Route, Switch } from 'react-router-dom';
-import styled from 'styled-components/macro';
-
-import { EntityPage } from '@app/entity/EntityPage';
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { GlossaryEntityContext } from '@app/entityV2/shared/GlossaryEntityContext';
-import BusinessGlossaryPage from '@app/glossary/BusinessGlossaryPage';
-import GlossarySidebar from '@app/glossary/GlossarySidebar';
-import BusinessGlossaryPageV2 from '@app/glossaryV2/BusinessGlossaryPage';
-import { shouldShowGlossary } from '@app/identity/user/UserUtils';
-import { useAppConfig } from '@app/useAppConfig';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { useGetAuthenticatedUser } from '@app/useGetAuthenticatedUser';
-import { useIsThemeV2 } from '@app/useIsThemeV2';
-import { PageRoutes } from '@conf/Global';
-import { Entity } from '@src/types.generated';
-
-const ContentWrapper = styled.div`
-    display: flex;
-    flex: 1;
-    overflow: hidden;
-`;
-
-export default function GlossaryRoutes() {
-    const entityRegistry = useEntityRegistry();
-    const [entityData, setEntityData] = useState<GenericEntityProperties | null>(null);
-    const [urnsToUpdate, setUrnsToUpdate] = useState<string[]>([]);
-    const [isSidebarOpen, setIsSidebarOpen] = useState<boolean>(true);
-    const [nodeToNewEntity, setNodeToNewEntity] = useState<Record<string, Entity>>({});
-    const [nodeToDeletedUrn, setNodeToDeletedUrn] = useState<Record<string, string>>({});
-
-    const appConfig = useAppConfig();
-    const authenticatedUser = useGetAuthenticatedUser();
-    const isThemeV2 = useIsThemeV2();
-    const canManageGlossary = authenticatedUser?.platformPrivileges?.manageGlossaries || false;
-    const hideGlossary = !!appConfig?.config?.visualConfig?.hideGlossary;
-    const showGlossary = shouldShowGlossary(canManageGlossary, hideGlossary);
-
-    const renderPage = (type1: boolean, type2: boolean) => {
-        if (type1) {
-            if (type2) {
-                return <BusinessGlossaryPageV2 />;
-            }
-            return <Redirect to="/" />;
-        }
-        if (type2) {
-            return <BusinessGlossaryPage />;
-        }
-        return <Redirect to="/" />;
-    };
-
-    return (
-        <GlossaryEntityContext.Provider
-            value={{
-                isInGlossaryContext: true,
-                entityData,
-                setEntityData,
-                urnsToUpdate,
-                setUrnsToUpdate,
-                isSidebarOpen,
-                setIsSidebarOpen,
-                nodeToNewEntity,
-                setNodeToNewEntity,
-                nodeToDeletedUrn,
-                setNodeToDeletedUrn,
-            }}
-        >
-            <ContentWrapper>
-                <GlossarySidebar />
-                <Switch>
-                    {entityRegistry.getGlossaryEntities().map((entity) => (
-                        <Route
-                            key={entity.getPathName()}
-                            path={`/${entity.getPathName()}/:urn`}
-                            render={() => <EntityPage entityType={entity.type} />}
-                        />
-                    ))}
-                    <Route path={PageRoutes.GLOSSARY} render={() => renderPage(isThemeV2, showGlossary)} />
-                </Switch>
-            </ContentWrapper>
-        </GlossaryEntityContext.Provider>
-    );
-}
diff --git a/datahub-web-react/src/app/glossary/GlossarySearch.tsx b/datahub-web-react/src/app/glossary/GlossarySearch.tsx
deleted file mode 100644
index 947ca5b2c1796f..00000000000000
--- a/datahub-web-react/src/app/glossary/GlossarySearch.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import React, { useState } from 'react';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import GloassarySearchResultItem from '@app/glossary/GloassarySearchResultItem';
-import { SearchBar } from '@app/search/SearchBar';
-import ClickOutside from '@app/shared/ClickOutside';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated';
-import { EntityType } from '@types';
-
-const GlossarySearchWrapper = styled.div`
-    position: relative;
-`;
-
-const ResultsWrapper = styled.div`
-    background-color: white;
-    border-radius: 5px;
-    box-shadow:
-        0 3px 6px -4px rgb(0 0 0 / 12%),
-        0 6px 16px 0 rgb(0 0 0 / 8%),
-        0 9px 28px 8px rgb(0 0 0 / 5%);
-    max-height: 380px;
-    overflow: auto;
-    padding: 8px;
-    position: absolute;
-    max-height: 210px;
-    overflow: auto;
-    width: calc(100% - 24px);
-    left: 12px;
-    top: 45px;
-`;
-
-const TermNodeName = styled.span`
-    margin-top: 12px;
-    color: ${ANTD_GRAY[8]};
-    font-weight: bold;
-`;
-
-function GlossarySearch() {
-    const [query, setQuery] = useState('');
-    const [isSearchBarFocused, setIsSearchBarFocused] = useState(false);
-    const entityRegistry = useEntityRegistry();
-
-    const { data } = useGetSearchResultsForMultipleQuery({
-        variables: {
-            input: {
-                types: [EntityType.GlossaryTerm, EntityType.GlossaryNode],
-                query,
-                start: 0,
-                count: 50,
-            },
-        },
-        skip: !query,
-    });
-
-    const searchResults = data?.searchAcrossEntities?.searchResults;
-
-    const renderSearchResults = () => (
-        <ResultsWrapper>
-            <TermNodeName>Glossary Terms</TermNodeName>
-            {searchResults?.map((result) => (
-                <GloassarySearchResultItem
-                    key={result.entity.urn}
-                    entity={result.entity}
-                    entityRegistry={entityRegistry}
-                    query={query}
-                    onResultClick={() => setIsSearchBarFocused(false)}
-                />
-            ))}
-        </ResultsWrapper>
-    );
-
-    return (
-        <GlossarySearchWrapper>
-            <ClickOutside onClickOutside={() => setIsSearchBarFocused(false)}>
-                <SearchBar
-                    initialQuery={query || ''}
-                    placeholderText="Search Glossary"
-                    suggestions={[]}
-                    hideRecommendations
-                    style={{
-                        padding: 12,
-                        paddingBottom: 5,
-                    }}
-                    inputStyle={{
-                        height: 30,
-                        fontSize: 12,
-                    }}
-                    onSearch={() => null}
-                    onQueryChange={(q) => setQuery(q)}
-                    entityRegistry={entityRegistry}
-                    onFocus={() => setIsSearchBarFocused(true)}
-                />
-                {isSearchBarFocused && searchResults && !!searchResults.length && renderSearchResults()}
-            </ClickOutside>
-        </GlossarySearchWrapper>
-    );
-}
-
-export default GlossarySearch;
diff --git a/datahub-web-react/src/app/glossary/GlossarySidebar.tsx b/datahub-web-react/src/app/glossary/GlossarySidebar.tsx
deleted file mode 100644
index f317df0cd8a309..00000000000000
--- a/datahub-web-react/src/app/glossary/GlossarySidebar.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React, { useEffect, useState } from 'react';
-
-import { ProfileSidebarResizer } from '@app/entity/shared/containers/profile/sidebar/ProfileSidebarResizer';
-import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext';
-import GlossaryBrowser from '@app/glossary/GlossaryBrowser/GlossaryBrowser';
-import GlossarySearch from '@app/glossary/GlossarySearch';
-import { SidebarWrapper } from '@app/shared/sidebar/components';
-
-export const MAX_BROWSER_WIDTH = 500;
-export const MIN_BROWSWER_WIDTH = 200;
-
-export default function GlossarySidebar() {
-    const [browserWidth, setBrowserWidth] = useState(window.innerWidth * 0.2);
-    const [previousBrowserWidth, setPreviousBrowserWidth] = useState(window.innerWidth * 0.2);
-    const { isSidebarOpen } = useGlossaryEntityData();
-
-    useEffect(() => {
-        if (isSidebarOpen) {
-            setBrowserWidth(previousBrowserWidth);
-        } else {
-            setBrowserWidth(0);
-        }
-    }, [isSidebarOpen, previousBrowserWidth]);
-
-    return (
-        <>
-            <SidebarWrapper width={browserWidth} data-testid="glossary-browser-sidebar">
-                <GlossarySearch />
-                <GlossaryBrowser openToEntity />
-            </SidebarWrapper>
-            <ProfileSidebarResizer
-                setSidePanelWidth={(width) => {
-                    const newWidth = Math.min(Math.max(width, MIN_BROWSWER_WIDTH), MAX_BROWSER_WIDTH);
-                    setBrowserWidth(newWidth);
-                    setPreviousBrowserWidth(newWidth);
-                }}
-                initialSize={browserWidth}
-                isSidebarOnLeft
-            />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/glossary/__tests__/utils.test.ts b/datahub-web-react/src/app/glossary/__tests__/utils.test.ts
deleted file mode 100644
index 5135d5a619a1ba..00000000000000
--- a/datahub-web-react/src/app/glossary/__tests__/utils.test.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { ROOT_NODES, ROOT_TERMS, getGlossaryRootToUpdate, getParentNodeToUpdate } from '@app/glossary/utils';
-import { glossaryNode1, glossaryNode3, glossaryTerm1 } from '@src/Mocks';
-
-import { EntityType } from '@types';
-
-const glossaryTermWithParent = {
-    ...glossaryTerm1,
-    parentNodes: {
-        count: 1,
-        nodes: [glossaryNode1],
-    },
-};
-
-describe('glossary utils tests', () => {
-    it('should get the direct parent node urn in getParentNodeToUpdate for glossary nodes', () => {
-        const parentNode = getParentNodeToUpdate(glossaryNode3 as any, EntityType.GlossaryNode);
-        expect(parentNode).toBe(glossaryNode3.parentNodes?.nodes[0]?.urn);
-    });
-
-    it('should get the direct parent node urn in getParentNodeToUpdate for glossary terms', () => {
-        const parentNode = getParentNodeToUpdate(glossaryTermWithParent as any, EntityType.GlossaryTerm);
-        expect(parentNode).toBe(glossaryNode1.urn);
-    });
-
-    it('should return ROOT_NODES for glossary node with no parent nodes', () => {
-        const parentNode = getParentNodeToUpdate(glossaryNode1 as any, EntityType.GlossaryNode);
-        expect(parentNode).toBe(ROOT_NODES);
-    });
-
-    it('should return ROOT_TERMS for glossary term with no parent nodes', () => {
-        const parentNode = getParentNodeToUpdate(glossaryTerm1 as any, EntityType.GlossaryTerm);
-        expect(parentNode).toBe(ROOT_TERMS);
-    });
-
-    it('should return ROOT_NODES for glossary node', () => {
-        expect(getGlossaryRootToUpdate(EntityType.GlossaryNode)).toBe(ROOT_NODES);
-    });
-
-    it('should return ROOT_TERMS for glossary term', () => {
-        expect(getGlossaryRootToUpdate(EntityType.GlossaryTerm)).toBe(ROOT_TERMS);
-    });
-});
diff --git a/datahub-web-react/src/app/glossary/useToggleSidebar.tsx b/datahub-web-react/src/app/glossary/useToggleSidebar.tsx
deleted file mode 100644
index 913583d628091a..00000000000000
--- a/datahub-web-react/src/app/glossary/useToggleSidebar.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { useGlossaryEntityData } from '@app/entityV2/shared/GlossaryEntityContext';
-import useToggle from '@app/shared/useToggle';
-
-const useToggleSidebar = () => {
-    const { isSidebarOpen, setIsSidebarOpen } = useGlossaryEntityData();
-
-    const { isOpen, toggle: toggleSidebar } = useToggle({
-        initialValue: isSidebarOpen ?? true,
-        onToggle: (isNowOpen: boolean) => {
-            setIsSidebarOpen(isNowOpen);
-        },
-    });
-
-    return { isOpen, toggleSidebar } as const;
-};
-
-export default useToggleSidebar;
diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryContentProvider.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryContentProvider.tsx
index aff7a269bf71ba..7f75eff0969b15 100644
--- a/datahub-web-react/src/app/glossaryV2/GlossaryContentProvider.tsx
+++ b/datahub-web-react/src/app/glossaryV2/GlossaryContentProvider.tsx
@@ -17,7 +17,7 @@ const MainContentWrapper = styled.div`
     flex-direction: column;
 `;
 
-export const HeaderWrapper = styled.div`
+const HeaderWrapper = styled.div`
     padding: 16px 20px 12px 20px;
     display: flex;
     align-items: center;
diff --git a/datahub-web-react/src/app/glossaryV2/GlossaryStatsProvider.tsx b/datahub-web-react/src/app/glossaryV2/GlossaryStatsProvider.tsx
deleted file mode 100644
index 1b9345e1491f5d..00000000000000
--- a/datahub-web-react/src/app/glossaryV2/GlossaryStatsProvider.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import Icon from '@ant-design/icons';
-import { BookmarksSimple } from '@phosphor-icons/react';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-
-import OwnersIcon from '@images/glossary_account_circle.svg?react';
-import ActiveGlossaryTermIcon from '@images/glossary_bookmark_added.svg?react';
-import ApprovedGlossaryTermIcon from '@images/glossary_verified.svg?react';
-
-const StatusWrapper = styled.div`
-    background-color: ${REDESIGN_COLORS.BACKGROUND_PURPLE_2};
-    border-radius: 9px;
-    border: 1px solid ${ANTD_GRAY[1]};
-    background: ${ANTD_GRAY[1]};
-    margin-bottom: 10px;
-    display: flex;
-    justify-content: space-around;
-    padding: 18px;
-`;
-
-const IconWrapper = styled.div`
-    display: flex;
-    margin-bottom: 5px;
-`;
-
-const CountTerms = styled.div`
-    color: ${REDESIGN_COLORS.BACKGROUND_OVERLAY_BLACK};
-    font-family: Mulish;
-    font-size: 20px;
-    font-style: normal;
-    font-weight: 700;
-    line-height: normal;
-    margin-left: 5px;
-`;
-
-const HeaderTitle = styled(Typography)`
-    color: ${REDESIGN_COLORS.BACKGROUND_OVERLAY_BLACK};
-    text-align: center;
-    font-family: Mulish;
-    font-size: 12px;
-    font-style: normal;
-    font-weight: 300;
-    line-height: normal;
-`;
-
-interface Props {
-    totalGlossaryTerms: number;
-    activeGlossaryTerms: number;
-    owners: number;
-    approvedGlossaryTerms: number;
-}
-
-const GlossaryStatsProvider = (props: Props) => {
-    const { totalGlossaryTerms, activeGlossaryTerms, owners, approvedGlossaryTerms } = props;
-
-    return (
-        <StatusWrapper>
-            <div>
-                <IconWrapper>
-                    <BookmarksSimple style={{ fontSize: 26 }} />
-                    <CountTerms>{totalGlossaryTerms} +</CountTerms>
-                </IconWrapper>
-                <HeaderTitle>Total Glossary Terms</HeaderTitle>
-            </div>
-            <div>
-                <IconWrapper>
-                    <Icon style={{ fontSize: 26 }} component={ActiveGlossaryTermIcon} />
-                    <CountTerms>{activeGlossaryTerms} +</CountTerms>
-                </IconWrapper>
-                <HeaderTitle>Active Glossary Terms</HeaderTitle>
-            </div>
-            <div>
-                <IconWrapper>
-                    <Icon style={{ fontSize: 26 }} component={OwnersIcon} />
-                    <CountTerms>{owners}</CountTerms>
-                </IconWrapper>
-                <HeaderTitle>Owners?</HeaderTitle>
-            </div>
-            <div>
-                <IconWrapper>
-                    <Icon style={{ fontSize: 26 }} component={ApprovedGlossaryTermIcon} />
-                    <CountTerms>{approvedGlossaryTerms}</CountTerms>
-                </IconWrapper>
-                <HeaderTitle>Approved Glossary</HeaderTitle>
-            </div>
-        </StatusWrapper>
-    );
-};
-
-export default GlossaryStatsProvider;
diff --git a/datahub-web-react/src/app/glossaryV2/colorUtils.ts b/datahub-web-react/src/app/glossaryV2/colorUtils.ts
index 8ac7d28374b974..dfafd358ad6d4d 100644
--- a/datahub-web-react/src/app/glossaryV2/colorUtils.ts
+++ b/datahub-web-react/src/app/glossaryV2/colorUtils.ts
@@ -1,8 +1,8 @@
 import { useCustomTheme } from '@src/customThemeContext';
 
-export type ColorPalette = { [key: string]: string };
+type ColorPalette = { [key: string]: string };
 
-export const GlossaryV2PaletteColors: ColorPalette = {
+const GlossaryV2PaletteColors: ColorPalette = {
     PASTEL_LAVENDER: '#9386E2',
     PURPLE: '#9254DE',
     LIGHT_BLUE: '#85A5FF',
diff --git a/datahub-web-react/src/app/govern/Dashboard/components.tsx b/datahub-web-react/src/app/govern/Dashboard/components.tsx
deleted file mode 100644
index 647f00b18175ac..00000000000000
--- a/datahub-web-react/src/app/govern/Dashboard/components.tsx
+++ /dev/null
@@ -1,241 +0,0 @@
-import { Select, Typography } from 'antd';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-
-export const Layout = styled.div<{ $isShowNavBarRedesign?: boolean }>`
-    overflow: hidden;
-    margin: ${(props) => (props.$isShowNavBarRedesign ? '5px' : '0 16px 12px 0')};
-    border-radius: ${(props) =>
-        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    background-color: #fff;
-    ${(props) => props.$isShowNavBarRedesign && `box-shadow: ${props.theme.styles['box-shadow-navbar-redesign']};`}
-`;
-
-export const Header = styled.div`
-    display: flex;
-    min-height: 85px;
-    align-items: center;
-    justify-content: space-between;
-    padding: 16px 20px 20px 20px;
-`;
-
-export const TabsContainer = styled.div<{ isThemeV2: boolean; formCreationEnabled: boolean }>`
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 1rem;
-
-    ${(props) =>
-        !props.formCreationEnabled
-            ? `
-        
-        height: 50px;
-        border-bottom: 1px solid #e8ebed;
-
-        .ant-tabs {
-            margin-bottom: -17px;
-        }
-
-        .ant-tabs-tab {
-            font-size: 16px;
-        }
-
-    `
-            : `
-
-        align-items: center;
-        height: 70px;
-
-        .ant-tabs-nav {
-            margin: 0;
-
-            &:before {
-                border-bottom: none !important;
-            }
-        }
-
-        .ant-tabs-ink-bar {
-            display: none;
-        }
-
-        .ant-tabs-tab {
-            font-size: 14px;
-            font-weight: 600;
-            color: ${REDESIGN_COLORS.GREY_300};
-            padding: 8px 16px !important;
-            border-radius: 36px;
-            border: 1px solid ${REDESIGN_COLORS.GREY_100};
-            background-color: ${REDESIGN_COLORS.WHITE};
-        }
-
-        ${
-            props.isThemeV2 &&
-            `
-                .ant-tabs-tab-active  {
-                    background-color: ${REDESIGN_COLORS.PURPLE_LIGHT};
-                    border: 1px solid ${REDESIGN_COLORS.PURPLE_LIGHT};
-                }
-                
-                .ant-tabs-tab-active .ant-tabs-tab-btn {
-                    color: ${props.theme.styles['primary-color']};
-                }
-            `
-        }
-    `}
-`;
-
-export const SeriesContainer = styled.div`
-    display: flex;
-    align-items: center;
-    margin-right: 1rem;
-`;
-
-export const SeriesButtons = styled.div`
-    display: flex;
-    align-items: center;
-
-    button {
-        box-shadow: none;
-        margin-left: -1px;
-        font-weight: 400;
-        font-size: 12px;
-
-        &:first-child {
-            border-top-right-radius: 0;
-            border-bottom-right-radius: 0;
-        }
-
-        &:not(:first-child):not(:last-child) {
-            border-radius: 0;
-        }
-
-        &:last-child {
-            border-top-left-radius: 0;
-            border-bottom-left-radius: 0;
-        }
-    }
-`;
-
-export const SeriesLabel = styled.div`
-    font-size: 10px;
-    margin-right: 0.5rem;
-    opacity: 0.75;
-`;
-
-export const BodyHeader = styled.div`
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 1rem;
-    height: 40px;
-
-    svg {
-        opacity: 0.25;
-
-        &:hover {
-            opacity: 0.75;
-        }
-    }
-`;
-
-export const DataFreshness = styled.div`
-    span {
-        display: flex;
-        align-items: center;
-
-        &:hover {
-            cursor: default;
-        }
-    }
-
-    svg {
-        color: orange;
-        margin-right: 0.15rem;
-    }
-`;
-
-export const Filters = styled.div`
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-`;
-
-export const Body = styled.div<{ $isShowNavBarRedesign?: boolean }>`
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    background-color: ${(props) => (props.$isShowNavBarRedesign ? 'white' : '#f8f9fa')};
-    padding: 1rem;
-`;
-
-export const TabBody = styled.div`
-    overflow: auto;
-    height: calc(100% - 70px);
-`;
-
-export const ChartGroup = styled.div`
-    width: 100%;
-    margin-bottom: 2rem;
-`;
-
-export const Row = styled.div`
-    display: flex;
-    gap: 1rem;
-    width: 100%;
-`;
-
-export const PrimaryHeading = styled(Typography.Text)`
-    font-size: 24px;
-    font-weight: 600;
-`;
-
-export const SecondaryHeading = styled(Typography.Text)`
-    display: block;
-    font-size: 18px;
-    font-weight: 600;
-    margin-bottom: 0.5rem;
-    color: inherit;
-`;
-
-export const StatusSeriesWrapper = styled.div`
-    width: 100%;
-`;
-
-export const StatusSeriesHeading = styled(Typography.Text)`
-    display: block;
-    font-size: 18px;
-    font-weight: 600;
-    margin-top: 0.5rem;
-    color: #00615f;
-`;
-
-export const StatusSeriesDescription = styled(Typography.Text)`
-    display: block;
-    font-size: 12px;
-    font-weight: 400;
-    color: ${ANTD_GRAY[7]};
-    max-width: 85%;
-`;
-
-export const ChartPerformanceItems = styled.div`
-    width: 100%;
-`;
-
-export const ChartPerformanceItem = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    width: 100%;
-    margin-top: 1rem;
-`;
-
-export const StyledSelect = styled(Select)`
-    .ant-select-arrow {
-        color: black;
-    }
-`;
diff --git a/datahub-web-react/src/app/govern/structuredProperties/styledComponents.ts b/datahub-web-react/src/app/govern/structuredProperties/styledComponents.ts
index 78f98a5f87c174..bf3e9c837f0077 100644
--- a/datahub-web-react/src/app/govern/structuredProperties/styledComponents.ts
+++ b/datahub-web-react/src/app/govern/structuredProperties/styledComponents.ts
@@ -1,4 +1,4 @@
-import { Checkbox, Collapse, Divider, Drawer, Form, Modal, Select, Spin, Typography } from 'antd';
+import { Collapse, Divider, Drawer, Form, Spin, Typography } from 'antd';
 import styled from 'styled-components';
 
 import { Icon, colors, typography } from '@src/alchemy-components';
@@ -138,41 +138,10 @@ export const ViewFieldsContainer = styled.div`
     gap: 24px;
 `;
 
-export const CheckboxWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    margin: 10px 0;
-    color: #374066;
-    p {
-        color: #374066;
-        font-weight: 500;
-    }
-`;
-
-export const StyledCheckbox = styled(Checkbox)`
-    .ant-checkbox-checked .ant-checkbox-inner {
-        background-color: ${(props) => props.theme.styles['primary-color']};
-        border-color: ${(props) => props.theme.styles['primary-color']} !important;
-    }
-`;
-
-export const StyledText = styled.div`
-    display: inline-flex;
-    margin-left: -4px;
-`;
-
 export const StyledFormItem = styled(Form.Item)`
     margin: 0;
 `;
 
-export const SupItemsContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    gap: 32px;
-    padding-top: 32px;
-`;
-
 export const StyledFormSubItem = styled(StyledFormItem)`
     padding-top: 32px;
     padding-left: 24px;
@@ -266,19 +235,6 @@ export const StyledSpin = styled(Spin)`
     color: ${(props) => props.theme.styles['primary-color']};
 `;
 
-export const CreatedByContainer = styled.div`
-    display: inline-flex;
-    align-items: center;
-    gap: 4px;
-    padding: 3px 6px 3px 4px;
-    border-radius: 20px;
-    border: 1px solid ${colors.gray[1400]};
-
-    :hover {
-        cursor: pointer;
-    }
-`;
-
 export const SubTextContainer = styled.div`
     display: flex;
     align-items: center;
@@ -310,26 +266,6 @@ export const ValueType = styled.div`
     padding: 2px 4px;
 `;
 
-export const StyledModal = styled(Modal)`
-    font-family: Mulish;
-
-    &&& .ant-modal-content {
-        box-shadow: 0px 4px 12px 0px rgba(9, 1, 61, 0.12);
-        border-radius: 12px;
-        width: 452px;
-    }
-
-    .ant-modal-header {
-        border-top-left-radius: 12px !important;
-        border-top-right-radius: 12px !important;
-        padding: 20px 20px 8px 20px;
-    }
-
-    .ant-modal-body {
-        padding: 0;
-    }
-`;
-
 export const FieldGroupContainer = styled.div`
     display: grid;
     margin-bottom: 8px;
@@ -389,66 +325,12 @@ export const FormContainer = styled.div`
     display: grid;
 `;
 
-export const ModalFooter = styled.div`
-    display: flex;
-    gap: 16px;
-    justify-content: end;
-`;
-
 export const VerticalDivider = styled(Divider)`
     color: ${colors.gray[1400]};
     height: 20px;
     width: 2px;
 `;
 
-export const StyledSelect = styled(Select)`
-    font-family: ${typography.fonts.body};
-
-    .ant-select-selector {
-        height: 50px !important;
-        border-radius: 8px !important;
-        outline: 2px solid transparent !important;
-
-        &:hover,
-        &:focus-within {
-            border: 1px solid ${colors.violet[200]} !important;
-            outline: 2px solid ${colors.violet[200]} !important;
-            box-shadow: none !important;
-        }
-    }
-
-    .ant-select-selection-item {
-        p {
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            overflow: hidden;
-        }
-    }
-
-    .ant-select-selection-placeholder {
-        display: flex;
-        align-items: center;
-        font-size: 14px;
-        color: ${colors.gray[400]};
-    }
-`;
-
-export const CustomDropdown = styled.div`
-    .ant-select-item-option-content {
-        white-space: normal;
-    }
-`;
-
-export const SelectOptionContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    padding: 4px 0;
-
-    p {
-        line-height: 20px;
-    }
-`;
-
 export const StyledDivider = styled(Divider)`
     color: ${colors.gray[1400]};
     margin: 16px 0;
diff --git a/datahub-web-react/src/app/govern/structuredProperties/utils.ts b/datahub-web-react/src/app/govern/structuredProperties/utils.ts
index c85dcf308d2823..f1a03f11f7540c 100644
--- a/datahub-web-react/src/app/govern/structuredProperties/utils.ts
+++ b/datahub-web-react/src/app/govern/structuredProperties/utils.ts
@@ -11,7 +11,6 @@ import {
     DISPLAY_NAME_FILTER_NAME,
     ENTITY_TYPES_FILTER_NAME,
     IS_HIDDEN_PROPERTY_FILTER_NAME,
-    SHOW_IN_ASSET_SUMMARY_PROPERTY_FILTER_NAME,
     SHOW_IN_COLUMNS_TABLE_PROPERTY_FILTER_NAME,
     VALUE_TYPE_FIELD_NAME,
 } from '@src/app/search/utils/constants';
@@ -241,14 +240,6 @@ export const getShowInColumnsTablePropertyFilter = () => {
     return columnsTableFilter;
 };
 
-export const getShowInAssetSummaryPropertyFilter = () => {
-    const assetSummaryFilter: FacetFilterInput = {
-        field: SHOW_IN_ASSET_SUMMARY_PROPERTY_FILTER_NAME,
-        values: ['true'],
-    };
-    return assetSummaryFilter;
-};
-
 export const getEntityTypesPropertyFilter = (
     entityRegistry: EntityRegistry,
     isSchemaField: boolean,
diff --git a/datahub-web-react/src/app/home/AcrylDemoBanner.tsx b/datahub-web-react/src/app/home/AcrylDemoBanner.tsx
deleted file mode 100644
index 34a0d7aa44932e..00000000000000
--- a/datahub-web-react/src/app/home/AcrylDemoBanner.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import Link from 'antd/lib/typography/Link';
-import React from 'react';
-import styled from 'styled-components';
-
-import DataHubLogo from '@images/datahublogo.png';
-
-const BannerWrapper = styled.div`
-    padding: 12px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: #262626;
-    background-color: #e6f4ff;
-    width: 100%;
-    margin-bottom: 24px;
-`;
-
-const Logo = styled.img`
-    margin-right: 12px;
-    width: 40px;
-`;
-
-const TextWrapper = styled.div`
-    font-size: 14px;
-`;
-
-const Title = styled.div`
-    font-weight: 700;
-`;
-
-const StyledLink = styled(Link)`
-    color: #1890ff;
-    font-weight: 700;
-`;
-
-const TextContent = styled.div`
-    max-width: 1025px;
-`;
-
-export default function AcrylDemoBanner() {
-    return (
-        <BannerWrapper>
-            <Logo src={DataHubLogo} />
-            <TextWrapper>
-                <Title>Schedule a Demo of DataHub Cloud</Title>
-                <TextContent>
-                    DataHub is already the industry&apos;s #1 Open Source Data Catalog.{' '}
-                    <StyledLink
-                        href="https://www.datahub.com/demo?utm_source=datahub&utm_medium=referral&utm_campaign=acryl_signup"
-                        target="_blank"
-                        rel="noopener noreferrer"
-                    >
-                        Schedule a demo
-                    </StyledLink>{' '}
-                    of DataHub Cloud to see the advanced features that take it to the next level or purchase DataHub
-                    Cloud on{' '}
-                    <StyledLink
-                        href="https://aws.amazon.com/marketplace/pp/prodview-ratzv4k453pck?sr=0-1&ref_=beagle&applicationId=AWSMPContessa"
-                        target="_blank"
-                        rel="noopener noreferrer"
-                    >
-                        AWS Marketplace
-                    </StyledLink>
-                    !
-                </TextContent>
-            </TextWrapper>
-        </BannerWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/home/DeprecationBanner.tsx b/datahub-web-react/src/app/home/DeprecationBanner.tsx
deleted file mode 100644
index 36a3b8949bcebf..00000000000000
--- a/datahub-web-react/src/app/home/DeprecationBanner.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Icon } from '@components';
-import React from 'react';
-import { Link } from 'react-router-dom';
-
-import PageBanner from '@app/sharedV2/PageBanner';
-import { useIsThemeV2Toggleable } from '@app/useIsThemeV2';
-import { PageRoutes } from '@conf/Global';
-
-export default function DeprecationBanner() {
-    const [isThemeV2Toggleable] = useIsThemeV2Toggleable();
-
-    const linkContent = (
-        <span>
-            {String.fromCodePoint(128064)}&nbsp; DataHub has a new look! Preview it now under{' '}
-            <Link to={`${PageRoutes.SETTINGS}/preferences`}>Appearance &gt; Try New User Experience</Link> before the
-            current UI goes away with v1.3.0.
-        </span>
-    );
-    const staticContent = (
-        <>
-            {String.fromCodePoint(128064)}&nbsp; DataHub has a new look! Contact your Admin to unlock the new interface
-            before the current UI goes away with v1.3.0.
-        </>
-    );
-
-    const content = isThemeV2Toggleable ? linkContent : staticContent;
-
-    return (
-        <PageBanner
-            localStorageKey="v1UIDeprecationAnnouncement"
-            icon={<Icon icon="ExclamationMark" color="red" weight="fill" source="phosphor" />}
-            content={content}
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/home/HomePage.tsx b/datahub-web-react/src/app/home/HomePage.tsx
deleted file mode 100644
index 570f45191171de..00000000000000
--- a/datahub-web-react/src/app/home/HomePage.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, { useEffect } from 'react';
-
-import analytics, { EventType } from '@app/analytics';
-import DeprecationBanner from '@app/home/DeprecationBanner';
-import { HomePageBody } from '@app/home/HomePageBody';
-import { HomePageHeader } from '@app/home/HomePageHeader';
-import { OnboardingTour } from '@app/onboarding/OnboardingTour';
-import {
-    GLOBAL_WELCOME_TO_DATAHUB_ID,
-    HOME_PAGE_DOMAINS_ID,
-    HOME_PAGE_INGESTION_ID,
-    HOME_PAGE_MOST_POPULAR_ID,
-    HOME_PAGE_PLATFORMS_ID,
-    HOME_PAGE_SEARCH_BAR_ID,
-} from '@app/onboarding/config/HomePageOnboardingConfig';
-
-export const HomePage = () => {
-    useEffect(() => {
-        analytics.event({ type: EventType.HomePageViewEvent });
-    }, []);
-    return (
-        <>
-            <OnboardingTour
-                stepIds={[
-                    GLOBAL_WELCOME_TO_DATAHUB_ID,
-                    HOME_PAGE_INGESTION_ID,
-                    HOME_PAGE_DOMAINS_ID,
-                    HOME_PAGE_PLATFORMS_ID,
-                    HOME_PAGE_MOST_POPULAR_ID,
-                    HOME_PAGE_SEARCH_BAR_ID,
-                ]}
-            />
-            <DeprecationBanner />
-            <HomePageHeader />
-            <HomePageBody />
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/home/HomePageBody.tsx b/datahub-web-react/src/app/home/HomePageBody.tsx
deleted file mode 100644
index 60efa7487abf83..00000000000000
--- a/datahub-web-react/src/app/home/HomePageBody.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { useUserContext } from '@app/context/useUserContext';
-import { HomePageRecommendations } from '@app/home/HomePageRecommendations';
-
-const BodyContainer = styled.div`
-    padding: 20px 100px;
-    margin: 0;
-    background-color: ${(props) => props.theme.styles['homepage-background-lower-fade']};
-    > div {
-        margin-bottom: 20px;
-    }
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-`;
-
-export const HomePageBody = () => {
-    const user = useUserContext()?.user;
-    return <BodyContainer>{user && <HomePageRecommendations user={user} />}</BodyContainer>;
-};
diff --git a/datahub-web-react/src/app/home/HomePageHeader.tsx b/datahub-web-react/src/app/home/HomePageHeader.tsx
deleted file mode 100644
index 24625384429e26..00000000000000
--- a/datahub-web-react/src/app/home/HomePageHeader.tsx
+++ /dev/null
@@ -1,316 +0,0 @@
-import { RightOutlined } from '@ant-design/icons';
-import { Button, Image, Row, Tag, Typography } from 'antd';
-import { debounce } from 'lodash';
-import React, { useEffect, useMemo, useState } from 'react';
-import { useHistory } from 'react-router';
-import styled, { useTheme } from 'styled-components/macro';
-
-import analytics, { EventType } from '@app/analytics';
-import { useUserContext } from '@app/context/useUserContext';
-import DemoButton from '@app/entity/shared/components/styled/DemoButton';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { HALF_SECOND_IN_MS } from '@app/entity/shared/tabs/Dataset/Queries/utils/constants';
-import AcrylDemoBanner from '@app/home/AcrylDemoBanner';
-import { HOME_PAGE_SEARCH_BAR_ID } from '@app/onboarding/config/HomePageOnboardingConfig';
-import { SearchBar } from '@app/search/SearchBar';
-import { getAutoCompleteInputFromQuickFilter } from '@app/search/utils/filterUtils';
-import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl';
-import { ManageAccount } from '@app/shared/ManageAccount';
-import { HeaderLinks } from '@app/shared/admin/HeaderLinks';
-import { useAppConfig, useIsShowAcrylInfoEnabled } from '@app/useAppConfig';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { useQuickFiltersContext } from '@providers/QuickFiltersContext';
-import { DEFAULT_APP_CONFIG } from '@src/appConfigContext';
-
-import {
-    GetAutoCompleteMultipleResultsQuery,
-    useGetAutoCompleteMultipleResultsLazyQuery,
-    useGetSearchResultsForMultipleQuery,
-} from '@graphql/search.generated';
-import { EntityType, FacetFilterInput } from '@types';
-
-const Background = styled.div`
-    width: 100%;
-    background-image: linear-gradient(
-        ${(props) => props.theme.styles['homepage-background-upper-fade']},
-        75%,
-        ${(props) => props.theme.styles['homepage-background-lower-fade']}
-    );
-`;
-
-const WelcomeText = styled(Typography.Text)`
-    font-size: 16px;
-    color: ${(props) =>
-        props.theme.styles['homepage-text-color'] || props.theme.styles['homepage-background-lower-fade']};
-`;
-
-const styles = {
-    navBar: { padding: '24px' },
-    searchContainer: { width: '100%', marginTop: '40px' },
-    logoImage: { width: 140 },
-    searchBox: { width: '50vw', minWidth: 400, margin: '40px 0px', marginBottom: '12px', maxWidth: '650px' },
-    subtitle: { marginTop: '28px', color: '#FFFFFF', fontSize: 12 },
-};
-
-const HeaderContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    margin-top: 20px;
-    margin-bottom: 20px;
-`;
-
-const NavGroup = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-`;
-
-const SuggestionsContainer = styled.div`
-    margin: 0px 30px;
-    max-width: 650px;
-    width: 50vw;
-    display: flex;
-    flex-direction: column;
-    justify-content: left;
-    align-items: start;
-`;
-
-const SuggestionsHeader = styled.div`
-    display: flex;
-    justify-content: space-between;
-    width: 100%;
-`;
-
-const SuggestionTagContainer = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-    flex-wrap: wrap;
-    > div {
-        margin-bottom: 12px;
-    }
-`;
-
-const SuggestionButton = styled(Button)`
-    padding: 0px;
-    margin-bottom: 16px;
-`;
-
-const SuggestionTag = styled(Tag)`
-    font-weight: 500;
-    font-size: 12px;
-    margin-bottom: 20px;
-    && {
-        padding: 8px 16px;
-    }
-`;
-
-const SuggestedQueriesText = styled(Typography.Text)`
-    margin-left: 12px;
-    margin-bottom: 12px;
-    color: ${ANTD_GRAY[8]};
-`;
-
-const SearchBarContainer = styled.div`
-    text-align: center;
-`;
-
-const ExploreAllButton = styled(Button)`
-    && {
-        padding: 0px;
-        margin: 0px;
-        height: 16px;
-    }
-`;
-
-const StyledRightOutlined = styled(RightOutlined)`
-    &&& {
-        font-size: 7px;
-        margin-left: 4px;
-        padding: 0px;
-    }
-`;
-
-function truncate(input, length) {
-    if (input.length > length) {
-        return `${input.substring(0, length)}...`;
-    }
-    return input;
-}
-
-function sortRandom() {
-    return 0.5 - Math.random();
-}
-
-export const HomePageHeader = () => {
-    const history = useHistory();
-    const entityRegistry = useEntityRegistry();
-    const [getAutoCompleteResultsForMultiple, { data: suggestionsData }] = useGetAutoCompleteMultipleResultsLazyQuery();
-    const userContext = useUserContext();
-    const themeConfig = useTheme();
-    const appConfig = useAppConfig();
-    const [newSuggestionData, setNewSuggestionData] = useState<GetAutoCompleteMultipleResultsQuery | undefined>();
-    const { selectedQuickFilter } = useQuickFiltersContext();
-    const showAcrylInfo = useIsShowAcrylInfoEnabled();
-    const { user } = userContext;
-    const viewUrn = userContext.localState?.selectedViewUrn;
-    const viewsEnabled = appConfig.config?.viewsConfig?.enabled || false;
-
-    useEffect(() => {
-        if (suggestionsData !== undefined) {
-            setNewSuggestionData(suggestionsData);
-        }
-    }, [suggestionsData]);
-
-    const onSearch = (query: string, type?: EntityType, filters?: FacetFilterInput[]) => {
-        analytics.event({
-            type: EventType.HomePageSearchEvent,
-            query,
-            pageNumber: 1,
-            selectedQuickFilterTypes: selectedQuickFilter ? [selectedQuickFilter.field] : undefined,
-            selectedQuickFilterValues: selectedQuickFilter ? [selectedQuickFilter.value] : undefined,
-        });
-        navigateToSearchUrl({
-            type,
-            query,
-            history,
-            filters,
-        });
-    };
-
-    const onAutoComplete = debounce((query: string) => {
-        if (query && query.trim() !== '') {
-            getAutoCompleteResultsForMultiple({
-                variables: {
-                    input: {
-                        query,
-                        limit: 10,
-                        viewUrn,
-                        ...getAutoCompleteInputFromQuickFilter(selectedQuickFilter),
-                    },
-                },
-            });
-        }
-    }, HALF_SECOND_IN_MS);
-
-    const onClickExploreAll = () => {
-        analytics.event({
-            type: EventType.HomePageExploreAllClickEvent,
-        });
-        navigateToSearchUrl({
-            query: '*',
-            history,
-        });
-    };
-
-    // Fetch results
-    const { data: searchResultsData } = useGetSearchResultsForMultipleQuery({
-        variables: {
-            input: {
-                types: [],
-                query: '*',
-                start: 0,
-                count: 6,
-                filters: [],
-                orFilters: [],
-                viewUrn,
-            },
-        },
-    });
-
-    const searchResultsToShow = useMemo(() => {
-        let result: string[] | undefined = [];
-        if (searchResultsData) {
-            const entities = searchResultsData?.searchAcrossEntities?.searchResults?.map((searchResult) => {
-                return searchResult?.entity;
-            });
-
-            result = entities?.map((entity) => {
-                return entityRegistry.getDisplayName(entity.type, entity);
-            });
-        }
-        return result?.sort(sortRandom);
-    }, [searchResultsData, entityRegistry]);
-
-    return (
-        <Background>
-            <Row justify="space-between" style={styles.navBar}>
-                <WelcomeText>
-                    {!!user && (
-                        <>
-                            Welcome back, <b>{entityRegistry.getDisplayName(EntityType.CorpUser, user)}</b>.
-                        </>
-                    )}
-                </WelcomeText>
-                <NavGroup>
-                    <HeaderLinks />
-                    <ManageAccount
-                        urn={user?.urn || ''}
-                        pictureLink={user?.editableProperties?.pictureLink || ''}
-                        name={(user && entityRegistry.getDisplayName(EntityType.CorpUser, user)) || undefined}
-                    />
-                    {showAcrylInfo && <DemoButton />}
-                </NavGroup>
-            </Row>
-            <HeaderContainer>
-                {showAcrylInfo && <AcrylDemoBanner />}
-                <Image
-                    src={
-                        appConfig.config !== DEFAULT_APP_CONFIG
-                            ? appConfig.config.visualConfig.logoUrl || themeConfig.assets.logoUrl
-                            : undefined
-                    }
-                    preview={false}
-                    style={styles.logoImage}
-                />
-                {!!themeConfig.content.subtitle && (
-                    <Typography.Text style={styles.subtitle}>{themeConfig.content.subtitle}</Typography.Text>
-                )}
-                <SearchBarContainer id={HOME_PAGE_SEARCH_BAR_ID}>
-                    <SearchBar
-                        placeholderText={themeConfig.content.search.searchbarMessage}
-                        suggestions={newSuggestionData?.autoCompleteForMultiple?.suggestions || []}
-                        onSearch={onSearch}
-                        onQueryChange={onAutoComplete}
-                        autoCompleteStyle={styles.searchBox}
-                        entityRegistry={entityRegistry}
-                        viewsEnabled={viewsEnabled}
-                        combineSiblings
-                        showQuickFilters
-                        showViewAllResults
-                        showCommandK
-                    />
-                    {searchResultsToShow && searchResultsToShow.length > 0 && (
-                        <SuggestionsContainer>
-                            <SuggestionsHeader>
-                                <SuggestedQueriesText strong>Try searching for</SuggestedQueriesText>
-                                <ExploreAllButton type="link" onClick={onClickExploreAll}>
-                                    Explore all <StyledRightOutlined />
-                                </ExploreAllButton>
-                            </SuggestionsHeader>
-                            <SuggestionTagContainer>
-                                {searchResultsToShow.slice(0, 3).map((suggestion) => (
-                                    <SuggestionButton
-                                        key={suggestion}
-                                        type="link"
-                                        onClick={() =>
-                                            navigateToSearchUrl({
-                                                type: undefined,
-                                                query: `"${suggestion}"`,
-                                                history,
-                                            })
-                                        }
-                                    >
-                                        <SuggestionTag>{truncate(suggestion, 40)}</SuggestionTag>
-                                    </SuggestionButton>
-                                ))}
-                            </SuggestionTagContainer>
-                        </SuggestionsContainer>
-                    )}
-                </SearchBarContainer>
-            </HeaderContainer>
-        </Background>
-    );
-};
diff --git a/datahub-web-react/src/app/home/HomePagePosts.tsx b/datahub-web-react/src/app/home/HomePagePosts.tsx
deleted file mode 100644
index ef516ab8206fba..00000000000000
--- a/datahub-web-react/src/app/home/HomePagePosts.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import { Divider, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { PostLinkCard } from '@app/search/PostLinkCard';
-import { PostTextCard } from '@app/search/PostTextCard';
-import { getHomePagePostsFilters } from '@app/utils/queryUtils';
-
-import { useListPostsQuery } from '@graphql/post.generated';
-import { Post, PostContentType } from '@types';
-
-const RecommendationContainer = styled.div`
-    margin-bottom: 92px;
-    max-width: 1000px;
-`;
-
-const ContentContainer = styled.div`
-    padding-right: 12px;
-    padding-left: 12px;
-`;
-
-const RecommendationTitle = styled(Typography.Title)`
-    margin-top: 0px;
-    margin-bottom: 0px;
-    padding: 0px;
-`;
-
-const ThinDivider = styled(Divider)`
-    margin-top: 12px;
-    margin-bottom: 12px;
-`;
-
-const TextPostsContainer = styled.div`
-    margin-bottom: 12px;
-    display: flex;
-    flex-direction: column;
-    gap: 18px;
-`;
-
-const LinkPostsContainer = styled.div`
-    display: grid;
-    grid-template-columns: 1fr 1fr 1fr;
-    gap: 12px;
-    margin-bottom: 12px;
-`;
-
-export const HomePagePosts = () => {
-    const { data: postsData } = useListPostsQuery({
-        variables: {
-            input: {
-                start: 0,
-                count: 10,
-                orFilters: getHomePagePostsFilters(),
-            },
-        },
-        fetchPolicy: 'cache-first',
-    });
-
-    const textPosts =
-        postsData?.listPosts?.posts?.filter((post) => post?.content?.contentType === PostContentType.Text) || [];
-    const linkPosts =
-        postsData?.listPosts?.posts?.filter((post) => post?.content?.contentType === PostContentType.Link) || [];
-    const hasPosts = textPosts.length > 0 || linkPosts.length > 0;
-    return hasPosts ? (
-        <RecommendationContainer>
-            <RecommendationTitle level={4}>Pinned</RecommendationTitle>
-            <ThinDivider />
-            <ContentContainer>
-                <TextPostsContainer>
-                    {textPosts.map((post) => (
-                        <PostTextCard textPost={post as Post} />
-                    ))}
-                </TextPostsContainer>
-                <LinkPostsContainer>
-                    {linkPosts.map((post) => (
-                        <PostLinkCard linkPost={post as Post} />
-                    ))}
-                </LinkPostsContainer>
-            </ContentContainer>
-        </RecommendationContainer>
-    ) : (
-        <></>
-    );
-};
diff --git a/datahub-web-react/src/app/home/HomePageRecommendations.tsx b/datahub-web-react/src/app/home/HomePageRecommendations.tsx
deleted file mode 100644
index 75c45780109035..00000000000000
--- a/datahub-web-react/src/app/home/HomePageRecommendations.tsx
+++ /dev/null
@@ -1,245 +0,0 @@
-import { Divider, Empty, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { useUserContext } from '@app/context/useUserContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { HomePagePosts } from '@app/home/HomePagePosts';
-import {
-    HOME_PAGE_DOMAINS_ID,
-    HOME_PAGE_MOST_POPULAR_ID,
-    HOME_PAGE_PLATFORMS_ID,
-} from '@app/onboarding/config/HomePageOnboardingConfig';
-import { useToggleEducationStepIdsAllowList } from '@app/onboarding/useToggleEducationStepIdsAllowList';
-import { RecommendationModule } from '@app/recommendations/RecommendationModule';
-import { BrowseEntityCard } from '@app/search/BrowseEntityCard';
-import { useBusinessAttributesFlag } from '@app/useAppConfig';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetEntityCountsQuery } from '@graphql/app.generated';
-import { useListRecommendationsQuery } from '@graphql/recommendations.generated';
-import {
-    CorpUser,
-    EntityType,
-    RecommendationModule as RecommendationModuleType,
-    RecommendationRenderType,
-    ScenarioType,
-} from '@types';
-
-const PLATFORMS_MODULE_ID = 'Platforms';
-const MOST_POPULAR_MODULE_ID = 'HighUsageEntities';
-
-const RecommendationsContainer = styled.div`
-    margin-top: 32px;
-    padding-left: 12px;
-    padding-right: 12px;
-`;
-
-const RecommendationContainer = styled.div`
-    margin-bottom: 32px;
-    max-width: 1000px;
-    min-width: 750px;
-`;
-
-const RecommendationTitle = styled(Typography.Title)`
-    margin-top: 0px;
-    margin-bottom: 0px;
-    padding: 0px;
-`;
-
-const ThinDivider = styled(Divider)`
-    margin-top: 12px;
-    margin-bottom: 12px;
-`;
-
-const BrowseCardContainer = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-    flex-wrap: wrap;
-`;
-
-const NoMetadataEmpty = styled(Empty)`
-    font-size: 18px;
-    color: ${ANTD_GRAY[8]};
-`;
-
-const NoMetadataContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-`;
-
-const DomainsRecomendationContainer = styled.div`
-    margin-top: -48px;
-    margin-bottom: 32px;
-    max-width: 1000px;
-    min-width: 750px;
-`;
-
-function getStepId(moduleId: string) {
-    switch (moduleId) {
-        case PLATFORMS_MODULE_ID:
-            return HOME_PAGE_PLATFORMS_ID;
-        case MOST_POPULAR_MODULE_ID:
-            return HOME_PAGE_MOST_POPULAR_ID;
-        default:
-            return undefined;
-    }
-}
-
-type Props = {
-    user: CorpUser;
-};
-
-const simpleViewEntityTypes = [
-    EntityType.Dataset,
-    EntityType.Chart,
-    EntityType.Dashboard,
-    EntityType.GlossaryNode,
-    EntityType.GlossaryTerm,
-    EntityType.DataProduct,
-];
-
-export const HomePageRecommendations = ({ user }: Props) => {
-    // Entity Types
-    const entityRegistry = useEntityRegistry();
-    const browseEntityList = entityRegistry.getBrowseEntityTypes();
-    const userUrn = user?.urn;
-
-    const userContext = useUserContext();
-    const viewUrn = userContext.localState?.selectedViewUrn;
-
-    const businessAttributesFlag = useBusinessAttributesFlag();
-
-    const showSimplifiedHomepage = user?.settings?.appearance?.showSimplifiedHomepage;
-
-    const { data: entityCountData } = useGetEntityCountsQuery({
-        variables: {
-            input: {
-                types: browseEntityList,
-                viewUrn,
-            },
-        },
-    });
-
-    const orderedEntityCounts = entityCountData?.getEntityCounts?.counts
-        ?.sort((a, b) => {
-            return browseEntityList.indexOf(a.entityType) - browseEntityList.indexOf(b.entityType);
-        })
-        .filter((entityCount) => !showSimplifiedHomepage || simpleViewEntityTypes.indexOf(entityCount.entityType) >= 0);
-
-    // Recommendations
-    const scenario = ScenarioType.Home;
-    const { data } = useListRecommendationsQuery({
-        variables: {
-            input: {
-                userUrn,
-                requestContext: {
-                    scenario,
-                },
-                limit: 10,
-                viewUrn,
-            },
-        },
-        fetchPolicy: 'no-cache',
-    });
-    const recommendationModules = data?.listRecommendations?.modules;
-
-    // Determine whether metadata has been ingested yet.
-    const hasIngestedMetadata =
-        orderedEntityCounts && orderedEntityCounts.filter((entityCount) => entityCount.count > 0).length > 0;
-
-    // we want to render the domain module first if it exists
-    const domainRecommendationModule = recommendationModules?.find(
-        (module) => module.renderType === RecommendationRenderType.DomainSearchList,
-    );
-
-    // Render domain onboarding step if the domains module exists
-    const hasDomains = !!domainRecommendationModule;
-    useToggleEducationStepIdsAllowList(hasDomains, HOME_PAGE_DOMAINS_ID);
-
-    // Render platforms onboarding step if the platforms module exists
-    const hasPlatforms = !!recommendationModules?.some((module) => module?.moduleId === PLATFORMS_MODULE_ID);
-    useToggleEducationStepIdsAllowList(hasPlatforms, HOME_PAGE_PLATFORMS_ID);
-
-    // Render most popular onboarding step if the most popular module exists
-    const hasMostPopular = !!recommendationModules?.some((module) => module?.moduleId === MOST_POPULAR_MODULE_ID);
-    useToggleEducationStepIdsAllowList(hasMostPopular, HOME_PAGE_MOST_POPULAR_ID);
-
-    return (
-        <RecommendationsContainer>
-            <HomePagePosts />
-            {orderedEntityCounts && orderedEntityCounts.length > 0 && (
-                <RecommendationContainer>
-                    {domainRecommendationModule && (
-                        <>
-                            <DomainsRecomendationContainer id={HOME_PAGE_DOMAINS_ID}>
-                                <RecommendationTitle level={4}>{domainRecommendationModule.title}</RecommendationTitle>
-                                <ThinDivider />
-                                <RecommendationModule
-                                    module={domainRecommendationModule as RecommendationModuleType}
-                                    scenarioType={scenario}
-                                    showTitle={false}
-                                />
-                            </DomainsRecomendationContainer>
-                        </>
-                    )}
-                    <RecommendationTitle level={4}>Explore your data</RecommendationTitle>
-                    <ThinDivider />
-                    {hasIngestedMetadata ? (
-                        <BrowseCardContainer>
-                            {orderedEntityCounts.map(
-                                (entityCount) =>
-                                    entityCount &&
-                                    entityCount.count !== 0 &&
-                                    entityCount.entityType !== EntityType.BusinessAttribute && (
-                                        <BrowseEntityCard
-                                            key={entityCount.entityType}
-                                            entityType={entityCount.entityType}
-                                            count={entityCount.count}
-                                        />
-                                    ),
-                            )}
-                            {orderedEntityCounts.map(
-                                (entityCount) =>
-                                    entityCount &&
-                                    entityCount.count !== 0 &&
-                                    entityCount.entityType === EntityType.BusinessAttribute &&
-                                    businessAttributesFlag && (
-                                        <BrowseEntityCard
-                                            key={entityCount.entityType}
-                                            entityType={entityCount.entityType}
-                                            count={entityCount.count}
-                                        />
-                                    ),
-                            )}
-                            {!orderedEntityCounts.some(
-                                (entityCount) => entityCount.entityType === EntityType.GlossaryTerm,
-                            ) && <BrowseEntityCard entityType={EntityType.GlossaryTerm} count={0} />}
-                        </BrowseCardContainer>
-                    ) : (
-                        <NoMetadataContainer>
-                            <NoMetadataEmpty description="No Metadata Found 😢" />
-                        </NoMetadataContainer>
-                    )}
-                </RecommendationContainer>
-            )}
-            {recommendationModules &&
-                recommendationModules
-                    .filter((module) => module.renderType !== RecommendationRenderType.DomainSearchList)
-                    .map((module) => (
-                        <RecommendationContainer id={getStepId(module.moduleId)} key={module.moduleId}>
-                            <RecommendationTitle level={4}>{module.title}</RecommendationTitle>
-                            <ThinDivider />
-                            <RecommendationModule
-                                module={module as RecommendationModuleType}
-                                scenarioType={scenario}
-                                showTitle={false}
-                            />
-                        </RecommendationContainer>
-                    ))}
-        </RecommendationsContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/home/__tests__/HomePage.test.tsx b/datahub-web-react/src/app/home/__tests__/HomePage.test.tsx
deleted file mode 100644
index c53ce975a133f7..00000000000000
--- a/datahub-web-react/src/app/home/__tests__/HomePage.test.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { fireEvent, render, waitFor } from '@testing-library/react';
-import React from 'react';
-
-import { HomePage } from '@app/home/HomePage';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-describe('HomePage', () => {
-    it('renders', async () => {
-        const { getByTestId } = render(
-            <MockedProvider
-                mocks={mocks}
-                addTypename={false}
-                defaultOptions={{
-                    watchQuery: { fetchPolicy: 'no-cache' },
-                    query: { fetchPolicy: 'no-cache' },
-                }}
-            >
-                <TestPageContainer>
-                    <HomePage />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        await waitFor(() => expect(getByTestId('search-input')).toBeInTheDocument());
-    });
-
-    it('renders browsable entities', async () => {
-        const { getByText } = render(
-            <MockedProvider
-                mocks={mocks}
-                addTypename={false}
-                defaultOptions={{
-                    watchQuery: { fetchPolicy: 'no-cache' },
-                    query: { fetchPolicy: 'no-cache' },
-                }}
-            >
-                <TestPageContainer>
-                    <HomePage />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        await waitFor(() => expect(getByText('Datasets')).toBeInTheDocument());
-    });
-
-    it('renders autocomplete results', async () => {
-        const { getByTestId, queryAllByText } = render(
-            <MockedProvider
-                mocks={mocks}
-                addTypename={false}
-                defaultOptions={{
-                    watchQuery: { fetchPolicy: 'no-cache' },
-                    query: { fetchPolicy: 'no-cache' },
-                }}
-            >
-                <TestPageContainer>
-                    <HomePage />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        const searchInput = getByTestId('search-input');
-        await waitFor(() => expect(searchInput).toBeInTheDocument());
-        fireEvent.change(searchInput, { target: { value: 't' } });
-
-        await waitFor(() => expect(queryAllByText('he Great Test Dataset').length).toBeGreaterThanOrEqual(1));
-        expect(queryAllByText('Some Other Dataset').length).toBeGreaterThanOrEqual(1);
-    });
-
-    it('renders search suggestions', async () => {
-        const { getByText, queryAllByText } = render(
-            <MockedProvider
-                mocks={mocks}
-                addTypename
-                defaultOptions={{
-                    watchQuery: { fetchPolicy: 'no-cache' },
-                    query: { fetchPolicy: 'no-cache' },
-                }}
-            >
-                <TestPageContainer>
-                    <HomePage />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        await waitFor(() => expect(getByText('Try searching for')).toBeInTheDocument());
-        expect(queryAllByText('Yet Another Dataset').length).toBeGreaterThanOrEqual(1);
-        expect(queryAllByText('Fourth Test Dataset').length).toBeGreaterThanOrEqual(1);
-    });
-
-    it('renders an explore all link on empty search', async () => {
-        const { getByTestId, queryByText } = render(
-            <MockedProvider
-                mocks={mocks}
-                addTypename
-                defaultOptions={{
-                    watchQuery: { fetchPolicy: 'no-cache' },
-                    query: { fetchPolicy: 'no-cache' },
-                }}
-            >
-                <TestPageContainer>
-                    <HomePage />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        const searchInput = getByTestId('search-input');
-        await waitFor(() => expect(searchInput).toBeInTheDocument());
-        fireEvent.mouseDown(searchInput);
-        await waitFor(() => expect(queryByText('Explore all →')).toBeInTheDocument());
-    });
-});
diff --git a/datahub-web-react/src/app/homeV2/action/learn/Resources.tsx b/datahub-web-react/src/app/homeV2/action/learn/Resources.tsx
deleted file mode 100644
index 358ba2ebebc7cd..00000000000000
--- a/datahub-web-react/src/app/homeV2/action/learn/Resources.tsx
+++ /dev/null
@@ -1,202 +0,0 @@
-import { ApiOutlined } from '@ant-design/icons';
-import { HelpCenterOutlined, OndemandVideoOutlined } from '@mui/icons-material';
-import AutoStoriesOutlinedIcon from '@mui/icons-material/AutoStoriesOutlined';
-import { BookmarkSimple } from '@phosphor-icons/react';
-import { Col, Row, Skeleton } from 'antd';
-import React, { useContext } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { useUserPersona } from '@app/homeV2/persona/useUserPersona';
-import { PersonaType } from '@app/homeV2/shared/types';
-import OnboardingContext from '@app/onboarding/OnboardingContext';
-import { useAppConfig } from '@app/useAppConfig';
-
-const Header = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: start;
-    margin: 8px 0px 20px 0px;
-`;
-
-const Title = styled.div`
-    font-weight: 600;
-    font-size: 14px;
-    color: #434863;
-    word-break: break-word;
-    display: flex;
-    align-items: center;
-`;
-
-const Icon = styled(BookmarkSimple)`
-    margin-right: 8px;
-    color: #9884d4;
-    font-size: 16px;
-`;
-
-const Section = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-    padding: 12px 0px;
-`;
-
-const Card = styled.div`
-    border: 1px solid ${ANTD_GRAY[4]};
-    border-radius: 8px;
-    background-color: #ffffff;
-    overflow: hidden;
-    padding: 12px 20px 20px 20px;
-`;
-
-const ResourceLink = styled.a`
-    color: ${ANTD_GRAY[8]};
-    padding: 0px 16px;
-    font-size: 14px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    opacity: 0.9;
-    transition:
-        transform 0.3s ease,
-        color 0.3s ease,
-        opacity 0.3s ease;
-    :hover {
-        transform: scale(1.05); // Slightly scale up the link on hover
-        opacity: 1;
-        color: #9884d4;
-        text-decoration: underline;
-    }
-`;
-
-const ResourceTitle = styled.div`
-    margin-top: 8px;
-    color: ${ANTD_GRAY[7]};
-    text-align: center;
-    opacity: 0.9;
-    :hover {
-        opacity: 1;
-        color: #9884d4;
-        text-decoration: underline;
-    }
-`;
-
-const Container = styled(Row)`
-    display: flex;
-    flex-direction: column;
-    justify-content: start;
-    gap: 8px;
-    margin: 12px 0;
-    width: 100%;
-`;
-
-const SkeletonCol = styled(Col)`
-    margin-bottom: 5px;
-    display: flex;
-    align-items: center;
-    gap: 1rem;
-`;
-const SkeletonButton = styled(Skeleton.Button)<{ width?: string }>`
-    &&& {
-        width: ${(props) => (props.width ? props.width : '100%')};
-        border-radius: 4px;
-        height: 63px;
-    }
-`;
-
-const ALL_GUIDES = [
-    {
-        id: 'integrations',
-        title: 'Connect Sources',
-        url: 'https://docs.datahub.com/docs/ui-ingestion',
-        icon: ApiOutlined,
-        personas: [PersonaType.TECHNICAL_USER, PersonaType.DATA_ENGINEER],
-    },
-    {
-        id: 'features',
-        title: 'Feature Guides',
-        url: 'https://docs.datahub.com/docs/category/features?utm_source=acryl_datahub_app',
-        icon: HelpCenterOutlined,
-        personas: [
-            PersonaType.TECHNICAL_USER,
-            PersonaType.BUSINESS_USER,
-            PersonaType.DATA_STEWARD,
-            PersonaType.DATA_ENGINEER,
-            PersonaType.DATA_LEADER,
-        ],
-    },
-    {
-        id: 'tutorials',
-        title: 'How-To Tutorials',
-        url: 'https://youtube.com/playlist?list=PLdCtLs64vZvErAXMiqUYH9e63wyDaMBgg&utm_source=acryl_datahub_app&utm_content=tutorials',
-        icon: OndemandVideoOutlined,
-        personas: [PersonaType.TECHNICAL_USER, PersonaType.DATA_ENGINEER, PersonaType.DATA_STEWARD],
-    },
-    {
-        id: 'case-studies',
-        title: 'Case Studies',
-        url: 'https://www.acryldata.io/customer-stories?utm_source=acryl_datahub_app&utm_content=case_studies',
-        icon: OndemandVideoOutlined,
-        personas: [PersonaType.BUSINESS_USER, PersonaType.DATA_LEADER],
-    },
-    {
-        id: 'blog',
-        title: 'Subscribe to the Blog',
-        url: 'https://www.medium.com/datahub-project',
-        icon: AutoStoriesOutlinedIcon,
-        personas: [
-            PersonaType.TECHNICAL_USER,
-            PersonaType.DATA_ENGINEER,
-            PersonaType.BUSINESS_USER,
-            PersonaType.DATA_STEWARD,
-            PersonaType.DATA_LEADER,
-        ],
-    },
-];
-
-export const Resources = () => {
-    const currentUserPersona = useUserPersona();
-    const selectedGuides = ALL_GUIDES.filter(
-        (guide) => !guide.personas || guide.personas.includes(currentUserPersona),
-    ).slice(0, 3);
-    const appConfig = useAppConfig();
-    const { isUserInitializing } = useContext(OnboardingContext);
-
-    if (isUserInitializing || !appConfig.loaded) {
-        return (
-            <Card>
-                <Container>
-                    <SkeletonCol>
-                        <Skeleton.Avatar active size="small" shape="circle" />
-                        <SkeletonButton active size="small" shape="square" block width="10rem" />
-                    </SkeletonCol>
-                    <SkeletonCol>
-                        <SkeletonButton active size="small" shape="square" block />
-                        <SkeletonButton active size="small" shape="square" block />
-                        <SkeletonButton active size="small" shape="square" block />
-                    </SkeletonCol>
-                </Container>
-            </Card>
-        );
-    }
-
-    if (!selectedGuides.length) return null;
-    return (
-        <Card>
-            <Header>
-                <Title>
-                    <Icon /> Resources
-                </Title>
-            </Header>
-            <Section>
-                {selectedGuides.map((guide) => (
-                    <ResourceLink target="_blank" rel="noreferrer noopener" href={guide.url} key={guide.title}>
-                        <guide.icon style={{ fontSize: 16, width: 18, height: 18 }} />
-                        <ResourceTitle>{guide.title}</ResourceTitle>
-                    </ResourceLink>
-                ))}
-            </Section>
-        </Card>
-    );
-};
diff --git a/datahub-web-react/src/app/homeV2/action/nudge/Domains.tsx b/datahub-web-react/src/app/homeV2/action/nudge/Domains.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/homeV2/action/nudge/Glossary.tsx b/datahub-web-react/src/app/homeV2/action/nudge/Glossary.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/homeV2/action/nudge/Ingestion.tsx b/datahub-web-react/src/app/homeV2/action/nudge/Ingestion.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/homeV2/action/nudge/MetadataTests.tsx b/datahub-web-react/src/app/homeV2/action/nudge/MetadataTests.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/homeV2/action/nudge/UserProfile.tsx b/datahub-web-react/src/app/homeV2/action/nudge/UserProfile.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/homeV2/content/recent/constants.ts b/datahub-web-react/src/app/homeV2/content/recent/constants.ts
deleted file mode 100644
index 3bac982f951858..00000000000000
--- a/datahub-web-react/src/app/homeV2/content/recent/constants.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { EntityType } from '@types';
-
-export const ENTITY_TYPES = [
-    EntityType.Dataset,
-    EntityType.Chart,
-    EntityType.Dashboard,
-    EntityType.DataFlow,
-    EntityType.DataJob,
-    EntityType.Container,
-    EntityType.Domain,
-    EntityType.GlossaryTerm,
-    EntityType.GlossaryNode,
-    EntityType.Notebook,
-    EntityType.Mlfeature,
-    EntityType.MlfeatureTable,
-    EntityType.Mlmodel,
-    EntityType.MlmodelGroup,
-    EntityType.MlprimaryKey,
-];
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/CenterTab.tsx b/datahub-web-react/src/app/homeV2/content/tabs/CenterTab.tsx
deleted file mode 100644
index 94952c947f5880..00000000000000
--- a/datahub-web-react/src/app/homeV2/content/tabs/CenterTab.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Tooltip } from '@components';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { CountBadge } from '@app/homeV2/content/tabs/CountBadge';
-
-const Tab = styled.div<{ selected: boolean; disabled: boolean }>`
-    font-size: 14px;
-    line-height: 22px;
-    padding: 10px 16px;
-    border-radius: 6px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    ${(props) => !props.selected && `color: ${ANTD_GRAY[9]};`}
-    ${(props) => props.disabled && `color: ${ANTD_GRAY[6]};`}
-    ${(props) => props.selected && `background-color: ${props.theme.styles['primary-color']};`}
-    ${(props) => props.selected && 'color: #ffffff;'}
-    ${(props) =>
-        !props.disabled &&
-        `:hover {
-            cursor: pointer;
-            ${!props.selected && `color: ${props.theme.styles['primary-color']};`}
-        }`}
-`;
-
-const Name = styled.div`
-    font-size: 14px;
-`;
-
-const tabIconStyle = {
-    fontSize: '16px',
-    marginRight: '10px',
-};
-
-type Props = {
-    id?: string;
-    name: string;
-    description?: string;
-    icon?: any;
-    onClick: () => void;
-    selected: boolean;
-    count?: number;
-    disabled?: boolean;
-};
-
-export const CenterTab = ({ id, name, description, icon: Icon, selected, count, disabled = false, onClick }: Props) => {
-    return (
-        <Tooltip title={description} placement="bottom" showArrow={false}>
-            <Tab
-                id={id}
-                key={name}
-                onClick={() => (!disabled ? onClick() : () => null)}
-                selected={selected}
-                disabled={disabled}
-            >
-                {Icon && <Icon style={tabIconStyle} />}
-                <Name>{name}</Name>
-                {(count && <CountBadge count={count} />) || null}
-            </Tab>
-        </Tooltip>
-    );
-};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/CountBadge.tsx b/datahub-web-react/src/app/homeV2/content/tabs/CountBadge.tsx
deleted file mode 100644
index dbe9e842af6ed9..00000000000000
--- a/datahub-web-react/src/app/homeV2/content/tabs/CountBadge.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-const DEFAULT_BADGE_COLOR = '#3CB47A';
-
-const Badge = styled.div<{ color: string }>`
-    height: 16px;
-    width: 16px;
-    border-radius: 50%;
-    background-color: ${(props) => props.color};
-    font-size: 10px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: #ffffff;
-    margin-left: -4px;
-    margin-top: -12px;
-    border: 1px solid #ffffff;
-`;
-
-type Props = {
-    count: number;
-    color?: string;
-};
-
-export const CountBadge = ({ count, color = DEFAULT_BADGE_COLOR }: Props) => {
-    if (!count) {
-        return null;
-    }
-    return <Badge color={color}>{count}</Badge>;
-};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/activity/ActivityTab.tsx b/datahub-web-react/src/app/homeV2/content/tabs/activity/ActivityTab.tsx
deleted file mode 100644
index a11b466863d47e..00000000000000
--- a/datahub-web-react/src/app/homeV2/content/tabs/activity/ActivityTab.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import React from 'react';
-
-export const ActivityTab = () => {
-    return <>Activate things here.</>;
-};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/AssertionResult.tsx b/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/AssertionResult.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/DocumentationEdit.tsx b/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/DocumentationEdit.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/DomainCreate.tsx b/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/DomainCreate.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/IncidentStatus.tsx b/datahub-web-react/src/app/homeV2/content/tabs/activity/cards/IncidentStatus.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/InsightStatusProvider.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/InsightStatusProvider.tsx
index 7954df363d70eb..654f23c23d6517 100644
--- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/InsightStatusProvider.tsx
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/InsightStatusProvider.tsx
@@ -10,7 +10,7 @@ const InsightStatusContext = createContext<InsightStatusContextType>({
     registerInsight: () => null,
 });
 
-export const useInsightStatusContext = () => {
+const useInsightStatusContext = () => {
     return useContext(InsightStatusContext);
 };
 
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/FoundationalAssetsCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/FoundationalAssetsCard.tsx
deleted file mode 100644
index f18e9e474e785b..00000000000000
--- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/FoundationalAssetsCard.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-
-import { SearchListInsightCard } from '@app/homeV2/content/tabs/discovery/sections/insight/cards/SearchListInsightCard';
-import {
-    buildFoundationalAssetsFilters,
-    buildFoundationalAssetsSort,
-} from '@app/homeV2/content/tabs/discovery/sections/insight/cards/useGetFoundationalAssets';
-import { ASSET_ENTITY_TYPES } from '@app/searchV2/utils/constants';
-
-export const FoundationalAssetsCard = () => {
-    return (
-        <SearchListInsightCard
-            id="FoundationalAssets"
-            types={[...ASSET_ENTITY_TYPES] as any}
-            title="Foundational Assets"
-            tip="Key data assets for your organization based popularity, freshness, and impact"
-            filters={buildFoundationalAssetsFilters()}
-            sort={buildFoundationalAssetsSort()}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/InsightLoadingCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/InsightLoadingCard.tsx
deleted file mode 100644
index 3a52b504d58669..00000000000000
--- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/InsightLoadingCard.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Skeleton } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const Container = styled.div``;
-
-const CardSkeleton = styled(Skeleton.Input)`
-    && {
-        width: 340px;
-        height: 270px;
-        border-radius: 10px;
-    }
-`;
-
-export const InsightLoadingCard = () => {
-    return (
-        <Container>
-            <CardSkeleton active size="large" />
-        </Container>
-    );
-};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/NewAssetsGraphCard.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/NewAssetsGraphCard.tsx
deleted file mode 100644
index 81cccda220c03c..00000000000000
--- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/NewAssetsGraphCard.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-
-// Ideally these sections are rendered from the backend, and are simply groups of entities.
-export const NewAssetsGraphCard = () => {
-    return <>New Assets</>;
-};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetFoundationalAssets.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetFoundationalAssets.tsx
deleted file mode 100644
index b2f49c5c1e11ca..00000000000000
--- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/insight/cards/useGetFoundationalAssets.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { FilterSet } from '@app/entityV2/shared/components/styled/search/types';
-import { LAST_MODIFIED_TIME_FIELD } from '@app/searchV2/context/constants';
-import { UnionType } from '@app/searchV2/utils/constants';
-
-import { FilterOperator, SortCriterion, SortOrder } from '@types';
-
-const FOUNDATIONAL_ASSET_TAGS = ['urn:li:tag:__default_large_table', 'urn:li:tag:__default_high_queries'];
-
-const FOUNDATIONAL_ASSET_EXCLUDE_TAGS = ['urn:li:tag:__default_no_queries', 'urn:li:tag:__default_low_changes'];
-
-export const buildFoundationalAssetsFilters = (): FilterSet => {
-    return {
-        unionType: UnionType.AND,
-        filters: [
-            {
-                field: 'tags',
-                values: FOUNDATIONAL_ASSET_TAGS,
-                condition: FilterOperator.Equal,
-                negated: false,
-            },
-            {
-                field: 'tags',
-                values: FOUNDATIONAL_ASSET_EXCLUDE_TAGS,
-                condition: FilterOperator.Equal,
-                negated: true,
-            },
-        ],
-    };
-};
-
-export const buildFoundationalAssetsSort = (): SortCriterion => {
-    return {
-        field: LAST_MODIFIED_TIME_FIELD,
-        sortOrder: SortOrder.Descending,
-    };
-};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetDataPlatforms.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetDataPlatforms.tsx
index 8542effd824b4a..8b8a6f811d7528 100644
--- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetDataPlatforms.tsx
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetDataPlatforms.tsx
@@ -1,7 +1,7 @@
 import { useGetDataPlatformsQuery } from '@graphql/dataPlatform.generated';
 import { DataPlatform } from '@types';
 
-export const DATA_PLATFORMS_URNS = [
+const DATA_PLATFORMS_URNS = [
     'urn:li:dataPlatform:snowflake',
     'urn:li:dataPlatform:bigquery',
     'urn:li:dataPlatform:redshift',
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetPlatforms.tsx b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetPlatforms.tsx
index bdf3683527ce07..6a3ec6a5619a57 100644
--- a/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetPlatforms.tsx
+++ b/datahub-web-react/src/app/homeV2/content/tabs/discovery/sections/platform/useGetPlatforms.tsx
@@ -7,7 +7,7 @@ export const PLATFORMS_MODULE_ID = 'Platforms';
 
 const MAX_PLATFORMS_TO_FETCH = 10;
 
-export type PlatformAndCount = {
+type PlatformAndCount = {
     platform: DataPlatform;
     count: number;
 };
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/tabs.tsx b/datahub-web-react/src/app/homeV2/content/tabs/tabs.tsx
index a54a1ab6cadedd..4ef06ab1db5d62 100644
--- a/datahub-web-react/src/app/homeV2/content/tabs/tabs.tsx
+++ b/datahub-web-react/src/app/homeV2/content/tabs/tabs.tsx
@@ -9,9 +9,8 @@ import {
     V2_HOME_PAGE_DISCOVER_ID,
 } from '@app/onboarding/configV2/HomePageOnboardingConfig';
 
-export enum TabType {
+enum TabType {
     Discover = 'Discover',
-    Activity = 'Activity',
     Announcements = 'Announcements',
 }
 
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/types.ts b/datahub-web-react/src/app/homeV2/content/tabs/types.ts
deleted file mode 100644
index 3d031f2d0fdca3..00000000000000
--- a/datahub-web-react/src/app/homeV2/content/tabs/types.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export type CenterTabProps = {
-    something?: string;
-};
diff --git a/datahub-web-react/src/app/homeV2/content/tabs/useGetVisibleTabs.tsx b/datahub-web-react/src/app/homeV2/content/tabs/useGetVisibleTabs.tsx
index 9d7dc5061390c9..669c8285eb1ee8 100644
--- a/datahub-web-react/src/app/homeV2/content/tabs/useGetVisibleTabs.tsx
+++ b/datahub-web-react/src/app/homeV2/content/tabs/useGetVisibleTabs.tsx
@@ -2,7 +2,7 @@ import { Tab } from '@components/components/Tabs/Tabs';
 
 import analytics, { EventType, HomePageModule } from '@app/analytics';
 import { useUserContext } from '@app/context/useUserContext';
-import { ANNOUNCEMENTS_TAB, DISCOVER_TAB, TabType } from '@app/homeV2/content/tabs/tabs';
+import { ANNOUNCEMENTS_TAB, DISCOVER_TAB } from '@app/homeV2/content/tabs/tabs';
 import { useUpdateLastViewedAnnouncementTime } from '@app/homeV2/shared/updateLastViewedAnnouncementTime';
 import { useGetLastViewedAnnouncementTime } from '@app/homeV2/shared/useGetLastViewedAnnouncementTime';
 import { hasViewedAnnouncement } from '@app/homeV2/shared/utils';
@@ -67,12 +67,6 @@ const useGetActivityExists = (): Tab | null => {
     return null;
 };
 
-export type ActiveTab = {
-    key: TabType;
-    count?: number;
-    onSelectTab?: () => void; // Refetch count, etc
-};
-
 export const useGetActiveTabs = (): Tab[] => {
     const activeTabs: Tab[] = [{ ...DISCOVER_TAB, onSelectTab: () => handleTabClick(HomePageModule.Discover) }];
 
diff --git a/datahub-web-react/src/app/homeV2/introduce/PersonaSelector.tsx b/datahub-web-react/src/app/homeV2/introduce/PersonaSelector.tsx
deleted file mode 100644
index 9f2d844d5bda48..00000000000000
--- a/datahub-web-react/src/app/homeV2/introduce/PersonaSelector.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { getColor } from '@components/theme/utils';
-
-import {
-    PERSONA_TYPES_TO_DISPLAY,
-    PERSONA_TYPE_TO_DESCRIPTION,
-    PERSONA_TYPE_TO_LABEL,
-    PERSONA_TYPE_TO_VIEW_ICON,
-} from '@app/homeV2/shared/types';
-import { Heading } from '@src/alchemy-components';
-
-const PersonaCard = styled.div<{ selected: boolean }>`
-    border: 1px rgb(217, 217, 217) solid;
-    border-radius: 5px;
-    padding: 12px;
-    margin: 12px 0;
-    display: flex;
-    height: 88px;
-    font-family: Mulish;
-
-    &:hover {
-        cursor: pointer;
-        ${(props) => !props.selected && `border: 1.5px ${getColor('primary', 200, props.theme)} solid;`}
-    }
-
-    ${(props) => props.selected && `border: 1.5px ${props.theme.styles['primary-color']} solid;`}
-`;
-const StyledIcon = styled.div`
-    display: flex;
-    align-items: center;
-    font-size: 20px;
-    margin-left: 8px;
-    margin-right: 20px;
-`;
-
-const PersonaSelectorContainer = styled.div`
-    margin-top: 10px;
-    max-width: 290px;
-`;
-
-const Content = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    font-size: 11px;
-`;
-
-const Text = styled.div`
-    color: rgb(129, 135, 159);
-    line-height: 16px;
-    font-size: 12px;
-    margin-bottom: 4px;
-`;
-
-type Props = {
-    onSelect: (urn: string) => void;
-    selectedPersona: string;
-};
-
-export const PersonaSelector = ({ onSelect, selectedPersona }: Props) => {
-    return (
-        <PersonaSelectorContainer>
-            <Heading size="md" type="h4" color="gray">
-                Select a Persona
-            </Heading>
-            {PERSONA_TYPES_TO_DISPLAY.map((urn) => (
-                <PersonaCard onClick={() => onSelect(urn)} key={urn} selected={urn === selectedPersona}>
-                    <StyledIcon>{PERSONA_TYPE_TO_VIEW_ICON[urn]}</StyledIcon>
-                    <Content>
-                        <Heading size="md" type="h5" weight="semiBold">
-                            {PERSONA_TYPE_TO_LABEL[urn]}
-                        </Heading>
-                        <Text>{PERSONA_TYPE_TO_DESCRIPTION[urn]}</Text>
-                    </Content>
-                </PersonaCard>
-            ))}
-        </PersonaSelectorContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarContext.tsx b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarContext.tsx
index 89c08ad655e018..5da6483fcdf0f3 100644
--- a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarContext.tsx
+++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/NavBarContext.tsx
@@ -14,7 +14,7 @@ const LOCAL_STATE_KEY = 'navBarState';
 /**
  * Local State is persisted to local storage.
  */
-export type LocalState = {
+type LocalState = {
     state?: NavBarStateType | null;
 };
 
@@ -32,7 +32,7 @@ const saveLocalState = (newState: LocalState) => {
     return localStorage.setItem(LOCAL_STATE_KEY, JSON.stringify(newState));
 };
 
-export interface NavBarContextType {
+interface NavBarContextType {
     state: NavBarStateType;
     isCollapsed: boolean;
     toggle: () => void;
@@ -41,7 +41,7 @@ export interface NavBarContextType {
     setDefaultNavBarState: (state: NavBarStateType) => void;
 }
 
-export const NavBarContext = React.createContext<NavBarContextType>({
+const NavBarContext = React.createContext<NavBarContextType>({
     state: NavBarStateType.Collapsed,
     isCollapsed: true,
     toggle: () => {},
diff --git a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/types.ts b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/types.ts
index 6fcd8329cea1cd..ed59b947a3ab6a 100644
--- a/datahub-web-react/src/app/homeV2/layout/navBarRedesign/types.ts
+++ b/datahub-web-react/src/app/homeV2/layout/navBarRedesign/types.ts
@@ -8,7 +8,7 @@ export enum NavBarMenuItemTypes {
     Custom = 'CUSTOM',
 }
 
-export interface NavBarMenuBaseElement {
+interface NavBarMenuBaseElement {
     type: NavBarMenuItemTypes;
     key: string;
     description?: string;
@@ -25,7 +25,7 @@ export interface NavBarMenuBaseElement {
     dataTestId?: string;
 }
 
-export type Badge = {
+type Badge = {
     count: number;
     show?: boolean;
 };
@@ -37,7 +37,7 @@ export interface NavBarMenuBaseItem extends NavBarMenuBaseElement {
     badge?: Badge;
 }
 
-export type NavBarMenuLinkItem = NavBarMenuBaseItem & {
+type NavBarMenuLinkItem = NavBarMenuBaseItem & {
     type: NavBarMenuItemTypes.Item;
     title: string;
 };
@@ -52,13 +52,13 @@ export type NavBarMenuDropdownItemElement = NavBarMenuBaseElement & {
     title: string;
 };
 
-export type NavBarMenuGroup = NavBarMenuBaseElement & {
+type NavBarMenuGroup = NavBarMenuBaseElement & {
     title?: string;
     type: NavBarMenuItemTypes.Group;
     items?: Array<NavBarMenuLinkItem | NavBarMenuDropdownItem>;
 };
 
-export type NavBarCustomElement = NavBarMenuBaseElement & {
+type NavBarCustomElement = NavBarMenuBaseElement & {
     type: NavBarMenuItemTypes.Custom;
     render: () => React.ReactNode;
 };
diff --git a/datahub-web-react/src/app/homeV2/layout/shared/styledComponents.tsx b/datahub-web-react/src/app/homeV2/layout/shared/styledComponents.tsx
index 011bb7eceeb560..c5c8043795bfd7 100644
--- a/datahub-web-react/src/app/homeV2/layout/shared/styledComponents.tsx
+++ b/datahub-web-react/src/app/homeV2/layout/shared/styledComponents.tsx
@@ -8,7 +8,7 @@ const ReferenceSectionContainer = styled.div<{ $isShowNavBarRedesign?: boolean }
     overflow: wrap;
 `;
 
-export const ReferenceSectionDivider = styled.hr`
+const ReferenceSectionDivider = styled.hr`
     height: 1px;
     opacity: 0.1;
     width: 100%;
diff --git a/datahub-web-react/src/app/homeV2/layout/types.ts b/datahub-web-react/src/app/homeV2/layout/types.ts
index 83ef7feccd5d43..eddc55e8df3dd8 100644
--- a/datahub-web-react/src/app/homeV2/layout/types.ts
+++ b/datahub-web-react/src/app/homeV2/layout/types.ts
@@ -22,7 +22,7 @@ export interface NavSubMenuItem {
     onClick?: () => void;
 }
 
-export interface NavSubMenu {
+interface NavSubMenu {
     isOpen: boolean;
     open: () => void;
     close: () => void;
diff --git a/datahub-web-react/src/app/homeV2/reference/sections/domains/DataProductsYouOwn.tsx b/datahub-web-react/src/app/homeV2/reference/sections/domains/DataProductsYouOwn.tsx
deleted file mode 100644
index e69de29bb2d1d6..00000000000000
diff --git a/datahub-web-react/src/app/homeV2/shared/types.ts b/datahub-web-react/src/app/homeV2/shared/types.ts
index ca95b3ca286864..7c7a3b666cefd2 100644
--- a/datahub-web-react/src/app/homeV2/shared/types.ts
+++ b/datahub-web-react/src/app/homeV2/shared/types.ts
@@ -9,31 +9,6 @@ export enum PersonaType {
     DATA_LEADER = 'urn:li:dataHubPersona:dataLeader', // Deprecated symbol.
 }
 
-export const PERSONA_TYPE_TO_LABEL: Record<PersonaType, string> = {
-    [PersonaType.TECHNICAL_USER]: 'Data Expert',
-    [PersonaType.BUSINESS_USER]: 'Data User',
-    [PersonaType.DATA_STEWARD]: 'Data Steward',
-    [PersonaType.DATA_ENGINEER]: 'Data Engineer',
-    [PersonaType.DATA_LEADER]: 'Data Leader', // Deprecated symbol.
-};
-
-export const PERSONA_TYPE_TO_VIEW_ICON = {
-    [PersonaType.TECHNICAL_USER]: '💡',
-    [PersonaType.BUSINESS_USER]: '📊',
-    [PersonaType.DATA_STEWARD]: '📖',
-    [PersonaType.DATA_ENGINEER]: '🔧',
-};
-
-/**
- * The default view names associated with each persona type
- */
-export const PERSONA_TYPE_TO_VIEW_NAME = {
-    [PersonaType.TECHNICAL_USER]: '💡  Data Expert',
-    [PersonaType.DATA_ENGINEER]: '🔧  Data Engineer',
-    [PersonaType.DATA_STEWARD]: '📖  Data Steward',
-    [PersonaType.BUSINESS_USER]: '📊  Data User',
-};
-
 /**
  * The default view urns associated with each persona type
  */
@@ -44,27 +19,6 @@ export const PERSONA_TYPE_TO_VIEW_URN = {
     [PersonaType.BUSINESS_USER]: 'urn:li:dataHubView:__default_businessUser',
 };
 
-export const PERSONA_TYPE_TO_DESCRIPTION: Record<PersonaType, string> = {
-    [PersonaType.TECHNICAL_USER]: 'Explore tables, topics, databases, data pipelines, dashboards, and more',
-    [PersonaType.BUSINESS_USER]: 'Explore tables, dashboards, and reports',
-    [PersonaType.DATA_STEWARD]: 'Explore tables, data domains, data products, and data dictionaries',
-    [PersonaType.DATA_ENGINEER]: 'Explore tables, topics, databases, and data pipelines',
-    [PersonaType.DATA_LEADER]: 'Explore tables, topics, databases, data pipelines, dashboards, and more', // Deprecated symbol.
-};
-
-/**
- * Standard Persona Types To Display When User is Selecting.
- */
-export const PERSONA_TYPES_TO_DISPLAY = [
-    PersonaType.TECHNICAL_USER, // Data Expert
-    PersonaType.DATA_ENGINEER, // Data Engineer
-    PersonaType.DATA_STEWARD, // Data Steward
-    PersonaType.BUSINESS_USER, // Data User
-];
-
-// For when we enabling fetching custom personas.
-export const LOAD_CUSTOM_PERSONAS = false;
-
 export const ROLE_TO_PERSONA_TYPE: Record<string, PersonaType> = {
     'Data Analyst': PersonaType.TECHNICAL_USER,
     'Data Engineer': PersonaType.TECHNICAL_USER,
diff --git a/datahub-web-react/src/app/homeV3/context/hooks/useAssetSummaryOperations.ts b/datahub-web-react/src/app/homeV3/context/hooks/useAssetSummaryOperations.ts
index cbcc8b0641245f..9bbdb6635fd47c 100644
--- a/datahub-web-react/src/app/homeV3/context/hooks/useAssetSummaryOperations.ts
+++ b/datahub-web-react/src/app/homeV3/context/hooks/useAssetSummaryOperations.ts
@@ -18,12 +18,7 @@ import {
 
 import { StructuredPropertyFieldsFragment } from '@graphql/fragments.generated';
 import { PageTemplateFragment, SummaryElementFragment } from '@graphql/template.generated';
-import { SummaryElement, SummaryElementType } from '@types';
-
-// Types for summary element operations
-export interface SummaryElementWithId extends SummaryElement {
-    id: string; // Unique identifier for React keys and operations
-}
+import { SummaryElementType } from '@types';
 
 export interface AddSummaryElementInput {
     elementType: SummaryElementType;
diff --git a/datahub-web-react/src/app/homeV3/context/hooks/useDragAndDrop.ts b/datahub-web-react/src/app/homeV3/context/hooks/useDragAndDrop.ts
index aa9c9cfb21972e..0a6b86d72373bc 100644
--- a/datahub-web-react/src/app/homeV3/context/hooks/useDragAndDrop.ts
+++ b/datahub-web-react/src/app/homeV3/context/hooks/useDragAndDrop.ts
@@ -12,14 +12,14 @@ interface DraggedModuleData {
     isSmall: boolean;
 }
 
-export interface DroppableData {
+interface DroppableData {
     rowIndex: number;
     moduleIndex?: number; // If undefined, drop at the end of the row
     insertNewRow?: boolean; // If true, create a new row at this position
     isSmall?: boolean; // If undefined, accept any module size
 }
 
-export interface ActiveDragModule {
+interface ActiveDragModule {
     module: PageModuleFragment;
     position: ModulePositionInput;
     isSmall: boolean;
diff --git a/datahub-web-react/src/app/homeV3/header/Header.tsx b/datahub-web-react/src/app/homeV3/header/Header.tsx
index f38a141ad82155..448386f31c0e59 100644
--- a/datahub-web-react/src/app/homeV3/header/Header.tsx
+++ b/datahub-web-react/src/app/homeV3/header/Header.tsx
@@ -6,7 +6,7 @@ import GreetingText from '@app/homeV3/header/components/GreetingText';
 import SearchBar from '@app/homeV3/header/components/SearchBar';
 import { CenteredContainer, contentWidth } from '@app/homeV3/styledComponents';
 
-export const HeaderWrapper = styled.div`
+const HeaderWrapper = styled.div`
     display: flex;
     justify-content: center;
     padding: 27px 0 24px 0;
diff --git a/datahub-web-react/src/app/homeV3/module/components/ModuleDescription.tsx b/datahub-web-react/src/app/homeV3/module/components/ModuleDescription.tsx
deleted file mode 100644
index 44d452e76c6cf0..00000000000000
--- a/datahub-web-react/src/app/homeV3/module/components/ModuleDescription.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Text } from '@components';
-import React from 'react';
-
-interface Props {
-    text?: string;
-}
-
-export default function ModuleDescription({ text }: Props) {
-    if (!text) return null;
-    return (
-        <Text color="gray" colorLevel={1700} size="md" weight="medium" lineHeight="xs">
-            {text}
-        </Text>
-    );
-}
diff --git a/datahub-web-react/src/app/homeV3/module/components/PublicModuleBadge.tsx b/datahub-web-react/src/app/homeV3/module/components/PublicModuleBadge.tsx
deleted file mode 100644
index 6c290375f4b1c8..00000000000000
--- a/datahub-web-react/src/app/homeV3/module/components/PublicModuleBadge.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Pill } from '@components';
-import React from 'react';
-
-interface Props {
-    isPublic?: boolean;
-}
-
-export default function PublicModuleBadge({ isPublic }: Props) {
-    if (!isPublic) return null;
-
-    return <Pill label="Public" color="gray" size="xs" />;
-}
diff --git a/datahub-web-react/src/app/homeV3/modules/hierarchyViewModule/components/form/constants.ts b/datahub-web-react/src/app/homeV3/modules/hierarchyViewModule/components/form/constants.ts
index f6e143f7ab159c..c04d970107a6f4 100644
--- a/datahub-web-react/src/app/homeV3/modules/hierarchyViewModule/components/form/constants.ts
+++ b/datahub-web-react/src/app/homeV3/modules/hierarchyViewModule/components/form/constants.ts
@@ -1,6 +1,5 @@
-export const FORM_FIELD_NAME = 'name';
+
 export const FORM_FIELD_ASSET_TYPE = 'assetsType';
-export const FORM_FIELD_DOMAIN_ASSETS = 'domainAssets';
 export const FORM_FIELD_GLOSSARY_ASSETS = 'glossaryAssets';
 export const FORM_FIELD_SHOW_RELATED_ENTITIES = 'showRelatedEntities';
 export const FORM_FIELD_RELATED_ENTITIES_FILTER = 'relatedEntitiesFilter';
diff --git a/datahub-web-react/src/app/homeV3/modules/hierarchyViewModule/components/glossary/types.ts b/datahub-web-react/src/app/homeV3/modules/hierarchyViewModule/components/glossary/types.ts
index d95b1af48862cf..f8a7af5a24e8db 100644
--- a/datahub-web-react/src/app/homeV3/modules/hierarchyViewModule/components/glossary/types.ts
+++ b/datahub-web-react/src/app/homeV3/modules/hierarchyViewModule/components/glossary/types.ts
@@ -1,11 +1,7 @@
-import { ListDomainsQuery } from '@graphql/domain.generated';
+
 import { RootGlossaryNodeWithFourLayersFragment } from '@graphql/fragments.generated';
 import { ChildGlossaryTermFragment } from '@graphql/glossaryNode.generated';
 import { GlossaryNode, GlossaryTerm } from '@types';
 
-type DomainsArray = NonNullable<ListDomainsQuery['listDomains']>['domains'];
-export type DomainItem = DomainsArray extends Array<infer T> ? T : never;
-
 export type GlossaryNodeType = GlossaryNode | RootGlossaryNodeWithFourLayersFragment;
 export type GlossaryTermType = GlossaryTerm | ChildGlossaryTermFragment;
-export type GlossaryItemType = GlossaryNodeType | GlossaryTermType;
diff --git a/datahub-web-react/src/app/homeV3/modules/hierarchyViewModule/treeView/components/itemsLoaderWrapper/NodesLoaderInfiniteScrollWrapper.tsx b/datahub-web-react/src/app/homeV3/modules/hierarchyViewModule/treeView/components/itemsLoaderWrapper/NodesLoaderInfiniteScrollWrapper.tsx
index 808ce7d31c973c..a718bfef4622d0 100644
--- a/datahub-web-react/src/app/homeV3/modules/hierarchyViewModule/treeView/components/itemsLoaderWrapper/NodesLoaderInfiniteScrollWrapper.tsx
+++ b/datahub-web-react/src/app/homeV3/modules/hierarchyViewModule/treeView/components/itemsLoaderWrapper/NodesLoaderInfiniteScrollWrapper.tsx
@@ -4,7 +4,7 @@ import styled from 'styled-components';
 
 import { NodesLoaderWrapperProps } from '@app/homeV3/modules/hierarchyViewModule/treeView/components/itemsLoaderWrapper/types';
 
-export const ObserverContainer = styled.div`
+const ObserverContainer = styled.div`
     height: 1px;
     margin-top: 1px;
 `;
diff --git a/datahub-web-react/src/app/homeV3/modules/link/types.ts b/datahub-web-react/src/app/homeV3/modules/link/types.ts
deleted file mode 100644
index 3644b1c9eeafc0..00000000000000
--- a/datahub-web-react/src/app/homeV3/modules/link/types.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export type LinkFormValues = {
-    linkUrl: string;
-    imageUrl?: string;
-    description?: string;
-};
diff --git a/datahub-web-react/src/app/homeV3/settings/EditHomePageSettingsButton.tsx b/datahub-web-react/src/app/homeV3/settings/EditHomePageSettingsButton.tsx
deleted file mode 100644
index 5c9c103a760f90..00000000000000
--- a/datahub-web-react/src/app/homeV3/settings/EditHomePageSettingsButton.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import { Dropdown, colors } from '@components';
-import React, { useCallback, useState } from 'react';
-import { createPortal } from 'react-dom';
-import styled from 'styled-components';
-
-import analytics, { EventType } from '@app/analytics';
-import { useUserContext } from '@app/context/useUserContext';
-import { usePageTemplateContext } from '@app/homeV3/context/PageTemplateContext';
-import { StyledIcon } from '@app/homeV3/styledComponents';
-import { ANT_NOTIFICATION_Z_INDEX } from '@app/shared/constants';
-import { ConfirmationModal } from '@app/sharedV2/modals/ConfirmationModal';
-
-const ButtonWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background-color: ${colors.white};
-    height: 40px;
-    width: 40px;
-    position: fixed;
-    right: 32px;
-    bottom: 32px;
-    border-radius: 200px;
-    box-shadow: 0px 4px 12px 0px rgba(9, 1, 61, 0.12);
-    z-index: ${ANT_NOTIFICATION_Z_INDEX + 1};
-`;
-
-const DropdownContainer = styled.div`
-    border-radius: 12px;
-    box-shadow: 0px 4px 12px 0px rgba(9, 1, 61, 0.12);
-    background-color: white;
-    overflow: hidden; // Cleanly rounds edges
-
-    .ant-dropdown-menu-item {
-        padding: 8px 16px;
-    }
-`;
-
-export default function EditHomePageSettingsButton() {
-    const user = useUserContext();
-    const canEditDefaultTemplate = user.platformPrivileges?.manageHomePageTemplates;
-
-    const { setIsEditingGlobalTemplate, isEditingGlobalTemplate, resetTemplateToDefault, personalTemplate } =
-        usePageTemplateContext();
-
-    const isOnPersonalTemplate = !!personalTemplate;
-
-    const [showConfirmResetModal, setShowConfirmResetModal] = useState(false);
-
-    const startGlobalTemplateEdit = useCallback(() => {
-        setIsEditingGlobalTemplate(true);
-        analytics.event({
-            type: EventType.HomePageTemplateGlobalTemplateEditingStart,
-        });
-    }, [setIsEditingGlobalTemplate]);
-
-    const handleResetToDefault = useCallback(() => {
-        resetTemplateToDefault();
-        setShowConfirmResetModal(false);
-        analytics.event({
-            type: EventType.HomePageTemplateResetToGlobalTemplate,
-        });
-    }, [resetTemplateToDefault]);
-
-    if (isEditingGlobalTemplate || (!canEditDefaultTemplate && !isOnPersonalTemplate)) return null;
-
-    const menu = {
-        items: [
-            ...(canEditDefaultTemplate
-                ? [
-                      {
-                          label: 'Edit Organization Default',
-                          key: 'edit-organization-default',
-                          style: {
-                              color: colors.gray[600],
-                              fontSize: '14px',
-                          },
-                          onClick: startGlobalTemplateEdit,
-                          'data-testid': 'edit-organization-default',
-                      },
-                  ]
-                : []),
-            ...(isOnPersonalTemplate
-                ? [
-                      {
-                          label: 'Reset to Organization Default',
-                          key: 'reset-to-organization-default',
-                          style: {
-                              color: colors.red[1000],
-                              fontSize: '14px',
-                          },
-                          onClick: () => setShowConfirmResetModal(true),
-                          'data-testid': 'reset-to-organization-default',
-                      },
-                  ]
-                : []),
-        ],
-    };
-
-    return (
-        <>
-            {createPortal(
-                <ButtonWrapper>
-                    <Dropdown
-                        menu={menu}
-                        trigger={['click']}
-                        dropdownRender={(menuNode) => <DropdownContainer>{menuNode}</DropdownContainer>}
-                    >
-                        <StyledIcon
-                            icon="Gear"
-                            color="gray"
-                            source="phosphor"
-                            size="4xl"
-                            data-testid="edit-home-page-settings"
-                        />
-                    </Dropdown>
-                </ButtonWrapper>,
-                document.body,
-            )}
-            <ConfirmationModal
-                isOpen={!!showConfirmResetModal}
-                handleConfirm={handleResetToDefault}
-                handleClose={() => setShowConfirmResetModal(false)}
-                modalTitle="Confirm reset to default template"
-                modalText="Are you sure you want to reset your homepage to the organization's default template? You will lose all your personal modules."
-                closeButtonText="Cancel"
-                confirmButtonText="Confirm"
-            />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/identity/user/useUserTitle.ts b/datahub-web-react/src/app/identity/user/useUserTitle.ts
index bfd3957779dbc5..927cd8c5c67de5 100644
--- a/datahub-web-react/src/app/identity/user/useUserTitle.ts
+++ b/datahub-web-react/src/app/identity/user/useUserTitle.ts
@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 
 import { useUserContext } from '@app/context/useUserContext';
 
-export const useUserTitle = () => {
+const useUserTitle = () => {
     const user = useUserContext();
     return user.user?.editableProperties?.title || user.user?.info?.title || '';
 };
diff --git a/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx b/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx
deleted file mode 100644
index 0ed2da831ab7f7..00000000000000
--- a/datahub-web-react/src/app/ingest/ManageIngestionPage.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, PageTitle } from '@components';
-import { Tabs } from 'antd';
-import React, { useEffect, useState } from 'react';
-import { useHistory } from 'react-router';
-import styled from 'styled-components';
-
-import { useUserContext } from '@app/context/useUserContext';
-import { SecretsList } from '@app/ingest/secret/SecretsList';
-import { IngestionSourceList } from '@app/ingest/source/IngestionSourceList';
-import { TabType } from '@app/ingest/types';
-import { OnboardingTour } from '@app/onboarding/OnboardingTour';
-import { INGESTION_CREATE_SOURCE_ID } from '@app/onboarding/config/IngestionOnboardingConfig';
-import { NoPageFound } from '@app/shared/NoPageFound';
-import { useAppConfig } from '@app/useAppConfig';
-import { useShowNavBarRedesign } from '@app/useShowNavBarRedesign';
-
-const PageContainer = styled.div<{ $isShowNavBarRedesign?: boolean }>`
-    padding-top: 16px;
-    padding-right: 16px;
-    background-color: white;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    border-radius: ${(props) =>
-        props.$isShowNavBarRedesign ? props.theme.styles['border-radius-navbar-redesign'] : '8px'};
-    ${(props) =>
-        props.$isShowNavBarRedesign &&
-        `
-        margin: 5px;
-        box-shadow: ${props.theme.styles['box-shadow-navbar-redesign']};
-    `}
-`;
-
-const PageHeaderContainer = styled.div`
-    && {
-        padding-left: 20px;
-        padding-right: 20px;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        align-items: center;
-        margin-bottom: 16px;
-    }
-`;
-
-const TitleContainer = styled.div`
-    flex: 1;
-`;
-
-const HeaderActionsContainer = styled.div`
-    display: flex;
-    justify-content: flex-end;
-`;
-
-const StyledTabs = styled(Tabs)`
-    &&& .ant-tabs-nav {
-        margin-bottom: 0;
-        padding-left: 20px;
-    }
-`;
-
-const Tab = styled(Tabs.TabPane)`
-    font-size: 14px;
-    line-height: 22px;
-`;
-
-const ListContainer = styled.div`
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-`;
-
-export const ManageIngestionPage = () => {
-    /**
-     * Determines which view should be visible: ingestion sources or secrets.
-     */
-    const { platformPrivileges, loaded: loadedPlatformPrivileges } = useUserContext();
-    const { config, loaded: loadedAppConfig } = useAppConfig();
-    const isIngestionEnabled = config?.managedIngestionConfig?.enabled;
-    const showIngestionTab = isIngestionEnabled && platformPrivileges?.manageIngestion;
-    const showSecretsTab = isIngestionEnabled && platformPrivileges?.manageSecrets;
-
-    // undefined == not loaded, null == no permissions
-    const [selectedTab, setSelectedTab] = useState<TabType | undefined | null>();
-
-    const [showCreateSourceModal, setShowCreateSourceModal] = useState<boolean>(false);
-    const [showCreateSecretModal, setShowCreateSecretModal] = useState<boolean>(false);
-    const isShowNavBarRedesign = useShowNavBarRedesign();
-
-    // defaultTab might not be calculated correctly on mount, if `config` or `me` haven't been loaded yet
-    useEffect(() => {
-        if (loadedAppConfig && loadedPlatformPrivileges && selectedTab === undefined) {
-            if (showIngestionTab) {
-                setSelectedTab(TabType.Sources);
-            } else if (showSecretsTab) {
-                setSelectedTab(TabType.Secrets);
-            } else {
-                setSelectedTab(null);
-            }
-        }
-    }, [loadedAppConfig, loadedPlatformPrivileges, showIngestionTab, showSecretsTab, selectedTab]);
-
-    const history = useHistory();
-    const onSwitchTab = (newTab: string, options?: { clearQueryParams: boolean }) => {
-        const matchingTab = Object.values(TabType).find((tab) => tab === newTab);
-        setSelectedTab(matchingTab || selectedTab);
-        if (options?.clearQueryParams) {
-            history.push({ search: '' });
-        }
-    };
-
-    const handleCreateSource = () => {
-        setShowCreateSourceModal(true);
-    };
-
-    const handleCreateSecret = () => {
-        setShowCreateSecretModal(true);
-    };
-
-    const TabTypeToListComponent = {
-        [TabType.Sources]: (
-            <IngestionSourceList
-                showCreateModal={showCreateSourceModal}
-                setShowCreateModal={setShowCreateSourceModal}
-            />
-        ),
-        [TabType.Secrets]: (
-            <SecretsList showCreateModal={showCreateSecretModal} setShowCreateModal={setShowCreateSecretModal} />
-        ),
-    };
-
-    if (selectedTab === undefined) {
-        return <></>; // loading
-    }
-    if (selectedTab === null) {
-        return <NoPageFound />;
-    }
-
-    return (
-        <PageContainer $isShowNavBarRedesign={isShowNavBarRedesign}>
-            <OnboardingTour stepIds={[INGESTION_CREATE_SOURCE_ID]} />
-            <PageHeaderContainer>
-                <TitleContainer>
-                    <PageTitle
-                        title="Manage Data Sources"
-                        subTitle="Configure and schedule syncs to import data from your data sources"
-                    />
-                </TitleContainer>
-                <HeaderActionsContainer>
-                    {selectedTab === TabType.Sources && showIngestionTab && (
-                        <Button
-                            variant="filled"
-                            id={INGESTION_CREATE_SOURCE_ID}
-                            onClick={handleCreateSource}
-                            data-testid="create-ingestion-source-button"
-                        >
-                            <PlusOutlined style={{ marginRight: '4px' }} /> Create new source
-                        </Button>
-                    )}
-
-                    {selectedTab === TabType.Secrets && showSecretsTab && (
-                        <Button variant="filled" onClick={handleCreateSecret} data-testid="create-secret-button">
-                            <PlusOutlined style={{ marginRight: '4px' }} /> Create new secret
-                        </Button>
-                    )}
-                </HeaderActionsContainer>
-            </PageHeaderContainer>
-            <StyledTabs
-                activeKey={selectedTab}
-                size="large"
-                onTabClick={(tab) => onSwitchTab(tab, { clearQueryParams: true })}
-            >
-                {showIngestionTab && <Tab key={TabType.Sources} tab={TabType.Sources} />}
-                {showSecretsTab && <Tab key={TabType.Secrets} tab={TabType.Secrets} />}
-            </StyledTabs>
-            <ListContainer>{TabTypeToListComponent[selectedTab]}</ListContainer>
-        </PageContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/ingest/constants.ts b/datahub-web-react/src/app/ingest/constants.ts
deleted file mode 100644
index 0c3f1658e48802..00000000000000
--- a/datahub-web-react/src/app/ingest/constants.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const INGESTION_TAB_QUERY_PARAMS = {
-    searchQuery: 'query',
-};
diff --git a/datahub-web-react/src/app/ingest/secret/SecretsList.tsx b/datahub-web-react/src/app/ingest/secret/SecretsList.tsx
deleted file mode 100644
index a8faaba68be3c7..00000000000000
--- a/datahub-web-react/src/app/ingest/secret/SecretsList.tsx
+++ /dev/null
@@ -1,365 +0,0 @@
-import { SearchBar } from '@components';
-import { Empty, Modal, Typography, message } from 'antd';
-import { PencilSimpleLine, Trash } from 'phosphor-react';
-import * as QueryString from 'query-string';
-import React, { useEffect, useState } from 'react';
-import { useLocation } from 'react-router';
-import styled from 'styled-components';
-
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import { SecretBuilderModal } from '@app/ingest/secret/SecretBuilderModal';
-import {
-    addSecretToListSecretsCache,
-    removeSecretFromListSecretsCache,
-    updateSecretInListSecretsCache,
-} from '@app/ingest/secret/cacheUtils';
-import { SecretBuilderState } from '@app/ingest/secret/types';
-import { Message } from '@app/shared/Message';
-import { scrollToTop } from '@app/shared/searchUtils';
-import { Pagination, Table } from '@src/alchemy-components';
-import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
-
-import {
-    useCreateSecretMutation,
-    useDeleteSecretMutation,
-    useListSecretsQuery,
-    useUpdateSecretMutation,
-} from '@graphql/ingestion.generated';
-
-const DeleteButtonContainer = styled.div`
-    display: flex;
-    justify-content: right;
-    gap: 8px;
-
-    button {
-        border: 1px solid #d9d9d9;
-        border-radius: 20px;
-        width: 28px;
-        height: 28px;
-        padding: 4px;
-        color: #595959;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        background: none;
-        cursor: pointer;
-        :hover {
-            color: #262626;
-            border-color: #262626;
-        }
-
-        &.delete-action {
-            color: #ff4d4f;
-            :hover {
-                color: #cf1322;
-                border-color: #262626;
-            }
-        }
-    }
-`;
-
-const EmptyState = () => (
-    <div style={{ padding: '20px', textAlign: 'center' }}>
-        <Empty description="No Secrets found!" image={Empty.PRESENTED_IMAGE_SIMPLE} />
-    </div>
-);
-
-type TableDataType = {
-    urn: string;
-    name: string;
-    description: string | null;
-};
-
-const DEFAULT_PAGE_SIZE = 25;
-
-type Props = {
-    showCreateModal: boolean;
-    setShowCreateModal: (show: boolean) => void;
-};
-
-const SearchContainer = styled.div`
-    display: flex;
-    align-items: center;
-    gap: 8px;
-`;
-
-const StyledTabToolbar = styled(TabToolbar)`
-    padding: 16px 20px;
-    height: auto;
-    &&& {
-        padding: 8px 20px;
-        height: auto;
-        box-shadow: none;
-        border-bottom: none;
-    }
-`;
-
-const StyledSearchBar = styled(SearchBar)`
-    width: 220px;
-`;
-
-const PaginationContainer = styled.div`
-    display: flex;
-    justify-content: center;
-    margin-top: 16px;
-`;
-
-const TableContainer = styled.div`
-    padding-left: 16px;
-`;
-
-export const SecretsList = ({ showCreateModal: isCreatingSecret, setShowCreateModal: setIsCreatingSecret }: Props) => {
-    const isShowNavBarRedesign = useShowNavBarRedesign();
-    const location = useLocation();
-    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
-    const paramsQuery = (params?.query as string) || undefined;
-    const [query, setQuery] = useState<undefined | string>(undefined);
-    useEffect(() => setQuery(paramsQuery), [paramsQuery]);
-
-    const [page, setPage] = useState(1);
-
-    const pageSize = DEFAULT_PAGE_SIZE;
-    const start = (page - 1) * pageSize;
-
-    const [editSecret, setEditSecret] = useState<SecretBuilderState | undefined>(undefined);
-
-    const [deleteSecretMutation] = useDeleteSecretMutation();
-    const [createSecretMutation] = useCreateSecretMutation();
-    const [updateSecretMutation] = useUpdateSecretMutation();
-    const { loading, error, data, client, refetch } = useListSecretsQuery({
-        variables: {
-            input: {
-                start,
-                count: pageSize,
-                query: (query?.length && query) || undefined,
-            },
-        },
-        fetchPolicy: (query?.length || 0) > 0 ? 'no-cache' : 'cache-first',
-    });
-
-    const totalSecrets = data?.listSecrets?.total || 0;
-    const secrets = data?.listSecrets?.secrets || [];
-
-    const deleteSecret = (urn: string) => {
-        deleteSecretMutation({
-            variables: { urn },
-        })
-            .then(() => {
-                message.success({ content: 'Removed secret.', duration: 2 });
-                removeSecretFromListSecretsCache(urn, client, page, pageSize);
-            })
-            .catch((e: unknown) => {
-                message.destroy();
-                if (e instanceof Error) {
-                    message.error({ content: `Failed to remove secret: \n ${e.message || ''}`, duration: 3 });
-                }
-            });
-    };
-
-    const onChangePage = (newPage: number) => {
-        scrollToTop();
-        setPage(newPage);
-    };
-
-    const handleSearch = (value: string) => {
-        setPage(1);
-        setQuery(value);
-    };
-
-    const onSubmit = (state: SecretBuilderState, resetBuilderState: () => void) => {
-        createSecretMutation({
-            variables: {
-                input: {
-                    name: state.name as string,
-                    value: state.value as string,
-                    description: state.description as string,
-                },
-            },
-        })
-            .then((res) => {
-                message.success({
-                    content: `Successfully created Secret!`,
-                    duration: 3,
-                });
-                resetBuilderState();
-                setIsCreatingSecret(false);
-                addSecretToListSecretsCache(
-                    {
-                        urn: res.data?.createSecret || '',
-                        name: state.name,
-                        description: state.description || '',
-                    },
-                    client,
-                    pageSize,
-                );
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({
-                    content: `Failed to update Secret!: \n ${e.message || ''}`,
-                    duration: 3,
-                });
-            });
-    };
-
-    const onUpdate = (state: SecretBuilderState, resetBuilderState: () => void) => {
-        const secretValue = state.value || '';
-
-        updateSecretMutation({
-            variables: {
-                input: {
-                    urn: state.urn as string,
-                    name: state.name as string,
-                    value: secretValue,
-                    description: state.description as string,
-                },
-            },
-        })
-            .then(() => {
-                message.success({
-                    content: `Successfully updated Secret!`,
-                    duration: 3,
-                });
-                resetBuilderState();
-                setIsCreatingSecret(false);
-                setEditSecret(undefined);
-                updateSecretInListSecretsCache(
-                    {
-                        urn: state.urn,
-                        name: state.name,
-                        description: state.description,
-                    },
-                    client,
-                    pageSize,
-                    page,
-                );
-                setTimeout(() => {
-                    refetch();
-                }, 3000);
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({
-                    content: `Failed to update Secret!: \n ${e.message || ''}`,
-                    duration: 3,
-                });
-            });
-    };
-
-    const onDeleteSecret = (urn: string) => {
-        Modal.confirm({
-            title: `Confirm Secret Removal`,
-            content: `Are you sure you want to remove this secret? Sources that use it may no longer work as expected.`,
-            onOk() {
-                deleteSecret(urn);
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    const onEditSecret = (urnData: any) => {
-        setIsCreatingSecret(true);
-        setEditSecret(urnData);
-    };
-
-    const onCancel = () => {
-        setIsCreatingSecret(false);
-        setEditSecret(undefined);
-    };
-
-    const tableColumns = [
-        {
-            title: 'Name',
-            key: 'name',
-            render: (record: TableDataType) => <Typography.Text strong>{record.name}</Typography.Text>,
-            sorter: (a: TableDataType, b: TableDataType) => a.name.localeCompare(b.name),
-        },
-        {
-            title: 'Description',
-            key: 'description',
-            render: (record: TableDataType) => {
-                return <>{record.description || <Typography.Text type="secondary">No description</Typography.Text>}</>;
-            },
-        },
-        {
-            title: '',
-            key: 'actions',
-            render: (record: TableDataType) => (
-                <DeleteButtonContainer>
-                    <button type="button" onClick={() => onEditSecret(record)} aria-label="Edit secret">
-                        <PencilSimpleLine size={16} />
-                    </button>
-                    <button
-                        type="button"
-                        className="delete-action"
-                        onClick={() => onDeleteSecret(record.urn)}
-                        aria-label="Delete secret"
-                        data-test-id="delete-secret-action"
-                        data-icon="delete"
-                    >
-                        <Trash size={16} />
-                    </button>
-                </DeleteButtonContainer>
-            ),
-        },
-    ];
-
-    const tableData =
-        secrets?.map((secret) => ({
-            urn: secret.urn,
-            name: secret.name,
-            description: secret.description || null,
-        })) || [];
-
-    return (
-        <>
-            {!data && loading && <Message type="loading" content="Loading secrets..." />}
-            {error && message.error({ content: `Failed to load secrets! \n ${error.message || ''}`, duration: 3 })}
-            <div>
-                <StyledTabToolbar>
-                    <SearchContainer>
-                        <StyledSearchBar
-                            placeholder="Search..."
-                            value={query || ''}
-                            onChange={(value) => handleSearch(value)}
-                        />
-                    </SearchContainer>
-                </StyledTabToolbar>
-                {tableData.length === 0 ? (
-                    <EmptyState />
-                ) : (
-                    <>
-                        <TableContainer>
-                            <Table
-                                columns={tableColumns}
-                                data={tableData}
-                                rowKey="urn"
-                                isScrollable={isShowNavBarRedesign}
-                                maxHeight={isShowNavBarRedesign ? 'calc(100vh - 450px)' : undefined}
-                                showHeader
-                            />
-                        </TableContainer>
-                        <PaginationContainer>
-                            <Pagination
-                                currentPage={page}
-                                itemsPerPage={pageSize}
-                                total={totalSecrets}
-                                onPageChange={onChangePage}
-                            />
-                        </PaginationContainer>
-                    </>
-                )}
-            </div>
-            <SecretBuilderModal
-                open={isCreatingSecret}
-                editSecret={editSecret}
-                onUpdate={onUpdate}
-                onSubmit={onSubmit}
-                onCancel={onCancel}
-            />
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/ingest/secret/cacheUtils.ts b/datahub-web-react/src/app/ingest/secret/cacheUtils.ts
index 4a06d971c0249b..2184371162b661 100644
--- a/datahub-web-react/src/app/ingest/secret/cacheUtils.ts
+++ b/datahub-web-react/src/app/ingest/secret/cacheUtils.ts
@@ -1,113 +1,4 @@
-import { ListSecretsDocument, ListSecretsQuery } from '@graphql/ingestion.generated';
 
-export const removeSecretFromListSecretsCache = (urn, client, page, pageSize) => {
-    const currData: ListSecretsQuery | null = client.readQuery({
-        query: ListSecretsDocument,
-        variables: {
-            input: {
-                start: (page - 1) * pageSize,
-                count: pageSize,
-            },
-        },
-    });
-
-    const newSecrets = [...(currData?.listSecrets?.secrets || []).filter((secret) => secret.urn !== urn)];
-
-    client.writeQuery({
-        query: ListSecretsDocument,
-        variables: {
-            input: {
-                start: (page - 1) * pageSize,
-                count: pageSize,
-            },
-        },
-        data: {
-            listSecrets: {
-                start: currData?.listSecrets?.start || 0,
-                count: (currData?.listSecrets?.count || 1) - 1,
-                total: (currData?.listSecrets?.total || 1) - 1,
-                secrets: newSecrets,
-            },
-        },
-    });
-};
-
-export const addSecretToListSecretsCache = (secret, client, pageSize) => {
-    const currData: ListSecretsQuery | null = client.readQuery({
-        query: ListSecretsDocument,
-        variables: {
-            input: {
-                start: 0,
-                count: pageSize,
-            },
-        },
-    });
-
-    const newSecrets = [secret, ...(currData?.listSecrets?.secrets || [])];
-
-    client.writeQuery({
-        query: ListSecretsDocument,
-        variables: {
-            input: {
-                start: 0,
-                count: pageSize,
-            },
-        },
-        data: {
-            listSecrets: {
-                start: currData?.listSecrets?.start || 0,
-                count: (currData?.listSecrets?.count || 1) + 1,
-                total: (currData?.listSecrets?.total || 1) + 1,
-                secrets: newSecrets,
-            },
-        },
-    });
-};
-
-export const updateSecretInListSecretsCache = (updatedSecret, client, pageSize, page) => {
-    const currData: ListSecretsQuery | null = client.readQuery({
-        query: ListSecretsDocument,
-        variables: {
-            input: {
-                start: (page - 1) * pageSize,
-                count: pageSize,
-            },
-        },
-    });
-
-    const updatedSecretIndex = (currData?.listSecrets?.secrets || [])
-        .map((secret, index) => {
-            if (secret.urn === updatedSecret.urn) {
-                return index;
-            }
-            return -1;
-        })
-        .find((index) => index !== -1);
-
-    if (updatedSecretIndex !== undefined) {
-        const newSecrets = (currData?.listSecrets?.secrets || []).map((secret, index) => {
-            return index === updatedSecretIndex ? updatedSecret : secret;
-        });
-
-        client.writeQuery({
-            query: ListSecretsDocument,
-            variables: {
-                input: {
-                    start: (page - 1) * pageSize,
-                    count: pageSize,
-                },
-            },
-            data: {
-                listSecrets: {
-                    start: currData?.listSecrets?.start || 0,
-                    count: currData?.listSecrets?.count || 1,
-                    total: currData?.listSecrets?.total || 1,
-                    secrets: newSecrets,
-                },
-            },
-        });
-    }
-};
 
 export const clearSecretListCache = (client) => {
     // Remove any caching of 'listSecrets'
diff --git a/datahub-web-react/src/app/ingest/source/IngestedAssets.tsx b/datahub-web-react/src/app/ingest/source/IngestedAssets.tsx
deleted file mode 100644
index 73f3ddbd15a94b..00000000000000
--- a/datahub-web-react/src/app/ingest/source/IngestedAssets.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-import { Button, Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { EmbeddedListSearchModal } from '@app/entity/shared/components/styled/search/EmbeddedListSearchModal';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import {
-    extractEntityTypeCountsFromFacets,
-    getEntitiesIngestedByType,
-    getTotalEntitiesIngested,
-} from '@app/ingest/source/utils';
-import { UnionType } from '@app/search/utils/constants';
-import { Message } from '@app/shared/Message';
-import { formatNumber } from '@app/shared/formatNumber';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { ExecutionRequestResult, Maybe } from '@src/types.generated';
-
-import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated';
-
-const HeaderContainer = styled.div`
-    display: flex;
-    justify-content: space-between;
-`;
-
-const TitleContainer = styled.div``;
-
-const TotalContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: right;
-    align-items: end;
-`;
-
-const TotalText = styled(Typography.Text)`
-    font-size: 16px;
-    color: ${ANTD_GRAY[8]};
-`;
-
-const EntityCountsContainer = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-    max-width: 100%;
-    flex-wrap: wrap;
-`;
-
-const EntityCount = styled.div`
-    margin-right: 40px;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-`;
-
-const ViewAllButton = styled(Button)`
-    padding: 0px;
-    margin-top: 4px;
-`;
-
-type Props = {
-    id: string;
-    executionResult?: Maybe<Partial<ExecutionRequestResult>>;
-};
-
-const ENTITY_FACET_NAME = 'entity';
-const TYPE_NAMES_FACET_NAME = 'typeNames';
-
-export default function IngestedAssets({ id, executionResult }: Props) {
-    const entityRegistry = useEntityRegistry();
-
-    // First thing to do is to search for all assets with the id as the run id!
-    const [showAssetSearch, setShowAssetSearch] = useState(false);
-
-    // Try getting the counts via the ingestion report.
-    const totalEntitiesIngested = executionResult && getTotalEntitiesIngested(executionResult);
-    const entitiesIngestedByTypeFromReport = executionResult && getEntitiesIngestedByType(executionResult);
-
-    // Fallback to the search across entities.
-    // First thing to do is to search for all assets with the id as the run id!
-    // Execute search
-    const { data, loading, error } = useGetSearchResultsForMultipleQuery({
-        skip: typeof totalEntitiesIngested === 'number' && !!entitiesIngestedByTypeFromReport?.length,
-        variables: {
-            input: {
-                query: '*',
-                start: 0,
-                count: 1,
-                filters: [
-                    {
-                        field: 'runId',
-                        values: [id],
-                    },
-                ],
-            },
-        },
-        fetchPolicy: 'cache-first',
-    });
-
-    // Parse filter values to get results.
-    const facets = data?.searchAcrossEntities?.facets;
-
-    // Extract facets to construct the per-entity type breakdown stats
-    const hasEntityTypeFacet = (facets || []).findIndex((facet) => facet.field === ENTITY_FACET_NAME) >= 0;
-    const entityTypeFacets =
-        (hasEntityTypeFacet && facets?.filter((facet) => facet.field === ENTITY_FACET_NAME)[0]) || undefined;
-    const hasSubTypeFacet = (facets || []).findIndex((facet) => facet.field === TYPE_NAMES_FACET_NAME) >= 0;
-    const subTypeFacets =
-        (hasSubTypeFacet && facets?.filter((facet) => facet.field === TYPE_NAMES_FACET_NAME)[0]) || undefined;
-
-    const countsByEntityType =
-        entitiesIngestedByTypeFromReport ??
-        (entityTypeFacets ? extractEntityTypeCountsFromFacets(entityRegistry, entityTypeFacets, subTypeFacets) : []);
-
-    // The total number of assets ingested
-    const total = totalEntitiesIngested ?? data?.searchAcrossEntities?.total ?? 0;
-
-    return (
-        <>
-            {error && <Message type="error" content="" />}
-            <HeaderContainer>
-                <TitleContainer>
-                    <Typography.Title level={5}>Ingested Assets</Typography.Title>
-                    {(loading && <Typography.Text type="secondary">Loading...</Typography.Text>) || (
-                        <>
-                            {(total > 0 && (
-                                <Typography.Paragraph type="secondary">
-                                    The following asset types were ingested during this run.
-                                </Typography.Paragraph>
-                            )) || <Typography.Text>No assets were ingested.</Typography.Text>}
-                        </>
-                    )}
-                </TitleContainer>
-                {!loading && (
-                    <TotalContainer>
-                        <Typography.Text type="secondary">Total</Typography.Text>
-                        <TotalText style={{ fontSize: 16, color: ANTD_GRAY[8] }}>
-                            <b>{formatNumber(total)}</b> assets
-                        </TotalText>
-                    </TotalContainer>
-                )}
-            </HeaderContainer>
-            <EntityCountsContainer>
-                {countsByEntityType.map((entityCount) => (
-                    <EntityCount>
-                        <Typography.Text style={{ paddingLeft: 2, fontSize: 18, color: ANTD_GRAY[8] }}>
-                            <b>{formatNumber(entityCount.count)}</b>
-                        </Typography.Text>
-                        <Typography.Text type="secondary">{entityCount.displayName}</Typography.Text>
-                    </EntityCount>
-                ))}
-            </EntityCountsContainer>
-            <ViewAllButton type="link" onClick={() => setShowAssetSearch(true)}>
-                View All
-            </ViewAllButton>
-            {showAssetSearch && (
-                <EmbeddedListSearchModal
-                    title="View Ingested Assets"
-                    searchBarStyle={{ width: 600, marginRight: 40 }}
-                    fixedFilters={{
-                        unionType: UnionType.AND,
-                        filters: [{ field: 'runId', values: [id] }],
-                    }}
-                    onClose={() => setShowAssetSearch(false)}
-                />
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx
deleted file mode 100644
index 18d8617ff6c084..00000000000000
--- a/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx
+++ /dev/null
@@ -1,588 +0,0 @@
-import { Button, SearchBar, SimpleSelect } from '@components';
-import { Modal, Pagination, message } from 'antd';
-import { ArrowClockwise } from 'phosphor-react';
-import * as QueryString from 'query-string';
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { useLocation } from 'react-router';
-import styled from 'styled-components';
-
-import analytics, { EventType } from '@app/analytics';
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import { INGESTION_TAB_QUERY_PARAMS } from '@app/ingest/constants';
-import IngestionSourceTable from '@app/ingest/source/IngestionSourceTable';
-import RecipeViewerModal from '@app/ingest/source/RecipeViewerModal';
-import { IngestionSourceBuilderModal } from '@app/ingest/source/builder/IngestionSourceBuilderModal';
-import { DEFAULT_EXECUTOR_ID, SourceBuilderState, StringMapEntryInput } from '@app/ingest/source/builder/types';
-import { ExecutionDetailsModal } from '@app/ingest/source/executions/ExecutionRequestDetailsModal';
-import { isExecutionRequestActive } from '@app/ingest/source/executions/IngestionSourceExecutionList';
-import useRefreshIngestionData from '@app/ingest/source/executions/useRefreshIngestionData';
-import { useCommandS } from '@app/ingest/source/hooks';
-import {
-    CLI_EXECUTOR_ID,
-    addToListIngestionSourcesCache,
-    removeFromListIngestionSourcesCache,
-} from '@app/ingest/source/utils';
-import { INGESTION_REFRESH_SOURCES_ID } from '@app/onboarding/config/IngestionOnboardingConfig';
-import { Message } from '@app/shared/Message';
-import { scrollToTop } from '@app/shared/searchUtils';
-import { PendingOwner } from '@app/sharedV2/owners/OwnersSection';
-import { OnboardingTour } from '@src/app/onboarding/OnboardingTour';
-
-import {
-    useCreateIngestionExecutionRequestMutation,
-    useCreateIngestionSourceMutation,
-    useDeleteIngestionSourceMutation,
-    useGetIngestionSourceQuery,
-    useListIngestionSourcesQuery,
-    useUpdateIngestionSourceMutation,
-} from '@graphql/ingestion.generated';
-import { useBatchAddOwnersMutation } from '@graphql/mutations.generated';
-import { IngestionSource, SortCriterion, SortOrder, UpdateIngestionSourceInput } from '@types';
-
-const PLACEHOLDER_URN = 'placeholder-urn';
-
-const SourceContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-`;
-
-const HeaderContainer = styled.div`
-    flex-shrink: 0;
-`;
-
-const TableContainer = styled.div`
-    flex: 1;
-    overflow: auto;
-`;
-
-const PaginationContainer = styled.div`
-    display: flex;
-    justify-content: center;
-    flex-shrink: 0;
-`;
-
-const StyledTabToolbar = styled(TabToolbar)`
-    padding: 16px 20px;
-    height: auto;
-    z-index: unset;
-    &&& {
-        padding: 8px 20px;
-        height: auto;
-        box-shadow: none;
-        flex-shrink: 0;
-    }
-`;
-
-const SearchContainer = styled.div`
-    display: flex;
-    align-items: center;
-    gap: 8px;
-`;
-
-const RefreshButtonContainer = styled.div``;
-
-const StyledSearchBar = styled(SearchBar)`
-    width: 220px;
-`;
-
-const StyledPagination = styled(Pagination)`
-    margin: 15px;
-`;
-
-const StyledSimpleSelect = styled(SimpleSelect)`
-    display: flex;
-    align-self: start;
-`;
-
-const SYSTEM_INTERNAL_SOURCE_TYPE = 'SYSTEM';
-
-enum IngestionSourceType {
-    ALL = 0,
-    UI = 1,
-    CLI = 2,
-}
-
-const DEFAULT_PAGE_SIZE = 25;
-
-const mapSourceTypeAliases = <T extends { type: string }>(source?: T): T | undefined => {
-    if (source) {
-        let { type } = source;
-        if (type === 'unity-catalog') {
-            type = 'databricks';
-        }
-        return { ...source, type };
-    }
-    return undefined;
-};
-
-const removeExecutionsFromIngestionSource = (source) => {
-    if (source) {
-        return {
-            name: source.name,
-            type: source.type,
-            schedule: source.schedule,
-            config: source.config,
-        };
-    }
-    return undefined;
-};
-
-type Props = {
-    showCreateModal?: boolean;
-    setShowCreateModal?: (show: boolean) => void;
-};
-
-export const IngestionSourceList = ({ showCreateModal, setShowCreateModal }: Props) => {
-    const location = useLocation();
-    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
-    const paramsQuery = (params?.[INGESTION_TAB_QUERY_PARAMS.searchQuery] as string) || undefined;
-
-    const [query, setQuery] = useState<undefined | string>(undefined);
-    const searchInputRef = useRef<HTMLInputElement | null>(null);
-    // highlight search input if user arrives with a query preset for salience
-    useEffect(() => {
-        if (paramsQuery?.length) {
-            setQuery(paramsQuery);
-            searchInputRef.current?.focus();
-        }
-    }, [paramsQuery]);
-
-    const [page, setPage] = useState(1);
-
-    const pageSize = DEFAULT_PAGE_SIZE;
-    const start = (page - 1) * pageSize;
-
-    const [isBuildingSource, setIsBuildingSource] = useState<boolean>(false);
-    const [isViewingRecipe, setIsViewingRecipe] = useState<boolean>(false);
-    const [focusSourceUrn, setFocusSourceUrn] = useState<undefined | string>(undefined);
-    const [focusExecutionUrn, setFocusExecutionUrn] = useState<undefined | string>(undefined);
-    const [lastRefresh, setLastRefresh] = useState(0);
-    // Set of removed urns used to account for eventual consistency
-    const [removedUrns, setRemovedUrns] = useState<string[]>([]);
-    const [sourceFilter, setSourceFilter] = useState(IngestionSourceType.ALL);
-    const [sort, setSort] = useState<SortCriterion>();
-    const [hideSystemSources, setHideSystemSources] = useState(true);
-
-    // Add a useEffect to handle the showCreateModal prop
-    useEffect(() => {
-        if (showCreateModal && setShowCreateModal) {
-            setIsBuildingSource(true);
-            setShowCreateModal(false);
-        }
-    }, [showCreateModal, setShowCreateModal]);
-
-    // When source filter changes, reset page to 1
-    useEffect(() => {
-        setPage(1);
-    }, [sourceFilter]);
-
-    /**
-     * Show or hide system ingestion sources using a hidden command S command.
-     */
-    useCommandS(() => setHideSystemSources(!hideSystemSources));
-
-    // Ingestion Source Default Filters
-    const filters = hideSystemSources
-        ? [{ field: 'sourceType', values: [SYSTEM_INTERNAL_SOURCE_TYPE], negated: true }]
-        : [{ field: 'sourceType', values: [SYSTEM_INTERNAL_SOURCE_TYPE] }];
-
-    if (sourceFilter !== IngestionSourceType.ALL) {
-        filters.push({
-            field: 'sourceExecutorId',
-            values: [CLI_EXECUTOR_ID],
-            negated: sourceFilter !== IngestionSourceType.CLI,
-        });
-    }
-
-    // Ingestion Source Queries
-    const { loading, error, data, client, refetch } = useListIngestionSourcesQuery({
-        variables: {
-            input: {
-                start,
-                count: pageSize,
-                query: query?.length ? query : undefined,
-                filters: filters.length ? filters : undefined,
-                sort,
-            },
-        },
-        fetchPolicy: (query?.length || 0) > 0 ? 'no-cache' : 'cache-first',
-    });
-    const [createIngestionSource] = useCreateIngestionSourceMutation();
-    const [updateIngestionSource] = useUpdateIngestionSourceMutation();
-    const [batchAddOwnersMutation] = useBatchAddOwnersMutation();
-
-    // Execution Request queries
-    const [createExecutionRequestMutation] = useCreateIngestionExecutionRequestMutation();
-    const [removeIngestionSourceMutation] = useDeleteIngestionSourceMutation();
-
-    const totalSources = data?.listIngestionSources?.total || 0;
-    const sources = data?.listIngestionSources?.ingestionSources || [];
-    const filteredSources = sources.filter((source) => !removedUrns.includes(source.urn)) as IngestionSource[];
-    const [focusSource, setFocusSource] = useState(
-        (focusSourceUrn && filteredSources.find((source) => source.urn === focusSourceUrn)) || undefined,
-    );
-
-    const { data: focusSourceData, refetch: focusSourceRefetch } = useGetIngestionSourceQuery({
-        variables: {
-            urn: focusSourceUrn || '',
-        },
-        skip: !focusSourceUrn,
-    });
-
-    const combinedRefetch = async () => {
-        await Promise.all([focusSourceRefetch(), refetch()]);
-    };
-
-    useEffect(() => {
-        setFocusSource(focusSourceData?.ingestionSource as IngestionSource);
-    }, [focusSourceData?.ingestionSource]);
-
-    const onRefresh = useCallback(() => {
-        refetch();
-        // Used to force a re-render of the child execution request list.
-        setLastRefresh(new Date().getTime());
-    }, [refetch]);
-
-    const handleSearch = (value: string) => {
-        setPage(1);
-        setQuery(value);
-    };
-
-    function hasActiveExecution() {
-        return !!filteredSources.find((source) =>
-            source.executions?.executionRequests?.find((request) => isExecutionRequestActive(request)),
-        );
-    }
-    useRefreshIngestionData(onRefresh, hasActiveExecution);
-
-    const executeIngestionSource = (urn: string) => {
-        createExecutionRequestMutation({
-            variables: {
-                input: {
-                    ingestionSourceUrn: urn,
-                },
-            },
-        })
-            .then(() => {
-                analytics.event({
-                    type: EventType.ExecuteIngestionSourceEvent,
-                    sourceType: focusSource?.type,
-                    sourceUrn: focusSource?.urn,
-                });
-                message.success({
-                    content: `Successfully submitted ingestion execution request!`,
-                    duration: 3,
-                });
-                setTimeout(() => onRefresh(), 3000);
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({
-                    content: `Failed to submit ingestion execution request!: \n ${e.message || ''}`,
-                    duration: 3,
-                });
-            });
-    };
-
-    const onCreateOrUpdateIngestionSourceSuccess = () => {
-        setTimeout(() => refetch(), 3000);
-        setIsBuildingSource(false);
-        setFocusSourceUrn(undefined);
-    };
-
-    const formatExtraArgs = (extraArgs): StringMapEntryInput[] => {
-        if (extraArgs === null || extraArgs === undefined) return [];
-        return extraArgs
-            .filter((entry) => entry.value !== null && entry.value !== undefined && entry.value !== '')
-            .map((entry) => ({ key: entry.key, value: entry.value }));
-    };
-
-    const createOrUpdateIngestionSource = (
-        input: UpdateIngestionSourceInput,
-        resetState: () => void,
-        shouldRun?: boolean,
-        owners?: PendingOwner[],
-    ) => {
-        if (focusSourceUrn) {
-            // Update:
-            updateIngestionSource({ variables: { urn: focusSourceUrn as string, input } })
-                .then(() => {
-                    if (owners && owners.length > 0) {
-                        batchAddOwnersMutation({
-                            variables: {
-                                input: {
-                                    owners: owners || [],
-                                    resources: [{ resourceUrn: focusSourceUrn }],
-                                },
-                            },
-                        });
-                    }
-                    analytics.event({
-                        type: EventType.UpdateIngestionSourceEvent,
-                        sourceType: input.type,
-                        sourceUrn: focusSourceUrn,
-                        interval: input.schedule?.interval,
-                    });
-                    message.success({
-                        content: `Successfully updated ingestion source!`,
-                        duration: 3,
-                    });
-                    onCreateOrUpdateIngestionSourceSuccess();
-                    resetState();
-                    if (shouldRun) executeIngestionSource(focusSourceUrn);
-                })
-                .catch((e) => {
-                    message.destroy();
-                    message.error({
-                        content: `Failed to update ingestion source!: \n ${e.message || ''}`,
-                        duration: 3,
-                    });
-                });
-        } else {
-            // Create
-            createIngestionSource({ variables: { input } })
-                .then((result) => {
-                    message.loading({ content: 'Loading...', duration: 2 });
-                    const newSource = {
-                        urn: result?.data?.createIngestionSource || PLACEHOLDER_URN,
-                        name: input.name,
-                        type: input.type,
-                        config: null,
-                        schedule: {
-                            interval: input.schedule?.interval || null,
-                            timezone: input.schedule?.timezone || null,
-                        },
-                        platform: null,
-                        executions: null,
-                        ownership: null,
-                    };
-                    if (owners && owners.length > 0) {
-                        batchAddOwnersMutation({
-                            variables: {
-                                input: {
-                                    owners,
-                                    resources: [{ resourceUrn: newSource.urn }],
-                                },
-                            },
-                        });
-                    }
-                    addToListIngestionSourcesCache(client, newSource, pageSize, query);
-                    setTimeout(() => {
-                        refetch();
-                        analytics.event({
-                            type: EventType.CreateIngestionSourceEvent,
-                            sourceType: input.type,
-                            sourceUrn: newSource.urn,
-                            interval: input.schedule?.interval,
-                        });
-                        message.success({
-                            content: `Successfully created ingestion source!`,
-                            duration: 3,
-                        });
-                        if (shouldRun && result.data?.createIngestionSource) {
-                            executeIngestionSource(result.data.createIngestionSource);
-                        }
-                    }, 2000);
-                    setIsBuildingSource(false);
-                    setFocusSourceUrn(undefined);
-                    resetState();
-                })
-                .catch((e) => {
-                    message.destroy();
-                    message.error({
-                        content: `Failed to create ingestion source!: \n ${e.message || ''}`,
-                        duration: 3,
-                    });
-                });
-        }
-    };
-
-    const onChangePage = (newPage: number) => {
-        scrollToTop();
-        setPage(newPage);
-    };
-
-    const deleteIngestionSource = (urn: string) => {
-        removeFromListIngestionSourcesCache(client, urn, page, pageSize, query);
-        removeIngestionSourceMutation({
-            variables: { urn },
-        })
-            .then(() => {
-                analytics.event({
-                    type: EventType.DeleteIngestionSourceEvent,
-                });
-                message.success({ content: 'Removed ingestion source.', duration: 2 });
-                const newRemovedUrns = [...removedUrns, urn];
-                setRemovedUrns(newRemovedUrns);
-                setTimeout(() => {
-                    refetch?.();
-                }, 3000);
-            })
-            .catch((e: unknown) => {
-                message.destroy();
-                if (e instanceof Error) {
-                    message.error({ content: `Failed to remove ingestion source: \n ${e.message || ''}`, duration: 3 });
-                }
-            });
-    };
-
-    const onSubmit = (recipeBuilderState: SourceBuilderState, resetState: () => void, shouldRun?: boolean) => {
-        createOrUpdateIngestionSource(
-            {
-                type: recipeBuilderState.type as string,
-                name: recipeBuilderState.name as string,
-                config: {
-                    recipe: recipeBuilderState.config?.recipe as string,
-                    version:
-                        (recipeBuilderState.config?.version?.length &&
-                            (recipeBuilderState.config?.version as string)) ||
-                        undefined,
-                    executorId:
-                        (recipeBuilderState.config?.executorId?.length &&
-                            (recipeBuilderState.config?.executorId as string)) ||
-                        DEFAULT_EXECUTOR_ID,
-                    debugMode: recipeBuilderState.config?.debugMode || false,
-                    extraArgs: formatExtraArgs(recipeBuilderState.config?.extraArgs || []),
-                },
-                schedule: recipeBuilderState.schedule && {
-                    interval: recipeBuilderState.schedule?.interval as string,
-                    timezone: recipeBuilderState.schedule?.timezone as string,
-                },
-            },
-            resetState,
-            shouldRun,
-            recipeBuilderState.owners,
-        );
-    };
-
-    const onEdit = (urn: string) => {
-        setIsBuildingSource(true);
-        setFocusSourceUrn(urn);
-    };
-
-    const onView = (urn: string) => {
-        setIsViewingRecipe(true);
-        setFocusSourceUrn(urn);
-    };
-
-    const onExecute = (urn: string) => {
-        Modal.confirm({
-            title: `Confirm Source Execution`,
-            content: "Click 'Execute' to run this ingestion source.",
-            onOk() {
-                executeIngestionSource(urn);
-            },
-            onCancel() {},
-            okText: 'Execute',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    const onDelete = (urn: string) => {
-        Modal.confirm({
-            title: `Confirm Ingestion Source Removal`,
-            content: `Are you sure you want to remove this ingestion source? Removing will terminate any scheduled ingestion runs.`,
-            onOk() {
-                deleteIngestionSource(urn);
-            },
-            onCancel() {},
-            okText: 'Yes',
-            okButtonProps: { ['data-testid' as any]: 'confirm-delete-ingestion-source' },
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    const onCancel = () => {
-        setIsBuildingSource(false);
-        setIsViewingRecipe(false);
-        setFocusSourceUrn(undefined);
-    };
-
-    const onChangeSort = (field, order) => {
-        setSort(
-            order
-                ? {
-                      sortOrder: order === 'ascend' ? SortOrder.Ascending : SortOrder.Descending,
-                      field,
-                  }
-                : undefined,
-        );
-    };
-
-    return (
-        <>
-            {!data && loading && <Message type="loading" content="Loading ingestion sources..." />}
-            {error && (
-                <Message type="error" content="Failed to load ingestion sources! An unexpected error occurred." />
-            )}
-            <SourceContainer>
-                <OnboardingTour stepIds={[INGESTION_REFRESH_SOURCES_ID]} />
-                <HeaderContainer>
-                    <StyledTabToolbar>
-                        <SearchContainer>
-                            <StyledSearchBar
-                                placeholder="Search..."
-                                value={query || ''}
-                                onChange={(value) => handleSearch(value)}
-                            />
-                            <StyledSimpleSelect
-                                options={[
-                                    { label: 'All', value: '0' },
-                                    { label: 'UI', value: '1' },
-                                    { label: 'CLI', value: '2' },
-                                ]}
-                                values={[sourceFilter.toString()]}
-                                onUpdate={(values) => setSourceFilter(Number(values[0]))}
-                                showClear={false}
-                                width={60}
-                            />
-                        </SearchContainer>
-                        <RefreshButtonContainer>
-                            <Button id={INGESTION_REFRESH_SOURCES_ID} variant="text" onClick={onRefresh}>
-                                <ArrowClockwise /> Refresh
-                            </Button>
-                        </RefreshButtonContainer>
-                    </StyledTabToolbar>
-                </HeaderContainer>
-                <TableContainer>
-                    <IngestionSourceTable
-                        lastRefresh={lastRefresh}
-                        sources={filteredSources || []}
-                        setFocusExecutionUrn={setFocusExecutionUrn}
-                        onExecute={onExecute}
-                        onEdit={onEdit}
-                        onView={onView}
-                        onDelete={onDelete}
-                        onRefresh={onRefresh}
-                        onChangeSort={onChangeSort}
-                    />
-                </TableContainer>
-                <PaginationContainer>
-                    <StyledPagination
-                        current={page}
-                        pageSize={pageSize}
-                        total={totalSources}
-                        showLessItems
-                        onChange={onChangePage}
-                        showSizeChanger={false}
-                    />
-                </PaginationContainer>
-            </SourceContainer>
-            <IngestionSourceBuilderModal
-                initialState={mapSourceTypeAliases(removeExecutionsFromIngestionSource(focusSource))}
-                open={isBuildingSource}
-                onSubmit={onSubmit}
-                onCancel={onCancel}
-                sourceRefetch={combinedRefetch}
-                selectedSource={focusSource}
-            />
-            {isViewingRecipe && <RecipeViewerModal recipe={focusSource?.config?.recipe} onCancel={onCancel} />}
-            {focusExecutionUrn && (
-                <ExecutionDetailsModal urn={focusExecutionUrn} open onClose={() => setFocusExecutionUrn(undefined)} />
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx
deleted file mode 100644
index 7dab5707dd3319..00000000000000
--- a/datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx
+++ /dev/null
@@ -1,175 +0,0 @@
-import { Empty } from 'antd';
-import { SorterResult } from 'antd/lib/table/interface';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { StyledTable } from '@app/entity/shared/components/styled/StyledTable';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import {
-    ActionsColumn,
-    LastStatusColumn,
-    ScheduleColumn,
-    TypeColumn,
-} from '@app/ingest/source/IngestionSourceTableColumns';
-import { IngestionSourceExecutionList } from '@app/ingest/source/executions/IngestionSourceExecutionList';
-import { CLI_EXECUTOR_ID, getIngestionSourceStatus } from '@app/ingest/source/utils';
-import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
-
-import { IngestionSource } from '@types';
-
-const PAGE_HEADER_HEIGHT = 395;
-
-const StyledSourceTable = styled(StyledTable)`
-    .cliIngestion {
-        td {
-            background-color: ${ANTD_GRAY[2]} !important;
-        }
-    }
-` as typeof StyledTable;
-
-const StyledSourceTableWithNavBarRedesign = styled(StyledSourceTable)`
-    overflow: hidden;
-
-    &&& .ant-table-body {
-        overflow-y: auto;
-        height: calc(100vh - ${PAGE_HEADER_HEIGHT}px);
-    }
-` as typeof StyledSourceTable;
-
-interface Props {
-    lastRefresh: number;
-    sources: IngestionSource[];
-    setFocusExecutionUrn: (urn: string) => void;
-    onExecute: (urn: string) => void;
-    onEdit: (urn: string) => void;
-    onView: (urn: string) => void;
-    onDelete: (urn: string) => void;
-    onRefresh: () => void;
-    onChangeSort: (field: string, order: SorterResult<any>['order']) => void;
-}
-
-function IngestionSourceTable({
-    lastRefresh,
-    sources,
-    setFocusExecutionUrn,
-    onExecute,
-    onEdit,
-    onView,
-    onDelete,
-    onRefresh,
-    onChangeSort,
-}: Props) {
-    const isShowNavBarRedesign = useShowNavBarRedesign();
-
-    const tableData = sources.map((source) => ({
-        urn: source.urn,
-        type: source.type,
-        name: source.name,
-        platformUrn: source.platform?.urn,
-        schedule: source.schedule?.interval,
-        timezone: source.schedule?.timezone,
-        execCount: source.executions?.total || 0,
-        lastExecUrn:
-            source.executions &&
-            source.executions?.executionRequests?.length > 0 &&
-            source.executions?.executionRequests[0]?.urn,
-        lastExecTime:
-            source.executions &&
-            source.executions?.executionRequests?.length > 0 &&
-            source.executions?.executionRequests[0]?.result?.startTimeMs,
-        lastExecStatus:
-            source.executions &&
-            source.executions?.executionRequests?.length > 0 &&
-            getIngestionSourceStatus(source.executions?.executionRequests[0]?.result),
-        cliIngestion: source.config?.executorId === CLI_EXECUTOR_ID,
-    }));
-
-    const tableColumns = [
-        {
-            title: 'Type',
-            dataIndex: 'type',
-            key: 'type',
-            render: (type: string, record: any) => <TypeColumn type={type} record={record} />,
-            sorter: true,
-        },
-        {
-            title: 'Name',
-            dataIndex: 'name',
-            key: 'name',
-            render: (name: string) => name || '',
-            sorter: true,
-        },
-        {
-            title: 'Schedule',
-            dataIndex: 'schedule',
-            key: 'schedule',
-            render: ScheduleColumn,
-        },
-        {
-            title: 'Status',
-            dataIndex: 'lastExecStatus',
-            key: 'lastExecStatus',
-            render: (status: any, record) => (
-                <LastStatusColumn status={status} record={record} setFocusExecutionUrn={setFocusExecutionUrn} />
-            ),
-        },
-        {
-            title: '',
-            dataIndex: '',
-            key: 'x',
-            render: (_, record: any) => (
-                <ActionsColumn
-                    record={record}
-                    setFocusExecutionUrn={setFocusExecutionUrn}
-                    onExecute={onExecute}
-                    onDelete={onDelete}
-                    onView={onView}
-                    onEdit={onEdit}
-                />
-            ),
-        },
-    ];
-
-    const handleTableChange = (_: any, __: any, sorter: any) => {
-        const sorterTyped: SorterResult<any> = sorter;
-        const field = sorterTyped.field as string;
-        const { order } = sorterTyped;
-        onChangeSort(field, order);
-    };
-
-    const FinalStyledSourceTable = isShowNavBarRedesign ? StyledSourceTableWithNavBarRedesign : StyledSourceTable;
-
-    return (
-        <FinalStyledSourceTable
-            columns={tableColumns}
-            onChange={handleTableChange}
-            dataSource={tableData}
-            scroll={isShowNavBarRedesign ? { y: 'max-content', x: 'max-content' } : {}}
-            rowKey="urn"
-            rowClassName={(record, _) => (record.cliIngestion ? 'cliIngestion' : '')}
-            locale={{
-                emptyText: <Empty description="No Ingestion Sources!" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
-            }}
-            expandable={{
-                expandedRowRender: (record, _index, _indent, expanded) => {
-                    return (
-                        <IngestionSourceExecutionList
-                            urn={record.urn}
-                            isExpanded={expanded}
-                            lastRefresh={lastRefresh}
-                            onRefresh={onRefresh}
-                        />
-                    );
-                },
-                rowExpandable: (record) => {
-                    return record.execCount > 0;
-                },
-                defaultExpandAllRows: false,
-                indentSize: 0,
-            }}
-            pagination={false}
-        />
-    );
-}
-
-export default IngestionSourceTable;
diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx
deleted file mode 100644
index 7e534f8728ead5..00000000000000
--- a/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx
+++ /dev/null
@@ -1,227 +0,0 @@
-import { blue } from '@ant-design/colors';
-import { CodeOutlined, CopyOutlined, DeleteOutlined } from '@ant-design/icons';
-import { Tooltip } from '@components';
-import { Button, Image, Typography } from 'antd';
-import cronstrue from 'cronstrue';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import useGetSourceLogoUrl from '@app/ingest/source/builder/useGetSourceLogoUrl';
-import {
-    RUNNING,
-    getExecutionRequestStatusDisplayColor,
-    getExecutionRequestStatusDisplayText,
-    getExecutionRequestStatusIcon,
-} from '@app/ingest/source/utils';
-import { capitalizeFirstLetter } from '@app/shared/textUtil';
-
-const PreviewImage = styled(Image)`
-    max-height: 28px;
-    width: auto;
-    object-fit: contain;
-    margin: 0px;
-    background-color: transparent;
-`;
-
-const StatusContainer = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-`;
-
-const AllStatusWrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-`;
-
-const StatusButton = styled(Button)`
-    padding: 0px;
-    margin: 0px;
-`;
-
-const ActionButtonContainer = styled.div`
-    display: flex;
-    justify-content: right;
-`;
-
-const TypeWrapper = styled.div`
-    align-items: center;
-    display: flex;
-`;
-
-const CliBadge = styled.span`
-    margin-left: 20px;
-    border-radius: 15px;
-    border: 1px solid ${ANTD_GRAY[8]};
-    padding: 1px 4px;
-    font-size: 10px;
-
-    font-size: 8px;
-    font-weight: bold;
-    letter-spacing: 0.5px;
-    border: 1px solid ${blue[6]};
-    color: ${blue[6]};
-
-    svg {
-        display: none;
-        margin-right: 5px;
-    }
-`;
-const StatusText = styled(Typography.Text)`
-    font-weight: bold;
-    margin-left: 8px;
-    color: ${(props) => props.color};
-    &:hover {
-        text-decoration: underline;
-      },
-`;
-interface TypeColumnProps {
-    type: string;
-    record: any;
-}
-
-export function TypeColumn({ type, record }: TypeColumnProps) {
-    const iconUrl = useGetSourceLogoUrl(type);
-    const typeDisplayName = capitalizeFirstLetter(type);
-
-    return (
-        <TypeWrapper>
-            {iconUrl ? (
-                <Tooltip overlay={typeDisplayName}>
-                    <PreviewImage preview={false} src={iconUrl} alt={type || ''} />
-                </Tooltip>
-            ) : (
-                <Typography.Text strong>{typeDisplayName}</Typography.Text>
-            )}
-            {record.cliIngestion && (
-                <Tooltip title="This source is ingested from the command-line interface (CLI)">
-                    <CliBadge>
-                        <CodeOutlined />
-                        CLI
-                    </CliBadge>
-                </Tooltip>
-            )}
-        </TypeWrapper>
-    );
-}
-
-export function LastExecutionColumn({ time }: { time: number }) {
-    const executionDate = time && new Date(time);
-    const localTime = executionDate && `${executionDate.toLocaleDateString()} at ${executionDate.toLocaleTimeString()}`;
-    return <Typography.Text type="secondary">{localTime ? `Last run ${localTime}` : 'Never run'}</Typography.Text>;
-}
-
-export function ScheduleColumn(schedule: any, record: any) {
-    let tooltip: string;
-    try {
-        tooltip = schedule && `Runs ${cronstrue.toString(schedule).toLowerCase()} (${record.timezone})`;
-    } catch (e) {
-        tooltip = 'Invalid cron schedule';
-        console.debug('Error parsing cron schedule', e);
-    }
-    return (
-        <Tooltip title={tooltip || 'Not scheduled'}>
-            <Typography.Text code>{schedule || 'None'}</Typography.Text>
-        </Tooltip>
-    );
-}
-
-interface LastStatusProps {
-    status: any;
-    record: any;
-    setFocusExecutionUrn: (urn: string) => void;
-}
-
-export function LastStatusColumn({ status, record, setFocusExecutionUrn }: LastStatusProps) {
-    const Icon = getExecutionRequestStatusIcon(status);
-    const text = getExecutionRequestStatusDisplayText(status);
-    const color = getExecutionRequestStatusDisplayColor(status);
-    const { lastExecTime, lastExecUrn } = record;
-    return (
-        <AllStatusWrapper>
-            <StatusContainer>
-                {Icon && <Icon style={{ color, fontSize: 14 }} />}
-                <StatusButton
-                    data-testid="ingestion-source-table-status"
-                    type="link"
-                    onClick={() => setFocusExecutionUrn(lastExecUrn)}
-                >
-                    <StatusText color={color}>{text || 'Pending...'}</StatusText>
-                </StatusButton>
-            </StatusContainer>
-            <LastExecutionColumn time={lastExecTime} />
-        </AllStatusWrapper>
-    );
-}
-
-interface ActionsColumnProps {
-    record: any;
-    setFocusExecutionUrn: (urn: string) => void;
-    onExecute: (urn: string) => void;
-    onEdit: (urn: string) => void;
-    onView: (urn: string) => void;
-    onDelete: (urn: string) => void;
-}
-
-export function ActionsColumn({
-    record,
-    onEdit,
-    setFocusExecutionUrn,
-    onView,
-    onExecute,
-    onDelete,
-}: ActionsColumnProps) {
-    return (
-        <ActionButtonContainer>
-            {navigator.clipboard && (
-                <Tooltip title="Copy Ingestion Source URN">
-                    <Button
-                        style={{ marginRight: 16 }}
-                        icon={<CopyOutlined />}
-                        onClick={() => {
-                            navigator.clipboard.writeText(record.urn);
-                        }}
-                    />
-                </Tooltip>
-            )}
-            {!record.cliIngestion && (
-                <Button
-                    data-testid="ingestion-source-table-edit-button"
-                    style={{ marginRight: 16 }}
-                    onClick={() => onEdit(record.urn)}
-                >
-                    EDIT
-                </Button>
-            )}
-            {record.cliIngestion && (
-                <Button style={{ marginRight: 16 }} onClick={() => onView(record.urn)}>
-                    VIEW
-                </Button>
-            )}
-            {record.lastExecStatus !== RUNNING && (
-                <Button
-                    disabled={record.cliIngestion}
-                    style={{ marginRight: 16 }}
-                    onClick={() => onExecute(record.urn)}
-                >
-                    RUN
-                </Button>
-            )}
-            {record.lastExecStatus === RUNNING && (
-                <Button style={{ marginRight: 16 }} onClick={() => setFocusExecutionUrn(record.lastExecUrn)}>
-                    DETAILS
-                </Button>
-            )}
-            <Button
-                data-testid={`delete-ingestion-source-${record.name}`}
-                onClick={() => onDelete(record.urn)}
-                type="text"
-                shape="circle"
-                danger
-            >
-                <DeleteOutlined />
-            </Button>
-        </ActionButtonContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/ingest/source/RecipeViewerModal.tsx b/datahub-web-react/src/app/ingest/source/RecipeViewerModal.tsx
deleted file mode 100644
index 8602f4286a06d7..00000000000000
--- a/datahub-web-react/src/app/ingest/source/RecipeViewerModal.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import Editor from '@monaco-editor/react';
-import { Button, Modal } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { jsonToYaml } from '@app/ingest/source/utils';
-
-const YamlWrapper = styled.div`
-    padding: 24px;
-`;
-
-interface Props {
-    recipe?: string;
-    onCancel: () => void;
-}
-
-function RecipeViewerModal({ recipe, onCancel }: Props) {
-    const formattedRecipe = recipe ? jsonToYaml(recipe) : '';
-
-    return (
-        <Modal
-            open
-            onCancel={onCancel}
-            width={800}
-            title="View Ingestion Recipe"
-            footer={<Button onClick={onCancel}>Done</Button>}
-        >
-            <YamlWrapper>
-                <Editor
-                    options={{
-                        readOnly: true,
-                        minimap: { enabled: false },
-                        scrollbar: {
-                            vertical: 'hidden',
-                            horizontal: 'hidden',
-                        },
-                    }}
-                    height="55vh"
-                    defaultLanguage="yaml"
-                    value={formattedRecipe}
-                />
-            </YamlWrapper>
-        </Modal>
-    );
-}
-
-export default RecipeViewerModal;
diff --git a/datahub-web-react/src/app/ingest/source/builder/CreateScheduleStep.tsx b/datahub-web-react/src/app/ingest/source/builder/CreateScheduleStep.tsx
deleted file mode 100644
index 682ee4cba38c3c..00000000000000
--- a/datahub-web-react/src/app/ingest/source/builder/CreateScheduleStep.tsx
+++ /dev/null
@@ -1,223 +0,0 @@
-import { CheckCircleOutlined, WarningOutlined } from '@ant-design/icons';
-import { Checkbox, Form, Input, Switch, Typography } from 'antd';
-import cronstrue from 'cronstrue';
-import React, { useMemo, useState } from 'react';
-import { Cron } from 'react-js-cron';
-import 'react-js-cron/dist/styles.css';
-import styled from 'styled-components';
-
-import { ANTD_GRAY, REDESIGN_COLORS } from '@app/entity/shared/constants';
-import { TimezoneSelect } from '@app/ingest/source/builder/TimezoneSelect';
-import { IngestionSourceBuilderStep } from '@app/ingest/source/builder/steps';
-import { SourceBuilderState, StepProps } from '@app/ingest/source/builder/types';
-import { RequiredFieldForm } from '@app/shared/form/RequiredFieldForm';
-import { lowerFirstLetter } from '@app/shared/textUtil';
-import { Button } from '@src/alchemy-components';
-
-const Section = styled.div`
-    display: flex;
-    flex-direction: column;
-    padding-bottom: 16px;
-    padding-top: 0px;
-`;
-
-const SelectTemplateHeader = styled(Typography.Title)`
-    && {
-        margin-bottom: 8px;
-    }
-`;
-
-const CronText = styled(Typography.Paragraph)`
-    &&& {
-        margin-bottom: 0px;
-    }
-    color: ${ANTD_GRAY[7]};
-`;
-
-const CronInput = styled(Input)`
-    margin-bottom: 8px;
-    max-width: 200px;
-`;
-
-const Schedule = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: start;
-`;
-
-const AdvancedSchedule = styled.div`
-    margin-left: 20px;
-`;
-
-const AdvancedCheckBox = styled(Typography.Text)`
-    margin-right: 10px;
-`;
-
-const CronSuccessCheck = styled(CheckCircleOutlined)`
-    color: ${REDESIGN_COLORS.BLUE};
-    margin-right: 4px;
-`;
-
-const ControlsContainer = styled.div`
-    display: flex;
-    justify-content: space-between;
-    margin-top: 8px;
-`;
-
-const StyledFormItem = styled(Form.Item)`
-    .cron-builder {
-        color: ${ANTD_GRAY[7]};
-    }
-    .cron-builder-select {
-        min-width: 100px;
-    }
-`;
-
-const WarningContainer = styled.div`
-    color: ${ANTD_GRAY[7]};
-`;
-
-const StyledWarningOutlined = styled(WarningOutlined)`
-    margin-right: 4px;
-    margin-top: 12px;
-`;
-
-const ItemDescriptionText = styled(Typography.Paragraph)``;
-
-const DAILY_MIDNIGHT_CRON_INTERVAL = '0 0 * * *';
-
-export const CreateScheduleStep = ({ state, updateState, goTo, prev }: StepProps) => {
-    const { schedule } = state;
-    const interval = schedule?.interval?.replaceAll(', ', ' ') || DAILY_MIDNIGHT_CRON_INTERVAL;
-    const timezone = schedule?.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone;
-    const [scheduleEnabled, setScheduleEnabled] = useState(!!schedule);
-    const [advancedCronCheck, setAdvancedCronCheck] = useState(false);
-    const [scheduleCronInterval, setScheduleCronInterval] = useState(interval);
-    const [scheduleTimezone, setScheduleTimezone] = useState(timezone);
-
-    const cronAsText = useMemo(() => {
-        if (scheduleCronInterval) {
-            try {
-                return {
-                    text: `Runs ${lowerFirstLetter(cronstrue.toString(scheduleCronInterval))}.`,
-                    error: false,
-                };
-            } catch (e) {
-                return {
-                    text: undefined,
-                    error: true,
-                };
-            }
-        }
-        return {
-            text: undefined,
-            error: false,
-        };
-    }, [scheduleCronInterval]);
-
-    const onClickNext = () => {
-        if (scheduleEnabled) {
-            const newState: SourceBuilderState = {
-                ...state,
-                schedule: {
-                    timezone: scheduleTimezone,
-                    interval: scheduleCronInterval,
-                },
-            };
-            updateState(newState);
-        } else {
-            const newState: SourceBuilderState = {
-                ...state,
-                schedule: undefined,
-            };
-            updateState(newState);
-        }
-
-        goTo(IngestionSourceBuilderStep.NAME_SOURCE);
-    };
-
-    return (
-        <>
-            <Section>
-                <SelectTemplateHeader level={5}>Configure an Ingestion Schedule</SelectTemplateHeader>
-            </Section>
-            <RequiredFieldForm layout="vertical">
-                <Form.Item
-                    tooltip="Enable to run ingestion syncs on a schedule. Running syncs on a schedule helps to keep information up to date."
-                    label={
-                        <Typography.Text strong>
-                            Run on a schedule <Typography.Text type="secondary">(Recommended)</Typography.Text>
-                        </Typography.Text>
-                    }
-                >
-                    <Switch checked={scheduleEnabled} onChange={(v) => setScheduleEnabled(v)} />
-                    {!scheduleEnabled && (
-                        <WarningContainer>
-                            <StyledWarningOutlined />
-                            Running ingestion without a schedule may result in out-of-date information.
-                        </WarningContainer>
-                    )}
-                </Form.Item>
-                <StyledFormItem required label={<Typography.Text strong>Schedule</Typography.Text>}>
-                    <Schedule>
-                        {advancedCronCheck ? (
-                            <CronInput
-                                placeholder={DAILY_MIDNIGHT_CRON_INTERVAL}
-                                autoFocus
-                                value={scheduleCronInterval}
-                                onChange={(e) => setScheduleCronInterval(e.target.value)}
-                            />
-                        ) : (
-                            <Cron
-                                value={scheduleCronInterval}
-                                setValue={setScheduleCronInterval}
-                                clearButton={false}
-                                className="cron-builder"
-                                leadingZero
-                            />
-                        )}
-                        <AdvancedSchedule>
-                            <AdvancedCheckBox type="secondary">Show Advanced</AdvancedCheckBox>
-                            <Checkbox
-                                checked={advancedCronCheck}
-                                onChange={(event) => setAdvancedCronCheck(event.target.checked)}
-                            />
-                        </AdvancedSchedule>
-                    </Schedule>
-                    <CronText>
-                        {cronAsText.error && <>Invalid cron schedule. Cron must be of UNIX form:</>}
-                        {!cronAsText.text && (
-                            <Typography.Paragraph keyboard style={{ marginTop: 4 }}>
-                                minute, hour, day, month, day of week
-                            </Typography.Paragraph>
-                        )}
-                        {cronAsText.text && (
-                            <>
-                                <CronSuccessCheck />
-                                {cronAsText.text}
-                            </>
-                        )}
-                    </CronText>
-                </StyledFormItem>
-                <Form.Item required label={<Typography.Text strong>Timezone</Typography.Text>}>
-                    <ItemDescriptionText>Choose a timezone for the schedule.</ItemDescriptionText>
-                    <TimezoneSelect value={scheduleTimezone} onChange={setScheduleTimezone} />
-                </Form.Item>
-            </RequiredFieldForm>
-            <ControlsContainer>
-                <Button variant="outline" color="gray" onClick={prev}>
-                    Previous
-                </Button>
-                <div>
-                    <Button
-                        data-testid="ingestion-schedule-next-button"
-                        disabled={!interval || interval.length === 0 || cronAsText.error}
-                        onClick={onClickNext}
-                    >
-                        Next
-                    </Button>
-                </div>
-            </ControlsContainer>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/ingest/source/builder/DataPlatformCard.tsx b/datahub-web-react/src/app/ingest/source/builder/DataPlatformCard.tsx
deleted file mode 100644
index 38fd6d1cebc426..00000000000000
--- a/datahub-web-react/src/app/ingest/source/builder/DataPlatformCard.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { Button, Image } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { REDESIGN_COLORS } from '@app/entity/shared/constants';
-
-const Container = styled(Button)`
-    padding: 32px;
-    height: 200px;
-    display: flex;
-    justify-content: center;
-    border-radius: 8px;
-    align-items: start;
-    flex-direction: column;
-    border: 1px solid #e0e0e0;
-    background-color: #ffffff;
-    &&:hover {
-        border: 1px solid ${REDESIGN_COLORS.BLUE};
-        background-color: #ffffff;
-    }
-    white-space: unset;
-`;
-
-const PlatformLogo = styled(Image)`
-    max-height: 32px;
-    height: 32px;
-    width: auto;
-    object-fit: contain;
-    background-color: transparent;
-`;
-
-const LogoContainer = styled.div`
-    margin-bottom: 14px;
-`;
-
-const Title = styled.div`
-    word-break: break-word;
-    color: #464646;
-    font-weight: bold;
-    font-size: 16px;
-    margin-bottom: 8px;
-`;
-
-const Description = styled.div`
-    word-break: break-word;
-    text-align: left;
-    color: #7c7c7c;
-`;
-
-type Props = {
-    logoUrl?: string;
-    logoComponent?: React.ReactNode;
-    name: string;
-    description?: string;
-    onClick?: () => void;
-};
-
-export const DataPlatformCard = ({ logoUrl, logoComponent, name, description, onClick }: Props) => {
-    return (
-        <Container type="link" onClick={onClick}>
-            <LogoContainer>
-                {(logoUrl && <PlatformLogo preview={false} src={logoUrl} alt={name} />) || logoComponent}
-            </LogoContainer>
-            <Title>{name}</Title>
-            <Description>{description}</Description>
-        </Container>
-    );
-};
diff --git a/datahub-web-react/src/app/ingest/source/builder/IngestionSourceBuilderModal.tsx b/datahub-web-react/src/app/ingest/source/builder/IngestionSourceBuilderModal.tsx
deleted file mode 100644
index 3ed4a91fd23bb1..00000000000000
--- a/datahub-web-react/src/app/ingest/source/builder/IngestionSourceBuilderModal.tsx
+++ /dev/null
@@ -1,180 +0,0 @@
-import { Modal, Steps, Typography } from 'antd';
-import { isEqual } from 'lodash';
-import React, { useEffect, useRef, useState } from 'react';
-import styled from 'styled-components';
-
-import { CreateScheduleStep } from '@app/ingest/source/builder/CreateScheduleStep';
-import { DefineRecipeStep } from '@app/ingest/source/builder/DefineRecipeStep';
-import { NameSourceStep } from '@app/ingest/source/builder/NameSourceStep';
-import { SelectTemplateStep } from '@app/ingest/source/builder/SelectTemplateStep';
-import sourcesJson from '@app/ingest/source/builder/sources.json';
-import { SourceBuilderState, StepProps } from '@app/ingest/source/builder/types';
-
-import { IngestionSource } from '@types';
-
-const StyledModal = styled(Modal)`
-    && .ant-modal-content {
-        border-radius: 16px;
-        overflow: hidden;
-        min-width: 400px;
-    }
-`;
-
-const TitleContainer = styled.div`
-    display: flex;
-    justify-content: space-between;
-    border-radius: 12px;
-`;
-
-const StepsContainer = styled.div`
-    margin-right: 20px;
-    margin-left: 20px;
-    margin-bottom: 40px;
-`;
-
-/**
- * Mapping from the step type to the title for the step
- */
-export enum IngestionSourceBuilderStepTitles {
-    SELECT_TEMPLATE = 'Choose Data Source',
-    DEFINE_RECIPE = 'Configure Connection',
-    CREATE_SCHEDULE = 'Sync Schedule',
-    NAME_SOURCE = 'Finish up',
-}
-
-/**
- * Mapping from the step type to the component implementing that step.
- */
-export const IngestionSourceBuilderStepComponent = {
-    SELECT_TEMPLATE: SelectTemplateStep,
-    DEFINE_RECIPE: DefineRecipeStep,
-    CREATE_SCHEDULE: CreateScheduleStep,
-    NAME_SOURCE: NameSourceStep,
-};
-
-/**
- * Steps of the Ingestion Source Builder flow.
- */
-export enum IngestionSourceBuilderStep {
-    SELECT_TEMPLATE = 'SELECT_TEMPLATE',
-    DEFINE_RECIPE = 'DEFINE_RECIPE',
-    CREATE_SCHEDULE = 'CREATE_SCHEDULE',
-    NAME_SOURCE = 'NAME_SOURCE',
-}
-
-const modalBodyStyle = { padding: '16px 24px 16px 24px', backgroundColor: '#F6F6F6' };
-
-type Props = {
-    initialState?: SourceBuilderState;
-    open: boolean;
-    onSubmit?: (input: SourceBuilderState, resetState: () => void, shouldRun?: boolean) => void;
-    onCancel?: () => void;
-    sourceRefetch?: () => Promise<any>;
-    selectedSource?: IngestionSource;
-};
-
-export const IngestionSourceBuilderModal = ({
-    initialState,
-    open,
-    onSubmit,
-    onCancel,
-    sourceRefetch,
-    selectedSource,
-}: Props) => {
-    const isEditing = initialState !== undefined;
-    const titleText = isEditing ? 'Edit Data Source' : 'Connect Data Source';
-    const initialStep = isEditing
-        ? IngestionSourceBuilderStep.DEFINE_RECIPE
-        : IngestionSourceBuilderStep.SELECT_TEMPLATE;
-
-    const [stepStack, setStepStack] = useState([initialStep]);
-    const [ingestionBuilderState, setIngestionBuilderState] = useState<SourceBuilderState>({
-        schedule: {
-            interval: '0 0 * * *',
-        },
-    });
-
-    const ingestionSources = JSON.parse(JSON.stringify(sourcesJson)); // TODO: replace with call to server once we have access to dynamic list of sources
-
-    // Reset the ingestion builder modal state when the modal is re-opened.
-    const prevInitialState = useRef(initialState);
-    useEffect(() => {
-        if (!isEqual(prevInitialState.current, initialState)) {
-            setIngestionBuilderState(initialState || {});
-        }
-        prevInitialState.current = initialState;
-    }, [initialState]);
-
-    // Reset the step stack to the initial step when the modal is re-opened.
-    useEffect(() => setStepStack([initialStep]), [initialStep]);
-
-    const goTo = (step: IngestionSourceBuilderStep) => {
-        setStepStack([...stepStack, step]);
-    };
-
-    const prev = () => {
-        setStepStack(stepStack.slice(0, -1));
-    };
-
-    const cancel = () => {
-        onCancel?.();
-    };
-
-    const submit = (shouldRun?: boolean) => {
-        onSubmit?.(
-            ingestionBuilderState,
-            () => {
-                setStepStack([initialStep]);
-                setIngestionBuilderState({});
-            },
-            shouldRun,
-        );
-    };
-
-    const currentStep = stepStack[stepStack.length - 1];
-    const currentStepIndex = Object.values(IngestionSourceBuilderStep)
-        .map((value, index) => ({
-            value,
-            index,
-        }))
-        .filter((obj) => obj.value === currentStep)[0].index;
-    const StepComponent: React.FC<StepProps> = IngestionSourceBuilderStepComponent[currentStep];
-
-    return (
-        <StyledModal
-            width="64%"
-            footer={null}
-            title={
-                <TitleContainer>
-                    <Typography.Text>{titleText}</Typography.Text>
-                </TitleContainer>
-            }
-            style={{ top: 40 }}
-            bodyStyle={modalBodyStyle}
-            open={open}
-            onCancel={onCancel}
-        >
-            {currentStepIndex > 0 ? (
-                <StepsContainer>
-                    <Steps current={currentStepIndex}>
-                        {Object.keys(IngestionSourceBuilderStep).map((item) => (
-                            <Steps.Step key={item} title={IngestionSourceBuilderStepTitles[item]} />
-                        ))}
-                    </Steps>
-                </StepsContainer>
-            ) : null}
-            <StepComponent
-                state={ingestionBuilderState}
-                updateState={setIngestionBuilderState}
-                isEditing={isEditing}
-                goTo={goTo}
-                prev={stepStack.length > 1 ? prev : undefined}
-                submit={submit}
-                cancel={cancel}
-                ingestionSources={ingestionSources}
-                sourceRefetch={sourceRefetch}
-                selectedSource={selectedSource}
-            />
-        </StyledModal>
-    );
-};
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeBuilder.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeBuilder.tsx
index a1e0e4272ef16f..3d8c90fcea9cb9 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeBuilder.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeBuilder.tsx
@@ -14,7 +14,7 @@ import { CSV, LOOKER, LOOK_ML } from '@app/ingest/source/builder/constants';
 import { SourceBuilderState, SourceConfig } from '@app/ingest/source/builder/types';
 import { Button } from '@src/alchemy-components';
 
-export const ControlsContainer = styled.div`
+const ControlsContainer = styled.div`
     display: flex;
     justify-content: space-between;
     margin-top: 8px;
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/DictField.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/DictField.tsx
index fe6e2713ce0188..10650b9011206c 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/DictField.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/DictField.tsx
@@ -13,7 +13,7 @@ export const Label = styled.div`
     padding-bottom: 8px;
 `;
 
-export const StyledButton = styled(Button)`
+const StyledButton = styled(Button)`
     color: ${ANTD_GRAY[7]};
     margin: 10px 0 0 30px;
     width: calc(100% - 72px);
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/RecipeForm.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/RecipeForm.tsx
index 007d1ae87e4db0..6dfbb68216c902 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/RecipeForm.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/RecipeForm.tsx
@@ -20,7 +20,7 @@ import { RequiredFieldForm } from '@app/shared/form/RequiredFieldForm';
 
 import { useListSecretsQuery } from '@graphql/ingestion.generated';
 
-export const ControlsContainer = styled.div`
+const ControlsContainer = styled.div`
     display: flex;
     justify-content: space-between;
     margin-top: 12px;
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/ConnectionCapabilityView.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/ConnectionCapabilityView.tsx
index 2664cbaf3d4c24..1a3101d98f85ee 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/ConnectionCapabilityView.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/ConnectionCapabilityView.tsx
@@ -30,12 +30,12 @@ const StyledQuestion = styled(QuestionCircleOutlined)`
     margin-left: 4px;
 `;
 
-export const StyledCheck = styled(CheckOutlined)`
+const StyledCheck = styled(CheckOutlined)`
     color: ${green[6]};
     margin-right: 15px;
 `;
 
-export const StyledClose = styled(CloseOutlined)`
+const StyledClose = styled(CloseOutlined)`
     color: ${red[5]};
     margin-right: 15px;
 `;
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/types.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/types.ts
index 4f401e34d1a39c..51fc487c637dcf 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/types.ts
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/TestConnection/types.ts
@@ -1,21 +1,7 @@
 export enum SourceCapability {
-    PLATFORM_INSTANCE = 'Platform Instance',
-    DOMAINS = 'Domains',
-    DATA_PROFILING = 'Data Profiling',
-    USAGE_STATS = 'Usage Stats',
-    PARTITION_SUPPORT = 'Partition Support',
-    DESCRIPTIONS = 'Descriptions',
-    LINEAGE_COARSE = 'Table-Level Lineage',
-    LINEAGE_FINE = 'Column-level Lineage',
-    OWNERSHIP = 'Extract Ownership',
-    DELETION_DETECTION = 'Detect Deleted Entities',
-    TAGS = 'Extract Tags',
-    SCHEMA_METADATA = 'Schema Metadata',
-    CONTAINERS = 'Asset Containers',
-    CLASSIFICATION = 'Classification',
-}
+    }
 
-export interface ConnectionCapability {
+interface ConnectionCapability {
     capable: boolean;
     failure_reason: string | null;
     mitigation_message: string | null;
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/azure.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/azure.ts
index 91a6bdd1999b7a..4075107209b409 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/azure.ts
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/azure.ts
@@ -160,12 +160,3 @@ export const USER_DENY: RecipeField = {
     setValueOnRecipeOverride: (recipe: any, values: string[]) =>
         setListValuesOnRecipe(recipe, values, schemaDenyFieldPathUser),
 };
-
-export const SKIP_USERS_WITHOUT_GROUP: RecipeField = {
-    name: 'skip_users_without_a_group',
-    label: 'Skip users without group',
-    tooltip: 'Whether to skip users without group from Okta.',
-    type: FieldType.BOOLEAN,
-    fieldPath: 'source.config.skip_users_without_a_group',
-    rules: null,
-};
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/bigquery.ts b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/bigquery.ts
index 63b69dbfce8b55..b4d394a08cf513 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/bigquery.ts
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/bigquery.ts
@@ -1,26 +1,5 @@
 import { FieldType, RecipeField } from '@app/ingest/source/builder/RecipeForm/common';
 
-export const BIGQUERY_PROJECT_ID: RecipeField = {
-    name: 'project_id',
-    label: 'Project ID',
-    tooltip: 'Project ID where you have rights to run queries and create tables.',
-    placeholder: 'my-project-123',
-    type: FieldType.TEXT,
-    fieldPath: 'source.config.project_id',
-    rules: null,
-    required: true,
-};
-
-export const BIGQUERY_CREDENTIAL_PROJECT_ID: RecipeField = {
-    name: 'credential.project_id',
-    label: 'Credentials Project ID',
-    tooltip: "The Project ID, which can be found in your service account's JSON Key (project_id)",
-    placeholder: 'my-project-123',
-    type: FieldType.TEXT,
-    fieldPath: 'source.config.credential.project_id',
-    rules: null,
-};
-
 export const BIGQUERY_PRIVATE_KEY_ID: RecipeField = {
     name: 'credential.private_key_id',
     label: 'Private Key Id',
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/common.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/common.tsx
index 3a8a19927401e1..a185cf0e8826ad 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/common.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/common.tsx
@@ -77,7 +77,7 @@ export function setListValuesOnRecipe(recipe: any, values: string[] | undefined,
 
 const NUM_CHARACTERS_TO_REMOVE_FROM_DATE = 5;
 
-export function setDateValueOnRecipe(recipe: any, value: Moment | undefined, fieldPath: string) {
+function setDateValueOnRecipe(recipe: any, value: Moment | undefined, fieldPath: string) {
     const updatedRecipe = { ...recipe };
     if (value !== undefined) {
         if (!value) {
@@ -125,38 +125,6 @@ export const DATABASE_DENY: RecipeField = {
         setListValuesOnRecipe(recipe, values, databaseDenyFieldPath),
 };
 
-const dashboardAllowFieldPath = 'source.config.dashboard_pattern.allow';
-export const DASHBOARD_ALLOW: RecipeField = {
-    name: 'dashboard_pattern.allow',
-    label: 'Allow Patterns',
-    tooltip:
-        'Only include specific Dashboards by providing the name of a Dashboard, or a Regular Expression (REGEX). If not provided, all Dashboards will be included.',
-    type: FieldType.LIST,
-    buttonLabel: 'Add pattern',
-    fieldPath: dashboardAllowFieldPath,
-    rules: null,
-    section: 'Dashboards',
-    placeholder: 'my_dashboard',
-    setValueOnRecipeOverride: (recipe: any, values: string[]) =>
-        setListValuesOnRecipe(recipe, values, dashboardAllowFieldPath),
-};
-
-const dashboardDenyFieldPath = 'source.config.dashboard_pattern.deny';
-export const DASHBOARD_DENY: RecipeField = {
-    name: 'dashboard_pattern.deny',
-    label: 'Deny Patterns',
-    tooltip:
-        'Exclude specific Dashboards by providing the name of a Dashboard, or a Regular Expression (REGEX). If not provided, all Dashboards will be included. Deny patterns always take precendence over Allow patterns.',
-    type: FieldType.LIST,
-    buttonLabel: 'Add pattern',
-    fieldPath: dashboardDenyFieldPath,
-    rules: null,
-    section: 'Dashboards',
-    placeholder: 'my_dashboard',
-    setValueOnRecipeOverride: (recipe: any, values: string[]) =>
-        setListValuesOnRecipe(recipe, values, dashboardDenyFieldPath),
-};
-
 const schemaAllowFieldPath = 'source.config.schema_pattern.allow';
 export const SCHEMA_ALLOW: RecipeField = {
     name: 'schema_pattern.allow',
@@ -318,15 +286,6 @@ export const STATEFUL_INGESTION_ENABLED: RecipeField = {
     rules: null,
 };
 
-export const UPSTREAM_LINEAGE_IN_REPORT: RecipeField = {
-    name: 'upstream_lineage_in_report',
-    label: 'Include Upstream Lineage In Report.',
-    tooltip: 'Useful for debugging lineage information. Set to True to see the raw lineage created internally.',
-    type: FieldType.BOOLEAN,
-    fieldPath: 'source.config.upstream_lineage_in_report',
-    rules: null,
-};
-
 export const TABLE_LINEAGE_MODE: RecipeField = {
     name: 'table_lineage_mode',
     label: 'Table Lineage Mode',
@@ -411,25 +370,6 @@ export const INCLUDE_VIEWS: RecipeField = {
     rules: null,
 };
 
-export const GITHUB_INFO_REPO: RecipeField = {
-    name: 'github_info.repo',
-    label: 'GitHub Repo',
-    tooltip: (
-        <div>
-            <p>
-                Name of your github repo. e.g. repo for{' '}
-                <a href="https://github.com/datahub-project/datahub" target="_blank" rel="noreferrer">
-                    https://github.com/datahub-project/datahub
-                </a>{' '}
-                is datahub-project/datahub.
-            </p>
-        </div>
-    ),
-    type: FieldType.TEXT,
-    fieldPath: 'source.config.github_info.repo',
-    rules: null,
-};
-
 export const EXTRACT_USAGE_HISTORY: RecipeField = {
     name: 'extract_usage_history',
     label: 'Extract Usage History',
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/dbt_cloud.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/dbt_cloud.tsx
index 98c9787d0a09d5..6595b0ff6fe1e7 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/dbt_cloud.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/dbt_cloud.tsx
@@ -8,8 +8,6 @@ const TipSection = styled.div`
     margin-bottom: 12px;
 `;
 
-export const DBT_CLOUD = 'dbt-cloud';
-
 export const DBT_CLOUD_TOKEN: RecipeField = {
     name: 'token',
     label: 'API Token',
@@ -234,17 +232,6 @@ export const NODE_DENY: RecipeField = {
     section: 'Nodes',
 };
 
-export const METADATA_ENDPOINT: RecipeField = {
-    name: 'metadata_endpoint',
-    label: 'Custom Metadata Endpoint URL',
-    tooltip:
-        'A custom URL used for extracting Metadata. By default, this metadata is extracted from https://metadata.cloud.getdbt.com/graphql. In most cases, users should NOT need to provide this value.',
-    placeholder: 'https://metadata.cloud.getdbt.com/graphql',
-    type: FieldType.TEXT,
-    fieldPath: 'source.config.metadata_endpoint',
-    rules: null,
-};
-
 const extractOwnersPath = 'source.config.enable_owner_extraction';
 export const EXTRACT_OWNERS: RecipeField = {
     name: 'extract_owners',
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/lookml.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/lookml.tsx
index 84fe1bcace90eb..d0972b95e7590d 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/lookml.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/lookml.tsx
@@ -142,7 +142,7 @@ export const PARSE_TABLE_NAMES_FROM_SQL: RecipeField = {
     rules: null,
 };
 
-export const CONNECTION_TO_PLATFORM_MAP_NAME: RecipeField = {
+const CONNECTION_TO_PLATFORM_MAP_NAME: RecipeField = {
     name: 'name',
     label: 'Name',
     tooltip: (
@@ -165,7 +165,7 @@ export const CONNECTION_TO_PLATFORM_MAP_NAME: RecipeField = {
     rules: [{ required: true, message: 'Name is required' }],
 };
 
-export const PLATFORM: RecipeField = {
+const PLATFORM: RecipeField = {
     name: 'platform',
     label: 'Platform',
     tooltip: 'The Data Platform ID in DataHub (e.g. snowflake, bigquery, redshift, mysql, postgres)',
@@ -175,7 +175,7 @@ export const PLATFORM: RecipeField = {
     rules: [{ required: true, message: 'Platform is required' }],
 };
 
-export const DEFAULT_DB: RecipeField = {
+const DEFAULT_DB: RecipeField = {
     name: 'default_db',
     label: 'Default Database',
     tooltip: 'The Database associated with assets from the Looker connection.',
diff --git a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/unity_catalog.tsx b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/unity_catalog.tsx
index 5af79ab1e9d671..10723e39d31062 100644
--- a/datahub-web-react/src/app/ingest/source/builder/RecipeForm/unity_catalog.tsx
+++ b/datahub-web-react/src/app/ingest/source/builder/RecipeForm/unity_catalog.tsx
@@ -2,8 +2,6 @@ import React from 'react';
 
 import { FieldType, RecipeField, setListValuesOnRecipe } from '@app/ingest/source/builder/RecipeForm/common';
 
-export const UNITY_CATALOG = 'unity-catalog';
-
 export const TOKEN: RecipeField = {
     name: 'token',
     label: 'Token',
@@ -26,21 +24,6 @@ export const WORKSPACE_URL: RecipeField = {
     rules: null,
 };
 
-export const INCLUDE_TABLE_LINEAGE: RecipeField = {
-    name: 'include_table_lineage',
-    label: 'Include Table Lineage',
-    tooltip: (
-        <div>
-            Extract Table Lineage from Unity Catalog. Note that this requires that your Databricks accounts meets
-            certain requirements. View them{' '}
-            <a href="https://docs.databricks.com/data-governance/unity-catalog/data-lineage.html#requirements">here</a>
-        </div>
-    ),
-    type: FieldType.BOOLEAN,
-    fieldPath: 'source.config.include_table_lineage',
-    rules: null,
-};
-
 export const INCLUDE_COLUMN_LINEAGE: RecipeField = {
     name: 'include_column_lineage',
     label: 'Include Column Lineage',
diff --git a/datahub-web-react/src/app/ingest/source/builder/SelectTemplateStep.tsx b/datahub-web-react/src/app/ingest/source/builder/SelectTemplateStep.tsx
deleted file mode 100644
index 026dde048c79a2..00000000000000
--- a/datahub-web-react/src/app/ingest/source/builder/SelectTemplateStep.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import { FormOutlined, SearchOutlined } from '@ant-design/icons';
-import { Input } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { DataPlatformCard } from '@app/ingest/source/builder/DataPlatformCard';
-import { CUSTOM } from '@app/ingest/source/builder/constants';
-import { IngestionSourceBuilderStep } from '@app/ingest/source/builder/steps';
-import { SourceBuilderState, SourceConfig, StepProps } from '@app/ingest/source/builder/types';
-import useGetSourceLogoUrl from '@app/ingest/source/builder/useGetSourceLogoUrl';
-import { Button } from '@src/alchemy-components';
-
-const Container = styled.div`
-    max-height: 82vh;
-    display: flex;
-    flex-direction: column;
-`;
-
-const Section = styled.div`
-    display: flex;
-    flex-direction: column;
-    padding-bottom: 12px;
-    overflow: hidden;
-`;
-
-const SearchBarContainer = styled.div`
-    display: flex;
-    justify-content: end;
-    width: auto;
-    padding-right: 12px;
-`;
-
-const StyledSearchBar = styled(Input)`
-    background-color: white;
-    border-radius: 8px;
-    box-shadow: 0px 0px 30px 0px rgb(239 239 239);
-    border: 1px solid #e0e0e0;
-    margin: 0 0 15px 0px;
-    max-width: 300px;
-    font-size: 16px;
-`;
-
-const StyledSearchOutlined = styled(SearchOutlined)`
-    color: #a9adbd;
-`;
-
-const PlatformListContainer = styled.div`
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(min(100%, 31%), 1fr));
-    gap: 10px;
-    height: 100%;
-    overflow-y: auto;
-    padding-right: 12px;
-`;
-
-interface SourceOptionProps {
-    source: SourceConfig;
-    onClick: () => void;
-}
-
-function SourceOption({ source, onClick }: SourceOptionProps) {
-    const { name, displayName, description } = source;
-
-    const logoUrl = useGetSourceLogoUrl(name);
-    let logoComponent;
-    if (name === CUSTOM) {
-        logoComponent = <FormOutlined style={{ color: ANTD_GRAY[8], fontSize: 28 }} />;
-    }
-
-    return (
-        <DataPlatformCard
-            onClick={onClick}
-            name={displayName}
-            logoUrl={logoUrl}
-            description={description}
-            logoComponent={logoComponent}
-        />
-    );
-}
-
-/**
- * Component responsible for selecting the mechanism for constructing a new Ingestion Source
- */
-export const SelectTemplateStep = ({ state, updateState, goTo, cancel, ingestionSources }: StepProps) => {
-    const [searchFilter, setSearchFilter] = useState('');
-
-    const onSelectTemplate = (type: string) => {
-        const newState: SourceBuilderState = {
-            ...state,
-            config: undefined,
-            type,
-        };
-        updateState(newState);
-        goTo(IngestionSourceBuilderStep.DEFINE_RECIPE);
-    };
-
-    const filteredSources = ingestionSources.filter(
-        (source) =>
-            source.displayName.toLocaleLowerCase().includes(searchFilter.toLocaleLowerCase()) ||
-            source.name.toLocaleLowerCase().includes(searchFilter.toLocaleLowerCase()),
-    );
-
-    filteredSources.sort((a, b) => {
-        if (a.name === 'custom') {
-            return 1;
-        }
-
-        if (b.name === 'custom') {
-            return -1;
-        }
-
-        return a.displayName.localeCompare(b.displayName);
-    });
-
-    return (
-        <Container>
-            <Section>
-                <SearchBarContainer>
-                    <StyledSearchBar
-                        placeholder="Search data sources..."
-                        value={searchFilter}
-                        onChange={(e) => setSearchFilter(e.target.value)}
-                        allowClear
-                        prefix={<StyledSearchOutlined />}
-                    />
-                </SearchBarContainer>
-                <PlatformListContainer data-testid="data-source-options">
-                    {filteredSources.map((source) => (
-                        <SourceOption key={source.urn} source={source} onClick={() => onSelectTemplate(source.name)} />
-                    ))}
-                </PlatformListContainer>
-            </Section>
-            <Button variant="text" color="gray" onClick={cancel}>
-                Cancel
-            </Button>
-        </Container>
-    );
-};
diff --git a/datahub-web-react/src/app/ingest/source/builder/TimezoneSelect.tsx b/datahub-web-react/src/app/ingest/source/builder/TimezoneSelect.tsx
deleted file mode 100644
index a505c321611013..00000000000000
--- a/datahub-web-react/src/app/ingest/source/builder/TimezoneSelect.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Select } from 'antd';
-import moment from 'moment-timezone';
-import React from 'react';
-import styled from 'styled-components';
-
-const StyledSelect = styled(Select)`
-    max-width: 300px;
-`;
-
-type Props = {
-    value: string;
-    onChange: (newTimezone: any) => void;
-};
-
-export const TimezoneSelect = ({ value, onChange }: Props) => {
-    const timezones = moment.tz.names();
-    return (
-        <>
-            <StyledSelect showSearch value={value} onChange={onChange}>
-                {timezones.map((timezone) => (
-                    <Select.Option key={timezone} value={timezone}>
-                        {timezone}
-                    </Select.Option>
-                ))}
-            </StyledSelect>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/ingest/source/builder/constants.ts b/datahub-web-react/src/app/ingest/source/builder/constants.ts
index 35e3514dc2eaff..87cda9ddf18a8c 100644
--- a/datahub-web-react/src/app/ingest/source/builder/constants.ts
+++ b/datahub-web-react/src/app/ingest/source/builder/constants.ts
@@ -45,116 +45,115 @@ import trinoLogo from '@images/trinologo.png';
 import vertexAI from '@images/vertexai.png';
 import verticaLogo from '@images/verticalogo.png';
 
-export const ATHENA = 'athena';
-export const ATHENA_URN = `urn:li:dataPlatform:${ATHENA}`;
+const ATHENA = 'athena';
+const ATHENA_URN = `urn:li:dataPlatform:${ATHENA}`;
 export const AZURE = 'azure-ad';
-export const AZURE_URN = `urn:li:dataPlatform:${AZURE}`;
-export const BIGQUERY = 'bigquery';
-export const BIGQUERY_USAGE = 'bigquery-usage';
+const AZURE_URN = `urn:li:dataPlatform:${AZURE}`;
+const BIGQUERY = 'bigquery';
+const BIGQUERY_USAGE = 'bigquery-usage';
 export const BIGQUERY_BETA = 'bigquery-beta';
-export const BIGQUERY_URN = `urn:li:dataPlatform:${BIGQUERY}`;
-export const CLICKHOUSE = 'clickhouse';
-export const CLICKHOUSE_USAGE = 'clickhouse-usage';
-export const CLICKHOUSE_URN = `urn:li:dataPlatform:${CLICKHOUSE}`;
-export const COCKROACHDB = 'cockroachdb';
-export const COCKROACHDB_URN = `urn:li:dataPlatform:${COCKROACHDB}`;
-export const DBT = 'dbt';
+const BIGQUERY_URN = `urn:li:dataPlatform:${BIGQUERY}`;
+const CLICKHOUSE = 'clickhouse';
+const CLICKHOUSE_USAGE = 'clickhouse-usage';
+const CLICKHOUSE_URN = `urn:li:dataPlatform:${CLICKHOUSE}`;
+const COCKROACHDB = 'cockroachdb';
+const COCKROACHDB_URN = `urn:li:dataPlatform:${COCKROACHDB}`;
+const DBT = 'dbt';
 export const DBT_URN = `urn:li:dataPlatform:${DBT}`;
-export const DREMIO = 'dremio';
-export const DREMIO_URN = `urn:li:dataPlatform:${DREMIO}`;
-export const DRUID = 'druid';
-export const DRUID_URN = `urn:li:dataPlatform:${DRUID}`;
-export const DYNAMODB = 'dynamodb';
-export const DYNAMODB_URN = `urn:li:dataPlatform:${DYNAMODB}`;
-export const ELASTICSEARCH = 'elasticsearch';
-export const ELASTICSEARCH_URN = `urn:li:dataPlatform:${ELASTICSEARCH}`;
-export const FEAST = 'feast';
-export const FEAST_LEGACY = 'feast-legacy';
-export const FEAST_URN = `urn:li:dataPlatform:${FEAST}`;
-export const GLUE = 'glue';
-export const GLUE_URN = `urn:li:dataPlatform:${GLUE}`;
-export const GRAFANA = 'grafana';
-export const GRAFANA_URN = `urn:li:dataPlatform:${GRAFANA}`;
-export const HIVE = 'hive';
-export const HIVE_URN = `urn:li:dataPlatform:${HIVE}`;
-export const KAFKA = 'kafka';
-export const KAFKA_URN = `urn:li:dataPlatform:${KAFKA}`;
+const DREMIO = 'dremio';
+const DREMIO_URN = `urn:li:dataPlatform:${DREMIO}`;
+const DRUID = 'druid';
+const DRUID_URN = `urn:li:dataPlatform:${DRUID}`;
+const DYNAMODB = 'dynamodb';
+const DYNAMODB_URN = `urn:li:dataPlatform:${DYNAMODB}`;
+const ELASTICSEARCH = 'elasticsearch';
+const ELASTICSEARCH_URN = `urn:li:dataPlatform:${ELASTICSEARCH}`;
+const FEAST = 'feast';
+const FEAST_LEGACY = 'feast-legacy';
+const FEAST_URN = `urn:li:dataPlatform:${FEAST}`;
+const GLUE = 'glue';
+const GLUE_URN = `urn:li:dataPlatform:${GLUE}`;
+const GRAFANA = 'grafana';
+const GRAFANA_URN = `urn:li:dataPlatform:${GRAFANA}`;
+const HIVE = 'hive';
+const HIVE_URN = `urn:li:dataPlatform:${HIVE}`;
+const KAFKA = 'kafka';
+const KAFKA_URN = `urn:li:dataPlatform:${KAFKA}`;
 export const LOOKER = 'looker';
 export const LOOK_ML = 'lookml';
 export const LOOKER_URN = `urn:li:dataPlatform:${LOOKER}`;
-export const MARIA_DB = 'mariadb';
-export const MARIA_DB_URN = `urn:li:dataPlatform:${MARIA_DB}`;
-export const METABASE = 'metabase';
-export const METABASE_URN = `urn:li:dataPlatform:${METABASE}`;
-export const MLFLOW = 'mlflow';
-export const MLFLOW_URN = `urn:li:dataPlatform:${MLFLOW}`;
+const MARIA_DB = 'mariadb';
+const MARIA_DB_URN = `urn:li:dataPlatform:${MARIA_DB}`;
+const METABASE = 'metabase';
+const METABASE_URN = `urn:li:dataPlatform:${METABASE}`;
+const MLFLOW = 'mlflow';
+const MLFLOW_URN = `urn:li:dataPlatform:${MLFLOW}`;
 export const MODE = 'mode';
 export const MODE_URN = `urn:li:dataPlatform:${MODE}`;
-export const MONGO_DB = 'mongodb';
-export const MONGO_DB_URN = `urn:li:dataPlatform:${MONGO_DB}`;
-export const MSSQL = 'mssql';
-export const MSSQL_URN = `urn:li:dataPlatform:${MSSQL}`;
+const MONGO_DB = 'mongodb';
+const MONGO_DB_URN = `urn:li:dataPlatform:${MONGO_DB}`;
+const MSSQL = 'mssql';
+const MSSQL_URN = `urn:li:dataPlatform:${MSSQL}`;
 export const MYSQL = 'mysql';
-export const MYSQL_URN = `urn:li:dataPlatform:${MYSQL}`;
+const MYSQL_URN = `urn:li:dataPlatform:${MYSQL}`;
 export const OKTA = 'okta';
-export const OKTA_URN = `urn:li:dataPlatform:${OKTA}`;
-export const ORACLE = 'oracle';
-export const ORACLE_URN = `urn:li:dataPlatform:${ORACLE}`;
-export const POSTGRES = 'postgres';
-export const POSTGRES_URN = `urn:li:dataPlatform:${POSTGRES}`;
+const OKTA_URN = `urn:li:dataPlatform:${OKTA}`;
+const ORACLE = 'oracle';
+const ORACLE_URN = `urn:li:dataPlatform:${ORACLE}`;
+const POSTGRES = 'postgres';
+const POSTGRES_URN = `urn:li:dataPlatform:${POSTGRES}`;
 export const POWER_BI = 'powerbi';
-export const POWER_BI_URN = `urn:li:dataPlatform:${POWER_BI}`;
-export const PRESET = 'preset';
-export const PRESET_URN = `urn:li:dataPlatform:${PRESET}`;
-export const REDSHIFT = 'redshift';
-export const REDSHIFT_USAGE = 'redshift-usage';
-export const REDSHIFT_URN = `urn:li:dataPlatform:${REDSHIFT}`;
-export const SNOWFLAKE = 'snowflake';
-export const SNOWFLAKE_BETA = 'snowflake-beta';
-export const SNOWFLAKE_USAGE = 'snowflake-usage';
-export const SNOWFLAKE_URN = `urn:li:dataPlatform:${SNOWFLAKE}`;
-export const STARBURST_TRINO_USAGE = 'starburst-trino-usage';
-export const SUPERSET = 'superset';
-export const SUPERSET_URN = `urn:li:dataPlatform:${SUPERSET}`;
-export const TABLEAU = 'tableau';
+const POWER_BI_URN = `urn:li:dataPlatform:${POWER_BI}`;
+const PRESET = 'preset';
+const PRESET_URN = `urn:li:dataPlatform:${PRESET}`;
+const REDSHIFT = 'redshift';
+const REDSHIFT_USAGE = 'redshift-usage';
+const REDSHIFT_URN = `urn:li:dataPlatform:${REDSHIFT}`;
+const SNOWFLAKE = 'snowflake';
+const SNOWFLAKE_BETA = 'snowflake-beta';
+const SNOWFLAKE_USAGE = 'snowflake-usage';
+const SNOWFLAKE_URN = `urn:li:dataPlatform:${SNOWFLAKE}`;
+const STARBURST_TRINO_USAGE = 'starburst-trino-usage';
+const SUPERSET = 'superset';
+const SUPERSET_URN = `urn:li:dataPlatform:${SUPERSET}`;
+const TABLEAU = 'tableau';
 export const TABLEAU_URN = `urn:li:dataPlatform:${TABLEAU}`;
-export const TRINO = 'trino';
-export const TRINO_URN = `urn:li:dataPlatform:${TRINO}`;
+const TRINO = 'trino';
+const TRINO_URN = `urn:li:dataPlatform:${TRINO}`;
 export const CUSTOM = 'custom';
-export const CUSTOM_URN = `urn:li:dataPlatform:${CUSTOM}`;
-export const UNITY_CATALOG = 'unity-catalog';
-export const UNITY_CATALOG_URN = `urn:li:dataPlatform:${UNITY_CATALOG}`;
+const UNITY_CATALOG = 'unity-catalog';
+const UNITY_CATALOG_URN = `urn:li:dataPlatform:${UNITY_CATALOG}`;
 export const DATABRICKS = 'databricks';
-export const DATABRICKS_URN = `urn:li:dataPlatform:${DATABRICKS}`;
+const DATABRICKS_URN = `urn:li:dataPlatform:${DATABRICKS}`;
 export const DBT_CLOUD = 'dbt-cloud';
 export const DBT_CLOUD_URN = `urn:li:dataPlatform:dbt`;
 export const VERTICA = 'vertica';
-export const VERTICA_URN = `urn:li:dataPlatform:${VERTICA}`;
-export const FIVETRAN = 'fivetran';
-export const FIVETRAN_URN = `urn:li:dataPlatform:${FIVETRAN}`;
+const VERTICA_URN = `urn:li:dataPlatform:${VERTICA}`;
+const FIVETRAN = 'fivetran';
+const FIVETRAN_URN = `urn:li:dataPlatform:${FIVETRAN}`;
 export const CSV = 'csv-enricher';
-export const CSV_URN = `urn:li:dataPlatform:${CSV}`;
-export const QLIK_SENSE = 'qlik-sense';
-export const QLIK_SENSE_URN = `urn:li:dataPlatform:${QLIK_SENSE}`;
-export const SIGMA = 'sigma';
-export const SIGMA_URN = `urn:li:dataPlatform:${SIGMA}`;
+const CSV_URN = `urn:li:dataPlatform:${CSV}`;
+const QLIK_SENSE = 'qlik-sense';
+const QLIK_SENSE_URN = `urn:li:dataPlatform:${QLIK_SENSE}`;
+const SIGMA = 'sigma';
+const SIGMA_URN = `urn:li:dataPlatform:${SIGMA}`;
 export const SAC = 'sac';
-export const SAC_URN = `urn:li:dataPlatform:${SAC}`;
-export const CASSANDRA = 'cassandra';
-export const CASSANDRA_URN = `urn:li:dataPlatform:${CASSANDRA}`;
-export const DATAHUB = 'datahub';
-export const DATAHUB_GC = 'datahub-gc';
-export const DATAHUB_LINEAGE_FILE = 'datahub-lineage-file';
-export const DATAHUB_BUSINESS_GLOSSARY = 'datahub-business-glossary';
-export const DATAHUB_URN = `urn:li:dataPlatform:${DATAHUB}`;
-export const NEO4J = 'neo4j';
-export const NEO4J_URN = `urn:li:dataPlatform:${NEO4J}`;
-export const VERTEX_AI = 'vertexai';
-export const VERTEXAI_URN = `urn:li:dataPlatform:${VERTEX_AI}`;
-export const SNAPLOGIC = 'snaplogic';
-export const SNAPLOGIC_URN = `urn:li:dataPlatform:${SNAPLOGIC}`;
-export const GOOGLE_SHEETS = 'google_sheets';
-export const GOOGLE_SHEETS_URN = `urn:li:dataPlatform:${GOOGLE_SHEETS}`;
+const SAC_URN = `urn:li:dataPlatform:${SAC}`;
+const CASSANDRA = 'cassandra';
+const CASSANDRA_URN = `urn:li:dataPlatform:${CASSANDRA}`;
+const DATAHUB = 'datahub';
+const DATAHUB_GC = 'datahub-gc';
+const DATAHUB_LINEAGE_FILE = 'datahub-lineage-file';
+const DATAHUB_BUSINESS_GLOSSARY = 'datahub-business-glossary';
+const DATAHUB_URN = `urn:li:dataPlatform:${DATAHUB}`;
+const NEO4J = 'neo4j';
+const NEO4J_URN = `urn:li:dataPlatform:${NEO4J}`;
+const VERTEX_AI = 'vertexai';
+const VERTEXAI_URN = `urn:li:dataPlatform:${VERTEX_AI}`;
+const SNAPLOGIC = 'snaplogic';
+const SNAPLOGIC_URN = `urn:li:dataPlatform:${SNAPLOGIC}`;
+const GOOGLE_SHEETS = 'google_sheets';
+const GOOGLE_SHEETS_URN = `urn:li:dataPlatform:${GOOGLE_SHEETS}`;
 
 export const PLATFORM_URN_TO_LOGO = {
     [ATHENA_URN]: athenaLogo,
diff --git a/datahub-web-react/src/app/ingest/source/builder/types.ts b/datahub-web-react/src/app/ingest/source/builder/types.ts
index 1ff0036d801ec7..74f1a148b7e070 100644
--- a/datahub-web-react/src/app/ingest/source/builder/types.ts
+++ b/datahub-web-react/src/app/ingest/source/builder/types.ts
@@ -3,19 +3,6 @@ import { PendingOwner } from '@app/sharedV2/owners/OwnersSection';
 
 import { IngestionSource } from '@types';
 
-/**
- * The size of the builder modal
- */
-export enum ModalSize {
-    SMALL = 800,
-    LARGE = 1200,
-}
-
-/**
- * The default executor id used for ingestion
- */
-export const DEFAULT_EXECUTOR_ID = 'default';
-
 export interface SourceConfig {
     urn: string;
     name: string;
diff --git a/datahub-web-react/src/app/ingest/source/conf/azure/azure.ts b/datahub-web-react/src/app/ingest/source/conf/azure/azure.ts
deleted file mode 100644
index 1d37b810efb76d..00000000000000
--- a/datahub-web-react/src/app/ingest/source/conf/azure/azure.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
-
-import azureLogo from '@images/azure-ad.png';
-
-const placeholderRecipe = `\
-source:
-    type: azure-ad
-    config:
-        client_id: # Your Azure Client ID, e.g. "00000000-0000-0000-0000-000000000000"
-        tenant_id: # Your Azure Tenant ID, e.g. "00000000-0000-0000-0000-000000000000"
-        # Add secret in Secrets Tab with this name
-        client_secret: "\${AZURE_AD_CLIENT_SECRET}"
-        redirect: # Your Redirect URL, e.g. "https://login.microsoftonline.com/common/oauth2/nativeclient"
-        authority: # Your Authority URL, e.g. "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000"
-        token_url: # Your Token URL, e.g. "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/oauth2/token"
-        graph_url: # The Graph URL, e.g. "https://graph.microsoft.com/v1.0"
-        
-        # Optional flags to ingest users, groups, or both
-        ingest_users: True
-        ingest_groups: True
-        
-        # Optional Allow / Deny extraction of particular Groups
-        # groups_pattern:
-        #    allow:
-        #        - ".*"
-
-        # Optional Allow / Deny extraction of particular Users.
-        # users_pattern:
-        #    allow:
-        #        - ".*"
-`;
-
-const azureAdConfig: SourceConfig = {
-    type: 'azure-ad',
-    placeholderRecipe,
-    displayName: 'Azure AD',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/azure-ad',
-    logoUrl: azureLogo,
-};
-
-export default azureAdConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/bigquery/bigquery.ts b/datahub-web-react/src/app/ingest/source/conf/bigquery/bigquery.ts
index a6bc81ee32177e..31ddd2ccbac500 100644
--- a/datahub-web-react/src/app/ingest/source/conf/bigquery/bigquery.ts
+++ b/datahub-web-react/src/app/ingest/source/conf/bigquery/bigquery.ts
@@ -1,38 +1,4 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
 
-import bigqueryLogo from '@images/bigquerylogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: bigquery
-    config:
-        # Coordinates
-        project_id: # Your BigQuery project id, e.g. sample_project_id
-        # Credentials
-        credential:
-            project_id: # Your BQ project id, e.g. sample_project_id
-            private_key_id: "\${BQ_PRIVATE_KEY_ID}"
-            private_key: "\${BQ_PRIVATE_KEY}"
-            client_email: # Your BQ client email, e.g. "test@suppproject-id-1234567.iam.gserviceaccount.com"
-            client_id: # Your BQ client id, e.g. "123456678890"
-            
-        include_table_lineage: true
-        include_view_lineage: true
-        profiling:
-            enabled: true
-        stateful_ingestion:
-            enabled: true
-                
-`;
 
 export const BIGQUERY = 'bigquery';
 
-const bigqueryConfig: SourceConfig = {
-    type: BIGQUERY,
-    placeholderRecipe,
-    displayName: 'BigQuery',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/bigquery/',
-    logoUrl: bigqueryLogo,
-};
-
-export default bigqueryConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/csv/csv.ts b/datahub-web-react/src/app/ingest/source/conf/csv/csv.ts
deleted file mode 100644
index f2c7157ac05ce9..00000000000000
--- a/datahub-web-react/src/app/ingest/source/conf/csv/csv.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
-
-import csvLogo from '@images/csv-logo.png';
-
-const placeholderRecipe = `\
-source:
-    type: csv-enricher
-    config:
-        filename: # URL of your csv file to ingest, e.g. https://docs.google.com/spreadsheets/d/DOCID/export?format=csv
-        array_delimiter: |
-        delimiter: ,
-        write_semantics: PATCH
-`;
-
-const csvConfig: SourceConfig = {
-    type: 'csv-enricher',
-    placeholderRecipe,
-    displayName: 'CSV',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/csv-enricher',
-    logoUrl: csvLogo,
-};
-
-export default csvConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/glue/glue.ts b/datahub-web-react/src/app/ingest/source/conf/glue/glue.ts
deleted file mode 100644
index dc7b962a2ccc5e..00000000000000
--- a/datahub-web-react/src/app/ingest/source/conf/glue/glue.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
-
-import glueLogo from '@images/gluelogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: glue
-    config:
-        # AWS credentials. 
-        aws_region: # The region for your AWS Glue instance. 
-        # Add secret in Secrets Tab with relevant names for each variable
-        # The access key for your AWS account.
-        aws_access_key_id: "\${AWS_ACCESS_KEY_ID}"
-        # The secret key for your AWS account.
-        aws_secret_access_key: "\${AWS_SECRET_KEY}"
-        aws_session_token: # The session key for your AWS account. This is only needed when you are using temporary credentials.
-        # aws_role: # (Optional) The role to assume (Role chaining supported by using a sorted list).
-
-        # Allow / Deny specific databases & tables
-        # database_pattern:
-        #    allow:
-        #        - "flights-database"
-        # table_pattern:
-        #    allow:
-        #        - "avro"
-`;
-
-const glueConfig: SourceConfig = {
-    type: 'glue',
-    placeholderRecipe,
-    displayName: 'Glue',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/glue',
-    logoUrl: glueLogo,
-};
-
-export default glueConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/hive/hive.ts b/datahub-web-react/src/app/ingest/source/conf/hive/hive.ts
index e631a95ddf5ff5..3419c09a1825a4 100644
--- a/datahub-web-react/src/app/ingest/source/conf/hive/hive.ts
+++ b/datahub-web-react/src/app/ingest/source/conf/hive/hive.ts
@@ -1,31 +1,4 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
 
-import hiveLogo from '@images/hivelogo.png';
-
-const placeholderRecipe = `\
-source: 
-    type: hive
-    config:
-        # Coordinates
-        host_port: # Your Hive host and port, e.g. hive:10000
-        database: # Your Hive database name, e.g. SampleDatabase (Optional, if not specified, ingests from all databases)
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        username: "\${HIVE_USERNAME}" # Your Hive username, e.g. admin
-        password: "\${HIVE_PASSWORD}"# Your Hive password, e.g. password_01
-        stateful_ingestion:
-            enabled: true
-`;
 
 export const HIVE = 'hive';
 
-const hiveConfig: SourceConfig = {
-    type: HIVE,
-    placeholderRecipe,
-    displayName: 'Hive',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/hive/',
-    logoUrl: hiveLogo,
-};
-
-export default hiveConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/kafka/kafka.ts b/datahub-web-react/src/app/ingest/source/conf/kafka/kafka.ts
index e459218f641fdc..9fc8b60b3a2281 100644
--- a/datahub-web-react/src/app/ingest/source/conf/kafka/kafka.ts
+++ b/datahub-web-react/src/app/ingest/source/conf/kafka/kafka.ts
@@ -1,28 +1,4 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
 
-import kafkaLogo from '@images/kafkalogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: kafka
-    config:
-        connection:
-            consumer_config:
-                security.protocol: "SASL_SSL"
-                sasl.mechanism: "PLAIN"
-        stateful_ingestion:
-            enabled: true
-
-`;
 
 export const KAFKA = 'kafka';
 
-const kafkaConfig: SourceConfig = {
-    type: KAFKA,
-    placeholderRecipe,
-    displayName: 'Kafka',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/kafka/',
-    logoUrl: kafkaLogo,
-};
-
-export default kafkaConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/looker/looker.ts b/datahub-web-react/src/app/ingest/source/conf/looker/looker.ts
index 91831f443edcde..184746f9bb1b1b 100644
--- a/datahub-web-react/src/app/ingest/source/conf/looker/looker.ts
+++ b/datahub-web-react/src/app/ingest/source/conf/looker/looker.ts
@@ -1,28 +1,4 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
 
-import lookerLogo from '@images/lookerlogo.svg';
-
-const placeholderRecipe = `\
-source:
-    type: looker
-    config:
-        # Coordinates
-        base_url: # Your Looker instance URL, e.g. https://company.looker.com:19999
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        client_id: "\${LOOKER_CLIENT_ID}" # Your Looker client id, e.g. admin
-        client_secret: "\${LOOKER_CLIENT_SECRET}" # Your Looker password, e.g. password_01
-`;
 
 export const LOOKER = 'looker';
 
-const lookerConfig: SourceConfig = {
-    type: LOOKER,
-    placeholderRecipe,
-    displayName: 'Looker',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/looker/',
-    logoUrl: lookerLogo,
-};
-
-export default lookerConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/mongodb/mongodb.ts b/datahub-web-react/src/app/ingest/source/conf/mongodb/mongodb.ts
deleted file mode 100644
index 4cdc13a5eb634c..00000000000000
--- a/datahub-web-react/src/app/ingest/source/conf/mongodb/mongodb.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
-
-import mongodbLogo from '@images/mongodblogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: mongodb
-    config:
-        # Coordinates
-        connect_uri: # Your MongoDB connect URI, e.g. "mongodb://localhost"
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        username: "\${MONGO_USERNAME}" # Your MongoDB username, e.g. admin
-        password: "\${MONGO_PASSWORD}" # Your MongoDB password, e.g. password_01
-
-        # Options (recommended)
-        enableSchemaInference: True
-        useRandomSampling: True
-        maxSchemaSize: 300
-`;
-
-const mongoConfig: SourceConfig = {
-    type: 'mongodb',
-    placeholderRecipe,
-    displayName: 'MongoDB',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/mongodb/',
-    logoUrl: mongodbLogo,
-};
-
-export default mongoConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/mysql/mysql.ts b/datahub-web-react/src/app/ingest/source/conf/mysql/mysql.ts
deleted file mode 100644
index da910385a6b614..00000000000000
--- a/datahub-web-react/src/app/ingest/source/conf/mysql/mysql.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
-
-import mysqlLogo from '@images/mysqllogo-2.png';
-
-const placeholderRecipe = `\
-source: 
-    type: mysql
-    config: 
-        # Coordinates
-        host_port: # Your MySQL host and post, e.g. mysql:3306
-        database: # Your MySQL database name, e.g. datahub
-    
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        username: "\${MYSQL_USERNAME}" # Your MySQL username, e.g. admin
-        password: "\${MYSQL_PASSWORD}" # Your MySQL password, e.g. password_01
-
-        # Options
-        include_tables: True
-        include_views: True
-
-        # Profiling
-        profiling:
-            enabled: false
-`;
-
-const mysqlConfig: SourceConfig = {
-    type: 'mysql',
-    placeholderRecipe,
-    displayName: 'MySQL',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/mysql/',
-    logoUrl: mysqlLogo,
-};
-
-export default mysqlConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/okta/okta.ts b/datahub-web-react/src/app/ingest/source/conf/okta/okta.ts
deleted file mode 100644
index 4a942814acd0dd..00000000000000
--- a/datahub-web-react/src/app/ingest/source/conf/okta/okta.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
-
-import oktaLogo from '@images/oktalogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: okta
-    config:
-        # Coordinates
-        okta_domain: # Your Okta Domain, e.g. "dev-35531955.okta.com"
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        okta_api_token: "\${OKTA_API_TOKEN}" # Your Okta API Token, e.g. "11be4R_M2MzDqXawbTHfKGpKee0kuEOfX1RCQSRx99"
-
-        # Optional flags to ingest users, groups, or both
-        ingest_users: True
-        ingest_groups: True
-
-        # Optional: Customize the mapping to DataHub Username from an attribute appearing in the Okta User
-        # profile. Reference: https://developer.okta.com/docs/reference/api/users/
-        # okta_profile_to_username_attr: str = "login"
-        # okta_profile_to_username_regex: str = "([^@]+)"
-    
-        # Optional: Customize the mapping to DataHub Group from an attribute appearing in the Okta Group
-        # profile. Reference: https://developer.okta.com/docs/reference/api/groups/
-        # okta_profile_to_group_name_attr: str = "name"
-        # okta_profile_to_group_name_regex: str = "(.*)"
-        
-        # Optional: Include deprovisioned or suspended Okta users in the ingestion.
-        # include_deprovisioned_users = False
-        # include_suspended_users = False
-`;
-
-const oktaConfig: SourceConfig = {
-    type: 'okta',
-    placeholderRecipe,
-    displayName: 'Okta',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/okta',
-    logoUrl: oktaLogo,
-};
-
-export default oktaConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/oracle/oracle.ts b/datahub-web-react/src/app/ingest/source/conf/oracle/oracle.ts
deleted file mode 100644
index a38d8a74371540..00000000000000
--- a/datahub-web-react/src/app/ingest/source/conf/oracle/oracle.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
-
-import oracleLogo from '@images/oraclelogo.png';
-
-const placeholderRecipe = `\
-source: 
-    type: oracle
-    config:
-        # Coordinates
-        host_port: # Your Oracle host and port, e.g. oracle:5432
-        database: # Your Oracle database name, e.g. sample_db
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        username: "\${ORACLE_USERNAME}" # Your Oracle username, e.g. admin
-        password: "\${ORACLE_PASSWORD}" # Your Oracle password, e.g. password_01
-
-        # Optional service name
-        # service_name: # Your service name, e.g. svc # omit database if using this option
-`;
-
-const oracleConfig: SourceConfig = {
-    type: 'oracle',
-    placeholderRecipe,
-    displayName: 'Oracle',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/oracle/',
-    logoUrl: oracleLogo,
-};
-
-export default oracleConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/postgres/postgres.ts b/datahub-web-react/src/app/ingest/source/conf/postgres/postgres.ts
index 63351d436aa1fa..40b73b9b9d327e 100644
--- a/datahub-web-react/src/app/ingest/source/conf/postgres/postgres.ts
+++ b/datahub-web-react/src/app/ingest/source/conf/postgres/postgres.ts
@@ -1,39 +1,4 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
 
-import postgresLogo from '@images/postgreslogo.png';
-
-const placeholderRecipe = `\
-source: 
-    type: postgres
-    config:
-        # Coordinates
-        host_port: # Your Postgres host and port, e.g. postgres:5432
-        database: # Your Postgres Database, e.g. sample_db
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        username: "\${POSTGRES_USERNAME}" # Your Postgres username, e.g. admin
-        password: "\${POSTGRES_PASSWORD}" # Your Postgres password, e.g. password_01
-
-        # Options
-        include_tables: True
-        include_views: True
-
-        # Profiling
-        profiling:
-            enabled: false
-        stateful_ingestion:
-            enabled: true    
-`;
 
 export const POSTGRES = 'postgres';
 
-const postgresConfig: SourceConfig = {
-    type: POSTGRES,
-    placeholderRecipe,
-    displayName: 'Postgres',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/postgres/',
-    logoUrl: postgresLogo,
-};
-
-export default postgresConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/redshift/redshift.ts b/datahub-web-react/src/app/ingest/source/conf/redshift/redshift.ts
index dbf8128282763a..22abd3ce9f5b1f 100644
--- a/datahub-web-react/src/app/ingest/source/conf/redshift/redshift.ts
+++ b/datahub-web-react/src/app/ingest/source/conf/redshift/redshift.ts
@@ -1,37 +1,4 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
 
-import redshiftLogo from '@images/redshiftlogo.png';
-
-const placeholderRecipe = `\
-source: 
-    type: redshift
-    config:
-        # Coordinates
-        host_port: # Your Redshift host and post, e.g. example.something.us-west-2.redshift.amazonaws.com:5439
-        database: # Your Redshift database, e.g. SampleDatabase
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        username: "\${REDSHIFT_USERNAME}" # Your Redshift username, e.g. admin
-        password: "\${REDSHIFT_PASSWORD}" # Your Redshift password, e.g. password_01
-
-        table_lineage_mode: stl_scan_based
-        include_table_lineage: true
-        include_view_lineage: true
-        profiling:
-            enabled: true
-        stateful_ingestion:
-            enabled: true
-`;
 
 export const REDSHIFT = 'redshift';
 
-const redshiftConfig: SourceConfig = {
-    type: REDSHIFT,
-    placeholderRecipe,
-    displayName: 'Redshift',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/redshift/',
-    logoUrl: redshiftLogo,
-};
-
-export default redshiftConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/sac/sac.ts b/datahub-web-react/src/app/ingest/source/conf/sac/sac.ts
deleted file mode 100644
index e6065646de0c81..00000000000000
--- a/datahub-web-react/src/app/ingest/source/conf/sac/sac.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
-
-import sacLogo from '@images/saclogo.svg';
-
-const placeholderRecipe = `\
-source:
-    type: sac
-    config:
-        tenant_url: # Your SAP Analytics Cloud tenant URL, e.g. https://company.eu10.sapanalytics.cloud or https://company.eu10.hcs.cloud.sap
-        token_url: # The Token URL of your SAP Analytics Cloud tenant, e.g. https://company.eu10.hana.ondemand.com/oauth/token.
-
-        # Add secret in Secrets Tab with relevant names for each variable
-        client_id: "\${SAC_CLIENT_ID}" # Your SAP Analytics Cloud client id
-        client_secret: "\${SAC_CLIENT_SECRET}" # Your SAP Analytics Cloud client secret
-`;
-
-export const SAC = 'sac';
-
-const sacConfig: SourceConfig = {
-    type: SAC,
-    placeholderRecipe,
-    displayName: 'SAP Analytics Cloud',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/sac/',
-    logoUrl: sacLogo,
-};
-
-export default sacConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/snowflake/snowflake.ts b/datahub-web-react/src/app/ingest/source/conf/snowflake/snowflake.ts
index 382810314c2f14..e87b2d3915fb1f 100644
--- a/datahub-web-react/src/app/ingest/source/conf/snowflake/snowflake.ts
+++ b/datahub-web-react/src/app/ingest/source/conf/snowflake/snowflake.ts
@@ -1,30 +1,4 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
 
-import snowflakeLogo from '@images/snowflakelogo.png';
-
-const placeholderRecipe = `\
-source: 
-    type: snowflake
-    config:
-        account_id: "example_id"
-        warehouse: "example_warehouse"
-        role: "datahub_role"
-        include_table_lineage: true
-        include_view_lineage: true
-        profiling:
-            enabled: true
-        stateful_ingestion:
-            enabled: true
-`;
 
 export const SNOWFLAKE = 'snowflake';
 
-const snowflakeConfig: SourceConfig = {
-    type: SNOWFLAKE,
-    placeholderRecipe,
-    displayName: 'Snowflake',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/snowflake/',
-    logoUrl: snowflakeLogo,
-};
-
-export default snowflakeConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/sources.tsx b/datahub-web-react/src/app/ingest/source/conf/sources.tsx
deleted file mode 100644
index 2b362255f8abc0..00000000000000
--- a/datahub-web-react/src/app/ingest/source/conf/sources.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { FormOutlined } from '@ant-design/icons';
-import React from 'react';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import azureAdConfig from '@app/ingest/source/conf/azure/azure';
-import bigqueryConfig from '@app/ingest/source/conf/bigquery/bigquery';
-import csvConfig from '@app/ingest/source/conf/csv/csv';
-import glueConfig from '@app/ingest/source/conf/glue/glue';
-import hiveConfig from '@app/ingest/source/conf/hive/hive';
-import kafkaConfig from '@app/ingest/source/conf/kafka/kafka';
-import lookerConfig from '@app/ingest/source/conf/looker/looker';
-import mongoConfig from '@app/ingest/source/conf/mongodb/mongodb';
-import mysqlConfig from '@app/ingest/source/conf/mysql/mysql';
-import oktaConfig from '@app/ingest/source/conf/okta/okta';
-import oracleConfig from '@app/ingest/source/conf/oracle/oracle';
-import postgresConfig from '@app/ingest/source/conf/postgres/postgres';
-import redshiftConfig from '@app/ingest/source/conf/redshift/redshift';
-import sacConfig from '@app/ingest/source/conf/sac/sac';
-import snowflakeConfig from '@app/ingest/source/conf/snowflake/snowflake';
-import tableauConfig from '@app/ingest/source/conf/tableau/tableau';
-import { SourceConfig } from '@app/ingest/source/conf/types';
-import { resolveRuntimePath } from '@utils/runtimeBasePath';
-
-const baseUrl = window.location.origin;
-
-const DEFAULT_PLACEHOLDER_RECIPE = `\
-source:
-  type: <source-type>
-  config:
-    # Source-type specifics config
-    <source-configs> 
-
-sink:
-  type: datahub-rest
-  config:
-    server: "${baseUrl}${resolveRuntimePath(`/api/gms`)}"`;
-
-export const SOURCE_TEMPLATE_CONFIGS: Array<SourceConfig> = [
-    bigqueryConfig,
-    redshiftConfig,
-    snowflakeConfig,
-    kafkaConfig,
-    lookerConfig,
-    tableauConfig,
-    mysqlConfig,
-    postgresConfig,
-    mongoConfig,
-    azureAdConfig,
-    oktaConfig,
-    glueConfig,
-    oracleConfig,
-    hiveConfig,
-    csvConfig,
-    sacConfig,
-    {
-        type: 'custom',
-        placeholderRecipe: DEFAULT_PLACEHOLDER_RECIPE,
-        displayName: 'Other',
-        docsUrl: 'https://docs.datahub.com/docs/metadata-ingestion/',
-        logoComponent: <FormOutlined style={{ color: ANTD_GRAY[8], fontSize: 28 }} />,
-    },
-];
diff --git a/datahub-web-react/src/app/ingest/source/conf/tableau/tableau.ts b/datahub-web-react/src/app/ingest/source/conf/tableau/tableau.ts
index 3171094cfff72b..23791b654586e2 100644
--- a/datahub-web-react/src/app/ingest/source/conf/tableau/tableau.ts
+++ b/datahub-web-react/src/app/ingest/source/conf/tableau/tableau.ts
@@ -1,36 +1,4 @@
-import { SourceConfig } from '@app/ingest/source/conf/types';
 
-import tableauLogo from '@images/tableaulogo.png';
-
-const placeholderRecipe = `\
-source:
-  type: tableau
-  config:
-    # Coordinates
-    connect_uri: https://prod-ca-a.online.tableau.com
-    site: acryl
-    projects: ["default", "Project 2"]
-
-    # Credentials
-    username: "\${TABLEAU_USER}"
-    password: "\${TABLEAU_PASSWORD}"
-
-    # Options
-    ingest_tags: True
-    ingest_owner: True
-    default_schema_map:
-      mydatabase: public
-      anotherdatabase: anotherschema
-`;
 
 export const TABLEAU = 'tableau';
 
-const tableauConfig: SourceConfig = {
-    type: TABLEAU,
-    placeholderRecipe,
-    displayName: 'Tableau',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/tableau/',
-    logoUrl: tableauLogo,
-};
-
-export default tableauConfig;
diff --git a/datahub-web-react/src/app/ingest/source/conf/types.ts b/datahub-web-react/src/app/ingest/source/conf/types.ts
deleted file mode 100644
index cca2a4929b89fe..00000000000000
--- a/datahub-web-react/src/app/ingest/source/conf/types.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Configs used to render the recipe builder experience for a particular source.
- */
-export interface SourceConfig {
-    /**
-     * The 'type' of the source, which should align with the recipe type.
-     */
-    type: string;
-
-    /**
-     * A placeholder recipe to show for the source.
-     */
-    placeholderRecipe: string;
-
-    /**
-     * TODO: A json schema for the 'source' block of the recipe to use for validation.
-     * Could also be a validate function.
-     */
-    // sourceSchema: string;
-
-    /**
-     * The display name for the source.
-     */
-    displayName: string;
-
-    /**
-     * The url to the docs about the source.
-     */
-    docsUrl?: string;
-
-    /**
-     * The url to a logo for the source.
-     */
-    logoUrl?: string;
-
-    /**
-     * A react component to use in place of a logo.
-     */
-    logoComponent?: React.ReactNode;
-}
diff --git a/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx b/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx
deleted file mode 100644
index 7821fbd434b67b..00000000000000
--- a/datahub-web-react/src/app/ingest/source/executions/ExecutionRequestDetailsModal.tsx
+++ /dev/null
@@ -1,251 +0,0 @@
-import { DownloadOutlined } from '@ant-design/icons';
-import { Button, Modal, Typography, message } from 'antd';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components';
-import YAML from 'yamljs';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import IngestedAssets from '@app/ingest/source/IngestedAssets';
-import { StructuredReport } from '@app/ingest/source/executions/reporting/StructuredReport';
-import {
-    RUNNING,
-    SUCCEEDED_WITH_WARNINGS,
-    SUCCESS,
-    getExecutionRequestStatusDisplayColor,
-    getExecutionRequestStatusDisplayText,
-    getExecutionRequestStatusIcon,
-    getExecutionRequestSummaryText,
-    getIngestionSourceStatus,
-    getStructuredReport,
-} from '@app/ingest/source/utils';
-import { downloadFile } from '@app/search/utils/csvUtils';
-import { Message } from '@app/shared/Message';
-
-import { useGetIngestionExecutionRequestQuery } from '@graphql/ingestion.generated';
-import { ExecutionRequestResult } from '@types';
-
-const StyledTitle = styled(Typography.Title)`
-    padding: 0px;
-    margin: 0px;
-`;
-
-const Section = styled.div`
-    display: flex;
-    flex-direction: column;
-    padding-bottom: 12px;
-`;
-
-const SectionHeader = styled(Typography.Title)`
-    &&&& {
-        padding: 0px;
-        margin: 0px;
-        margin-bottom: 12px;
-    }
-`;
-
-const SectionSubHeader = styled.div`
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-`;
-
-const SubHeaderParagraph = styled(Typography.Paragraph)`
-    margin-bottom: 0px;
-`;
-
-const HeaderSection = styled.div``;
-
-const StatusSection = styled.div`
-    border-bottom: 1px solid ${ANTD_GRAY[4]};
-    padding: 16px;
-    padding-left: 30px;
-    padding-right: 30px;
-`;
-
-const ResultText = styled.div`
-    margin-bottom: 4px;
-`;
-
-const IngestedAssetsSection = styled.div`
-    border-bottom: 1px solid ${ANTD_GRAY[4]};
-    padding: 16px;
-    padding-left: 30px;
-    padding-right: 30px;
-`;
-
-const RecipeSection = styled.div`
-    border-top: 1px solid ${ANTD_GRAY[4]};
-    padding-top: 16px;
-    padding-left: 30px;
-    padding-right: 30px;
-`;
-
-const LogsSection = styled.div`
-    padding-top: 16px;
-    padding-left: 30px;
-    padding-right: 30px;
-`;
-
-const ShowMoreButton = styled(Button)`
-    padding: 0px;
-`;
-
-const DetailsContainer = styled.div<DetailsContainerProps>`
-    margin-bottom: -25px;
-    ${(props) =>
-        props.areDetailsExpandable &&
-        !props.showExpandedDetails &&
-        `
-        -webkit-mask-image: linear-gradient(to bottom, rgba(0,0,0,1) 50%, rgba(255,0,0,0.5) 60%, rgba(255,0,0,0) 90% );
-        mask-image: linear-gradient(to bottom, rgba(0,0,0,1) 50%, rgba(255,0,0,0.5) 60%, rgba(255,0,0,0) 90%);
-    `}
-`;
-
-const modalStyle = {
-    top: 100,
-};
-
-const modalBodyStyle = {
-    padding: 0,
-};
-
-type DetailsContainerProps = {
-    showExpandedDetails: boolean;
-    areDetailsExpandable: boolean;
-};
-
-type Props = {
-    urn: string;
-    open: boolean;
-    onClose: () => void;
-};
-
-export const ExecutionDetailsModal = ({ urn, open, onClose }: Props) => {
-    const [showExpandedLogs, setShowExpandedLogs] = useState(false);
-    const [showExpandedRecipe, setShowExpandedRecipe] = useState(false);
-
-    const { data, loading, error, refetch } = useGetIngestionExecutionRequestQuery({ variables: { urn } });
-    const output = data?.executionRequest?.result?.report || 'No output found.';
-
-    const downloadLogs = () => {
-        downloadFile(output, `exec-${urn}.log`);
-    };
-
-    const logs = (showExpandedLogs && output) || output?.split('\n')?.slice(0, 5)?.join('\n');
-    const result = data?.executionRequest?.result as Partial<ExecutionRequestResult>;
-    const status = getIngestionSourceStatus(result);
-
-    useEffect(() => {
-        const interval = setInterval(() => {
-            if (status === RUNNING) refetch();
-        }, 2000);
-
-        return () => clearInterval(interval);
-    });
-
-    const ResultIcon = status && getExecutionRequestStatusIcon(status);
-    const resultColor = status && getExecutionRequestStatusDisplayColor(status);
-    const resultText = status && (
-        <Typography.Text style={{ color: resultColor, fontSize: 14 }}>
-            {ResultIcon && <ResultIcon style={{ marginRight: 4 }} />}
-            {getExecutionRequestStatusDisplayText(status)}
-        </Typography.Text>
-    );
-
-    const structuredReport = result && getStructuredReport(result);
-
-    const resultSummaryText =
-        (status && <Typography.Text type="secondary">{getExecutionRequestSummaryText(status)}</Typography.Text>) ||
-        undefined;
-
-    const recipeJson = data?.executionRequest?.input?.arguments?.find((arg) => arg.key === 'recipe')?.value;
-    let recipeYaml: string;
-    try {
-        recipeYaml = recipeJson && YAML.stringify(JSON.parse(recipeJson), 8, 2).trim();
-    } catch (e) {
-        recipeYaml = '';
-    }
-    const recipe = showExpandedRecipe ? recipeYaml : recipeYaml?.split('\n')?.slice(0, 5)?.join('\n');
-
-    const areLogsExpandable = output?.split(/\r\n|\r|\n/)?.length > 5;
-    const isRecipeExpandable = recipeYaml?.split(/\r\n|\r|\n/)?.length > 5;
-
-    return (
-        <Modal
-            width={800}
-            footer={<Button onClick={onClose}>Close</Button>}
-            style={modalStyle}
-            bodyStyle={modalBodyStyle}
-            title={
-                <HeaderSection>
-                    <StyledTitle level={4}>Execution Run Details</StyledTitle>
-                </HeaderSection>
-            }
-            open={open}
-            onCancel={onClose}
-        >
-            {!data && loading && <Message type="loading" content="Loading execution run details..." />}
-            {error && message.error('Failed to load execution run details :(')}
-            <Section>
-                <StatusSection>
-                    <Typography.Title level={5}>Status</Typography.Title>
-                    <ResultText>{resultText}</ResultText>
-                    <SubHeaderParagraph>{resultSummaryText}</SubHeaderParagraph>
-                    {structuredReport ? <StructuredReport report={structuredReport} /> : null}
-                </StatusSection>
-                {(status === SUCCESS || status === SUCCEEDED_WITH_WARNINGS) && (
-                    <IngestedAssetsSection>
-                        {data?.executionRequest?.id && (
-                            <IngestedAssets executionResult={result} id={data?.executionRequest?.id} />
-                        )}
-                    </IngestedAssetsSection>
-                )}
-                <LogsSection>
-                    <SectionHeader level={5}>Logs</SectionHeader>
-                    <SectionSubHeader>
-                        <SubHeaderParagraph type="secondary">
-                            View logs that were collected during the sync.
-                        </SubHeaderParagraph>
-                        <Button type="text" onClick={downloadLogs}>
-                            <DownloadOutlined />
-                            Download
-                        </Button>
-                    </SectionSubHeader>
-                    <DetailsContainer areDetailsExpandable={areLogsExpandable} showExpandedDetails={showExpandedLogs}>
-                        <Typography.Paragraph ellipsis>
-                            <pre>{`${logs}${!showExpandedLogs && areLogsExpandable ? '...' : ''}`}</pre>
-                        </Typography.Paragraph>
-                    </DetailsContainer>
-                    {areLogsExpandable && (
-                        <ShowMoreButton type="link" onClick={() => setShowExpandedLogs(!showExpandedLogs)}>
-                            {showExpandedLogs ? 'Hide' : 'Show More'}
-                        </ShowMoreButton>
-                    )}
-                </LogsSection>
-                {recipe && (
-                    <RecipeSection>
-                        <SectionHeader level={5}>Recipe</SectionHeader>
-                        <SectionSubHeader>
-                            <SubHeaderParagraph type="secondary">
-                                The configurations used for this sync with the data source.
-                            </SubHeaderParagraph>
-                        </SectionSubHeader>
-                        <DetailsContainer
-                            areDetailsExpandable={isRecipeExpandable}
-                            showExpandedDetails={showExpandedRecipe}
-                        >
-                            <Typography.Paragraph ellipsis>
-                                <pre>{`${recipe}${!showExpandedRecipe && isRecipeExpandable ? '...' : ''}`}</pre>
-                            </Typography.Paragraph>
-                        </DetailsContainer>
-                        {isRecipeExpandable && (
-                            <ShowMoreButton type="link" onClick={() => setShowExpandedRecipe((v) => !v)}>
-                                {showExpandedRecipe ? 'Hide' : 'Show More'}
-                            </ShowMoreButton>
-                        )}
-                    </RecipeSection>
-                )}
-            </Section>
-        </Modal>
-    );
-};
diff --git a/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTable.tsx b/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTable.tsx
deleted file mode 100644
index f6e504fec54166..00000000000000
--- a/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTable.tsx
+++ /dev/null
@@ -1,171 +0,0 @@
-import { Empty, Pagination, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { StyledTable } from '@app/entity/shared/components/styled/StyledTable';
-import {
-    ButtonsColumn,
-    SourceColumn,
-    StatusColumn,
-    TimeColumn,
-} from '@app/ingest/source/executions/IngestionExecutionTableColumns';
-import { SUCCESS, getIngestionSourceStatus } from '@app/ingest/source/utils';
-import { formatDuration } from '@app/shared/formatDuration';
-import { useEntityRegistry } from '@src/app/useEntityRegistry';
-import { SearchCfg } from '@src/conf';
-
-import { EntityType, ExecutionRequest } from '@types';
-
-const PaginationInfoContainer = styled.span`
-    padding: 8px;
-    padding-left: 16px;
-    border-top: 1px solid;
-    border-color: ${(props) => props.theme.styles['border-color-base']};
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-`;
-
-const StyledPagination = styled(Pagination)`
-    margin: 0px;
-    padding: 0px;
-`;
-
-const PaginationInfo = styled(Typography.Text)`
-    padding: 0px;
-`;
-
-interface Props {
-    executionRequests: ExecutionRequest[];
-    setFocusExecutionUrn: (urn: string) => void;
-    handleViewDetails: (urn: string) => void;
-    handleCancelExecution: (urn: string) => void;
-    handleRollbackExecution: (runId: string) => void;
-    onChangePage: (number: any) => void;
-    setNumResultsPerPage: (number: any) => void;
-    totalExecution?: number | null;
-    page?: any;
-    pageSize?: any;
-    lastResultIndex?: any;
-}
-
-export default function IngestionExecutionTable({
-    executionRequests,
-    onChangePage,
-    setFocusExecutionUrn,
-    handleViewDetails,
-    handleCancelExecution,
-    handleRollbackExecution,
-    setNumResultsPerPage,
-    totalExecution,
-    pageSize,
-    lastResultIndex,
-    page,
-}: Props) {
-    const entityRegistry = useEntityRegistry();
-    const tableColumns = [
-        {
-            title: 'Requested At',
-            dataIndex: 'requestedAt',
-            key: 'requestedAt',
-            render: TimeColumn,
-        },
-        {
-            title: 'Started At',
-            dataIndex: 'executedAt',
-            key: 'executedAt',
-            render: TimeColumn,
-        },
-        {
-            title: 'Duration',
-            dataIndex: 'duration',
-            key: 'duration',
-            render: (durationMs: number) => formatDuration(durationMs),
-        },
-        {
-            title: 'Status',
-            dataIndex: 'status',
-            key: 'status',
-            render: (status: any, record) => (
-                <StatusColumn status={status} record={record} setFocusExecutionUrn={setFocusExecutionUrn} />
-            ),
-        },
-        {
-            title: 'Source',
-            dataIndex: 'source',
-            key: 'source',
-            render: (_, record: any) => (
-                <SourceColumn
-                    source={record.source}
-                    actor={{
-                        actorUrn: record.actorUrn,
-                        displayName: record?.actorUrn?.split(':')?.slice(-1)?.[0] || '',
-                        displayUrl: entityRegistry.getEntityUrl(EntityType.CorpUser, record.actorUrn),
-                    }}
-                />
-            ),
-        },
-
-        {
-            title: '',
-            dataIndex: '',
-            key: 'x',
-            render: (_, record: any) => (
-                <ButtonsColumn
-                    record={record}
-                    handleViewDetails={handleViewDetails}
-                    handleCancelExecution={handleCancelExecution}
-                    handleRollbackExecution={handleRollbackExecution}
-                />
-            ),
-        },
-    ];
-
-    const mostRecentSuccessfulExecution =
-        page === 1 && executionRequests.find((execution) => execution.result?.status === SUCCESS);
-
-    const tableData = executionRequests.map((execution) => ({
-        urn: execution.urn,
-        actorUrn: execution.input.actorUrn,
-        id: execution.id,
-        source: execution.input.source.type,
-        requestedAt: execution.input?.requestedAt,
-        executedAt: execution.result?.startTimeMs,
-        duration: execution.result?.durationMs,
-        status: getIngestionSourceStatus(execution.result),
-        // we should add this logic to backend
-        showRollback: mostRecentSuccessfulExecution && execution?.urn === mostRecentSuccessfulExecution?.urn,
-    }));
-
-    return (
-        <>
-            <StyledTable
-                columns={tableColumns}
-                dataSource={tableData}
-                rowKey="id"
-                locale={{
-                    emptyText: <Empty description="No Executions found!" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
-                }}
-                pagination={false}
-            />
-            <PaginationInfoContainer>
-                <PaginationInfo>
-                    <b>
-                        {lastResultIndex > 0 ? (page - 1) * pageSize + 1 : 0} - {lastResultIndex}
-                    </b>{' '}
-                    of <b>{totalExecution}</b>
-                </PaginationInfo>
-                <StyledPagination
-                    current={page}
-                    pageSize={pageSize}
-                    total={totalExecution as any}
-                    showLessItems
-                    onChange={onChangePage}
-                    showSizeChanger={(totalExecution as any) > SearchCfg.RESULTS_PER_PAGE}
-                    onShowSizeChange={(_currNum, newNum) => setNumResultsPerPage(newNum)}
-                    pageSizeOptions={['10', '20', '50', '100']}
-                />
-            </PaginationInfoContainer>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTableColumns.tsx b/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTableColumns.tsx
deleted file mode 100644
index 0efeb7fcad61d3..00000000000000
--- a/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTableColumns.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-import { CopyOutlined } from '@ant-design/icons';
-import { Text, Tooltip } from '@components';
-import { Button, Typography } from 'antd';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import {
-    CLI_INGESTION_SOURCE,
-    MANUAL_INGESTION_SOURCE,
-    RUNNING,
-    SCHEDULED_INGESTION_SOURCE,
-    SUCCESS,
-    getExecutionRequestStatusDisplayColor,
-    getExecutionRequestStatusDisplayText,
-    getExecutionRequestStatusIcon,
-} from '@app/ingest/source/utils';
-import { CreatedByContainer } from '@src/app/govern/structuredProperties/styledComponents';
-import CustomAvatar from '@src/app/shared/avatar/CustomAvatar';
-
-type Actor = {
-    actorUrn: string;
-    displayName: string;
-    displayUrl: string;
-};
-
-const UserContainer = styled.div`
-    display: flex;
-    align-items: center;
-    gap: 4px;
-    wrap: auto;
-`;
-
-const StatusContainer = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-`;
-
-const StatusButton = styled(Button)`
-    padding: 0px;
-    margin: 0px;
-`;
-
-export function TimeColumn(time: string) {
-    const date = time && new Date(time);
-    const localTime = date && `${date.toLocaleDateString()} at ${date.toLocaleTimeString()}`;
-    return <Typography.Text>{localTime || 'None'}</Typography.Text>;
-}
-
-interface StatusColumnProps {
-    status: string;
-    record: any;
-    setFocusExecutionUrn: (urn: string) => void;
-}
-
-export function StatusColumn({ status, record, setFocusExecutionUrn }: StatusColumnProps) {
-    const Icon = getExecutionRequestStatusIcon(status);
-    const text = getExecutionRequestStatusDisplayText(status);
-    const color = getExecutionRequestStatusDisplayColor(status);
-    return (
-        <StatusContainer>
-            {Icon && <Icon style={{ color, fontSize: 14 }} />}
-            <StatusButton type="link" onClick={() => setFocusExecutionUrn(record.urn)}>
-                <Typography.Text strong style={{ color, marginLeft: 8 }}>
-                    {text || 'Pending...'}
-                </Typography.Text>
-            </StatusButton>
-        </StatusContainer>
-    );
-}
-
-// TODO: This will be soon exported into a component
-const UserPill = ({ actor }: { actor: Actor }) => (
-    <Link to={actor?.displayUrl}>
-        <CreatedByContainer>
-            <CustomAvatar size={16} name={actor?.displayName} hideTooltip />
-            <Text type="div" color="gray" size="sm" weight="semiBold">
-                {actor?.displayName}
-            </Text>
-        </CreatedByContainer>
-    </Link>
-);
-
-interface SourceColumnProps {
-    source: string;
-    actor?: Actor;
-}
-
-export function SourceColumn({ source, actor }: SourceColumnProps) {
-    switch (source) {
-        case MANUAL_INGESTION_SOURCE:
-            if (!actor) return <>Manual Execution</>;
-            return (
-                <UserContainer>
-                    Manual Execution by <UserPill actor={actor} />
-                </UserContainer>
-            );
-
-        case SCHEDULED_INGESTION_SOURCE:
-            return <span>Scheduled Execution</span>;
-
-        case CLI_INGESTION_SOURCE:
-            return <span>CLI Execution</span>;
-
-        default:
-            return <span>N/A</span>;
-    }
-}
-
-interface ButtonsColumnProps {
-    record: any;
-    handleViewDetails: (urn: string) => void;
-    handleCancelExecution: (urn: string) => void;
-    handleRollbackExecution: (runId: string) => void;
-}
-
-export function ButtonsColumn({
-    record,
-    handleViewDetails,
-    handleCancelExecution,
-    handleRollbackExecution,
-}: ButtonsColumnProps) {
-    return (
-        <div style={{ display: 'flex', justifyContent: 'right' }}>
-            {record.urn && navigator.clipboard && (
-                <Tooltip title="Copy Execution Request URN">
-                    <Button
-                        style={{ marginRight: 16 }}
-                        icon={<CopyOutlined />}
-                        onClick={() => {
-                            navigator.clipboard.writeText(record.urn);
-                        }}
-                    />
-                </Tooltip>
-            )}
-            {record.duration && (
-                <Button style={{ marginRight: 16 }} onClick={() => handleViewDetails(record.urn)}>
-                    DETAILS
-                </Button>
-            )}
-            {record.status === RUNNING && (
-                <Button style={{ marginRight: 16 }} onClick={() => handleCancelExecution(record.urn)}>
-                    CANCEL
-                </Button>
-            )}
-            {record.status === SUCCESS && record.showRollback && (
-                <Button style={{ marginRight: 16 }} onClick={() => handleRollbackExecution(record.id)}>
-                    ROLLBACK
-                </Button>
-            )}
-        </div>
-    );
-}
diff --git a/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx b/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx
index 7079afce5223bc..09f7bfd6addc6f 100644
--- a/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx
+++ b/datahub-web-react/src/app/ingest/source/executions/IngestionSourceExecutionList.tsx
@@ -1,183 +1,7 @@
-import { Modal, message } from 'antd';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components';
 
-import { ExecutionDetailsModal } from '@app/ingest/source/executions/ExecutionRequestDetailsModal';
-import IngestionExecutionTable from '@app/ingest/source/executions/IngestionExecutionTable';
-import useRefreshIngestionData from '@app/ingest/source/executions/useRefreshIngestionData';
 import { ROLLING_BACK, RUNNING } from '@app/ingest/source/utils';
-import { Message } from '@app/shared/Message';
-import { SearchCfg } from '@src/conf';
-
-import {
-    useCancelIngestionExecutionRequestMutation,
-    useGetIngestionSourceQuery,
-    useRollbackIngestionMutation,
-} from '@graphql/ingestion.generated';
 import { ExecutionRequest } from '@types';
 
-const ListContainer = styled.div`
-    margin-left: 28px;
-`;
-
 export function isExecutionRequestActive(executionRequest: ExecutionRequest) {
     return executionRequest.result?.status === RUNNING || executionRequest.result?.status === ROLLING_BACK;
 }
-
-type Props = {
-    urn: string;
-    isExpanded: boolean;
-    lastRefresh: number;
-    onRefresh: () => void;
-};
-
-export const IngestionSourceExecutionList = ({ urn, isExpanded, lastRefresh, onRefresh }: Props) => {
-    const [focusExecutionUrn, setFocusExecutionUrn] = useState<undefined | string>(undefined);
-    const [page, setPage] = useState(1);
-    const [numResultsPerPage, setNumResultsPerPage] = useState(SearchCfg.RESULTS_PER_PAGE);
-
-    const start: number = (page - 1) * numResultsPerPage;
-
-    const { loading, data, error, refetch } = useGetIngestionSourceQuery({
-        variables: {
-            urn,
-            runStart: start,
-            runCount: numResultsPerPage,
-        },
-    });
-
-    const onChangePage = (newPage: number) => {
-        setPage(newPage);
-    };
-
-    function hasActiveExecution() {
-        return !!data?.ingestionSource?.executions?.executionRequests?.find((request) =>
-            isExecutionRequestActive(request as ExecutionRequest),
-        );
-    }
-    useRefreshIngestionData(refetch, hasActiveExecution);
-
-    const [cancelExecutionRequestMutation] = useCancelIngestionExecutionRequestMutation();
-    const [rollbackIngestion] = useRollbackIngestionMutation();
-
-    useEffect(() => {
-        if (isExpanded) {
-            refetch();
-        }
-    }, [lastRefresh, isExpanded, refetch]);
-
-    const handleViewDetails = (focusUrn: string) => {
-        setFocusExecutionUrn(focusUrn);
-    };
-
-    const onCancelExecutionRequest = (executionUrn: string) => {
-        cancelExecutionRequestMutation({
-            variables: {
-                input: {
-                    ingestionSourceUrn: urn,
-                    executionRequestUrn: executionUrn,
-                },
-            },
-        })
-            .catch((e) => {
-                message.destroy();
-                message.error({
-                    content: `Failed to cancel execution!: \n ${e.message || ''}`,
-                    duration: 3,
-                });
-            })
-            .finally(() => {
-                message.success({
-                    content: `Successfully submitted cancellation request!`,
-                    duration: 3,
-                });
-                // Refresh once a job was cancelled.
-                setTimeout(() => onRefresh(), 2000);
-            });
-    };
-
-    const handleCancelExecution = (executionUrn: string) => {
-        Modal.confirm({
-            title: `Confirm Cancel`,
-            content:
-                'Cancelling a running execution will NOT remove any data that has already been ingested. You can use the DataHub CLI to rollback this ingestion run.',
-            onOk() {
-                onCancelExecutionRequest(executionUrn);
-            },
-            onCancel() {},
-            okText: 'Cancel',
-            cancelText: 'Close',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    function handleRollbackExecution(runId: string) {
-        Modal.confirm({
-            title: `Confirm Rollback`,
-            content: (
-                <div>
-                    Rolling back this ingestion run will remove any new data ingested during the run. This may exclude
-                    data that was previously extracted, but did not change during this run.
-                    <br />
-                    <br /> Are you sure you want to continue?
-                </div>
-            ),
-            onOk() {
-                message.loading('Requesting rollback...');
-                rollbackIngestion({ variables: { input: { runId } } })
-                    .then(() => {
-                        setTimeout(() => {
-                            message.destroy();
-                            refetch();
-                            onRefresh();
-                            message.success('Successfully requested ingestion rollback');
-                        }, 2000);
-                    })
-                    .catch(() => {
-                        message.error('Error requesting ingestion rollback');
-                    });
-            },
-            onCancel() {},
-            okText: 'Rollback',
-            cancelText: 'Close',
-            maskClosable: true,
-            closable: true,
-        });
-    }
-
-    const executionRequests = (data?.ingestionSource?.executions?.executionRequests as ExecutionRequest[]) || [];
-    const totalExecution = data?.ingestionSource?.executions?.total || 0;
-    const pageSize = data?.ingestionSource?.executions?.count || 0;
-    const pageStart = data?.ingestionSource?.executions?.start || 0;
-    const lastResultIndex = pageStart + pageSize > totalExecution ? totalExecution : pageStart + pageSize;
-
-    return (
-        <ListContainer>
-            {!data && loading && <Message type="loading" content="Loading executions..." />}
-            {error && (
-                <Message type="error" content="Failed to load ingestion executions! An unexpected error occurred." />
-            )}
-            <IngestionExecutionTable
-                onChangePage={onChangePage}
-                executionRequests={executionRequests}
-                totalExecution={totalExecution}
-                page={page}
-                pageSize={numResultsPerPage}
-                lastResultIndex={lastResultIndex}
-                setFocusExecutionUrn={setFocusExecutionUrn}
-                handleCancelExecution={handleCancelExecution}
-                handleViewDetails={handleViewDetails}
-                handleRollbackExecution={handleRollbackExecution}
-                setNumResultsPerPage={setNumResultsPerPage}
-            />
-            {focusExecutionUrn && (
-                <ExecutionDetailsModal
-                    urn={focusExecutionUrn}
-                    open={focusExecutionUrn !== undefined}
-                    onClose={() => setFocusExecutionUrn(undefined)}
-                />
-            )}
-        </ListContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReport.tsx b/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReport.tsx
deleted file mode 100644
index efc3845351e911..00000000000000
--- a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReport.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { CloseCircleOutlined, ExclamationCircleOutlined, InfoCircleOutlined } from '@ant-design/icons';
-import React from 'react';
-import styled from 'styled-components';
-
-import { REDESIGN_COLORS } from '@app/entity/shared/constants';
-import { StructuredReportItemList } from '@app/ingest/source/executions/reporting/StructuredReportItemList';
-import { StructuredReportItemLevel, StructuredReport as StructuredReportType } from '@app/ingest/source/types';
-
-const Container = styled.div`
-    display: flex;
-    flex-direction: column;
-    gap: 12px;
-`;
-
-const ERROR_COLOR = '#F5222D';
-const WARNING_COLOR = '#FA8C16';
-const INFO_COLOR = REDESIGN_COLORS.BLUE;
-
-interface Props {
-    report: StructuredReportType;
-}
-
-export function StructuredReport({ report }: Props) {
-    if (!report.items.length) {
-        return null;
-    }
-
-    const warnings = report.items.filter((item) => item.level === StructuredReportItemLevel.WARN);
-    const errors = report.items.filter((item) => item.level === StructuredReportItemLevel.ERROR);
-    const infos = report.items.filter((item) => item.level === StructuredReportItemLevel.INFO);
-    return (
-        <Container>
-            {errors.length ? (
-                <StructuredReportItemList items={errors} color={ERROR_COLOR} icon={CloseCircleOutlined} />
-            ) : null}
-            {warnings.length ? (
-                <StructuredReportItemList items={warnings} color={WARNING_COLOR} icon={ExclamationCircleOutlined} />
-            ) : null}
-            {infos.length ? (
-                <StructuredReportItemList items={infos} color={INFO_COLOR} icon={InfoCircleOutlined} />
-            ) : null}
-        </Container>
-    );
-}
diff --git a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItem.tsx b/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItem.tsx
deleted file mode 100644
index bc742685c94cae..00000000000000
--- a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItem.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { Collapse } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { StructuredReportItemContext } from '@app/ingest/source/executions/reporting/StructuredReportItemContext';
-import { StructuredReportLogEntry } from '@app/ingest/source/types';
-import { applyOpacity } from '@app/shared/styleUtils';
-
-const StyledCollapse = styled(Collapse)<{ color: string }>`
-    background-color: ${(props) => applyOpacity(props.color, 8)};
-    border: 1px solid ${(props) => applyOpacity(props.color, 20)};
-    display: flex;
-
-    && {
-        .ant-collapse-header {
-            display: flex;
-            align-items: center;
-            overflow: auto;
-        }
-
-        .ant-collapse-item {
-            border: none;
-            width: 100%;
-        }
-    }
-`;
-
-const Item = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: start;
-    gap: 4px;
-`;
-
-const Content = styled.div`
-    border-radius: 8px;
-`;
-
-const Text = styled.div`
-    display: flex;
-    flex-direction: column;
-`;
-
-const Type = styled.div`
-    font-weight: bold;
-    font-size: 14px;
-`;
-
-const Message = styled.div`
-    color: ${ANTD_GRAY[8]};
-`;
-
-interface Props {
-    item: StructuredReportLogEntry;
-    color: string;
-    icon?: React.ComponentType<any>;
-}
-
-export function StructuredReportItem({ item, color, icon }: Props) {
-    const Icon = icon;
-    return (
-        <StyledCollapse color={color}>
-            <Collapse.Panel
-                header={
-                    <Item>
-                        {Icon ? <Icon style={{ fontSize: 16, color, marginRight: 12 }} /> : null}
-                        <Text>
-                            <Type>{item.title}</Type>
-                            <Message>{item.message}</Message>
-                        </Text>
-                    </Item>
-                }
-                key="0"
-            >
-                <Content>
-                    <StructuredReportItemContext item={item} />
-                </Content>
-            </Collapse.Panel>
-        </StyledCollapse>
-    );
-}
diff --git a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItemContext.tsx b/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItemContext.tsx
deleted file mode 100644
index dcb5d18d201737..00000000000000
--- a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItemContext.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Tooltip } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { StructuredReportLogEntry } from '@app/ingest/source/types';
-
-const Container = styled.div`
-    display: flex;
-    flex-direction: column;
-    gap: 8px;
-    margin-left: 12px;
-`;
-
-const Title = styled.div`
-    font-size: 14px;
-    font-weight: bold;
-`;
-
-const Item = styled.pre`
-    padding: 6px;
-    font-size: 12px;
-    border-radius: 2px;
-    background-color: ${ANTD_GRAY[3]};
-    color: ${ANTD_GRAY[8]};
-`;
-
-interface Props {
-    item: StructuredReportLogEntry;
-}
-
-export function StructuredReportItemContext({ item }: Props) {
-    return (
-        <Container>
-            <Tooltip showArrow={false} title="Additional context about the source of the issue" placement="left">
-                <Title>Context</Title>
-            </Tooltip>
-            {item.context.length
-                ? // eslint-disable-next-line react/no-array-index-key
-                  item.context.map((contextItem, index) => <Item key={`${contextItem}-${index}`}>{contextItem}</Item>)
-                : 'No additional context found.'}
-        </Container>
-    );
-}
diff --git a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItemList.tsx b/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItemList.tsx
deleted file mode 100644
index 411cf93f0c8538..00000000000000
--- a/datahub-web-react/src/app/ingest/source/executions/reporting/StructuredReportItemList.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { StructuredReportItem } from '@app/ingest/source/executions/reporting/StructuredReportItem';
-import { StructuredReportLogEntry } from '@app/ingest/source/types';
-import { ShowMoreSection } from '@app/shared/ShowMoreSection';
-
-const ItemList = styled.div`
-    display: flex;
-    flex-direction: column;
-    gap: 12px;
-`;
-
-interface Props {
-    items: StructuredReportLogEntry[];
-    color: string;
-    icon?: React.ComponentType<any>;
-    pageSize?: number;
-}
-
-export function StructuredReportItemList({ items, color, icon, pageSize = 3 }: Props) {
-    const [visibleCount, setVisibleCount] = useState(pageSize);
-    const visibleItems = items.slice(0, visibleCount);
-    const totalCount = items.length;
-
-    return (
-        <>
-            <ItemList>
-                {visibleItems.map((item) => (
-                    <StructuredReportItem
-                        item={item}
-                        color={color}
-                        icon={icon}
-                        key={`${item.message}-${item.context}`}
-                    />
-                ))}
-            </ItemList>
-            {totalCount > visibleCount ? (
-                <ShowMoreSection
-                    totalCount={totalCount}
-                    visibleCount={visibleCount}
-                    setVisibleCount={setVisibleCount}
-                    pageSize={pageSize}
-                />
-            ) : null}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/ingest/source/executions/useRefreshIngestionData.ts b/datahub-web-react/src/app/ingest/source/executions/useRefreshIngestionData.ts
deleted file mode 100644
index c38387253953fe..00000000000000
--- a/datahub-web-react/src/app/ingest/source/executions/useRefreshIngestionData.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useEffect, useState } from 'react';
-
-export default function useRefreshIngestionData(refresh: () => void, hasActiveExecution: () => boolean) {
-    const [refreshInterval, setRefreshInterval] = useState<NodeJS.Timeout | null>(null);
-
-    useEffect(() => {
-        const shouldRefresh = hasActiveExecution();
-        if (shouldRefresh) {
-            if (!refreshInterval) {
-                const interval = setInterval(refresh, 3000);
-                setRefreshInterval(interval);
-            }
-        } else if (refreshInterval) {
-            clearInterval(refreshInterval);
-            setRefreshInterval(null);
-        }
-    }, [refreshInterval, refresh, hasActiveExecution]);
-}
diff --git a/datahub-web-react/src/app/ingest/source/hooks.ts b/datahub-web-react/src/app/ingest/source/hooks.ts
deleted file mode 100644
index 7197c9daffa9ca..00000000000000
--- a/datahub-web-react/src/app/ingest/source/hooks.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { useEffect } from 'react';
-
-export const useCommandS = (onPress: () => void) => {
-    useEffect(() => {
-        const handleKeyDown = (event: KeyboardEvent) => {
-            if (event.metaKey && event.key === 's') {
-                event.preventDefault();
-                onPress();
-            }
-        };
-        window.addEventListener('keydown', handleKeyDown);
-        return () => {
-            window.removeEventListener('keydown', handleKeyDown);
-        };
-    }, [onPress]);
-};
diff --git a/datahub-web-react/src/app/ingest/source/types.ts b/datahub-web-react/src/app/ingest/source/types.ts
deleted file mode 100644
index e99377159db956..00000000000000
--- a/datahub-web-react/src/app/ingest/source/types.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * The "log level" for log items reported from ingestion
- */
-export enum StructuredReportItemLevel {
-    /**
-     * An error log
-     */
-    ERROR,
-    /**
-     * A warn log
-     */
-    WARN,
-    /**
-     * An info log - generally unused.
-     */
-    INFO,
-}
-
-/**
- * A type describing an individual warning / failure item in a structured report.
- *
- * TODO: Determine whether we need a message field to be reported!
- */
-export interface StructuredReportLogEntry {
-    level: StructuredReportItemLevel; // The "log level"
-    title?: string; // The "well-supported" or standardized title
-    message: string; // The message to display associated with the error.
-    context: string[]; // The context of WHERE the issue was encountered, as a string.
-}
-
-/**
- * A type describing a structured ingestion report.
- */
-export interface StructuredReport {
-    infoCount: number;
-    errorCount: number;
-    warnCount: number;
-    items: StructuredReportLogEntry[];
-}
diff --git a/datahub-web-react/src/app/ingest/source/utils.ts b/datahub-web-react/src/app/ingest/source/utils.ts
index 2014d2eda97d07..58f0954cc9101d 100644
--- a/datahub-web-react/src/app/ingest/source/utils.ts
+++ b/datahub-web-react/src/app/ingest/source/utils.ts
@@ -9,14 +9,8 @@ import {
     X,
 } from 'phosphor-react';
 import YAML from 'yamljs';
-
-import EntityRegistry from '@app/entity/EntityRegistry';
 import { SourceConfig } from '@app/ingest/source/builder/types';
-import { StructuredReport, StructuredReportItemLevel, StructuredReportLogEntry } from '@app/ingest/source/types';
-import { capitalizeFirstLetterOnly, pluralize } from '@app/shared/textUtil';
-
-import { ListIngestionSourcesDocument, ListIngestionSourcesQuery } from '@graphql/ingestion.generated';
-import { EntityType, ExecutionRequestResult, FacetMetadata } from '@types';
+import { ExecutionRequestResult } from '@types';
 
 export const getSourceConfigs = (ingestionSources: SourceConfig[], sourceType: string) => {
     const sourceConfigs = ingestionSources.find((source) => source.name === sourceType);
@@ -45,21 +39,16 @@ export function getPlaceholderRecipe(ingestionSources: SourceConfig[], type?: st
 
 export const RUNNING = 'RUNNING';
 export const SUCCESS = 'SUCCESS';
-export const SUCCEEDED_WITH_WARNINGS = 'SUCCEEDED_WITH_WARNINGS';
-export const WARNING = 'WARNING';
+const SUCCEEDED_WITH_WARNINGS = 'SUCCEEDED_WITH_WARNINGS';
 export const FAILURE = 'FAILURE';
-export const CONNECTION_FAILURE = 'CONNECTION_FAILURE';
-export const CANCELLED = 'CANCELLED';
-export const ABORTED = 'ABORTED';
-export const UP_FOR_RETRY = 'UP_FOR_RETRY';
+const CANCELLED = 'CANCELLED';
+const ABORTED = 'ABORTED';
+const UP_FOR_RETRY = 'UP_FOR_RETRY';
 export const ROLLING_BACK = 'ROLLING_BACK';
 export const ROLLED_BACK = 'ROLLED_BACK';
-export const ROLLBACK_FAILED = 'ROLLBACK_FAILED';
+const ROLLBACK_FAILED = 'ROLLBACK_FAILED';
 
 export const CLI_EXECUTOR_ID = '__datahub_cli_';
-export const MANUAL_INGESTION_SOURCE = 'MANUAL_INGESTION_SOURCE';
-export const SCHEDULED_INGESTION_SOURCE = 'SCHEDULED_INGESTION_SOURCE';
-export const CLI_INGESTION_SOURCE = 'CLI_INGESTION_SOURCE';
 
 export const getExecutionRequestStatusIcon = (status?: string) => {
     return (
@@ -93,31 +82,6 @@ export const getExecutionRequestStatusDisplayText = (status?: string) => {
     );
 };
 
-export const getExecutionRequestSummaryText = (status: string) => {
-    switch (status) {
-        case RUNNING:
-            return 'Ingestion is running...';
-        case SUCCESS:
-            return 'Ingestion completed with no errors or warnings.';
-        case SUCCEEDED_WITH_WARNINGS:
-            return 'Ingestion completed with some warnings.';
-        case FAILURE:
-            return 'Ingestion failed to complete, or completed with errors.';
-        case CANCELLED:
-            return 'Ingestion was cancelled.';
-        case ROLLED_BACK:
-            return 'Ingestion was rolled back.';
-        case ROLLING_BACK:
-            return 'Ingestion is in the process of rolling back.';
-        case ROLLBACK_FAILED:
-            return 'Ingestion rollback failed.';
-        case ABORTED:
-            return 'Ingestion job got aborted due to worker restart.';
-        default:
-            return 'Ingestion status not recognized.';
-    }
-};
-
 export const getExecutionRequestStatusDisplayColor = (status?: string) => {
     return (
         (status === RUNNING && colors.blue[1000]) ||
@@ -149,88 +113,6 @@ export const validateURL = (fieldName: string) => {
     };
 };
 
-const createStructuredReport = (items: StructuredReportLogEntry[]): StructuredReport => {
-    const errorCount = items.filter((item) => item.level === StructuredReportItemLevel.ERROR).length;
-    const warnCount = items.filter((item) => item.level === StructuredReportItemLevel.WARN).length;
-    const infoCount = items.filter((item) => item.level === StructuredReportItemLevel.INFO).length;
-    return {
-        errorCount,
-        warnCount,
-        infoCount,
-        items,
-    };
-};
-
-const transformToStructuredReport = (structuredReportObj: any): StructuredReport | null => {
-    if (!structuredReportObj) {
-        return null;
-    }
-
-    /* Legacy helper function to map backend failure or warning ingestion objects into StructuredReportLogEntry[] */
-    const mapItemObject = (
-        items: { [key: string]: string[] },
-        level: StructuredReportItemLevel,
-    ): StructuredReportLogEntry[] => {
-        return Object.entries(items).map(([rawMessage, context]) => ({
-            level,
-            title: 'An unexpected issue occurred',
-            message: rawMessage,
-            context,
-        }));
-    };
-
-    /* V2 helper function to map backend failure or warning lists into StructuredReportLogEntry[] */
-    const mapItemArray = (items, level: StructuredReportItemLevel): StructuredReportLogEntry[] => {
-        return items
-            .map((item) => {
-                if (typeof item === 'string') {
-                    // Handle "sampled from" case..
-                    return null;
-                }
-
-                return {
-                    level,
-                    title: item.title || 'An unexpected issue occurred',
-                    message: item.message,
-                    context: item.context,
-                };
-            })
-            .filter((item) => item != null);
-    };
-
-    try {
-        const sourceReport = structuredReportObj.source?.report;
-
-        if (!sourceReport) {
-            return null;
-        }
-
-        // Else fallback to using the legacy fields
-        const failures = Array.isArray(sourceReport.failures)
-            ? /* Use V2 failureList if present */
-              mapItemArray(sourceReport.failures || [], StructuredReportItemLevel.ERROR)
-            : /* Else use the legacy object type */
-              mapItemObject(sourceReport.failures || {}, StructuredReportItemLevel.ERROR);
-
-        const warnings = Array.isArray(sourceReport.warnings)
-            ? /* Use V2 warning if present */
-              mapItemArray(sourceReport.warnings || [], StructuredReportItemLevel.WARN)
-            : /* Else use the legacy object type */
-              mapItemObject(sourceReport.warnings || {}, StructuredReportItemLevel.WARN);
-
-        const infos = Array.isArray(sourceReport.infos)
-            ? /* Use V2 infos if present */
-              mapItemArray(sourceReport.infos || [], StructuredReportItemLevel.INFO)
-            : /* Else use the legacy object type */
-              mapItemObject(sourceReport.infos || {}, StructuredReportItemLevel.INFO);
-
-        return createStructuredReport([...failures, ...warnings, ...infos]);
-    } catch (e) {
-        console.warn('Failed to extract structured report from ingestion report!', e);
-        return null;
-    }
-};
-
 const extractStructuredReportPOJO = (result: Partial<ExecutionRequestResult>): any | null => {
     const structuredReportStr = result?.structuredReport?.serializedValue;
     if (!structuredReportStr) {
@@ -244,40 +126,6 @@ const extractStructuredReportPOJO = (result: Partial<ExecutionRequestResult>): a
     }
 };
 
-export const getStructuredReport = (result: Partial<ExecutionRequestResult>): StructuredReport | null => {
-    // 1. Extract Serialized Structured Report
-    const structuredReportObject = extractStructuredReportPOJO(result);
-    if (!structuredReportObject) {
-        return null;
-    }
-
-    // 3. Transform into the typed model that we have.
-    const structuredReport = transformToStructuredReport(structuredReportObject);
-
-    // 4. Return JSON report
-    return structuredReport;
-};
-
-/**
- * This function is used to get the total number of entities ingested from the structured report.
- *
- * @param result - The result of the execution request.
- * @returns {number | null}
- */
-export const getTotalEntitiesIngested = (result: Partial<ExecutionRequestResult>) => {
-    const structuredReportObject = extractStructuredReportPOJO(result);
-    if (!structuredReportObject) {
-        return null;
-    }
-
-    try {
-        return structuredReportObject.sink.report.total_records_written;
-    } catch (e) {
-        console.error(`Caught exception while parsing structured report!`, e);
-        return null;
-    }
-};
-
 /** *
  * This function is used to get the entities ingested by type from the structured report.
  * It returns an array of objects with the entity type and the count of entities ingested.
@@ -367,162 +215,7 @@ export const getEntitiesIngestedByType = (result: Partial<ExecutionRequestResult
     }
 };
 
-export const getIngestionSourceStatus = (result?: Partial<ExecutionRequestResult> | null) => {
-    if (!result) {
-        return undefined;
-    }
-
-    const { status } = result;
-    const structuredReport = getStructuredReport(result);
-
-    /**
-     * Simply map SUCCESS in the presence of warnings to SUCCEEDED_WITH_WARNINGS
-     *
-     * This is somewhat of a hack - ideally the ingestion source should report this status back to us.
-     */
-    if (status === SUCCESS && (structuredReport?.warnCount || 0) > 0) {
-        return SUCCEEDED_WITH_WARNINGS;
-    }
-    // Else return the raw status.
-    return status;
-};
-
-const ENTITIES_WITH_SUBTYPES = new Set([
-    EntityType.Dataset.toLowerCase(),
-    EntityType.Container.toLowerCase(),
-    EntityType.Notebook.toLowerCase(),
-    EntityType.Dashboard.toLowerCase(),
-]);
-
-export type EntityTypeCount = {
+type EntityTypeCount = {
     count: number;
     displayName: string;
 };
-
-/**
- * Extract entity type counts to display in the ingestion summary.
- *
- * @param entityTypeFacets the filter facets for entity type.
- * @param subTypeFacets the filter facets for sub types.
- */
-export const extractEntityTypeCountsFromFacets = (
-    entityRegistry: EntityRegistry,
-    entityTypeFacets: FacetMetadata,
-    subTypeFacets?: FacetMetadata | null,
-): EntityTypeCount[] => {
-    const finalCounts: EntityTypeCount[] = [];
-
-    if (subTypeFacets) {
-        subTypeFacets.aggregations
-            .filter((agg) => agg.count > 0)
-            .forEach((agg) =>
-                finalCounts.push({
-                    count: agg.count,
-                    displayName: pluralize(agg.count, capitalizeFirstLetterOnly(agg.value) || ''),
-                }),
-            );
-        entityTypeFacets.aggregations
-            .filter((agg) => agg.count > 0)
-            .filter((agg) => !ENTITIES_WITH_SUBTYPES.has(agg.value.toLowerCase()))
-            .forEach((agg) =>
-                finalCounts.push({
-                    count: agg.count,
-                    displayName: entityRegistry.getCollectionName(agg.value as EntityType),
-                }),
-            );
-    } else {
-        // Only use Entity Types- no subtypes.
-        entityTypeFacets.aggregations
-            .filter((agg) => agg.count > 0)
-            .forEach((agg) =>
-                finalCounts.push({
-                    count: agg.count,
-                    displayName: entityRegistry.getCollectionName(agg.value as EntityType),
-                }),
-            );
-    }
-
-    return finalCounts;
-};
-
-/**
- * Add an entry to the ListIngestionSources cache.
- */
-export const addToListIngestionSourcesCache = (client, newSource, pageSize, query) => {
-    // Read the data from our cache for this query.
-    const currData: ListIngestionSourcesQuery | null = client.readQuery({
-        query: ListIngestionSourcesDocument,
-        variables: {
-            input: {
-                start: 0,
-                count: pageSize,
-                query,
-            },
-        },
-    });
-
-    // Add our new source into the existing list.
-    const newSources = [newSource, ...(currData?.listIngestionSources?.ingestionSources || [])];
-
-    // Write our data back to the cache.
-    client.writeQuery({
-        query: ListIngestionSourcesDocument,
-        variables: {
-            input: {
-                start: 0,
-                count: pageSize,
-                query,
-            },
-        },
-        data: {
-            listIngestionSources: {
-                start: 0,
-                count: (currData?.listIngestionSources?.count || 0) + 1,
-                total: (currData?.listIngestionSources?.total || 0) + 1,
-                ingestionSources: newSources,
-            },
-        },
-    });
-};
-
-/**
- * Remove an entry from the ListIngestionSources cache.
- */
-export const removeFromListIngestionSourcesCache = (client, urn, page, pageSize, query) => {
-    // Read the data from our cache for this query.
-    const currData: ListIngestionSourcesQuery | null = client.readQuery({
-        query: ListIngestionSourcesDocument,
-        variables: {
-            input: {
-                start: (page - 1) * pageSize,
-                count: pageSize,
-                query,
-            },
-        },
-    });
-
-    // Remove the source from the existing sources set.
-    const newSources = [
-        ...(currData?.listIngestionSources?.ingestionSources || []).filter((source) => source.urn !== urn),
-    ];
-
-    // Write our data back to the cache.
-    client.writeQuery({
-        query: ListIngestionSourcesDocument,
-        variables: {
-            input: {
-                start: (page - 1) * pageSize,
-                count: pageSize,
-                query,
-            },
-        },
-        data: {
-            listIngestionSources: {
-                start: currData?.listIngestionSources?.start || 0,
-                count: (currData?.listIngestionSources?.count || 1) - 1,
-                total: (currData?.listIngestionSources?.total || 1) - 1,
-                ingestionSources: newSources,
-            },
-        },
-    });
-};
diff --git a/datahub-web-react/src/app/ingest/types.ts b/datahub-web-react/src/app/ingest/types.ts
deleted file mode 100644
index b4fd16ebbaf499..00000000000000
--- a/datahub-web-react/src/app/ingest/types.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export enum TabType {
-    Sources = 'Sources',
-    Secrets = 'Secrets',
-    RemoteExecutors = 'Executors',
-}
diff --git a/datahub-web-react/src/app/ingestV2/EmptySources.tsx b/datahub-web-react/src/app/ingestV2/EmptySources.tsx
index bc14063c976a67..d11d3fd46c01ab 100644
--- a/datahub-web-react/src/app/ingestV2/EmptySources.tsx
+++ b/datahub-web-react/src/app/ingestV2/EmptySources.tsx
@@ -5,7 +5,7 @@ import styled from 'styled-components';
 import { EmptyContainer } from '@app/govern/structuredProperties/styledComponents';
 import EmptyFormsImage from '@src/images/empty-forms.svg?react';
 
-export const TextContainer = styled.div`
+const TextContainer = styled.div`
     display: flex;
     flex-direction: column;
     align-items: center;
diff --git a/datahub-web-react/src/app/ingestV2/constants.ts b/datahub-web-react/src/app/ingestV2/constants.ts
index 6df9ff1ff84cc6..e4181a7faa25ae 100644
--- a/datahub-web-react/src/app/ingestV2/constants.ts
+++ b/datahub-web-react/src/app/ingestV2/constants.ts
@@ -1,6 +1,4 @@
-export const INGESTION_TAB_QUERY_PARAMS = {
-    searchQuery: 'query',
-};
+
 
 export const SYSTEM_INTERNAL_SOURCE_TYPE = 'SYSTEM';
 export const CLI_EXECUTOR_ID = '__datahub_cli_';
diff --git a/datahub-web-react/src/app/ingestV2/executions/components/EmptyState.tsx b/datahub-web-react/src/app/ingestV2/executions/components/EmptyState.tsx
index f3c1e027376d2e..8f0f26b76e9d13 100644
--- a/datahub-web-react/src/app/ingestV2/executions/components/EmptyState.tsx
+++ b/datahub-web-react/src/app/ingestV2/executions/components/EmptyState.tsx
@@ -5,7 +5,7 @@ import styled from 'styled-components';
 import { EmptyContainer } from '@app/govern/structuredProperties/styledComponents';
 import EmptyFormsImage from '@src/images/empty-forms.svg?react';
 
-export const TextContainer = styled.div`
+const TextContainer = styled.div`
     display: flex;
     flex-direction: column;
     align-items: center;
diff --git a/datahub-web-react/src/app/ingestV2/executions/components/Filters.tsx b/datahub-web-react/src/app/ingestV2/executions/components/Filters.tsx
index 7c53698df1fedb..17f650d5016772 100644
--- a/datahub-web-react/src/app/ingestV2/executions/components/Filters.tsx
+++ b/datahub-web-react/src/app/ingestV2/executions/components/Filters.tsx
@@ -21,7 +21,7 @@ const Container = styled.div`
     padding: 1px; // prevent cutting of select's outline
 `;
 
-export type FiltersState = Map<string, string[]>;
+type FiltersState = Map<string, string[]>;
 
 interface Props {
     onFiltersApplied?: (filters: FiltersState) => void;
diff --git a/datahub-web-react/src/app/ingestV2/executions/constants.ts b/datahub-web-react/src/app/ingestV2/executions/constants.ts
index 264c831419564c..e54675b8d5a927 100644
--- a/datahub-web-react/src/app/ingestV2/executions/constants.ts
+++ b/datahub-web-react/src/app/ingestV2/executions/constants.ts
@@ -1,9 +1,7 @@
 export const EXECUTION_REQUEST_STATUS_RUNNING = 'RUNNING';
 export const EXECUTION_REQUEST_STATUS_SUCCESS = 'SUCCESS';
 export const EXECUTION_REQUEST_STATUS_SUCCEEDED_WITH_WARNINGS = 'SUCCEEDED_WITH_WARNINGS';
-export const EXECUTION_REQUEST_STATUS_WARNING = 'WARNING';
 export const EXECUTION_REQUEST_STATUS_FAILURE = 'FAILURE';
-export const EXECUTION_REQUEST_STATUS_CONNECTION_FAILURE = 'CONNECTION_FAILURE';
 export const EXECUTION_REQUEST_STATUS_CANCELLED = 'CANCELLED';
 export const EXECUTION_REQUEST_STATUS_ABORTED = 'ABORTED';
 export const EXECUTION_REQUEST_STATUS_UP_FOR_RETRY = 'UP_FOR_RETRY';
diff --git a/datahub-web-react/src/app/ingestV2/executions/hooks/useFilters.ts b/datahub-web-react/src/app/ingestV2/executions/hooks/useFilters.ts
index fe959c88a6b3b6..19ad87a9a40778 100644
--- a/datahub-web-react/src/app/ingestV2/executions/hooks/useFilters.ts
+++ b/datahub-web-react/src/app/ingestV2/executions/hooks/useFilters.ts
@@ -12,7 +12,7 @@ import {
 } from '@app/ingestV2/shared/components/filters/ExecutorTypeFilter';
 import { RESULT_STATUS_ALL_VALUE } from '@app/ingestV2/shared/components/filters/ResultStatusFilter';
 
-export type FacetFilterInput = {
+type FacetFilterInput = {
     field: string;
     negated?: boolean;
     values?: string[];
diff --git a/datahub-web-react/src/app/ingestV2/shared/capabilitySummary.ts b/datahub-web-react/src/app/ingestV2/shared/capabilitySummary.ts
index c9c6449e37201c..29e6579094a6dc 100644
--- a/datahub-web-react/src/app/ingestV2/shared/capabilitySummary.ts
+++ b/datahub-web-react/src/app/ingestV2/shared/capabilitySummary.ts
@@ -20,4 +20,4 @@ interface CapabilitySummary {
 }
 
 // Export types for use in other files
-export type { CapabilitySummary, PluginDetails, Capability };
+export type { CapabilitySummary, PluginDetails  };
diff --git a/datahub-web-react/src/app/ingestV2/shared/components/columns/SourceNameColumn.tsx b/datahub-web-react/src/app/ingestV2/shared/components/columns/SourceNameColumn.tsx
deleted file mode 100644
index cfd374aa625735..00000000000000
--- a/datahub-web-react/src/app/ingestV2/shared/components/columns/SourceNameColumn.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { Pill, Text, Tooltip, colors } from '@components';
-import { Image, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import useGetSourceLogoUrl from '@app/ingestV2/source/builder/useGetSourceLogoUrl';
-import { capitalizeFirstLetter } from '@app/shared/textUtil';
-
-const NameContainer = styled.div`
-    display: flex;
-    align-items: center;
-    gap: 12px;
-    width: 100%;
-`;
-
-const TextContainer = styled(Typography.Text)`
-    color: ${colors.gray[1700]};
-`;
-
-const DisplayNameContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    max-width: calc(100% - 50px);
-`;
-
-const TruncatedText = styled(Text)`
-    max-width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-`;
-
-const PreviewImage = styled(Image)`
-    max-height: 28px;
-    width: auto;
-    object-fit: contain;
-    margin: 0px;
-    background-color: transparent;
-`;
-
-interface TypeColumnProps {
-    type: string;
-    record: any;
-}
-
-export function SourceNameColumn({ type, record }: TypeColumnProps) {
-    const iconUrl = useGetSourceLogoUrl(type);
-    const typeDisplayName = capitalizeFirstLetter(type);
-
-    return (
-        <NameContainer>
-            {iconUrl && (
-                <Tooltip overlay={typeDisplayName}>
-                    <PreviewImage preview={false} src={iconUrl} alt={type || ''} />
-                </Tooltip>
-            )}
-            <DisplayNameContainer>
-                <TextContainer
-                    ellipsis={{
-                        tooltip: {
-                            title: record.name,
-                            color: 'white',
-                            overlayInnerStyle: { color: colors.gray[1700] },
-                            showArrow: false,
-                        },
-                    }}
-                >
-                    {record.name || ''}
-                </TextContainer>
-                {!iconUrl && typeDisplayName && <TruncatedText color="gray">{typeDisplayName}</TruncatedText>}
-            </DisplayNameContainer>
-            {record.cliIngestion && (
-                <Tooltip title="This source is ingested from the command-line interface (CLI)">
-                    <div>
-                        <Pill label="CLI" color="blue" size="xs" />
-                    </div>
-                </Tooltip>
-            )}
-        </NameContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/ingestV2/shared/components/filters/ExecutorTypeFilter.tsx b/datahub-web-react/src/app/ingestV2/shared/components/filters/ExecutorTypeFilter.tsx
index 7af9c9f49ea4e1..838f9269abd0f5 100644
--- a/datahub-web-react/src/app/ingestV2/shared/components/filters/ExecutorTypeFilter.tsx
+++ b/datahub-web-react/src/app/ingestV2/shared/components/filters/ExecutorTypeFilter.tsx
@@ -2,7 +2,7 @@ import { SimpleSelect } from '@components';
 import React, { useCallback, useState } from 'react';
 
 export const EXECUTOR_TYPE_ALL_VALUE = 'All';
-export const EXECUTOR_TYPE_UI_VALUE = 'UI';
+const EXECUTOR_TYPE_UI_VALUE = 'UI';
 export const EXECUTOR_TYPE_CLI_VALUE = 'CLI';
 
 interface Props {
diff --git a/datahub-web-react/src/app/ingestV2/source/IngestionSourceList.tsx b/datahub-web-react/src/app/ingestV2/source/IngestionSourceList.tsx
index a2c06eaf21e833..2d94ae86ada98e 100644
--- a/datahub-web-react/src/app/ingestV2/source/IngestionSourceList.tsx
+++ b/datahub-web-react/src/app/ingestV2/source/IngestionSourceList.tsx
@@ -106,7 +106,7 @@ const PaginationContainer = styled.div`
     flex-shrink: 0;
 `;
 
-export enum IngestionSourceType {
+enum IngestionSourceType {
     ALL,
     UI,
     CLI,
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/IngestionSourceBuilderModal.tsx b/datahub-web-react/src/app/ingestV2/source/builder/IngestionSourceBuilderModal.tsx
index 51200f734e5ac6..f61892f4f000bf 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/IngestionSourceBuilderModal.tsx
+++ b/datahub-web-react/src/app/ingestV2/source/builder/IngestionSourceBuilderModal.tsx
@@ -24,7 +24,7 @@ const StepsContainer = styled.div`
 /**
  * Mapping from the step type to the title for the step
  */
-export enum IngestionSourceBuilderStepTitles {
+enum IngestionSourceBuilderStepTitles {
     SELECT_TEMPLATE = 'Choose Data Source',
     DEFINE_RECIPE = 'Configure Connection',
     CREATE_SCHEDULE = 'Sync Schedule',
@@ -34,7 +34,7 @@ export enum IngestionSourceBuilderStepTitles {
 /**
  * Mapping from the step type to the component implementing that step.
  */
-export const IngestionSourceBuilderStepComponent = {
+const IngestionSourceBuilderStepComponent = {
     SELECT_TEMPLATE: SelectTemplateStep,
     DEFINE_RECIPE: DefineRecipeStep,
     CREATE_SCHEDULE: CreateScheduleStep,
@@ -44,7 +44,7 @@ export const IngestionSourceBuilderStepComponent = {
 /**
  * Steps of the Ingestion Source Builder flow.
  */
-export enum IngestionSourceBuilderStep {
+enum IngestionSourceBuilderStep {
     SELECT_TEMPLATE = 'SELECT_TEMPLATE',
     DEFINE_RECIPE = 'DEFINE_RECIPE',
     CREATE_SCHEDULE = 'CREATE_SCHEDULE',
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/RecipeBuilder.tsx b/datahub-web-react/src/app/ingestV2/source/builder/RecipeBuilder.tsx
index 848e3c8ec23102..ed09628a0c933c 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/RecipeBuilder.tsx
+++ b/datahub-web-react/src/app/ingestV2/source/builder/RecipeBuilder.tsx
@@ -16,7 +16,7 @@ import { Button } from '@src/alchemy-components';
 
 import { IngestionSource } from '@types';
 
-export const ControlsContainer = styled.div`
+const ControlsContainer = styled.div`
     display: flex;
     justify-content: space-between;
     margin-top: 8px;
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/DictField.tsx b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/DictField.tsx
index 7f89c952842cb7..9a855eb8e3aae0 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/DictField.tsx
+++ b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/DictField.tsx
@@ -13,7 +13,7 @@ export const Label = styled.div`
     padding-bottom: 8px;
 `;
 
-export const StyledButton = styled(Button)`
+const StyledButton = styled(Button)`
     color: ${ANTD_GRAY[7]};
     margin: 10px 0 0 30px;
     width: calc(100% - 72px);
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/RecipeForm.tsx b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/RecipeForm.tsx
index 867eb38c1d1c59..8154ba95f1921a 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/RecipeForm.tsx
+++ b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/RecipeForm.tsx
@@ -18,7 +18,7 @@ import { RequiredFieldForm } from '@app/shared/form/RequiredFieldForm';
 import { useListSecretsQuery } from '@graphql/ingestion.generated';
 import { IngestionSource } from '@types';
 
-export const ControlsContainer = styled.div`
+const ControlsContainer = styled.div`
     display: flex;
     justify-content: space-between;
     margin-top: 12px;
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/TestConnection/ConnectionCapabilityView.tsx b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/TestConnection/ConnectionCapabilityView.tsx
index 2664cbaf3d4c24..1a3101d98f85ee 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/TestConnection/ConnectionCapabilityView.tsx
+++ b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/TestConnection/ConnectionCapabilityView.tsx
@@ -30,12 +30,12 @@ const StyledQuestion = styled(QuestionCircleOutlined)`
     margin-left: 4px;
 `;
 
-export const StyledCheck = styled(CheckOutlined)`
+const StyledCheck = styled(CheckOutlined)`
     color: ${green[6]};
     margin-right: 15px;
 `;
 
-export const StyledClose = styled(CloseOutlined)`
+const StyledClose = styled(CloseOutlined)`
     color: ${red[5]};
     margin-right: 15px;
 `;
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/TestConnection/TestConnectionButton.tsx b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/TestConnection/TestConnectionButton.tsx
index 1f39213ab71395..bd7b113572df8f 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/TestConnection/TestConnectionButton.tsx
+++ b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/TestConnection/TestConnectionButton.tsx
@@ -31,12 +31,12 @@ export function getRecipeJson(recipeYaml: string) {
     return recipeJson;
 }
 
-export function getSourceTypeFromRecipeJson(recipeJson: string) {
+function getSourceTypeFromRecipeJson(recipeJson: string) {
     const recipe = JSON.parse(recipeJson);
     return recipe.source.type;
 }
 
-export function getBasicConnectivityFromResult(result: ExecutionRequestResult) {
+function getBasicConnectivityFromResult(result: ExecutionRequestResult) {
     if (!result?.structuredReport?.serializedValue) {
         return false;
     }
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/TestConnection/types.ts b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/TestConnection/types.ts
index 4f401e34d1a39c..51fc487c637dcf 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/TestConnection/types.ts
+++ b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/TestConnection/types.ts
@@ -1,21 +1,7 @@
 export enum SourceCapability {
-    PLATFORM_INSTANCE = 'Platform Instance',
-    DOMAINS = 'Domains',
-    DATA_PROFILING = 'Data Profiling',
-    USAGE_STATS = 'Usage Stats',
-    PARTITION_SUPPORT = 'Partition Support',
-    DESCRIPTIONS = 'Descriptions',
-    LINEAGE_COARSE = 'Table-Level Lineage',
-    LINEAGE_FINE = 'Column-level Lineage',
-    OWNERSHIP = 'Extract Ownership',
-    DELETION_DETECTION = 'Detect Deleted Entities',
-    TAGS = 'Extract Tags',
-    SCHEMA_METADATA = 'Schema Metadata',
-    CONTAINERS = 'Asset Containers',
-    CLASSIFICATION = 'Classification',
-}
+    }
 
-export interface ConnectionCapability {
+interface ConnectionCapability {
     capable: boolean;
     failure_reason: string | null;
     mitigation_message: string | null;
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/azure.ts b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/azure.ts
index 59cb0c536bb224..283ff1df9921df 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/azure.ts
+++ b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/azure.ts
@@ -160,12 +160,3 @@ export const USER_DENY: RecipeField = {
     setValueOnRecipeOverride: (recipe: any, values: string[]) =>
         setListValuesOnRecipe(recipe, values, schemaDenyFieldPathUser),
 };
-
-export const SKIP_USERS_WITHOUT_GROUP: RecipeField = {
-    name: 'skip_users_without_a_group',
-    label: 'Skip users without group',
-    tooltip: 'Whether to skip users without group from Okta.',
-    type: FieldType.BOOLEAN,
-    fieldPath: 'source.config.skip_users_without_a_group',
-    rules: null,
-};
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/bigquery.ts b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/bigquery.ts
index f8998c071661ab..a272a48926035d 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/bigquery.ts
+++ b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/bigquery.ts
@@ -1,26 +1,5 @@
 import { FieldType, RecipeField } from '@app/ingestV2/source/builder/RecipeForm/common';
 
-export const BIGQUERY_PROJECT_ID: RecipeField = {
-    name: 'project_id',
-    label: 'Project ID',
-    tooltip: 'Project ID where you have rights to run queries and create tables.',
-    placeholder: 'my-project-123',
-    type: FieldType.TEXT,
-    fieldPath: 'source.config.project_id',
-    rules: null,
-    required: true,
-};
-
-export const BIGQUERY_CREDENTIAL_PROJECT_ID: RecipeField = {
-    name: 'credential.project_id',
-    label: 'Credentials Project ID',
-    tooltip: "The Project ID, which can be found in your service account's JSON Key (project_id)",
-    placeholder: 'my-project-123',
-    type: FieldType.TEXT,
-    fieldPath: 'source.config.credential.project_id',
-    rules: null,
-};
-
 export const BIGQUERY_PRIVATE_KEY_ID: RecipeField = {
     name: 'credential.private_key_id',
     label: 'Private Key Id',
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/common.tsx b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/common.tsx
index 3a8a19927401e1..a185cf0e8826ad 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/common.tsx
+++ b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/common.tsx
@@ -77,7 +77,7 @@ export function setListValuesOnRecipe(recipe: any, values: string[] | undefined,
 
 const NUM_CHARACTERS_TO_REMOVE_FROM_DATE = 5;
 
-export function setDateValueOnRecipe(recipe: any, value: Moment | undefined, fieldPath: string) {
+function setDateValueOnRecipe(recipe: any, value: Moment | undefined, fieldPath: string) {
     const updatedRecipe = { ...recipe };
     if (value !== undefined) {
         if (!value) {
@@ -125,38 +125,6 @@ export const DATABASE_DENY: RecipeField = {
         setListValuesOnRecipe(recipe, values, databaseDenyFieldPath),
 };
 
-const dashboardAllowFieldPath = 'source.config.dashboard_pattern.allow';
-export const DASHBOARD_ALLOW: RecipeField = {
-    name: 'dashboard_pattern.allow',
-    label: 'Allow Patterns',
-    tooltip:
-        'Only include specific Dashboards by providing the name of a Dashboard, or a Regular Expression (REGEX). If not provided, all Dashboards will be included.',
-    type: FieldType.LIST,
-    buttonLabel: 'Add pattern',
-    fieldPath: dashboardAllowFieldPath,
-    rules: null,
-    section: 'Dashboards',
-    placeholder: 'my_dashboard',
-    setValueOnRecipeOverride: (recipe: any, values: string[]) =>
-        setListValuesOnRecipe(recipe, values, dashboardAllowFieldPath),
-};
-
-const dashboardDenyFieldPath = 'source.config.dashboard_pattern.deny';
-export const DASHBOARD_DENY: RecipeField = {
-    name: 'dashboard_pattern.deny',
-    label: 'Deny Patterns',
-    tooltip:
-        'Exclude specific Dashboards by providing the name of a Dashboard, or a Regular Expression (REGEX). If not provided, all Dashboards will be included. Deny patterns always take precendence over Allow patterns.',
-    type: FieldType.LIST,
-    buttonLabel: 'Add pattern',
-    fieldPath: dashboardDenyFieldPath,
-    rules: null,
-    section: 'Dashboards',
-    placeholder: 'my_dashboard',
-    setValueOnRecipeOverride: (recipe: any, values: string[]) =>
-        setListValuesOnRecipe(recipe, values, dashboardDenyFieldPath),
-};
-
 const schemaAllowFieldPath = 'source.config.schema_pattern.allow';
 export const SCHEMA_ALLOW: RecipeField = {
     name: 'schema_pattern.allow',
@@ -318,15 +286,6 @@ export const STATEFUL_INGESTION_ENABLED: RecipeField = {
     rules: null,
 };
 
-export const UPSTREAM_LINEAGE_IN_REPORT: RecipeField = {
-    name: 'upstream_lineage_in_report',
-    label: 'Include Upstream Lineage In Report.',
-    tooltip: 'Useful for debugging lineage information. Set to True to see the raw lineage created internally.',
-    type: FieldType.BOOLEAN,
-    fieldPath: 'source.config.upstream_lineage_in_report',
-    rules: null,
-};
-
 export const TABLE_LINEAGE_MODE: RecipeField = {
     name: 'table_lineage_mode',
     label: 'Table Lineage Mode',
@@ -411,25 +370,6 @@ export const INCLUDE_VIEWS: RecipeField = {
     rules: null,
 };
 
-export const GITHUB_INFO_REPO: RecipeField = {
-    name: 'github_info.repo',
-    label: 'GitHub Repo',
-    tooltip: (
-        <div>
-            <p>
-                Name of your github repo. e.g. repo for{' '}
-                <a href="https://github.com/datahub-project/datahub" target="_blank" rel="noreferrer">
-                    https://github.com/datahub-project/datahub
-                </a>{' '}
-                is datahub-project/datahub.
-            </p>
-        </div>
-    ),
-    type: FieldType.TEXT,
-    fieldPath: 'source.config.github_info.repo',
-    rules: null,
-};
-
 export const EXTRACT_USAGE_HISTORY: RecipeField = {
     name: 'extract_usage_history',
     label: 'Extract Usage History',
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/dbt_cloud.tsx b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/dbt_cloud.tsx
index a0e0575dc4e8f6..429efa242de30a 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/dbt_cloud.tsx
+++ b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/dbt_cloud.tsx
@@ -8,8 +8,6 @@ const TipSection = styled.div`
     margin-bottom: 12px;
 `;
 
-export const DBT_CLOUD = 'dbt-cloud';
-
 export const DBT_CLOUD_TOKEN: RecipeField = {
     name: 'token',
     label: 'API Token',
@@ -234,17 +232,6 @@ export const NODE_DENY: RecipeField = {
     section: 'Nodes',
 };
 
-export const METADATA_ENDPOINT: RecipeField = {
-    name: 'metadata_endpoint',
-    label: 'Custom Metadata Endpoint URL',
-    tooltip:
-        'A custom URL used for extracting Metadata. By default, this metadata is extracted from https://metadata.cloud.getdbt.com/graphql. In most cases, users should NOT need to provide this value.',
-    placeholder: 'https://metadata.cloud.getdbt.com/graphql',
-    type: FieldType.TEXT,
-    fieldPath: 'source.config.metadata_endpoint',
-    rules: null,
-};
-
 const extractOwnersPath = 'source.config.enable_owner_extraction';
 export const EXTRACT_OWNERS: RecipeField = {
     name: 'extract_owners',
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/lookml.tsx b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/lookml.tsx
index 7e1d0deb7f1d22..af377e02c580bc 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/lookml.tsx
+++ b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/lookml.tsx
@@ -142,7 +142,7 @@ export const PARSE_TABLE_NAMES_FROM_SQL: RecipeField = {
     rules: null,
 };
 
-export const CONNECTION_TO_PLATFORM_MAP_NAME: RecipeField = {
+const CONNECTION_TO_PLATFORM_MAP_NAME: RecipeField = {
     name: 'name',
     label: 'Name',
     tooltip: (
@@ -165,7 +165,7 @@ export const CONNECTION_TO_PLATFORM_MAP_NAME: RecipeField = {
     rules: [{ required: true, message: 'Name is required' }],
 };
 
-export const PLATFORM: RecipeField = {
+const PLATFORM: RecipeField = {
     name: 'platform',
     label: 'Platform',
     tooltip: 'The Data Platform ID in DataHub (e.g. snowflake, bigquery, redshift, mysql, postgres)',
@@ -175,7 +175,7 @@ export const PLATFORM: RecipeField = {
     rules: [{ required: true, message: 'Platform is required' }],
 };
 
-export const DEFAULT_DB: RecipeField = {
+const DEFAULT_DB: RecipeField = {
     name: 'default_db',
     label: 'Default Database',
     tooltip: 'The Database associated with assets from the Looker connection.',
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/unity_catalog.tsx b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/unity_catalog.tsx
index 75dbdda79d9e4a..ec8c2edd4bd74a 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/unity_catalog.tsx
+++ b/datahub-web-react/src/app/ingestV2/source/builder/RecipeForm/unity_catalog.tsx
@@ -2,8 +2,6 @@ import React from 'react';
 
 import { FieldType, RecipeField, setListValuesOnRecipe } from '@app/ingestV2/source/builder/RecipeForm/common';
 
-export const UNITY_CATALOG = 'unity-catalog';
-
 export const TOKEN: RecipeField = {
     name: 'token',
     label: 'Token',
@@ -26,21 +24,6 @@ export const WORKSPACE_URL: RecipeField = {
     rules: null,
 };
 
-export const INCLUDE_TABLE_LINEAGE: RecipeField = {
-    name: 'include_table_lineage',
-    label: 'Include Table Lineage',
-    tooltip: (
-        <div>
-            Extract Table Lineage from Unity Catalog. Note that this requires that your Databricks accounts meets
-            certain requirements. View them{' '}
-            <a href="https://docs.databricks.com/data-governance/unity-catalog/data-lineage.html#requirements">here</a>
-        </div>
-    ),
-    type: FieldType.BOOLEAN,
-    fieldPath: 'source.config.include_table_lineage',
-    rules: null,
-};
-
 export const INCLUDE_COLUMN_LINEAGE: RecipeField = {
     name: 'include_column_lineage',
     label: 'Include Column Lineage',
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/constants.ts b/datahub-web-react/src/app/ingestV2/source/builder/constants.ts
index c7082faf0194c9..81f3be298a0df7 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/constants.ts
+++ b/datahub-web-react/src/app/ingestV2/source/builder/constants.ts
@@ -42,109 +42,106 @@ import trinoLogo from '@images/trinologo.png';
 import vertexAI from '@images/vertexai.png';
 import verticaLogo from '@images/verticalogo.png';
 
-export const ATHENA = 'athena';
-export const ATHENA_URN = `urn:li:dataPlatform:${ATHENA}`;
+const ATHENA = 'athena';
+const ATHENA_URN = `urn:li:dataPlatform:${ATHENA}`;
 export const AZURE = 'azure-ad';
-export const AZURE_URN = `urn:li:dataPlatform:${AZURE}`;
-export const BIGQUERY = 'bigquery';
-export const BIGQUERY_BETA = 'bigquery-beta';
-export const BIGQUERY_URN = `urn:li:dataPlatform:${BIGQUERY}`;
-export const CLICKHOUSE = 'clickhouse';
-export const CLICKHOUSE_USAGE = 'clickhouse-usage';
-export const CLICKHOUSE_URN = `urn:li:dataPlatform:${CLICKHOUSE}`;
-export const COCKROACHDB = 'cockroachdb';
-export const COCKROACHDB_URN = `urn:li:dataPlatform:${COCKROACHDB}`;
-export const DBT = 'dbt';
+const AZURE_URN = `urn:li:dataPlatform:${AZURE}`;
+const BIGQUERY = 'bigquery';
+const BIGQUERY_URN = `urn:li:dataPlatform:${BIGQUERY}`;
+const CLICKHOUSE = 'clickhouse';
+const CLICKHOUSE_USAGE = 'clickhouse-usage';
+const CLICKHOUSE_URN = `urn:li:dataPlatform:${CLICKHOUSE}`;
+const COCKROACHDB = 'cockroachdb';
+const COCKROACHDB_URN = `urn:li:dataPlatform:${COCKROACHDB}`;
+const DBT = 'dbt';
 export const DBT_URN = `urn:li:dataPlatform:${DBT}`;
-export const DREMIO = 'dremio';
-export const DREMIO_URN = `urn:li:dataPlatform:${DREMIO}`;
-export const DRUID = 'druid';
-export const DRUID_URN = `urn:li:dataPlatform:${DRUID}`;
-export const DYNAMODB = 'dynamodb';
-export const DYNAMODB_URN = `urn:li:dataPlatform:${DYNAMODB}`;
-export const ELASTICSEARCH = 'elasticsearch';
-export const ELASTICSEARCH_URN = `urn:li:dataPlatform:${ELASTICSEARCH}`;
-export const FEAST = 'feast';
-export const FEAST_LEGACY = 'feast-legacy';
-export const FEAST_URN = `urn:li:dataPlatform:${FEAST}`;
-export const GLUE = 'glue';
-export const GLUE_URN = `urn:li:dataPlatform:${GLUE}`;
-export const HIVE = 'hive';
-export const HIVE_URN = `urn:li:dataPlatform:${HIVE}`;
-export const KAFKA = 'kafka';
-export const KAFKA_URN = `urn:li:dataPlatform:${KAFKA}`;
+const DREMIO = 'dremio';
+const DREMIO_URN = `urn:li:dataPlatform:${DREMIO}`;
+const DRUID = 'druid';
+const DRUID_URN = `urn:li:dataPlatform:${DRUID}`;
+const DYNAMODB = 'dynamodb';
+const DYNAMODB_URN = `urn:li:dataPlatform:${DYNAMODB}`;
+const ELASTICSEARCH = 'elasticsearch';
+const ELASTICSEARCH_URN = `urn:li:dataPlatform:${ELASTICSEARCH}`;
+const FEAST = 'feast';
+const FEAST_LEGACY = 'feast-legacy';
+const FEAST_URN = `urn:li:dataPlatform:${FEAST}`;
+const GLUE = 'glue';
+const GLUE_URN = `urn:li:dataPlatform:${GLUE}`;
+const HIVE = 'hive';
+const HIVE_URN = `urn:li:dataPlatform:${HIVE}`;
+const KAFKA = 'kafka';
+const KAFKA_URN = `urn:li:dataPlatform:${KAFKA}`;
 export const LOOKER = 'looker';
 export const LOOK_ML = 'lookml';
-export const LOOKER_URN = `urn:li:dataPlatform:${LOOKER}`;
-export const MARIA_DB = 'mariadb';
-export const MARIA_DB_URN = `urn:li:dataPlatform:${MARIA_DB}`;
-export const METABASE = 'metabase';
-export const METABASE_URN = `urn:li:dataPlatform:${METABASE}`;
-export const MLFLOW = 'mlflow';
-export const MLFLOW_URN = `urn:li:dataPlatform:${MLFLOW}`;
-export const MODE = 'mode';
-export const MODE_URN = `urn:li:dataPlatform:${MODE}`;
-export const MONGO_DB = 'mongodb';
-export const MONGO_DB_URN = `urn:li:dataPlatform:${MONGO_DB}`;
-export const MSSQL = 'mssql';
-export const MSSQL_URN = `urn:li:dataPlatform:${MSSQL}`;
+const LOOKER_URN = `urn:li:dataPlatform:${LOOKER}`;
+const MARIA_DB = 'mariadb';
+const MARIA_DB_URN = `urn:li:dataPlatform:${MARIA_DB}`;
+const METABASE = 'metabase';
+const METABASE_URN = `urn:li:dataPlatform:${METABASE}`;
+const MLFLOW = 'mlflow';
+const MLFLOW_URN = `urn:li:dataPlatform:${MLFLOW}`;
+const MODE = 'mode';
+const MODE_URN = `urn:li:dataPlatform:${MODE}`;
+const MONGO_DB = 'mongodb';
+const MONGO_DB_URN = `urn:li:dataPlatform:${MONGO_DB}`;
+const MSSQL = 'mssql';
+const MSSQL_URN = `urn:li:dataPlatform:${MSSQL}`;
 export const MYSQL = 'mysql';
-export const MYSQL_URN = `urn:li:dataPlatform:${MYSQL}`;
+const MYSQL_URN = `urn:li:dataPlatform:${MYSQL}`;
 export const OKTA = 'okta';
-export const OKTA_URN = `urn:li:dataPlatform:${OKTA}`;
-export const ORACLE = 'oracle';
-export const ORACLE_URN = `urn:li:dataPlatform:${ORACLE}`;
-export const POSTGRES = 'postgres';
-export const POSTGRES_URN = `urn:li:dataPlatform:${POSTGRES}`;
+const OKTA_URN = `urn:li:dataPlatform:${OKTA}`;
+const ORACLE = 'oracle';
+const ORACLE_URN = `urn:li:dataPlatform:${ORACLE}`;
+const POSTGRES = 'postgres';
+const POSTGRES_URN = `urn:li:dataPlatform:${POSTGRES}`;
 export const POWER_BI = 'powerbi';
-export const POWER_BI_URN = `urn:li:dataPlatform:${POWER_BI}`;
-export const PRESET = 'preset';
-export const PRESET_URN = `urn:li:dataPlatform:${PRESET}`;
-export const REDSHIFT = 'redshift';
-export const REDSHIFT_USAGE = 'redshift-usage';
-export const REDSHIFT_URN = `urn:li:dataPlatform:${REDSHIFT}`;
-export const SNOWFLAKE = 'snowflake';
-export const SNOWFLAKE_BETA = 'snowflake-beta';
-export const SNOWFLAKE_USAGE = 'snowflake-usage';
-export const SNOWFLAKE_URN = `urn:li:dataPlatform:${SNOWFLAKE}`;
-export const STARBURST_TRINO_USAGE = 'starburst-trino-usage';
-export const SUPERSET = 'superset';
-export const SUPERSET_URN = `urn:li:dataPlatform:${SUPERSET}`;
-export const TABLEAU = 'tableau';
-export const TABLEAU_URN = `urn:li:dataPlatform:${TABLEAU}`;
-export const TRINO = 'trino';
-export const TRINO_URN = `urn:li:dataPlatform:${TRINO}`;
+const POWER_BI_URN = `urn:li:dataPlatform:${POWER_BI}`;
+const PRESET = 'preset';
+const PRESET_URN = `urn:li:dataPlatform:${PRESET}`;
+const REDSHIFT = 'redshift';
+const REDSHIFT_USAGE = 'redshift-usage';
+const REDSHIFT_URN = `urn:li:dataPlatform:${REDSHIFT}`;
+const SNOWFLAKE = 'snowflake';
+const SNOWFLAKE_BETA = 'snowflake-beta';
+const SNOWFLAKE_USAGE = 'snowflake-usage';
+const SNOWFLAKE_URN = `urn:li:dataPlatform:${SNOWFLAKE}`;
+const STARBURST_TRINO_USAGE = 'starburst-trino-usage';
+const SUPERSET = 'superset';
+const SUPERSET_URN = `urn:li:dataPlatform:${SUPERSET}`;
+const TABLEAU = 'tableau';
+const TABLEAU_URN = `urn:li:dataPlatform:${TABLEAU}`;
+const TRINO = 'trino';
+const TRINO_URN = `urn:li:dataPlatform:${TRINO}`;
 export const CUSTOM = 'custom';
-export const CUSTOM_URN = `urn:li:dataPlatform:${CUSTOM}`;
-export const UNITY_CATALOG = 'unity-catalog';
-export const UNITY_CATALOG_URN = `urn:li:dataPlatform:${UNITY_CATALOG}`;
+const UNITY_CATALOG = 'unity-catalog';
+const UNITY_CATALOG_URN = `urn:li:dataPlatform:${UNITY_CATALOG}`;
 export const DATABRICKS = 'databricks';
-export const DATABRICKS_URN = `urn:li:dataPlatform:${DATABRICKS}`;
+const DATABRICKS_URN = `urn:li:dataPlatform:${DATABRICKS}`;
 export const DBT_CLOUD = 'dbt-cloud';
-export const DBT_CLOUD_URN = `urn:li:dataPlatform:dbt`;
 export const VERTICA = 'vertica';
-export const VERTICA_URN = `urn:li:dataPlatform:${VERTICA}`;
-export const FIVETRAN = 'fivetran';
-export const FIVETRAN_URN = `urn:li:dataPlatform:${FIVETRAN}`;
+const VERTICA_URN = `urn:li:dataPlatform:${VERTICA}`;
+const FIVETRAN = 'fivetran';
+const FIVETRAN_URN = `urn:li:dataPlatform:${FIVETRAN}`;
 export const CSV = 'csv-enricher';
-export const CSV_URN = `urn:li:dataPlatform:${CSV}`;
-export const QLIK_SENSE = 'qlik-sense';
-export const QLIK_SENSE_URN = `urn:li:dataPlatform:${QLIK_SENSE}`;
-export const SIGMA = 'sigma';
-export const SIGMA_URN = `urn:li:dataPlatform:${SIGMA}`;
+const CSV_URN = `urn:li:dataPlatform:${CSV}`;
+const QLIK_SENSE = 'qlik-sense';
+const QLIK_SENSE_URN = `urn:li:dataPlatform:${QLIK_SENSE}`;
+const SIGMA = 'sigma';
+const SIGMA_URN = `urn:li:dataPlatform:${SIGMA}`;
 export const SAC = 'sac';
-export const SAC_URN = `urn:li:dataPlatform:${SAC}`;
-export const CASSANDRA = 'cassandra';
-export const CASSANDRA_URN = `urn:li:dataPlatform:${CASSANDRA}`;
-export const DATAHUB = 'datahub';
-export const DATAHUB_GC = 'datahub-gc';
-export const DATAHUB_LINEAGE_FILE = 'datahub-lineage-file';
-export const DATAHUB_BUSINESS_GLOSSARY = 'datahub-business-glossary';
-export const DATAHUB_URN = `urn:li:dataPlatform:${DATAHUB}`;
-export const NEO4J = 'neo4j';
-export const NEO4J_URN = `urn:li:dataPlatform:${NEO4J}`;
-export const VERTEX_AI = 'vertexai';
-export const VERTEXAI_URN = `urn:li:dataPlatform:${VERTEX_AI}`;
+const SAC_URN = `urn:li:dataPlatform:${SAC}`;
+const CASSANDRA = 'cassandra';
+const CASSANDRA_URN = `urn:li:dataPlatform:${CASSANDRA}`;
+const DATAHUB = 'datahub';
+const DATAHUB_GC = 'datahub-gc';
+const DATAHUB_LINEAGE_FILE = 'datahub-lineage-file';
+const DATAHUB_BUSINESS_GLOSSARY = 'datahub-business-glossary';
+const DATAHUB_URN = `urn:li:dataPlatform:${DATAHUB}`;
+const NEO4J = 'neo4j';
+const NEO4J_URN = `urn:li:dataPlatform:${NEO4J}`;
+const VERTEX_AI = 'vertexai';
+const VERTEXAI_URN = `urn:li:dataPlatform:${VERTEX_AI}`;
 
 export const PLATFORM_URN_TO_LOGO = {
     [ATHENA_URN]: athenaLogo,
diff --git a/datahub-web-react/src/app/ingestV2/source/builder/types.ts b/datahub-web-react/src/app/ingestV2/source/builder/types.ts
index 5470f61463d238..4c00bc79481b32 100644
--- a/datahub-web-react/src/app/ingestV2/source/builder/types.ts
+++ b/datahub-web-react/src/app/ingestV2/source/builder/types.ts
@@ -2,14 +2,6 @@ import { IngestionSourceBuilderStep } from '@app/ingestV2/source/builder/steps';
 
 import { Entity, IngestionSource } from '@types';
 
-/**
- * The size of the builder modal
- */
-export enum ModalSize {
-    SMALL = 800,
-    LARGE = 1200,
-}
-
 /**
  * The default executor id used for ingestion
  */
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/azure/azure.ts b/datahub-web-react/src/app/ingestV2/source/conf/azure/azure.ts
deleted file mode 100644
index 5ac41364e75f18..00000000000000
--- a/datahub-web-react/src/app/ingestV2/source/conf/azure/azure.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
-
-import azureLogo from '@images/azure-ad.png';
-
-const placeholderRecipe = `\
-source:
-    type: azure-ad
-    config:
-        client_id: # Your Azure Client ID, e.g. "00000000-0000-0000-0000-000000000000"
-        tenant_id: # Your Azure Tenant ID, e.g. "00000000-0000-0000-0000-000000000000"
-        # Add secret in Secrets Tab with this name
-        client_secret: "\${AZURE_AD_CLIENT_SECRET}"
-        redirect: # Your Redirect URL, e.g. "https://login.microsoftonline.com/common/oauth2/nativeclient"
-        authority: # Your Authority URL, e.g. "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000"
-        token_url: # Your Token URL, e.g. "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/oauth2/token"
-        graph_url: # The Graph URL, e.g. "https://graph.microsoft.com/v1.0"
-
-        # Optional flags to ingest users, groups, or both
-        ingest_users: True
-        ingest_groups: True
-
-        # Optional Allow / Deny extraction of particular Groups
-        # groups_pattern:
-        #    allow:
-        #        - ".*"
-
-        # Optional Allow / Deny extraction of particular Users.
-        # users_pattern:
-        #    allow:
-        #        - ".*"
-`;
-
-const azureAdConfig: SourceConfig = {
-    type: 'azure-ad',
-    placeholderRecipe,
-    displayName: 'Azure AD',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/azure-ad',
-    logoUrl: azureLogo,
-};
-
-export default azureAdConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/bigquery/bigquery.ts b/datahub-web-react/src/app/ingestV2/source/conf/bigquery/bigquery.ts
index 56c5f41be5755d..31ddd2ccbac500 100644
--- a/datahub-web-react/src/app/ingestV2/source/conf/bigquery/bigquery.ts
+++ b/datahub-web-react/src/app/ingestV2/source/conf/bigquery/bigquery.ts
@@ -1,38 +1,4 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
 
-import bigqueryLogo from '@images/bigquerylogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: bigquery
-    config:
-        # Coordinates
-        project_id: # Your BigQuery project id, e.g. sample_project_id
-        # Credentials
-        credential:
-            project_id: # Your BQ project id, e.g. sample_project_id
-            private_key_id: "\${BQ_PRIVATE_KEY_ID}"
-            private_key: "\${BQ_PRIVATE_KEY}"
-            client_email: # Your BQ client email, e.g. "test@suppproject-id-1234567.iam.gserviceaccount.com"
-            client_id: # Your BQ client id, e.g. "123456678890"
-
-        include_table_lineage: true
-        include_view_lineage: true
-        profiling:
-            enabled: true
-        stateful_ingestion:
-            enabled: true
-
-`;
 
 export const BIGQUERY = 'bigquery';
 
-const bigqueryConfig: SourceConfig = {
-    type: BIGQUERY,
-    placeholderRecipe,
-    displayName: 'BigQuery',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/bigquery/',
-    logoUrl: bigqueryLogo,
-};
-
-export default bigqueryConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/csv/csv.ts b/datahub-web-react/src/app/ingestV2/source/conf/csv/csv.ts
deleted file mode 100644
index 1e8f0e96683191..00000000000000
--- a/datahub-web-react/src/app/ingestV2/source/conf/csv/csv.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
-
-import csvLogo from '@images/csv-logo.png';
-
-const placeholderRecipe = `\
-source:
-    type: csv-enricher
-    config:
-        filename: # URL of your csv file to ingest, e.g. https://docs.google.com/spreadsheets/d/DOCID/export?format=csv
-        array_delimiter: |
-        delimiter: ,
-        write_semantics: PATCH
-`;
-
-const csvConfig: SourceConfig = {
-    type: 'csv-enricher',
-    placeholderRecipe,
-    displayName: 'CSV',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/csv-enricher',
-    logoUrl: csvLogo,
-};
-
-export default csvConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/glue/glue.ts b/datahub-web-react/src/app/ingestV2/source/conf/glue/glue.ts
deleted file mode 100644
index ee0f8cb7b2a05f..00000000000000
--- a/datahub-web-react/src/app/ingestV2/source/conf/glue/glue.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
-
-import glueLogo from '@images/gluelogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: glue
-    config:
-        # AWS credentials.
-        aws_region: # The region for your AWS Glue instance.
-        # Add secret in Secrets Tab with relevant names for each variable
-        # The access key for your AWS account.
-        aws_access_key_id: "\${AWS_ACCESS_KEY_ID}"
-        # The secret key for your AWS account.
-        aws_secret_access_key: "\${AWS_SECRET_KEY}"
-        aws_session_token: # The session key for your AWS account. This is only needed when you are using temporary credentials.
-        # aws_role: # (Optional) The role to assume (Role chaining supported by using a sorted list).
-
-        # Allow / Deny specific databases & tables
-        # database_pattern:
-        #    allow:
-        #        - "flights-database"
-        # table_pattern:
-        #    allow:
-        #        - "avro"
-`;
-
-const glueConfig: SourceConfig = {
-    type: 'glue',
-    placeholderRecipe,
-    displayName: 'Glue',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/glue',
-    logoUrl: glueLogo,
-};
-
-export default glueConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/hive/hive.ts b/datahub-web-react/src/app/ingestV2/source/conf/hive/hive.ts
index 4e19a6003bd7c2..3419c09a1825a4 100644
--- a/datahub-web-react/src/app/ingestV2/source/conf/hive/hive.ts
+++ b/datahub-web-react/src/app/ingestV2/source/conf/hive/hive.ts
@@ -1,31 +1,4 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
 
-import hiveLogo from '@images/hivelogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: hive
-    config:
-        # Coordinates
-        host_port: # Your Hive host and port, e.g. hive:10000
-        database: # Your Hive database name, e.g. SampleDatabase (Optional, if not specified, ingests from all databases)
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        username: "\${HIVE_USERNAME}" # Your Hive username, e.g. admin
-        password: "\${HIVE_PASSWORD}"# Your Hive password, e.g. password_01
-        stateful_ingestion:
-            enabled: true
-`;
 
 export const HIVE = 'hive';
 
-const hiveConfig: SourceConfig = {
-    type: HIVE,
-    placeholderRecipe,
-    displayName: 'Hive',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/hive/',
-    logoUrl: hiveLogo,
-};
-
-export default hiveConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/kafka/kafka.ts b/datahub-web-react/src/app/ingestV2/source/conf/kafka/kafka.ts
index 35ad0e1c3538d1..9fc8b60b3a2281 100644
--- a/datahub-web-react/src/app/ingestV2/source/conf/kafka/kafka.ts
+++ b/datahub-web-react/src/app/ingestV2/source/conf/kafka/kafka.ts
@@ -1,28 +1,4 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
 
-import kafkaLogo from '@images/kafkalogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: kafka
-    config:
-        connection:
-            consumer_config:
-                security.protocol: "SASL_SSL"
-                sasl.mechanism: "PLAIN"
-        stateful_ingestion:
-            enabled: true
-
-`;
 
 export const KAFKA = 'kafka';
 
-const kafkaConfig: SourceConfig = {
-    type: KAFKA,
-    placeholderRecipe,
-    displayName: 'Kafka',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/kafka/',
-    logoUrl: kafkaLogo,
-};
-
-export default kafkaConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/looker/looker.ts b/datahub-web-react/src/app/ingestV2/source/conf/looker/looker.ts
index 78e16d04b46d90..184746f9bb1b1b 100644
--- a/datahub-web-react/src/app/ingestV2/source/conf/looker/looker.ts
+++ b/datahub-web-react/src/app/ingestV2/source/conf/looker/looker.ts
@@ -1,28 +1,4 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
 
-import lookerLogo from '@images/lookerlogo.svg';
-
-const placeholderRecipe = `\
-source:
-    type: looker
-    config:
-        # Coordinates
-        base_url: # Your Looker instance URL, e.g. https://company.looker.com:19999
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        client_id: "\${LOOKER_CLIENT_ID}" # Your Looker client id, e.g. admin
-        client_secret: "\${LOOKER_CLIENT_SECRET}" # Your Looker password, e.g. password_01
-`;
 
 export const LOOKER = 'looker';
 
-const lookerConfig: SourceConfig = {
-    type: LOOKER,
-    placeholderRecipe,
-    displayName: 'Looker',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/looker/',
-    logoUrl: lookerLogo,
-};
-
-export default lookerConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/mongodb/mongodb.ts b/datahub-web-react/src/app/ingestV2/source/conf/mongodb/mongodb.ts
deleted file mode 100644
index 852b8d84b7b0be..00000000000000
--- a/datahub-web-react/src/app/ingestV2/source/conf/mongodb/mongodb.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
-
-import mongodbLogo from '@images/mongodblogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: mongodb
-    config:
-        # Coordinates
-        connect_uri: # Your MongoDB connect URI, e.g. "mongodb://localhost"
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        username: "\${MONGO_USERNAME}" # Your MongoDB username, e.g. admin
-        password: "\${MONGO_PASSWORD}" # Your MongoDB password, e.g. password_01
-
-        # Options (recommended)
-        enableSchemaInference: True
-        useRandomSampling: True
-        maxSchemaSize: 300
-`;
-
-const mongoConfig: SourceConfig = {
-    type: 'mongodb',
-    placeholderRecipe,
-    displayName: 'MongoDB',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/mongodb/',
-    logoUrl: mongodbLogo,
-};
-
-export default mongoConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/mysql/mysql.ts b/datahub-web-react/src/app/ingestV2/source/conf/mysql/mysql.ts
deleted file mode 100644
index 9b2ec734ab2d91..00000000000000
--- a/datahub-web-react/src/app/ingestV2/source/conf/mysql/mysql.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
-
-import mysqlLogo from '@images/mysqllogo-2.png';
-
-const placeholderRecipe = `\
-source:
-    type: mysql
-    config:
-        # Coordinates
-        host_port: # Your MySQL host and post, e.g. mysql:3306
-        database: # Your MySQL database name, e.g. datahub
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        username: "\${MYSQL_USERNAME}" # Your MySQL username, e.g. admin
-        password: "\${MYSQL_PASSWORD}" # Your MySQL password, e.g. password_01
-
-        # Options
-        include_tables: True
-        include_views: True
-
-        # Profiling
-        profiling:
-            enabled: false
-`;
-
-const mysqlConfig: SourceConfig = {
-    type: 'mysql',
-    placeholderRecipe,
-    displayName: 'MySQL',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/mysql/',
-    logoUrl: mysqlLogo,
-};
-
-export default mysqlConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/okta/okta.ts b/datahub-web-react/src/app/ingestV2/source/conf/okta/okta.ts
deleted file mode 100644
index e43e8f11ee5b10..00000000000000
--- a/datahub-web-react/src/app/ingestV2/source/conf/okta/okta.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
-
-import oktaLogo from '@images/oktalogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: okta
-    config:
-        # Coordinates
-        okta_domain: # Your Okta Domain, e.g. "dev-35531955.okta.com"
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        okta_api_token: "\${OKTA_API_TOKEN}" # Your Okta API Token, e.g. "11be4R_M2MzDqXawbTHfKGpKee0kuEOfX1RCQSRx99"
-
-        # Optional flags to ingest users, groups, or both
-        ingest_users: True
-        ingest_groups: True
-
-        # Optional: Customize the mapping to DataHub Username from an attribute appearing in the Okta User
-        # profile. Reference: https://developer.okta.com/docs/reference/api/users/
-        # okta_profile_to_username_attr: str = "login"
-        # okta_profile_to_username_regex: str = "([^@]+)"
-
-        # Optional: Customize the mapping to DataHub Group from an attribute appearing in the Okta Group
-        # profile. Reference: https://developer.okta.com/docs/reference/api/groups/
-        # okta_profile_to_group_name_attr: str = "name"
-        # okta_profile_to_group_name_regex: str = "(.*)"
-
-        # Optional: Include deprovisioned or suspended Okta users in the ingestion.
-        # include_deprovisioned_users = False
-        # include_suspended_users = False
-`;
-
-const oktaConfig: SourceConfig = {
-    type: 'okta',
-    placeholderRecipe,
-    displayName: 'Okta',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/okta',
-    logoUrl: oktaLogo,
-};
-
-export default oktaConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/oracle/oracle.ts b/datahub-web-react/src/app/ingestV2/source/conf/oracle/oracle.ts
deleted file mode 100644
index 55715f03a65437..00000000000000
--- a/datahub-web-react/src/app/ingestV2/source/conf/oracle/oracle.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
-
-import oracleLogo from '@images/oraclelogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: oracle
-    config:
-        # Coordinates
-        host_port: # Your Oracle host and port, e.g. oracle:5432
-        database: # Your Oracle database name, e.g. sample_db
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        username: "\${ORACLE_USERNAME}" # Your Oracle username, e.g. admin
-        password: "\${ORACLE_PASSWORD}" # Your Oracle password, e.g. password_01
-
-        # Optional service name
-        # service_name: # Your service name, e.g. svc # omit database if using this option
-`;
-
-const oracleConfig: SourceConfig = {
-    type: 'oracle',
-    placeholderRecipe,
-    displayName: 'Oracle',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/oracle/',
-    logoUrl: oracleLogo,
-};
-
-export default oracleConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/postgres/postgres.ts b/datahub-web-react/src/app/ingestV2/source/conf/postgres/postgres.ts
index 159343ac6c8f0c..40b73b9b9d327e 100644
--- a/datahub-web-react/src/app/ingestV2/source/conf/postgres/postgres.ts
+++ b/datahub-web-react/src/app/ingestV2/source/conf/postgres/postgres.ts
@@ -1,39 +1,4 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
 
-import postgresLogo from '@images/postgreslogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: postgres
-    config:
-        # Coordinates
-        host_port: # Your Postgres host and port, e.g. postgres:5432
-        database: # Your Postgres Database, e.g. sample_db
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        username: "\${POSTGRES_USERNAME}" # Your Postgres username, e.g. admin
-        password: "\${POSTGRES_PASSWORD}" # Your Postgres password, e.g. password_01
-
-        # Options
-        include_tables: True
-        include_views: True
-
-        # Profiling
-        profiling:
-            enabled: false
-        stateful_ingestion:
-            enabled: true
-`;
 
 export const POSTGRES = 'postgres';
 
-const postgresConfig: SourceConfig = {
-    type: POSTGRES,
-    placeholderRecipe,
-    displayName: 'Postgres',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/postgres/',
-    logoUrl: postgresLogo,
-};
-
-export default postgresConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/redshift/redshift.ts b/datahub-web-react/src/app/ingestV2/source/conf/redshift/redshift.ts
index 017693fef3ef7e..22abd3ce9f5b1f 100644
--- a/datahub-web-react/src/app/ingestV2/source/conf/redshift/redshift.ts
+++ b/datahub-web-react/src/app/ingestV2/source/conf/redshift/redshift.ts
@@ -1,37 +1,4 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
 
-import redshiftLogo from '@images/redshiftlogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: redshift
-    config:
-        # Coordinates
-        host_port: # Your Redshift host and post, e.g. example.something.us-west-2.redshift.amazonaws.com:5439
-        database: # Your Redshift database, e.g. SampleDatabase
-
-        # Credentials
-        # Add secret in Secrets Tab with relevant names for each variable
-        username: "\${REDSHIFT_USERNAME}" # Your Redshift username, e.g. admin
-        password: "\${REDSHIFT_PASSWORD}" # Your Redshift password, e.g. password_01
-
-        table_lineage_mode: stl_scan_based
-        include_table_lineage: true
-        include_view_lineage: true
-        profiling:
-            enabled: true
-        stateful_ingestion:
-            enabled: true
-`;
 
 export const REDSHIFT = 'redshift';
 
-const redshiftConfig: SourceConfig = {
-    type: REDSHIFT,
-    placeholderRecipe,
-    displayName: 'Redshift',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/redshift/',
-    logoUrl: redshiftLogo,
-};
-
-export default redshiftConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/sac/sac.ts b/datahub-web-react/src/app/ingestV2/source/conf/sac/sac.ts
deleted file mode 100644
index d0fc372f09410d..00000000000000
--- a/datahub-web-react/src/app/ingestV2/source/conf/sac/sac.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
-
-import sacLogo from '@images/saclogo.svg';
-
-const placeholderRecipe = `\
-source:
-    type: sac
-    config:
-        tenant_url: # Your SAP Analytics Cloud tenant URL, e.g. https://company.eu10.sapanalytics.cloud or https://company.eu10.hcs.cloud.sap
-        token_url: # The Token URL of your SAP Analytics Cloud tenant, e.g. https://company.eu10.hana.ondemand.com/oauth/token.
-
-        # Add secret in Secrets Tab with relevant names for each variable
-        client_id: "\${SAC_CLIENT_ID}" # Your SAP Analytics Cloud client id
-        client_secret: "\${SAC_CLIENT_SECRET}" # Your SAP Analytics Cloud client secret
-`;
-
-export const SAC = 'sac';
-
-const sacConfig: SourceConfig = {
-    type: SAC,
-    placeholderRecipe,
-    displayName: 'SAP Analytics Cloud',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/sac/',
-    logoUrl: sacLogo,
-};
-
-export default sacConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/snowflake/snowflake.ts b/datahub-web-react/src/app/ingestV2/source/conf/snowflake/snowflake.ts
index a540df6f85b60f..e87b2d3915fb1f 100644
--- a/datahub-web-react/src/app/ingestV2/source/conf/snowflake/snowflake.ts
+++ b/datahub-web-react/src/app/ingestV2/source/conf/snowflake/snowflake.ts
@@ -1,30 +1,4 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
 
-import snowflakeLogo from '@images/snowflakelogo.png';
-
-const placeholderRecipe = `\
-source:
-    type: snowflake
-    config:
-        account_id: "example_id"
-        warehouse: "example_warehouse"
-        role: "datahub_role"
-        include_table_lineage: true
-        include_view_lineage: true
-        profiling:
-            enabled: true
-        stateful_ingestion:
-            enabled: true
-`;
 
 export const SNOWFLAKE = 'snowflake';
 
-const snowflakeConfig: SourceConfig = {
-    type: SNOWFLAKE,
-    placeholderRecipe,
-    displayName: 'Snowflake',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/snowflake/',
-    logoUrl: snowflakeLogo,
-};
-
-export default snowflakeConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/sources.tsx b/datahub-web-react/src/app/ingestV2/source/conf/sources.tsx
deleted file mode 100644
index 353c483ba103de..00000000000000
--- a/datahub-web-react/src/app/ingestV2/source/conf/sources.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import { FormOutlined } from '@ant-design/icons';
-import React from 'react';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import azureAdConfig from '@app/ingestV2/source/conf/azure/azure';
-import bigqueryConfig from '@app/ingestV2/source/conf/bigquery/bigquery';
-import csvConfig from '@app/ingestV2/source/conf/csv/csv';
-import glueConfig from '@app/ingestV2/source/conf/glue/glue';
-import hiveConfig from '@app/ingestV2/source/conf/hive/hive';
-import kafkaConfig from '@app/ingestV2/source/conf/kafka/kafka';
-import lookerConfig from '@app/ingestV2/source/conf/looker/looker';
-import mongoConfig from '@app/ingestV2/source/conf/mongodb/mongodb';
-import mysqlConfig from '@app/ingestV2/source/conf/mysql/mysql';
-import oktaConfig from '@app/ingestV2/source/conf/okta/okta';
-import oracleConfig from '@app/ingestV2/source/conf/oracle/oracle';
-import postgresConfig from '@app/ingestV2/source/conf/postgres/postgres';
-import redshiftConfig from '@app/ingestV2/source/conf/redshift/redshift';
-import sacConfig from '@app/ingestV2/source/conf/sac/sac';
-import snowflakeConfig from '@app/ingestV2/source/conf/snowflake/snowflake';
-import tableauConfig from '@app/ingestV2/source/conf/tableau/tableau';
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
-
-const baseUrl = window.location.origin;
-
-const DEFAULT_PLACEHOLDER_RECIPE = `\
-source:
-  type: <source-type>
-  config:
-    # Source-type specifics config
-    <source-configs> 
-
-sink:
-  type: datahub-rest
-  config:
-    server: "${baseUrl}/api/gms"`;
-
-export const SOURCE_TEMPLATE_CONFIGS: Array<SourceConfig> = [
-    bigqueryConfig,
-    redshiftConfig,
-    snowflakeConfig,
-    kafkaConfig,
-    lookerConfig,
-    tableauConfig,
-    mysqlConfig,
-    postgresConfig,
-    mongoConfig,
-    azureAdConfig,
-    oktaConfig,
-    glueConfig,
-    oracleConfig,
-    hiveConfig,
-    csvConfig,
-    sacConfig,
-    {
-        type: 'custom',
-        placeholderRecipe: DEFAULT_PLACEHOLDER_RECIPE,
-        displayName: 'Other',
-        docsUrl: 'https://docs.datahub.com/docs/metadata-ingestion/',
-        logoComponent: <FormOutlined style={{ color: ANTD_GRAY[8], fontSize: 28 }} />,
-    },
-];
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/tableau/tableau.ts b/datahub-web-react/src/app/ingestV2/source/conf/tableau/tableau.ts
index 23d06024c1559a..23791b654586e2 100644
--- a/datahub-web-react/src/app/ingestV2/source/conf/tableau/tableau.ts
+++ b/datahub-web-react/src/app/ingestV2/source/conf/tableau/tableau.ts
@@ -1,36 +1,4 @@
-import { SourceConfig } from '@app/ingestV2/source/conf/types';
 
-import tableauLogo from '@images/tableaulogo.png';
-
-const placeholderRecipe = `\
-source:
-  type: tableau
-  config:
-    # Coordinates
-    connect_uri: https://prod-ca-a.online.tableau.com
-    site: acryl
-    projects: ["default", "Project 2"]
-
-    # Credentials
-    username: "\${TABLEAU_USER}"
-    password: "\${TABLEAU_PASSWORD}"
-
-    # Options
-    ingest_tags: True
-    ingest_owner: True
-    default_schema_map:
-      mydatabase: public
-      anotherdatabase: anotherschema
-`;
 
 export const TABLEAU = 'tableau';
 
-const tableauConfig: SourceConfig = {
-    type: TABLEAU,
-    placeholderRecipe,
-    displayName: 'Tableau',
-    docsUrl: 'https://docs.datahub.com/docs/generated/ingestion/sources/tableau/',
-    logoUrl: tableauLogo,
-};
-
-export default tableauConfig;
diff --git a/datahub-web-react/src/app/ingestV2/source/conf/types.ts b/datahub-web-react/src/app/ingestV2/source/conf/types.ts
deleted file mode 100644
index cca2a4929b89fe..00000000000000
--- a/datahub-web-react/src/app/ingestV2/source/conf/types.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Configs used to render the recipe builder experience for a particular source.
- */
-export interface SourceConfig {
-    /**
-     * The 'type' of the source, which should align with the recipe type.
-     */
-    type: string;
-
-    /**
-     * A placeholder recipe to show for the source.
-     */
-    placeholderRecipe: string;
-
-    /**
-     * TODO: A json schema for the 'source' block of the recipe to use for validation.
-     * Could also be a validate function.
-     */
-    // sourceSchema: string;
-
-    /**
-     * The display name for the source.
-     */
-    displayName: string;
-
-    /**
-     * The url to the docs about the source.
-     */
-    docsUrl?: string;
-
-    /**
-     * The url to a logo for the source.
-     */
-    logoUrl?: string;
-
-    /**
-     * A react component to use in place of a logo.
-     */
-    logoComponent?: React.ReactNode;
-}
diff --git a/datahub-web-react/src/app/ingestV2/source/utils.ts b/datahub-web-react/src/app/ingestV2/source/utils.ts
index 1d41109d2ade62..318d50bc93cb7b 100644
--- a/datahub-web-react/src/app/ingestV2/source/utils.ts
+++ b/datahub-web-react/src/app/ingestV2/source/utils.ts
@@ -478,7 +478,7 @@ const ENTITIES_WITH_SUBTYPES = new Set([
     EntityType.Dashboard.toLowerCase(),
 ]);
 
-export type EntityTypeCount = {
+type EntityTypeCount = {
     count: number;
     displayName: string;
 };
diff --git a/datahub-web-react/src/app/lineage/LineageExplorer.tsx b/datahub-web-react/src/app/lineage/LineageExplorer.tsx
index 9f6a79ad2baeb3..4c7d5297ab68cb 100644
--- a/datahub-web-react/src/app/lineage/LineageExplorer.tsx
+++ b/datahub-web-react/src/app/lineage/LineageExplorer.tsx
@@ -39,7 +39,7 @@ const EntityDrawer = styled(Drawer)<{ distanceFromTop: number }>`
     }
 `;
 
-export function getEntityAndType(lineageData?: GetEntityLineageQuery) {
+function getEntityAndType(lineageData?: GetEntityLineageQuery) {
     if (lineageData && lineageData.entity) {
         return {
             type: lineageData.entity.type,
diff --git a/datahub-web-react/src/app/lineage/LineageViz.tsx b/datahub-web-react/src/app/lineage/LineageViz.tsx
index 9f6cf9b12ba8c6..88b4b19bfcd53c 100644
--- a/datahub-web-react/src/app/lineage/LineageViz.tsx
+++ b/datahub-web-react/src/app/lineage/LineageViz.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import LineageVizInsideZoom from '@app/lineage/LineageVizInsideZoom';
 import { TreeProps } from '@app/lineage/types';
 
-export const defaultMargin = { top: 10, left: 280, right: 280, bottom: 10 };
+const defaultMargin = { top: 10, left: 280, right: 280, bottom: 10 };
 
 interface Props extends TreeProps {
     refetchCenterNode: () => void;
diff --git a/datahub-web-react/src/app/lineage/__tests__/LineageEdges.test.tsx b/datahub-web-react/src/app/lineage/__tests__/LineageEdges.test.tsx
deleted file mode 100644
index b6177211f49805..00000000000000
--- a/datahub-web-react/src/app/lineage/__tests__/LineageEdges.test.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { render } from '@testing-library/react';
-import React from 'react';
-
-import LineageEdges from '@app/lineage/manage/LineageEdges';
-import { Direction } from '@app/lineage/types';
-import { dataset1, dataset4WithLineage } from '@src/Mocks';
-import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer';
-
-const mockEntityRegistry = getTestEntityRegistry();
-vi.mock('../../useEntityRegistry', () => ({
-    useEntityRegistry: () => mockEntityRegistry,
-}));
-
-describe('LineageEdges', () => {
-    it('should render an empty state if there are no lineage children or entities to add', () => {
-        const { getByTestId, queryByTestId } = render(
-            <LineageEdges
-                entity={dataset1}
-                lineageDirection={Direction.Upstream}
-                entitiesToAdd={[]}
-                entitiesToRemove={[]}
-                setEntitiesToAdd={vi.fn()}
-                setEntitiesToRemove={vi.fn()}
-            />,
-        );
-
-        expect(getByTestId('empty-lineage')).toBeInTheDocument();
-        expect(queryByTestId('lineage-entity-item')).not.toBeInTheDocument();
-    });
-
-    it('should render upstream children if the direction is upstream', async () => {
-        const { queryByTestId, findAllByTestId, getByText } = render(
-            <LineageEdges
-                entity={dataset4WithLineage}
-                lineageDirection={Direction.Upstream}
-                entitiesToAdd={[]}
-                entitiesToRemove={[]}
-                setEntitiesToAdd={vi.fn()}
-                setEntitiesToRemove={vi.fn()}
-            />,
-        );
-
-        const entityItems = await findAllByTestId('lineage-entity-item');
-
-        expect(queryByTestId('empty-lineage')).not.toBeInTheDocument();
-        expect(entityItems).toHaveLength(2);
-        expect(getByText(dataset4WithLineage.upstream.relationships[0].entity.properties.name)).toBeInTheDocument();
-        expect(getByText(dataset4WithLineage.upstream.relationships[1].entity.properties.name)).toBeInTheDocument();
-    });
-
-    it('should render downstream children if the direction is downstream', async () => {
-        const { queryByTestId, findAllByTestId, getByText } = render(
-            <LineageEdges
-                entity={dataset4WithLineage}
-                lineageDirection={Direction.Downstream}
-                entitiesToAdd={[]}
-                entitiesToRemove={[]}
-                setEntitiesToAdd={vi.fn()}
-                setEntitiesToRemove={vi.fn()}
-            />,
-        );
-
-        const entityItems = await findAllByTestId('lineage-entity-item');
-
-        expect(queryByTestId('empty-lineage')).not.toBeInTheDocument();
-        expect(entityItems).toHaveLength(1);
-        expect(
-            getByText(dataset4WithLineage.downstream.relationships[0]!.entity!.properties!.name!),
-        ).toBeInTheDocument();
-    });
-
-    it('should remove entities from the displayed list if the urn is in entitiesToRemove', async () => {
-        const { queryByTestId, findAllByTestId, getByText, queryByText } = render(
-            <LineageEdges
-                entity={dataset4WithLineage}
-                lineageDirection={Direction.Upstream}
-                entitiesToAdd={[]}
-                entitiesToRemove={[dataset4WithLineage.upstream.relationships[1].entity]}
-                setEntitiesToAdd={vi.fn()}
-                setEntitiesToRemove={vi.fn()}
-            />,
-        );
-
-        const entityItems = await findAllByTestId('lineage-entity-item');
-
-        expect(queryByTestId('empty-lineage')).not.toBeInTheDocument();
-        expect(entityItems).toHaveLength(1);
-        expect(getByText(dataset4WithLineage.upstream.relationships[0].entity.properties.name)).toBeInTheDocument();
-        expect(
-            queryByText(dataset4WithLineage.upstream.relationships[1].entity.properties.name),
-        ).not.toBeInTheDocument();
-    });
-
-    it('should append entities from entitiesToAdd to the displayed list', async () => {
-        const { queryByTestId, findAllByTestId, getByText } = render(
-            <LineageEdges
-                entity={dataset4WithLineage}
-                lineageDirection={Direction.Upstream}
-                entitiesToAdd={[dataset1]}
-                entitiesToRemove={[]}
-                setEntitiesToAdd={vi.fn()}
-                setEntitiesToRemove={vi.fn()}
-            />,
-        );
-
-        const entityItems = await findAllByTestId('lineage-entity-item');
-
-        expect(queryByTestId('empty-lineage')).not.toBeInTheDocument();
-        expect(entityItems).toHaveLength(3);
-        expect(getByText(dataset4WithLineage.upstream.relationships[0].entity.properties.name)).toBeInTheDocument();
-        expect(getByText(dataset4WithLineage.upstream.relationships[1].entity.properties.name)).toBeInTheDocument();
-        expect(getByText(dataset1.properties.name)).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/lineage/__tests__/LineageEntityView.empty.test.tsx b/datahub-web-react/src/app/lineage/__tests__/LineageEntityView.empty.test.tsx
deleted file mode 100644
index 1121bbc6dab3e8..00000000000000
--- a/datahub-web-react/src/app/lineage/__tests__/LineageEntityView.empty.test.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { render } from '@testing-library/react';
-import React from 'react';
-
-import LineageEntityView from '@app/lineage/manage/LineageEntityView';
-import { dataset1 } from '@src/Mocks';
-import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer';
-
-const mockEntityRegistry = getTestEntityRegistry();
-vi.mock('../../useEntityRegistry', () => ({
-    useEntityRegistry: () => mockEntityRegistry,
-}));
-vi.mock('@app/entity/shared/EntityContext', () => ({
-    useEntityData: () => {
-        return {};
-    },
-}));
-describe('LineageEntityViewEmpty', () => {
-    it('should render an entity properly in LineageEntityView if no containers', () => {
-        const { getByTestId, getByText } = render(<LineageEntityView entity={dataset1} />);
-        // expect platform logo, platform name, divider, entity type, and display name
-        expect(getByTestId('platform-logo')).toBeInTheDocument();
-        expect(getByText(dataset1.platform.name)).toBeInTheDocument();
-        expect(getByTestId('divider')).toBeInTheDocument();
-        expect(getByText('Dataset')).toBeInTheDocument();
-        expect(getByText(dataset1.properties.name)).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/lineage/__tests__/LineageEntityView.test.tsx b/datahub-web-react/src/app/lineage/__tests__/LineageEntityView.test.tsx
deleted file mode 100644
index 0d9d5c4dc406e8..00000000000000
--- a/datahub-web-react/src/app/lineage/__tests__/LineageEntityView.test.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { render } from '@testing-library/react';
-import React from 'react';
-
-import LineageEntityView from '@app/lineage/manage/LineageEntityView';
-import { dataset1, useEntityDataFunc } from '@src/Mocks';
-import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer';
-
-const mockEntityRegistry = getTestEntityRegistry();
-vi.mock('../../useEntityRegistry', () => ({
-    useEntityRegistry: () => mockEntityRegistry,
-}));
-
-vi.mock('@app/entity/shared/EntityContext', () => ({
-    useEntityData: () => {
-        return useEntityDataFunc();
-    },
-}));
-
-describe('LineageEntityView', () => {
-    it('should render an entity properly in LineageEntityView', () => {
-        const { getByTestId, getByText } = render(<LineageEntityView entity={dataset1} />);
-        // expect platform logo, platform name, divider, entity type, and display name
-        expect(getByTestId('platform-logo')).toBeInTheDocument();
-        expect(getByText(dataset1.platform.name)).toBeInTheDocument();
-        expect(getByTestId('divider')).toBeInTheDocument();
-        expect(getByText('Dataset')).toBeInTheDocument();
-        expect(getByText(dataset1.properties.name)).toBeInTheDocument();
-    });
-
-    it('should render the subtype name if it exists and not the type name', () => {
-        const datasetWithSubtype = { ...dataset1, subTypes: { typeNames: ['view'] } };
-        const { getByText, queryByText } = render(<LineageEntityView entity={datasetWithSubtype} />);
-        expect(queryByText('Dataset')).not.toBeInTheDocument();
-        expect(getByText('View')).toBeInTheDocument();
-    });
-
-    it('should not render a divider if there is no platform name', () => {
-        vi.mock('@app/entity/shared/EntityContext', () => ({
-            useEntityData: () => {
-                return useEntityDataFunc();
-            },
-        }));
-
-        const datasetNoPlatformName = {
-            ...dataset1,
-            platform: { ...dataset1.platform, name: '', properties: { displayName: '' } },
-        };
-        const { queryByTestId } = render(<LineageEntityView entity={datasetNoPlatformName} />);
-        expect(queryByTestId('divider')).not.toBeInTheDocument();
-    });
-
-    afterAll(() => {
-        vi.resetAllMocks();
-    });
-});
diff --git a/datahub-web-react/src/app/lineage/__tests__/LineageTree.test.tsx b/datahub-web-react/src/app/lineage/__tests__/LineageTree.test.tsx
deleted file mode 100644
index 717efa74547a49..00000000000000
--- a/datahub-web-react/src/app/lineage/__tests__/LineageTree.test.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { render } from '@testing-library/react';
-import { Zoom } from '@visx/zoom';
-import React from 'react';
-
-import LineageTree from '@app/lineage/LineageTree';
-import { Direction, EntityAndType } from '@app/lineage/types';
-import constructTree from '@app/lineage/utils/constructTree';
-import extendAsyncEntities from '@app/lineage/utils/extendAsyncEntities';
-import { dataset3WithLineage, dataset4WithLineage, dataset5WithLineage, dataset6WithLineage, mocks } from '@src/Mocks';
-import TestPageContainer, { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer';
-
-import { EntityType } from '@types';
-
-const margin = { top: 10, left: 280, right: 280, bottom: 10 };
-const [windowWidth, windowHeight] = [1000, 500];
-
-const height = windowHeight - 125;
-const width = windowWidth;
-const yMax = height - margin.top - margin.bottom;
-const initialTransform = {
-    scaleX: 2 / 3,
-    scaleY: 2 / 3,
-    translateX: width / 2,
-    translateY: 0,
-    skewX: 0,
-    skewY: 0,
-};
-
-const testEntityRegistry = getTestEntityRegistry();
-
-describe('LineageTree', () => {
-    it('renders a tree with many layers', () => {
-        const fetchedEntities = [
-            { entity: dataset4WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset5WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset6WithLineage, direction: Direction.Upstream, fullyFetched: true },
-        ];
-        const mockFetchedEntities = fetchedEntities.reduce(
-            (acc, entry) =>
-                extendAsyncEntities(
-                    {},
-                    {},
-                    acc,
-                    testEntityRegistry,
-                    { entity: entry.entity, type: EntityType.Dataset } as EntityAndType,
-                    entry.fullyFetched,
-                ),
-            new Map(),
-        );
-
-        const downstreamData = constructTree(
-            { entity: dataset3WithLineage, type: EntityType.Dataset },
-            mockFetchedEntities,
-            Direction.Downstream,
-            testEntityRegistry,
-            {},
-        );
-        const upstreamData = constructTree(
-            { entity: dataset3WithLineage, type: EntityType.Dataset },
-            mockFetchedEntities,
-            Direction.Upstream,
-            testEntityRegistry,
-            {},
-        );
-
-        const { getByTestId } = render(
-            <MockedProvider mocks={mocks}>
-                <TestPageContainer>
-                    <Zoom
-                        width={width}
-                        height={height}
-                        scaleXMin={1 / 8}
-                        scaleXMax={2}
-                        scaleYMin={1 / 8}
-                        scaleYMax={2}
-                        initialTransformMatrix={initialTransform}
-                    >
-                        {(zoom) => (
-                            <svg>
-                                <LineageTree
-                                    upstreamData={upstreamData}
-                                    downstreamData={downstreamData}
-                                    zoom={zoom}
-                                    onEntityClick={vi.fn()}
-                                    onLineageExpand={vi.fn()}
-                                    canvasHeight={yMax}
-                                    margin={margin}
-                                    setIsDraggingNode={vi.fn()}
-                                    draggedNodes={{}}
-                                    setDraggedNodes={vi.fn()}
-                                    onEntityCenter={vi.fn()}
-                                    setHoveredEntity={vi.fn()}
-                                    fetchedEntities={mockFetchedEntities}
-                                    setUpdatedLineages={vi.fn()}
-                                />
-                            </svg>
-                        )}
-                    </Zoom>
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        expect(getByTestId('edge-urn:li:dataset:6-urn:li:dataset:5-Upstream')).toBeInTheDocument();
-        expect(getByTestId('edge-urn:li:dataset:4-urn:li:dataset:6-Upstream')).toBeInTheDocument();
-        expect(getByTestId('edge-urn:li:dataset:4-urn:li:dataset:5-Upstream')).toBeInTheDocument();
-        expect(getByTestId('edge-urn:li:dataset:3-urn:li:dataset:4-Upstream')).toBeInTheDocument();
-
-        expect(getByTestId('node-urn:li:dataset:6-Upstream')).toBeInTheDocument();
-        expect(getByTestId('node-urn:li:dataset:5-Upstream')).toBeInTheDocument();
-        expect(getByTestId('node-urn:li:dataset:4-Upstream')).toBeInTheDocument();
-        expect(getByTestId('node-urn:li:dataset:3-Upstream')).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/lineage/__tests__/adjustVXTreeLayout.test.tsx b/datahub-web-react/src/app/lineage/__tests__/adjustVXTreeLayout.test.tsx
deleted file mode 100644
index 808a2ac72d41d1..00000000000000
--- a/datahub-web-react/src/app/lineage/__tests__/adjustVXTreeLayout.test.tsx
+++ /dev/null
@@ -1,265 +0,0 @@
-import { render } from '@testing-library/react';
-import { Tree, hierarchy } from '@visx/hierarchy';
-import React from 'react';
-
-import { Direction, EntityAndType, NodeData } from '@app/lineage/types';
-import adjustVXTreeLayout from '@app/lineage/utils/adjustVXTreeLayout';
-import constructTree from '@app/lineage/utils/constructTree';
-import extendAsyncEntities from '@app/lineage/utils/extendAsyncEntities';
-import {
-    dataset3WithLineage,
-    dataset4WithLineage,
-    dataset5WithCyclicalLineage,
-    dataset5WithLineage,
-    dataset6WithLineage,
-    dataset7WithLineage,
-    dataset7WithSelfReferentialLineage,
-} from '@src/Mocks';
-import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer';
-
-import { Dataset, Entity, EntityType } from '@types';
-
-const testEntityRegistry = getTestEntityRegistry();
-
-describe('adjustVXTreeLayout', () => {
-    it('adjusts nodes with layers of lineage to make sure identical nodes are given the same coordinates', () => {
-        const fetchedEntities = [
-            { entity: dataset4WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset5WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset6WithLineage, direction: Direction.Upstream, fullyFetched: true },
-        ];
-        const mockFetchedEntities = fetchedEntities.reduce(
-            (acc, entry) =>
-                extendAsyncEntities(
-                    {},
-                    {},
-                    acc,
-                    testEntityRegistry,
-                    { entity: entry.entity, type: EntityType.Dataset } as EntityAndType,
-                    entry.fullyFetched,
-                ),
-            new Map(),
-        );
-
-        const downstreamData = hierarchy(
-            constructTree(
-                { entity: dataset3WithLineage, type: EntityType.Dataset },
-                mockFetchedEntities,
-                Direction.Upstream,
-                testEntityRegistry,
-                {},
-            ),
-        );
-
-        render(
-            <Tree<NodeData> root={downstreamData} size={[1000, 1000]}>
-                {(tree) => {
-                    const adjustedTree = adjustVXTreeLayout({ tree, direction: Direction.Downstream });
-
-                    expect(adjustedTree.nodesToRender[3].x).toEqual(adjustedTree.nodesToRender[4].x);
-                    expect(adjustedTree.nodesToRender[3].y).toEqual(adjustedTree.nodesToRender[4].y);
-                    expect(adjustedTree.nodesToRender[3].data.name).toEqual(adjustedTree.nodesToRender[4].data.name);
-
-                    expect(adjustedTree.nodesToRender[2].y).not.toEqual(adjustedTree.nodesToRender[3].y);
-                    expect(adjustedTree.nodesToRender[1].x).not.toEqual(adjustedTree.nodesToRender[3].x);
-                    expect(adjustedTree.nodesToRender[0].x).not.toEqual(adjustedTree.nodesToRender[3].x);
-
-                    expect(adjustedTree.nodesToRender.length).toEqual(5);
-
-                    return <div />;
-                }}
-            </Tree>,
-        );
-    });
-
-    it('handles multiple instances of lineage jumping over layers while upstream', () => {
-        const fetchedEntities = [
-            { entity: dataset4WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset5WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset6WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset7WithLineage, direction: Direction.Upstream, fullyFetched: true },
-        ];
-        const mockFetchedEntities = fetchedEntities.reduce(
-            (acc, entry) =>
-                extendAsyncEntities(
-                    {},
-                    {},
-                    acc,
-                    testEntityRegistry,
-                    { entity: entry.entity, type: EntityType.Dataset } as EntityAndType,
-                    entry.fullyFetched,
-                ),
-            new Map(),
-        );
-
-        const upstreamData = hierarchy(
-            constructTree(
-                { entity: dataset3WithLineage, type: EntityType.Dataset },
-                mockFetchedEntities,
-                Direction.Upstream,
-                testEntityRegistry,
-                {},
-            ),
-        );
-
-        render(
-            <Tree<NodeData> root={upstreamData} size={[1000, 1000]}>
-                {(tree) => {
-                    const adjustedTree = adjustVXTreeLayout({ tree, direction: Direction.Upstream });
-
-                    expect(adjustedTree.nodesToRender[5].x).toEqual(adjustedTree.nodesToRender[6].x);
-                    expect(adjustedTree.nodesToRender[5].y).toEqual(adjustedTree.nodesToRender[6].y);
-                    expect(adjustedTree.nodesToRender[5].data.name).toEqual(adjustedTree.nodesToRender[6].data.name);
-
-                    expect(adjustedTree.nodesToRender[5].x).toEqual(adjustedTree.nodesToRender[3].x);
-                    expect(adjustedTree.nodesToRender[5].y).toEqual(adjustedTree.nodesToRender[3].y);
-                    expect(adjustedTree.nodesToRender[5].data.name).toEqual(adjustedTree.nodesToRender[3].data.name);
-
-                    expect(adjustedTree.nodesToRender.length).toEqual(7);
-
-                    adjustedTree.nodesToRender.forEach((node) => {
-                        expect(node.y).toBeLessThanOrEqual(0);
-                    });
-
-                    return <div />;
-                }}
-            </Tree>,
-        );
-    });
-
-    it('handles self referntial lineage at the root level', () => {
-        const fetchedEntities = [
-            { entity: dataset4WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset5WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset6WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset3WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset7WithSelfReferentialLineage, direction: Direction.Upstream, fullyFetched: true },
-        ];
-        const mockFetchedEntities = fetchedEntities.reduce(
-            (acc, entry) =>
-                extendAsyncEntities(
-                    {},
-                    {},
-                    acc,
-                    testEntityRegistry,
-                    { entity: entry.entity, type: EntityType.Dataset } as EntityAndType,
-                    entry.fullyFetched,
-                ),
-            new Map(),
-        );
-
-        const upstreamData = hierarchy(
-            constructTree(
-                { entity: dataset7WithSelfReferentialLineage as Entity, type: EntityType.Dataset } as EntityAndType,
-                mockFetchedEntities,
-                Direction.Upstream,
-                testEntityRegistry,
-                {},
-            ),
-        );
-
-        render(
-            <Tree<NodeData> root={upstreamData} size={[1000, 1000]}>
-                {(tree) => {
-                    const adjustedTree = adjustVXTreeLayout({ tree, direction: Direction.Upstream });
-
-                    adjustedTree.nodesToRender.forEach((node) => {
-                        expect(node.y).toBeLessThanOrEqual(0);
-                    });
-
-                    return <div />;
-                }}
-            </Tree>,
-        );
-    });
-
-    it('handles self referential lineage at the child level', () => {
-        const fetchedEntities = [
-            { entity: dataset4WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset5WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset6WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset7WithSelfReferentialLineage, direction: Direction.Upstream, fullyFetched: true },
-        ];
-        const mockFetchedEntities = fetchedEntities.reduce(
-            (acc, entry) =>
-                extendAsyncEntities(
-                    {},
-                    {},
-                    acc,
-                    testEntityRegistry,
-                    { entity: entry.entity as Dataset, type: EntityType.Dataset },
-                    entry.fullyFetched,
-                ),
-            new Map(),
-        );
-
-        const upstreamData = hierarchy(
-            constructTree(
-                { entity: dataset3WithLineage, type: EntityType.Dataset },
-                mockFetchedEntities,
-                Direction.Upstream,
-                testEntityRegistry,
-                {},
-            ),
-        );
-
-        render(
-            <Tree<NodeData> root={upstreamData} size={[1000, 1000]}>
-                {(tree) => {
-                    const adjustedTree = adjustVXTreeLayout({ tree, direction: Direction.Upstream });
-
-                    adjustedTree.nodesToRender.forEach((node) => {
-                        expect(node.y).toBeLessThanOrEqual(0);
-                    });
-
-                    return <div />;
-                }}
-            </Tree>,
-        );
-    });
-
-    it('handles multi-element cycle lineage', () => {
-        const fetchedEntities = [
-            { entity: dataset4WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset5WithCyclicalLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset6WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset7WithSelfReferentialLineage, direction: Direction.Upstream, fullyFetched: true },
-        ];
-        const mockFetchedEntities = fetchedEntities.reduce(
-            (acc, entry) =>
-                extendAsyncEntities(
-                    {},
-                    {},
-                    acc,
-                    testEntityRegistry,
-                    { entity: entry.entity as Dataset, type: EntityType.Dataset },
-                    entry.fullyFetched,
-                ),
-            new Map(),
-        );
-
-        const upstreamData = hierarchy(
-            constructTree(
-                { entity: dataset3WithLineage, type: EntityType.Dataset },
-                mockFetchedEntities,
-                Direction.Upstream,
-                testEntityRegistry,
-                {},
-            ),
-        );
-
-        render(
-            <Tree<NodeData> root={upstreamData} size={[1000, 1000]}>
-                {(tree) => {
-                    const adjustedTree = adjustVXTreeLayout({ tree, direction: Direction.Upstream });
-
-                    adjustedTree.nodesToRender.forEach((node) => {
-                        expect(node.y).toBeLessThanOrEqual(0);
-                    });
-
-                    return <div />;
-                }}
-            </Tree>,
-        );
-    });
-});
diff --git a/datahub-web-react/src/app/lineage/__tests__/constructFetchedNode.test.tsx b/datahub-web-react/src/app/lineage/__tests__/constructFetchedNode.test.tsx
deleted file mode 100644
index ee31a44bdb1478..00000000000000
--- a/datahub-web-react/src/app/lineage/__tests__/constructFetchedNode.test.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Direction, EntityAndType, FetchedEntity } from '@app/lineage/types';
-import { shouldIncludeChildEntity } from '@app/lineage/utils/constructFetchedNode';
-import { dataJob1, dataset1, dataset1FetchedEntity, dataset2, dataset2FetchedEntity } from '@src/Mocks';
-
-import { Entity, EntityType } from '@types';
-
-describe('shouldIncludeChildEntity', () => {
-    const parentChildren = [
-        { entity: dataset1, type: dataset1.type },
-        { entity: dataJob1, type: dataJob1.type },
-    ] as EntityAndType[];
-
-    it('should return false if parent and child are datasets and the child has a datajob child that belongs to the parent children', () => {
-        const shouldBeIncluded = shouldIncludeChildEntity(
-            Direction.Upstream,
-            parentChildren,
-            dataset1FetchedEntity,
-            dataset2FetchedEntity,
-        );
-
-        expect(shouldBeIncluded).toBe(false);
-    });
-
-    it('should return true if the datajob is not a child of the parent', () => {
-        const parentChild = [{ entity: dataset1, type: dataset1.type }] as EntityAndType[];
-        const shouldBeIncluded = shouldIncludeChildEntity(
-            Direction.Upstream,
-            parentChild,
-            dataset1FetchedEntity,
-            dataset2FetchedEntity,
-        );
-
-        expect(shouldBeIncluded).toBe(true);
-    });
-
-    it('should return true if either parent or child is not a dataset', () => {
-        const fetchedDatajobEntity = { ...dataset1FetchedEntity, type: EntityType.DataJob };
-        let shouldBeIncluded = shouldIncludeChildEntity(
-            Direction.Upstream,
-            parentChildren,
-            fetchedDatajobEntity,
-            dataset2FetchedEntity,
-        );
-        expect(shouldBeIncluded).toBe(true);
-
-        const fetchedDashboardEntity = { ...dataset2FetchedEntity, type: EntityType.Dashboard };
-        shouldBeIncluded = shouldIncludeChildEntity(
-            Direction.Upstream,
-            parentChildren,
-            dataset1FetchedEntity,
-            fetchedDashboardEntity,
-        );
-        expect(shouldBeIncluded).toBe(true);
-    });
-
-    it('should return true if the parent has a datajob child that is not a child of the dataset child', () => {
-        const updatedDataset1FetchedEntity = {
-            ...dataset1FetchedEntity,
-            downstreamChildren: [{ type: EntityType.Dataset, entity: dataset2 as Entity }],
-        } as FetchedEntity;
-
-        const shouldBeIncluded = shouldIncludeChildEntity(
-            Direction.Upstream,
-            parentChildren,
-            updatedDataset1FetchedEntity,
-            dataset2FetchedEntity,
-        );
-
-        expect(shouldBeIncluded).toBe(true);
-    });
-});
diff --git a/datahub-web-react/src/app/lineage/__tests__/constructTree.test.ts b/datahub-web-react/src/app/lineage/__tests__/constructTree.test.ts
deleted file mode 100644
index 716dc5d702e56e..00000000000000
--- a/datahub-web-react/src/app/lineage/__tests__/constructTree.test.ts
+++ /dev/null
@@ -1,480 +0,0 @@
-import { Direction, EntityAndType, FetchedEntity, UpdatedLineages } from '@app/lineage/types';
-import constructTree from '@app/lineage/utils/constructTree';
-import extendAsyncEntities from '@app/lineage/utils/extendAsyncEntities';
-import {
-    dataFlow1,
-    dataJob1,
-    dataset1,
-    dataset3,
-    dataset3WithLineage,
-    dataset4,
-    dataset4WithLineage,
-    dataset5,
-    dataset5WithLineage,
-    dataset6WithLineage,
-} from '@src/Mocks';
-import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer';
-
-import { DataPlatform, Dataset, Entity, EntityType, RelationshipDirection } from '@types';
-
-const testEntityRegistry = getTestEntityRegistry();
-const kafkaPlatform: DataPlatform = dataset3.platform;
-
-const airflowPlatform: DataPlatform = dataFlow1.platform;
-
-describe('constructTree', () => {
-    it('handles nodes without any lineage', () => {
-        const mockFetchedEntities = new Map();
-        expect(
-            constructTree(
-                { entity: dataset3, type: EntityType.Dataset },
-                mockFetchedEntities,
-                Direction.Upstream,
-                testEntityRegistry,
-                {},
-            ),
-        ).toMatchObject({
-            name: 'Yet Another Dataset',
-            expandedName: 'Yet Another Dataset',
-            urn: 'urn:li:dataset:3',
-            type: EntityType.Dataset,
-            unexploredChildren: 0,
-            children: [],
-            icon: undefined,
-            platform: kafkaPlatform,
-            schemaMetadata: dataset3.schemaMetadata,
-            canEditLineage: true,
-        });
-    });
-
-    it('handles nodes with downstream lineage', () => {
-        const fetchedEntities = [
-            { entity: dataset4, direction: Direction.Upstream, fullyFetched: false },
-            { entity: dataset5, direction: Direction.Upstream, fullyFetched: false },
-        ];
-        const mockFetchedEntities = fetchedEntities.reduce(
-            (acc, entry) =>
-                extendAsyncEntities(
-                    {},
-                    {},
-                    acc,
-                    testEntityRegistry,
-                    { entity: entry.entity as Dataset, type: EntityType.Dataset },
-                    entry.fullyFetched,
-                ),
-            new Map(),
-        );
-
-        expect(
-            constructTree(
-                { entity: dataset6WithLineage as Dataset, type: EntityType.Dataset },
-                mockFetchedEntities,
-                Direction.Downstream,
-                testEntityRegistry,
-                {},
-            ),
-        ).toMatchObject({
-            name: 'Display Name of Sixth',
-            expandedName: 'Fully Qualified Name of Sixth Test Dataset',
-            urn: 'urn:li:dataset:6',
-            type: EntityType.Dataset,
-            unexploredChildren: 0,
-            icon: undefined,
-            platform: kafkaPlatform,
-            schemaMetadata: dataset6WithLineage.schemaMetadata,
-            children: [
-                {
-                    name: 'Fourth Test Dataset',
-                    expandedName: 'Fourth Test Dataset',
-                    type: EntityType.Dataset,
-                    unexploredChildren: 0,
-                    urn: 'urn:li:dataset:4',
-                    countercurrentChildrenUrns: [],
-                    children: [],
-                    icon: undefined,
-                    platform: kafkaPlatform,
-                    status: null,
-                },
-            ],
-        });
-    });
-
-    it('handles nodes with upstream lineage', () => {
-        const fetchedEntities = [
-            { entity: dataset4, direction: Direction.Upstream, fullyFetched: false },
-            { entity: dataset5, direction: Direction.Upstream, fullyFetched: false },
-        ];
-        const mockFetchedEntities = fetchedEntities.reduce(
-            (acc, entry) =>
-                extendAsyncEntities(
-                    {},
-                    {},
-                    acc,
-                    testEntityRegistry,
-                    { entity: entry.entity as Dataset, type: EntityType.Dataset },
-                    entry.fullyFetched,
-                ),
-            new Map(),
-        );
-
-        expect(
-            constructTree(
-                { entity: dataset6WithLineage as Dataset, type: EntityType.Dataset },
-                mockFetchedEntities,
-                Direction.Upstream,
-                testEntityRegistry,
-                {},
-            ),
-        ).toMatchObject({
-            name: 'Display Name of Sixth',
-            expandedName: 'Fully Qualified Name of Sixth Test Dataset',
-            urn: 'urn:li:dataset:6',
-            type: EntityType.Dataset,
-            unexploredChildren: 0,
-            icon: undefined,
-            platform: kafkaPlatform,
-            schemaMetadata: dataset6WithLineage.schemaMetadata,
-            children: [
-                {
-                    countercurrentChildrenUrns: [],
-                    name: 'Fifth Test Dataset',
-                    expandedName: 'Fifth Test Dataset',
-                    type: EntityType.Dataset,
-                    unexploredChildren: 0,
-                    urn: 'urn:li:dataset:5',
-                    children: [],
-                    icon: undefined,
-                    platform: kafkaPlatform,
-                    status: null,
-                },
-            ],
-        });
-    });
-
-    it('handles nodes with layers of lineage', () => {
-        const fetchedEntities = [
-            { entity: dataset4WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset5WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset6WithLineage, direction: Direction.Upstream, fullyFetched: true },
-        ];
-        const mockFetchedEntities = fetchedEntities.reduce(
-            (acc, entry) =>
-                extendAsyncEntities(
-                    {},
-                    {},
-                    acc,
-                    testEntityRegistry,
-                    { entity: entry.entity as Dataset, type: EntityType.Dataset },
-                    entry.fullyFetched,
-                ),
-            new Map(),
-        );
-
-        expect(
-            constructTree(
-                { entity: dataset3WithLineage, type: EntityType.Dataset },
-                mockFetchedEntities,
-                Direction.Upstream,
-                testEntityRegistry,
-                {},
-            ),
-        ).toMatchObject({
-            name: 'Yet Another Dataset',
-            expandedName: 'Yet Another Dataset',
-            urn: 'urn:li:dataset:3',
-            type: EntityType.Dataset,
-            unexploredChildren: 0,
-            icon: undefined,
-            platform: kafkaPlatform,
-            schemaMetadata: dataset3WithLineage.schemaMetadata,
-            children: [
-                {
-                    name: 'Fourth Test Dataset',
-                    expandedName: 'Fourth Test Dataset',
-                    type: EntityType.Dataset,
-                    unexploredChildren: 0,
-                    urn: 'urn:li:dataset:4',
-                    countercurrentChildrenUrns: ['urn:li:dataset:3'],
-                    icon: undefined,
-                    platform: kafkaPlatform,
-                    status: null,
-                    children: [
-                        {
-                            name: 'Display Name of Sixth',
-                            expandedName: 'Fully Qualified Name of Sixth Test Dataset',
-                            type: 'DATASET',
-                            unexploredChildren: 0,
-                            urn: 'urn:li:dataset:6',
-                            countercurrentChildrenUrns: ['urn:li:dataset:4'],
-                            icon: undefined,
-                            platform: kafkaPlatform,
-                            status: null,
-                            children: [
-                                {
-                                    name: 'Fifth Test Dataset',
-                                    expandedName: 'Fifth Test Dataset',
-                                    type: EntityType.Dataset,
-                                    unexploredChildren: 0,
-                                    urn: 'urn:li:dataset:5',
-                                    children: [],
-                                    countercurrentChildrenUrns: [
-                                        'urn:li:dataset:7',
-                                        'urn:li:dataset:6',
-                                        'urn:li:dataset:4',
-                                    ],
-                                    icon: undefined,
-                                    platform: kafkaPlatform,
-                                    status: null,
-                                },
-                            ],
-                        },
-                        {
-                            name: 'Fifth Test Dataset',
-                            expandedName: 'Fifth Test Dataset',
-                            type: EntityType.Dataset,
-                            unexploredChildren: 0,
-                            urn: 'urn:li:dataset:5',
-                            children: [],
-                            countercurrentChildrenUrns: ['urn:li:dataset:7', 'urn:li:dataset:6', 'urn:li:dataset:4'],
-                            icon: undefined,
-                            platform: kafkaPlatform,
-                            status: null,
-                        },
-                    ],
-                },
-            ],
-        });
-    });
-
-    it('for a set of identical nodes, both will be referentially identical', () => {
-        const fetchedEntities = [
-            { entity: dataset4WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset5WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataset6WithLineage, direction: Direction.Upstream, fullyFetched: true },
-        ];
-        const mockFetchedEntities = fetchedEntities.reduce(
-            (acc, entry) =>
-                extendAsyncEntities(
-                    {},
-                    {},
-                    acc,
-                    testEntityRegistry,
-                    { entity: entry.entity as Dataset, type: EntityType.Dataset },
-                    entry.fullyFetched,
-                ),
-            new Map(),
-        );
-
-        const tree = constructTree(
-            { entity: dataset3WithLineage, type: EntityType.Dataset },
-            mockFetchedEntities,
-            Direction.Upstream,
-            testEntityRegistry,
-            {},
-        );
-
-        const fifthDatasetIntance1 = tree?.children?.[0]?.children?.[1];
-        const fifthDatasetIntance2 = tree?.children?.[0]?.children?.[0]?.children?.[0];
-
-        expect(fifthDatasetIntance1?.name).toEqual('Fifth Test Dataset');
-        expect(fifthDatasetIntance2?.name).toEqual('Fifth Test Dataset');
-        expect(fifthDatasetIntance1 === fifthDatasetIntance2).toEqual(true);
-    });
-
-    it('handles partially fetched graph with layers of lineage', () => {
-        const fetchedEntities = [{ entity: dataset4WithLineage, direction: Direction.Upstream, fullyFetched: false }];
-        const mockFetchedEntities = fetchedEntities.reduce(
-            (acc, entry) =>
-                extendAsyncEntities(
-                    {},
-                    {},
-                    acc,
-                    testEntityRegistry,
-                    { entity: entry.entity as Entity, type: EntityType.Dataset } as EntityAndType,
-                    entry.fullyFetched,
-                ),
-            new Map(),
-        );
-        expect(
-            constructTree(
-                { entity: dataset3WithLineage, type: EntityType.Dataset },
-                mockFetchedEntities,
-                Direction.Upstream,
-                testEntityRegistry,
-                {},
-            ),
-        ).toMatchObject({
-            name: 'Yet Another Dataset',
-            expandedName: 'Yet Another Dataset',
-            urn: 'urn:li:dataset:3',
-            type: EntityType.Dataset,
-            unexploredChildren: 0,
-            icon: undefined,
-            platform: kafkaPlatform,
-            schemaMetadata: dataset3WithLineage.schemaMetadata,
-            children: [
-                {
-                    name: 'Fourth Test Dataset',
-                    expandedName: 'Fourth Test Dataset',
-                    type: EntityType.Dataset,
-                    unexploredChildren: 2,
-                    urn: 'urn:li:dataset:4',
-                    children: [],
-                    countercurrentChildrenUrns: ['urn:li:dataset:3'],
-                    icon: undefined,
-                    platform: kafkaPlatform,
-                    status: null,
-                },
-            ],
-        });
-    });
-
-    it('should not include a Dataset as a child if that Dataset has a Datajob child which points to the parent', () => {
-        // dataset6 is downstream of dataset5 and datajob1, datajob 1 is downstream of dataset 5
-        const updatedDataset6WithLineage = {
-            ...dataset6WithLineage,
-            downstream: null,
-            upstream: {
-                start: 0,
-                count: 2,
-                total: 2,
-                relationships: [
-                    {
-                        type: 'DownstreamOf',
-                        direction: RelationshipDirection.Incoming,
-                        entity: dataset5,
-                    },
-                    {
-                        type: 'DownstreamOf',
-                        direction: RelationshipDirection.Incoming,
-                        entity: dataJob1,
-                    },
-                ],
-            },
-        };
-        const updatedDataset5WithLineage = {
-            ...dataset5WithLineage,
-            downstream: {
-                ...dataset5WithLineage.downstream,
-                relationships: [
-                    ...dataset5WithLineage.downstream.relationships,
-                    {
-                        type: 'DownstreamOf',
-                        direction: RelationshipDirection.Outgoing,
-                        entity: dataJob1,
-                    },
-                ],
-            },
-        };
-        const fetchedEntities = [
-            { entity: updatedDataset5WithLineage, direction: Direction.Upstream, fullyFetched: true },
-            { entity: dataJob1, direction: Direction.Upstream, fullyFetched: true },
-        ];
-        const mockFetchedEntities = fetchedEntities.reduce(
-            (acc, entry) =>
-                extendAsyncEntities(
-                    {},
-                    {},
-                    acc,
-                    testEntityRegistry,
-                    { entity: entry.entity as Dataset, type: entry.entity.type as EntityType } as EntityAndType,
-                    entry.fullyFetched,
-                ),
-            new Map<string, FetchedEntity>(),
-        );
-        expect(
-            constructTree(
-                { entity: updatedDataset6WithLineage as Dataset, type: EntityType.Dataset },
-                mockFetchedEntities,
-                Direction.Upstream,
-                testEntityRegistry,
-                {},
-            ),
-        ).toMatchObject({
-            name: 'Display Name of Sixth',
-            expandedName: 'Fully Qualified Name of Sixth Test Dataset',
-            urn: 'urn:li:dataset:6',
-            type: EntityType.Dataset,
-            unexploredChildren: 0,
-            icon: undefined,
-            platform: kafkaPlatform,
-            subtype: undefined,
-            schemaMetadata: updatedDataset6WithLineage.schemaMetadata,
-            canEditLineage: true,
-            children: [
-                {
-                    name: 'DataJobInfoName',
-                    expandedName: 'DataFlowInfoName.DataJobInfoName',
-                    type: EntityType.DataJob,
-                    unexploredChildren: 0,
-                    urn: dataJob1.urn,
-                    children: [],
-                    countercurrentChildrenUrns: [],
-                    icon: undefined,
-                    status: null,
-                    platform: airflowPlatform,
-                    subtype: undefined,
-                    canEditLineage: true,
-                },
-            ],
-        });
-    });
-
-    it('should construct a tree taking into account updatedLineages in state', () => {
-        const fetchedEntities = [
-            { entity: dataset4, direction: Direction.Upstream, fullyFetched: false },
-            { entity: dataset5, direction: Direction.Upstream, fullyFetched: false },
-        ];
-        const mockFetchedEntities = fetchedEntities.reduce(
-            (acc, entry) =>
-                extendAsyncEntities(
-                    {},
-                    {},
-                    acc,
-                    testEntityRegistry,
-                    { entity: entry.entity as Dataset, type: EntityType.Dataset },
-                    entry.fullyFetched,
-                ),
-            new Map(),
-        );
-
-        const updatedLineages: UpdatedLineages = {
-            [dataset6WithLineage.urn]: {
-                lineageDirection: Direction.Upstream,
-                entitiesToAdd: [dataset1],
-                urnsToRemove: [dataset5.urn],
-            },
-        };
-
-        expect(
-            constructTree(
-                { entity: dataset6WithLineage as Dataset, type: EntityType.Dataset },
-                mockFetchedEntities,
-                Direction.Upstream,
-                testEntityRegistry,
-                updatedLineages,
-            ),
-        ).toMatchObject({
-            name: 'Display Name of Sixth',
-            expandedName: 'Fully Qualified Name of Sixth Test Dataset',
-            urn: 'urn:li:dataset:6',
-            type: EntityType.Dataset,
-            unexploredChildren: 0,
-            icon: undefined,
-            platform: kafkaPlatform,
-            schemaMetadata: dataset6WithLineage.schemaMetadata,
-            children: [
-                {
-                    countercurrentChildrenUrns: [],
-                    name: dataset1.name,
-                    expandedName: dataset1.name,
-                    type: EntityType.Dataset,
-                    unexploredChildren: 0,
-                    urn: dataset1.urn,
-                    children: [],
-                    platform: dataset1.platform,
-                },
-            ],
-        });
-    });
-});
diff --git a/datahub-web-react/src/app/lineage/__tests__/manageLineage.test.tsx b/datahub-web-react/src/app/lineage/__tests__/manageLineage.test.tsx
deleted file mode 100644
index da582ecd8cbe16..00000000000000
--- a/datahub-web-react/src/app/lineage/__tests__/manageLineage.test.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import { existsInEntitiesToAdd } from '@app/lineage/manage/AddEntityEdge';
-import { Direction } from '@app/lineage/types';
-import { buildUpdateLineagePayload, getValidEntityTypes } from '@app/lineage/utils/manageLineageUtils';
-import { dataFlow1, dataJob1, dataset1, dataset2, dataset3 } from '@src/Mocks';
-
-import { EntityType } from '@types';
-
-describe('existsInEntitiesToAdd', () => {
-    it('should return false if the search result is not in entitiesAlreadyAdded', () => {
-        const result = { entity: { urn: 'urn:li:test' } } as any;
-        const entitiesAlreadyAdded = [{ urn: 'urn:li:testing123' }] as any;
-        const exists = existsInEntitiesToAdd(result.entity, entitiesAlreadyAdded);
-
-        expect(exists).toBe(false);
-    });
-
-    it('should return true if the search result is in entitiesAlreadyAdded', () => {
-        const result = { entity: { urn: 'urn:li:test' } } as any;
-        const entitiesAlreadyAdded = [{ urn: 'urn:li:testing123' }, { urn: 'urn:li:test' }] as any;
-        const exists = existsInEntitiesToAdd(result.entity, entitiesAlreadyAdded);
-
-        expect(exists).toBe(true);
-    });
-});
-
-describe('buildUpdateLineagePayload', () => {
-    it('should build update lineage payload properly in the upstream direction', () => {
-        const entitiesToAdd = [dataFlow1, dataset2];
-        const entitiesToRemove = [dataJob1, dataset3];
-        const entityUrn = dataset1.urn;
-        const payload = buildUpdateLineagePayload(Direction.Upstream, entitiesToAdd, entitiesToRemove, entityUrn);
-
-        expect(payload).toMatchObject({
-            edgesToAdd: [
-                { upstreamUrn: dataFlow1.urn, downstreamUrn: entityUrn },
-                { upstreamUrn: dataset2.urn, downstreamUrn: entityUrn },
-            ],
-            edgesToRemove: [
-                { upstreamUrn: dataJob1.urn, downstreamUrn: entityUrn },
-                { upstreamUrn: dataset3.urn, downstreamUrn: entityUrn },
-            ],
-        });
-    });
-
-    it('should build update lineage payload properly in the downstream direction', () => {
-        const entitiesToAdd = [dataFlow1, dataset2];
-        const entitiesToRemove = [dataJob1, dataset3];
-        const entityUrn = dataset1.urn;
-        const payload = buildUpdateLineagePayload(Direction.Downstream, entitiesToAdd, entitiesToRemove, entityUrn);
-
-        expect(payload).toMatchObject({
-            edgesToAdd: [
-                { upstreamUrn: entityUrn, downstreamUrn: dataFlow1.urn },
-                { upstreamUrn: entityUrn, downstreamUrn: dataset2.urn },
-            ],
-            edgesToRemove: [
-                { upstreamUrn: entityUrn, downstreamUrn: dataJob1.urn },
-                { upstreamUrn: entityUrn, downstreamUrn: dataset3.urn },
-            ],
-        });
-    });
-});
-
-describe('getValidEntityTypes', () => {
-    it('should get valid entity types to query upstream lineage for datasets', () => {
-        const validEntityTypes = getValidEntityTypes(Direction.Upstream, EntityType.Dataset);
-        expect(validEntityTypes).toMatchObject([EntityType.Dataset, EntityType.DataJob]);
-    });
-    it('should get valid entity types to query upstream lineage for charts', () => {
-        const validEntityTypes = getValidEntityTypes(Direction.Upstream, EntityType.Chart);
-        expect(validEntityTypes).toMatchObject([EntityType.Dataset]);
-    });
-    it('should get valid entity types to query upstream lineage for dashboards', () => {
-        const validEntityTypes = getValidEntityTypes(Direction.Upstream, EntityType.Dashboard);
-        expect(validEntityTypes).toMatchObject([EntityType.Chart, EntityType.Dataset]);
-    });
-    it('should get valid entity types to query upstream lineage for datajobs', () => {
-        const validEntityTypes = getValidEntityTypes(Direction.Upstream, EntityType.DataJob);
-        expect(validEntityTypes).toMatchObject([EntityType.DataJob, EntityType.Dataset]);
-    });
-    it('should return an empty list if the entity type is unexpected for upstream', () => {
-        const validEntityTypes = getValidEntityTypes(Direction.Upstream, EntityType.Container);
-        expect(validEntityTypes).toMatchObject([]);
-    });
-
-    it('should get valid entity types to query downstream lineage for datasets', () => {
-        const validEntityTypes = getValidEntityTypes(Direction.Downstream, EntityType.Dataset);
-        expect(validEntityTypes).toMatchObject([
-            EntityType.Dataset,
-            EntityType.Chart,
-            EntityType.Dashboard,
-            EntityType.DataJob,
-        ]);
-    });
-    it('should get valid entity types to query downstream lineage for charts', () => {
-        const validEntityTypes = getValidEntityTypes(Direction.Downstream, EntityType.Chart);
-        expect(validEntityTypes).toMatchObject([EntityType.Dashboard]);
-    });
-    it('should return an empty list for downstream lineage for dashboards', () => {
-        const validEntityTypes = getValidEntityTypes(Direction.Downstream, EntityType.Dashboard);
-        expect(validEntityTypes).toMatchObject([]);
-    });
-    it('should get valid entity types to query downstream lineage for datajobs', () => {
-        const validEntityTypes = getValidEntityTypes(Direction.Downstream, EntityType.DataJob);
-        expect(validEntityTypes).toMatchObject([EntityType.DataJob, EntityType.Dataset]);
-    });
-    it('should return an empty list if the entity type is unexpected for downstream', () => {
-        const validEntityTypes = getValidEntityTypes(Direction.Downstream, EntityType.Container);
-        expect(validEntityTypes).toMatchObject([]);
-    });
-});
diff --git a/datahub-web-react/src/app/lineage/constants.ts b/datahub-web-react/src/app/lineage/constants.ts
index ee810d2d0b1a86..e511eba9c44e89 100644
--- a/datahub-web-react/src/app/lineage/constants.ts
+++ b/datahub-web-react/src/app/lineage/constants.ts
@@ -1,7 +1,4 @@
-// these relationships trigger a link where the source is to the right of the sink
-export const FORWARD_RELATIONSHIPS = ['DownstreamOf', 'Consumes', 'Contains', 'TrainedBy'];
-// these relationships trigger a link where the source is to the left of the sink
-export const INVERSE_RELATIONSHIPS = ['Produces', 'MemberOf'];
+
 
 export const HORIZONTAL_SPACE_PER_LAYER = 400;
 export const VERTICAL_SPACE_BETWEEN_NODES = 40;
@@ -12,7 +9,7 @@ export const COLUMN_HEIGHT = 30;
 export const CURVE_PADDING = 75;
 
 export const width = 250;
-export const height = 80;
+const height = 80;
 export const iconWidth = 32;
 export const iconHeight = 32;
 export const iconX = -width / 2 + 22;
diff --git a/datahub-web-react/src/app/lineage/manage/AddEntityEdge.tsx b/datahub-web-react/src/app/lineage/manage/AddEntityEdge.tsx
index 45b6a9c9def06b..7aa287b10c5c84 100644
--- a/datahub-web-react/src/app/lineage/manage/AddEntityEdge.tsx
+++ b/datahub-web-react/src/app/lineage/manage/AddEntityEdge.tsx
@@ -64,7 +64,7 @@ function getPlaceholderText(validEntityTypes: EntityType[], entityRegistry: Enti
     return placeholderText;
 }
 
-export function existsInEntitiesToAdd(result: Entity, entitiesAlreadyAdded: Entity[]) {
+function existsInEntitiesToAdd(result: Entity, entitiesAlreadyAdded: Entity[]) {
     return !!entitiesAlreadyAdded.find((entity) => entity.urn === result.urn);
 }
 
diff --git a/datahub-web-react/src/app/lineage/manage/ContainerView.tsx b/datahub-web-react/src/app/lineage/manage/ContainerView.tsx
index 046de602ee41b0..c099f89d33cffe 100644
--- a/datahub-web-react/src/app/lineage/manage/ContainerView.tsx
+++ b/datahub-web-react/src/app/lineage/manage/ContainerView.tsx
@@ -4,7 +4,7 @@ import { StyledRightOutlined } from '@app/entity/shared/containers/profile/heade
 
 import { Container } from '@types';
 
-export interface ContainerViewProps {
+interface ContainerViewProps {
     directContainer: Container | undefined | null;
     remainingContainers: Container[] | undefined | null;
 }
diff --git a/datahub-web-react/src/app/lineage/manage/LineageEntityView.tsx b/datahub-web-react/src/app/lineage/manage/LineageEntityView.tsx
index b84f37c4384619..87210729deafd6 100644
--- a/datahub-web-react/src/app/lineage/manage/LineageEntityView.tsx
+++ b/datahub-web-react/src/app/lineage/manage/LineageEntityView.tsx
@@ -33,7 +33,7 @@ const PlatformLogo = styled.img`
     margin-right: 5px;
 `;
 
-export const EntityName = styled.span<{ shrinkSize?: boolean }>`
+const EntityName = styled.span<{ shrinkSize?: boolean }>`
     font-size: ${(props) => (props.shrinkSize ? '12px' : '14px')};
     font-weight: bold;
 `;
diff --git a/datahub-web-react/src/app/lineage/types.ts b/datahub-web-react/src/app/lineage/types.ts
index a822e83067f939..0327250e655a73 100644
--- a/datahub-web-react/src/app/lineage/types.ts
+++ b/datahub-web-react/src/app/lineage/types.ts
@@ -1,6 +1,4 @@
 import { GenericEntityProperties } from '@app/entity/shared/types';
-
-import { FullLineageResultsFragment } from '@graphql/lineage.generated';
 import {
     Chart,
     Dashboard,
@@ -31,12 +29,6 @@ export type EntitySelectParams = {
     urn: string;
 };
 
-export type LineageExpandParams = {
-    type: EntityType;
-    urn: string;
-    direction: Direction;
-};
-
 export type FetchedEntity = {
     urn: string;
     name: string;
@@ -129,11 +121,6 @@ export enum Direction {
     Downstream = 'Downstream',
 }
 
-export type LineageExplorerParams = {
-    type: string;
-    urn: string;
-};
-
 export type TreeProps = {
     margin?: { top: number; right: number; bottom: number; left: number };
     entityAndType?: EntityAndType | null;
@@ -184,17 +171,11 @@ export type EntityAndType =
           entity: MlPrimaryKey;
       };
 
-export interface LineageResult {
-    urn: string;
-    upstream?: Maybe<{ __typename?: 'EntityLineageResult' } & FullLineageResultsFragment>;
-    downstream?: Maybe<{ __typename?: 'EntityLineageResult' } & FullLineageResultsFragment>;
-}
-
 export interface UpdatedLineages {
     [urn: string]: UpdatedLineage;
 }
 
-export interface UpdatedLineage {
+interface UpdatedLineage {
     lineageDirection: Direction;
     entitiesToAdd: Entity[];
     urnsToRemove: string[];
diff --git a/datahub-web-react/src/app/lineage/utils/__tests__/columnLineageUtils.test.tsx b/datahub-web-react/src/app/lineage/utils/__tests__/columnLineageUtils.test.tsx
deleted file mode 100644
index 4706084adac37d..00000000000000
--- a/datahub-web-react/src/app/lineage/utils/__tests__/columnLineageUtils.test.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import { FetchedEntity } from '@app/lineage/types';
-import {
-    decodeSchemaField,
-    encodeSchemaField,
-    getFieldPathFromSchemaFieldUrn,
-    getPopulatedColumnsByUrn,
-    getSourceUrnFromSchemaFieldUrn,
-} from '@app/lineage/utils/columnLineageUtils';
-import { dataJob1, dataset1, dataset2 } from '@src/Mocks';
-
-import { FineGrainedLineage, SchemaFieldDataType } from '@types';
-
-describe('getSourceUrnFromSchemaFieldUrn', () => {
-    it('should get the source urn for a chart schemaField', () => {
-        const schemaFieldUrn = 'urn:li:schemaField:(urn:li:chart:(looker,dashboard_elements.1),goal)';
-        const sourceUrn = getSourceUrnFromSchemaFieldUrn(schemaFieldUrn);
-        expect(sourceUrn).toBe('urn:li:chart:(looker,dashboard_elements.1)');
-    });
-
-    it('should get the source urn for a dataset schemaField', () => {
-        const schemaFieldUrn =
-            'urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_cypress_users_created,PROD),user_name)';
-        const sourceUrn = getSourceUrnFromSchemaFieldUrn(schemaFieldUrn);
-        expect(sourceUrn).toBe('urn:li:dataset:(urn:li:dataPlatform:hive,fct_cypress_users_created,PROD)');
-    });
-
-    it('should get the source urn for a nested schemaField', () => {
-        const schemaFieldUrn =
-            'urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_cypress_users_created,PROD),user.name.test)';
-        const sourceUrn = getSourceUrnFromSchemaFieldUrn(schemaFieldUrn);
-        expect(sourceUrn).toBe('urn:li:dataset:(urn:li:dataPlatform:hive,fct_cypress_users_created,PROD)');
-    });
-});
-
-describe('getFieldPathFromSchemaFieldUrn', () => {
-    it('should get the fieldPath from a chart schemaField urn', () => {
-        const schemaFieldUrn = 'urn:li:schemaField:(urn:li:chart:(looker,dashboard_elements.1),goal)';
-        const sourceUrn = getFieldPathFromSchemaFieldUrn(schemaFieldUrn);
-        expect(sourceUrn).toBe('goal');
-    });
-
-    it('should get the fieldPath for a dataset schemaField', () => {
-        const schemaFieldUrn =
-            'urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_cypress_users_created,PROD),user_name)';
-        const sourceUrn = getFieldPathFromSchemaFieldUrn(schemaFieldUrn);
-        expect(sourceUrn).toBe('user_name');
-    });
-
-    it('should get the fieldPath for a nested schemaField', () => {
-        const schemaFieldUrn =
-            'urn:li:schemaField:(urn:li:dataset:(urn:li:dataPlatform:hive,fct_cypress_users_created,PROD),user.name.test)';
-        const sourceUrn = getFieldPathFromSchemaFieldUrn(schemaFieldUrn);
-        expect(sourceUrn).toBe('user.name.test');
-    });
-});
-
-describe('decodeSchemaField', () => {
-    it('should decode a schemaField path when it has encoded reserved characters', () => {
-        const decodedSchemaField = decodeSchemaField('Test%2C test%2C test %28and test%29');
-        expect(decodedSchemaField).toBe('Test, test, test (and test)');
-    });
-
-    it('should return a regular schemaField path when it was not encoded', () => {
-        const schemaField = 'user.name';
-        const decodedSchemaField = decodeSchemaField(schemaField);
-        expect(decodedSchemaField).toBe(schemaField);
-    });
-});
-
-describe('encodeSchemaField', () => {
-    it('should encode a schemaField path when it has encoded reserved characters', () => {
-        const encodedSchemaField = encodeSchemaField('Test, test, test (and test)');
-        expect(encodedSchemaField).toBe('Test%2C test%2C test %28and test%29');
-    });
-
-    it('should return a regular schemaField path when it does not have reserved characters', () => {
-        const schemaField = 'user.name';
-        const encodedSchemaField = encodeSchemaField(schemaField);
-        expect(encodedSchemaField).toBe(schemaField);
-    });
-
-    it('should encode a decoded schemaField that we generate', () => {
-        const schemaField = 'Adults, men (% of pop)';
-        const encodedSchemaField = encodeSchemaField(schemaField);
-        const decodedSchemaField = decodeSchemaField(encodedSchemaField);
-        expect(encodedSchemaField).toBe('Adults%2C men %28% of pop%29');
-        expect(decodedSchemaField).toBe(schemaField);
-    });
-});
-
-describe('getPopulatedColumnsByUrn', () => {
-    it('should update columns by urn with data job fine grained data so that the data job appears to have the upstream and downstream columns', () => {
-        const dataJobWithCLL = {
-            ...dataJob1,
-            name: '',
-            fineGrainedLineages: [
-                {
-                    upstreams: [{ urn: dataset1.urn, path: 'test1' }],
-                    downstreams: [{ urn: dataset2.urn, path: 'test2' }],
-                },
-                {
-                    upstreams: [{ urn: dataset1.urn, path: 'test3' }],
-                    downstreams: [{ urn: dataset2.urn, path: 'test4' }],
-                },
-            ] as FineGrainedLineage[],
-        };
-        const fetchedEntities = new Map([[dataJobWithCLL.urn, dataJobWithCLL as FetchedEntity]]);
-        const columnsByUrn = getPopulatedColumnsByUrn({}, fetchedEntities);
-
-        expect(columnsByUrn).toMatchObject({
-            [dataJobWithCLL.urn]: [
-                {
-                    fieldPath: 'test1',
-                    nullable: false,
-                    recursive: false,
-                    type: SchemaFieldDataType.String,
-                },
-                {
-                    fieldPath: 'test2',
-                    nullable: false,
-                    recursive: false,
-                    type: SchemaFieldDataType.String,
-                },
-                {
-                    fieldPath: 'test3',
-                    nullable: false,
-                    recursive: false,
-                    type: SchemaFieldDataType.String,
-                },
-                {
-                    fieldPath: 'test4',
-                    nullable: false,
-                    recursive: false,
-                    type: SchemaFieldDataType.String,
-                },
-            ],
-        });
-    });
-});
diff --git a/datahub-web-react/src/app/lineage/utils/__tests__/extendAsyncEntities.test.ts b/datahub-web-react/src/app/lineage/utils/__tests__/extendAsyncEntities.test.ts
deleted file mode 100644
index a540b6ed561ac6..00000000000000
--- a/datahub-web-react/src/app/lineage/utils/__tests__/extendAsyncEntities.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { FetchedEntity } from '@app/lineage/types';
-import { extendColumnLineage } from '@app/lineage/utils/extendAsyncEntities';
-import { dataJob1, dataset1, dataset2 } from '@src/Mocks';
-
-import { FineGrainedLineage } from '@types';
-
-describe('extendColumnLineage', () => {
-    it('should update fineGrainedMap to draw lines from downstream and upstream datasets with a datajob in between', () => {
-        const dataJobWithCLL = {
-            ...dataJob1,
-            name: '',
-            platform: dataJob1.dataFlow?.platform || undefined,
-            fineGrainedLineages: [
-                {
-                    upstreams: [{ urn: dataset1.urn, path: 'test1' }],
-                    downstreams: [{ urn: dataset2.urn, path: 'test2' }],
-                },
-                {
-                    upstreams: [{ urn: dataset1.urn, path: 'test3' }],
-                    downstreams: [{ urn: dataset2.urn, path: 'test4' }],
-                },
-            ] as FineGrainedLineage[],
-        };
-        const fetchedEntities = new Map([[dataJobWithCLL.urn, dataJobWithCLL as FetchedEntity]]);
-        const fineGrainedMap = { forward: {}, reverse: {} };
-        extendColumnLineage(dataJobWithCLL, fineGrainedMap, {}, fetchedEntities);
-
-        expect(fineGrainedMap).toMatchObject({
-            forward: {
-                [dataJob1.urn]: {
-                    test1: { [dataset2.urn]: ['test2'] },
-                    test3: { [dataset2.urn]: ['test4'] },
-                },
-                [dataset1.urn]: {
-                    test1: { [dataJob1.urn]: ['test1'] },
-                    test3: { [dataJob1.urn]: ['test3'] },
-                },
-            },
-            reverse: {
-                [dataJob1.urn]: { test1: { [dataset1.urn]: ['test1'] }, test3: { [dataset1.urn]: ['test3'] } },
-                [dataset2.urn]: { test4: { [dataJob1.urn]: ['test3'] }, test2: { [dataJob1.urn]: ['test1'] } },
-            },
-        });
-    });
-});
diff --git a/datahub-web-react/src/app/lineage/utils/adjustVXTreeLayout.ts b/datahub-web-react/src/app/lineage/utils/adjustVXTreeLayout.ts
deleted file mode 100644
index 81409d0d83a45d..00000000000000
--- a/datahub-web-react/src/app/lineage/utils/adjustVXTreeLayout.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { HierarchyPointNode } from '@visx/hierarchy/lib/types';
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { width as nodeWidth } from '@app/lineage/constants';
-import { Direction, NodeData } from '@app/lineage/types';
-
-export default function adjustVXTreeLayout({
-    tree,
-    direction,
-}: {
-    tree: HierarchyPointNode<NodeData>;
-    direction: Direction;
-}) {
-    const nodesByUrn: { [x: string]: HierarchyPointNode<NodeData>[] } = {};
-    // adjust node's positions
-    tree.descendants().forEach((descendent) => {
-        // first, we need to flip the position of nodes who are going upstream
-        // eslint-disable-next-line  no-param-reassign
-        if (direction === Direction.Upstream) {
-            // eslint-disable-next-line  no-param-reassign
-            descendent.y = -Math.abs(descendent.y);
-        }
-        // second, duplicate nodes will be created if dependencies are in a dag rather than a tree.
-        // this is expected, however the <Tree /> component will try to lay them out independently.
-        // We need to force them to be laid out in the same place so each copy's edges begin at the same source.
-        if (descendent.data.urn && !nodesByUrn[descendent.data.urn]) {
-            nodesByUrn[descendent.data.urn] = [descendent];
-        } else if (descendent.data.urn) {
-            const existing = nodesByUrn[descendent.data.urn];
-            if (
-                descendent.height < Math.max(...existing.map((nodeByUrn) => nodeByUrn.height)) &&
-                descendent.depth <= Math.max(...existing.map((nodeByUrn) => nodeByUrn.depth))
-            ) {
-                // eslint-disable-next-line  no-param-reassign
-                descendent.x = existing[0].x;
-                // eslint-disable-next-line  no-param-reassign
-                descendent.y = existing[0].y;
-            } else {
-                existing.forEach((nodeByUrn) => {
-                    // eslint-disable-next-line  no-param-reassign
-                    nodeByUrn.x = descendent.x;
-                    // eslint-disable-next-line  no-param-reassign
-                    nodeByUrn.y = descendent.y;
-                });
-                nodesByUrn[descendent.data.urn] = [...nodesByUrn[descendent.data.urn], descendent];
-            }
-        }
-    });
-
-    const nodesToReturn = tree.descendants().map((descendentToCopy) => ({
-        x: descendentToCopy.x,
-        y: descendentToCopy.y,
-        data: { ...descendentToCopy.data },
-    }));
-
-    const edgesToReturn = tree.links().map((linkToCopy) => {
-        if (linkToCopy.target.y === linkToCopy.source.y) {
-            const sourceHigher = linkToCopy.source.x > linkToCopy.target.x;
-
-            return {
-                target: {
-                    x: linkToCopy.target.x + (sourceHigher ? 40 : 0),
-                    y: linkToCopy.target.y,
-                    data: { ...linkToCopy.target.data },
-                },
-                source: {
-                    x: linkToCopy.source.x - (sourceHigher ? 0 : 40),
-                    y: linkToCopy.source.y,
-                    data: { ...linkToCopy.source.data },
-                },
-            };
-        }
-        return {
-            target: {
-                x: linkToCopy.target.x,
-                y: linkToCopy.target.y + (direction === Direction.Upstream ? nodeWidth / 2 - 10 : -(nodeWidth / 2)),
-                data: { ...linkToCopy.target.data },
-            },
-            source: {
-                x: linkToCopy.source.x,
-                y: linkToCopy.source.y + (direction === Direction.Upstream ? -(nodeWidth / 2) : nodeWidth / 2 - 10),
-                data: { ...linkToCopy.source.data },
-            },
-        };
-    });
-
-    return { nodesToRender: nodesToReturn, edgesToRender: edgesToReturn, nodesByUrn };
-}
diff --git a/datahub-web-react/src/app/lineage/utils/columnLineageUtils.ts b/datahub-web-react/src/app/lineage/utils/columnLineageUtils.ts
index bd16aa67f5d619..9002f2862ee854 100644
--- a/datahub-web-react/src/app/lineage/utils/columnLineageUtils.ts
+++ b/datahub-web-react/src/app/lineage/utils/columnLineageUtils.ts
@@ -70,7 +70,7 @@ export function convertInputFieldsToSchemaFields(inputFields?: InputFields) {
  * pointing to and to know where to draw column arrows in and out of the entity. DataJobs won't show columns
  * underneath them, but we need this populated for validating that this column "exists" on the entity.
  */
-export function getPopulatedColumnsByUrn(
+function getPopulatedColumnsByUrn(
     columnsByUrn: Record<string, SchemaField[]>,
     fetchedEntities: Map<string, FetchedEntity>,
 ) {
diff --git a/datahub-web-react/src/app/lineage/utils/extendAsyncEntities.ts b/datahub-web-react/src/app/lineage/utils/extendAsyncEntities.ts
index 6a11307cfc83a0..1156246fe8ade5 100644
--- a/datahub-web-react/src/app/lineage/utils/extendAsyncEntities.ts
+++ b/datahub-web-react/src/app/lineage/utils/extendAsyncEntities.ts
@@ -55,7 +55,7 @@ function updateFineGrainedMap(
     mapForFieldReverse[upstreamEntityUrn] = listForDownstreamReverse;
 }
 
-export function extendColumnLineage(
+function extendColumnLineage(
     lineageVizConfig: FetchedEntity,
     fineGrainedMap: any,
     fineGrainedMapForSiblings: any,
diff --git a/datahub-web-react/src/app/lineage/utils/lineageUtils.ts b/datahub-web-react/src/app/lineage/utils/lineageUtils.ts
deleted file mode 100644
index 024e064c192c02..00000000000000
--- a/datahub-web-react/src/app/lineage/utils/lineageUtils.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import dayjs from 'dayjs';
-
-const MILLIS_PER_HOUR = 3600000;
-
-/**
- * Returns the default time-lineage start time which is 28 days - current time, rounded down to the nearest hour.
- */
-export const getDefaultLineageStartTime = () => {
-    return Math.floor(dayjs().subtract(28, 'day').valueOf() / MILLIS_PER_HOUR) * MILLIS_PER_HOUR;
-};
-
-/**
- * Returns the default time-lineage start time which is the current time round up to the nearest hour.
- */
-export const getDefaultLineageEndTime = () => {
-    return Math.ceil(dayjs().valueOf() / MILLIS_PER_HOUR) * MILLIS_PER_HOUR;
-};
-
-/**
- * Returns the default time-lineage header text.
- */
-export const getDefaultLineageHeaderText = () => {
-    return 'Last 28 days';
-};
diff --git a/datahub-web-react/src/app/lineage/utils/titleUtils.ts b/datahub-web-react/src/app/lineage/utils/titleUtils.ts
index c5b63ea5a58054..a32372f823ca06 100644
--- a/datahub-web-react/src/app/lineage/utils/titleUtils.ts
+++ b/datahub-web-react/src/app/lineage/utils/titleUtils.ts
@@ -27,7 +27,7 @@ interface Size {
 
 const HEIGHT_WITHOUT_TEXT_HEIGHT = 66;
 const DEFAULT_TEXT_TO_GET_NON_ZERO_HEIGHT = 'a';
-export const NODE_WIDTH_WITHOUT_TITLE = 61;
+const NODE_WIDTH_WITHOUT_TITLE = 61;
 
 function createDummyElement(text: string, options: Options): HTMLElement {
     const element = document.createElement('div');
diff --git a/datahub-web-react/src/app/lineage/utils/useGetLineageTimeParams.ts b/datahub-web-react/src/app/lineage/utils/useGetLineageTimeParams.ts
index f6c41a01bdb256..68fdaf51cd0a14 100644
--- a/datahub-web-react/src/app/lineage/utils/useGetLineageTimeParams.ts
+++ b/datahub-web-react/src/app/lineage/utils/useGetLineageTimeParams.ts
@@ -2,9 +2,9 @@ import * as QueryString from 'query-string';
 import { useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
 
-export const START_TIME_MILLIS_URL_PARAM = 'start_time_millis';
-export const END_TIME_MILLIS_URL_PARAM = 'end_time_millis';
-export const SHOW_ALL_TIME_LINEAGE_URL_PARAM = 'show_all_time_lineage';
+const START_TIME_MILLIS_URL_PARAM = 'start_time_millis';
+const END_TIME_MILLIS_URL_PARAM = 'end_time_millis';
+const SHOW_ALL_TIME_LINEAGE_URL_PARAM = 'show_all_time_lineage';
 
 export function useGetDefaultLineageStartTimeMillis() {
     return useMemo(() => null, []);
diff --git a/datahub-web-react/src/app/lineageV2/LineageEntityNode/components.tsx b/datahub-web-react/src/app/lineageV2/LineageEntityNode/components.tsx
index 1e6b91d2adaaa0..5710471927f5c5 100644
--- a/datahub-web-react/src/app/lineageV2/LineageEntityNode/components.tsx
+++ b/datahub-web-react/src/app/lineageV2/LineageEntityNode/components.tsx
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 import { ANTD_GRAY, LINEAGE_COLORS } from '@app/entityV2/shared/constants';
 
-export const ExpandContractButton = styled.div<{ expandOnHover?: boolean }>`
+const ExpandContractButton = styled.div<{ expandOnHover?: boolean }>`
     background-color: white;
     border: 1px solid ${ANTD_GRAY[5]};
     border-radius: 10px;
diff --git a/datahub-web-react/src/app/lineageV2/LineageTimeSelector.tsx b/datahub-web-react/src/app/lineageV2/LineageTimeSelector.tsx
index 616b993802eb3f..b44ee2b40621a6 100644
--- a/datahub-web-react/src/app/lineageV2/LineageTimeSelector.tsx
+++ b/datahub-web-react/src/app/lineageV2/LineageTimeSelector.tsx
@@ -33,7 +33,7 @@ const ConfirmButton = styled(Button)`
     }
 `;
 
-export type Props = {
+type Props = {
     onChange: (start: Datetime, end: Datetime) => void;
     startTimeMillis?: number;
     endTimeMillis?: number;
diff --git a/datahub-web-react/src/app/lineageV2/common.ts b/datahub-web-react/src/app/lineageV2/common.ts
index ad13177d49047f..116af6fa2eb411 100644
--- a/datahub-web-react/src/app/lineageV2/common.ts
+++ b/datahub-web-react/src/app/lineageV2/common.ts
@@ -38,7 +38,7 @@ export interface Filters {
     searchUrns?: Set<string>;
 }
 
-export interface NodeBase {
+interface NodeBase {
     id: string;
     isExpanded: Record<LineageDirection, boolean>;
     direction?: LineageDirection; // Root node has no direction. One day can try to support cycles in the same way.
@@ -56,7 +56,7 @@ export interface LineageEntity extends NodeBase {
 }
 
 export const LINEAGE_FILTER_TYPE = 'lineage-filter';
-export const LINEAGE_FILTER_ID_PREFIX = 'lf:';
+const LINEAGE_FILTER_ID_PREFIX = 'lf:';
 
 export function createLineageFilterNodeId(urn: Urn, direction: LineageDirection): string {
     const dir = direction === LineageDirection.Upstream ? 'u:' : 'd:';
@@ -117,7 +117,7 @@ export function isTransformational(node: Pick<LineageNode, 'urn' | 'type'>): boo
     return TRANSFORMATION_TYPES.includes(node.type) || isDbt(node);
 }
 
-export function isUrnDbt(urn: string, entityRegistry: EntityRegistry): boolean {
+function isUrnDbt(urn: string, entityRegistry: EntityRegistry): boolean {
     const type = getEntityTypeFromEntityUrn(urn, entityRegistry);
     return (
         (type === EntityType.Dataset || type === EntityType.SchemaField) &&
@@ -200,7 +200,7 @@ export function reverseDirection(direction: LineageDirection): LineageDirection
     return direction === LineageDirection.Upstream ? LineageDirection.Downstream : LineageDirection.Upstream;
 }
 
-export type NeighborMap = Map<Urn, Set<Urn>>;
+type NeighborMap = Map<Urn, Set<Urn>>;
 
 export interface NodeContext {
     rootUrn: string;
@@ -275,16 +275,6 @@ export function removeFromAdjacencyList(
     adjacencyList[reverseDirection(direction)].get(child)?.delete(parent);
 }
 
-export function clearEdges(urn: Urn, context: Pick<NodeContext, 'edges' | 'adjacencyList'>): void {
-    const { edges, adjacencyList } = context;
-    adjacencyList[LineageDirection.Upstream].get(urn)?.forEach((upstream) => edges.delete(createEdgeId(upstream, urn)));
-    adjacencyList[LineageDirection.Downstream]
-        .get(urn)
-        ?.forEach((downstream) => edges.delete(createEdgeId(urn, downstream)));
-    adjacencyList[LineageDirection.Upstream].delete(urn);
-    adjacencyList[LineageDirection.Downstream].delete(urn);
-}
-
 // Mapping fromRef -> toRef -> operationRef represents a column-level edge (fromRef -> toRef)
 // with an operationRef attached if this is an edge to that operation's query node
 export type FineGrainedLineageMap = Map<ColumnRef, Map<ColumnRef, FineGrainedOperationRef | null>>;
diff --git a/datahub-web-react/src/app/lineageV2/lineageUtils.ts b/datahub-web-react/src/app/lineageV2/lineageUtils.ts
index cc660febfd8332..2f215f6be02b7d 100644
--- a/datahub-web-react/src/app/lineageV2/lineageUtils.ts
+++ b/datahub-web-react/src/app/lineageV2/lineageUtils.ts
@@ -5,7 +5,7 @@ import { getFieldPathFromSchemaFieldUrn } from '@app/entityV2/schemaField/utils'
 import { useEntityRegistry } from '@app/useEntityRegistry';
 import { EntityRegistry } from '@src/entityRegistryContext';
 
-import { EntityType, SchemaField } from '@types';
+import { EntityType } from '@types';
 
 export function downgradeV2FieldPath(fieldPath: string): string;
 export function downgradeV2FieldPath(fieldPath?: string | null) {
@@ -31,13 +31,6 @@ export function processDocumentationString(docString): string {
     return docString.replace(fieldRegex, (_, fieldPath) => `'${downgradeV2FieldPath(fieldPath)}'`);
 }
 
-export function convertFieldsToV1FieldPath(fields: SchemaField[]) {
-    return fields.map((field) => ({
-        ...field,
-        fieldPath: downgradeV2FieldPath(field.fieldPath) || '',
-    }));
-}
-
 export function getV1FieldPathFromSchemaFieldUrn(schemaFieldUrn: string) {
     return downgradeV2FieldPath(getFieldPathFromSchemaFieldUrn(schemaFieldUrn)) as string;
 }
diff --git a/datahub-web-react/src/app/lineageV2/pruneAllDuplicateEdges.ts b/datahub-web-react/src/app/lineageV2/pruneAllDuplicateEdges.ts
index 771d755c90e42e..6f53725cef8ff3 100644
--- a/datahub-web-react/src/app/lineageV2/pruneAllDuplicateEdges.ts
+++ b/datahub-web-react/src/app/lineageV2/pruneAllDuplicateEdges.ts
@@ -46,7 +46,7 @@ export default function pruneAllDuplicateEdges(
 /**
  * Remove direct edges between a certain set of "excluded" nodes, if there is a path between them through only "included" nodes.
  */
-export function pruneDuplicateEdges(
+function pruneDuplicateEdges(
     urn: string,
     direction: LineageDirection | null,
     hideOption: HideOption,
diff --git a/datahub-web-react/src/app/lineageV2/types.ts b/datahub-web-react/src/app/lineageV2/types.ts
index 68dee569250516..ce4f34c5943cad 100644
--- a/datahub-web-react/src/app/lineageV2/types.ts
+++ b/datahub-web-react/src/app/lineageV2/types.ts
@@ -34,12 +34,12 @@ export interface ColumnAsset extends LineageAssetBase {
     nativeDataType?: string | null;
 }
 
-export interface EntityAsset extends LineageAssetBase {
+interface EntityAsset extends LineageAssetBase {
     type: LineageAssetType.Entity;
     entityType: EntityType;
 }
 
-export interface DataProductAsset extends LineageAssetBase {
+interface DataProductAsset extends LineageAssetBase {
     type: LineageAssetType.DataProduct;
     size?: number;
 }
diff --git a/datahub-web-react/src/app/lineageV2/useAvoidIntersections.ts b/datahub-web-react/src/app/lineageV2/useAvoidIntersections.ts
deleted file mode 100644
index db4e4ad21c9b85..00000000000000
--- a/datahub-web-react/src/app/lineageV2/useAvoidIntersections.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-import { Node, useReactFlow } from 'reactflow';
-
-import { LINEAGE_NODE_WIDTH } from '@app/lineageV2/LineageEntityNode/useDisplayedColumns';
-import { NodeBase } from '@app/lineageV2/common';
-
-interface ReturnType {
-    onNodeHeightChange: (id: string, height: number) => void;
-}
-
-/**
- * Pushes down nodes when node height changes, to avoid overlapping nodes.
- * Returns function onNodeHeightChange(id, y, height) to be called when a node's height changes.
- * TODO: Consider using over per-node useAvoidIntersections for performance. Not complete.
- */
-export default function useAvoidIntersections(vizVersion: number): ReturnType {
-    const { getNodes, setNodes } = useReactFlow<NodeBase & { offset?: number }>();
-
-    // Build up tree of dependencies, where nodes a -> b means b may need to be pushed down if a's height increases
-    const [dependencies] = useState(new Map<string, Set<string>>());
-
-    useEffect(() => {
-        // Reminder: Could optimize by calculating minYIntervals: [number, number][]
-        // of shape [(x, y)] that states the minimum y value for each x interval
-        // to run in O(n) time instead of O(n^2)
-        const nodes = getNodes().sort((a, b) => a.position.y - b.position.y);
-        nodes.forEach((node, i) => {
-            const overlaps = nodes.slice(i + 1).filter((n) => overlapsX(node, n));
-            dependencies.set(node.id, new Set(overlaps.map((n) => n.id)));
-        });
-    }, [vizVersion, dependencies, getNodes]);
-
-    const onNodeHeightChange = useCallback(
-        (id: string, height: number) => {
-            const allNodes = getNodes();
-            const y = allNodes.find((n) => n.id === id)?.position.y || 0;
-            const mayOverlapNodes = allNodes
-                .filter((n) => dependencies.get(id)?.has(n.id))
-                .sort((a, b) => a.position.y - b.position.y);
-            let currentY = y + height;
-
-            const offsets = new Map<string, number>();
-            mayOverlapNodes.forEach((node) => {
-                const distance = pushDownDistance(currentY, node.position.y);
-                if (distance) {
-                    currentY = node.position.y + distance + (node.height || 0);
-                }
-                offsets.set(node.id, distance);
-            });
-
-            setNodes((oldNodes) =>
-                oldNodes.map((node) => {
-                    const newOffset = offsets.get(node.id) || 0;
-                    const changeInY = newOffset - (node.data.offset || 0);
-                    if (changeInY) {
-                        return {
-                            ...node,
-                            position: {
-                                ...node.position,
-                                y: node.position.y + changeInY,
-                            },
-                            data: {
-                                ...node.data,
-                                offset: newOffset,
-                            },
-                        };
-                    }
-                    return node;
-                }),
-            );
-        },
-        [dependencies, getNodes, setNodes],
-    );
-    return { onNodeHeightChange };
-}
-
-const MIN_Y_SEP = 10;
-
-function pushDownDistance(newY: number, nodeY: number): number {
-    return Math.max(0, newY + MIN_Y_SEP - nodeY);
-}
-
-function overlapsX(a: Node, b: Node): boolean {
-    return (
-        Math.min(a.position.x + (a.width || LINEAGE_NODE_WIDTH), b.position.x + (b.width || LINEAGE_NODE_WIDTH)) >
-        Math.max(a.position.x, b.position.x)
-    );
-}
diff --git a/datahub-web-react/src/app/lineageV3/LineageEntityNode/ContainerPath.tsx b/datahub-web-react/src/app/lineageV3/LineageEntityNode/ContainerPath.tsx
deleted file mode 100644
index 738e27fe93cea3..00000000000000
--- a/datahub-web-react/src/app/lineageV3/LineageEntityNode/ContainerPath.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-import { ContainerIconBase } from '@app/entityV2/shared/containers/profile/header/PlatformContent/ContainerIcon';
-import MatchTextSizeWrapper from '@app/sharedV2/text/MatchTextSizeWrapper';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Container } from '@types';
-
-const ContainerPathWrapper = styled.div`
-    display: flex;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    width: 100%;
-
-    flex: 1 1 10px;
-    min-height: 8px;
-    max-height: 12px;
-`;
-
-const EmptyContainer = styled.div`
-    height: 8px;
-`;
-
-// TODO: Put ellipsis on last item correctly
-const ContainerEntry = styled(MatchTextSizeWrapper)<{ numItems?: number; isLast: boolean }>`
-    align-items: center;
-    color: ${REDESIGN_COLORS.TEXT_GREY};
-    display: flex;
-    flex-direction: row;
-    max-width: ${({ numItems, isLast }) => (numItems && !isLast ? 100 / numItems : 100)}%;
-`;
-
-const ContainerText = styled(Typography.Text)`
-    color: inherit;
-    margin-left: 4px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-`;
-
-const VerticalDivider = styled.hr<{ margin: number }>`
-    align-self: stretch;
-    height: auto;
-    margin: 0 ${({ margin }) => margin}px;
-    border: 0.5px solid;
-    opacity: 0.1;
-    vertical-align: text-top;
-`;
-
-interface Props {
-    parents?: Container[] | GenericEntityProperties[];
-    className?: string;
-}
-
-export default function ContainerPath({ parents, className }: Props) {
-    const entityRegistry = useEntityRegistry();
-    const containers = parents?.slice(0, 1);
-
-    if (!containers?.length) {
-        return <EmptyContainer />;
-    }
-
-    return (
-        <ContainerPathWrapper className={className}>
-            {containers?.map((container, i) => (
-                <ContainerEntry
-                    key={container.urn}
-                    isLast={i === containers.length - 1}
-                    numItems={containers.length}
-                    defaultHeight={10}
-                >
-                    {i > 0 && <VerticalDivider margin={4} />}
-                    <ContainerIconBase container={container} />
-                    <ContainerText ellipsis={{ tooltip: { showArrow: false } }}>
-                        {/*
-                            Browse paths with no entity are stored as { name: ... }, with no type.
-                            Entity registry will return empty string display name for undefined type.
-                         */}
-                        {entityRegistry.getDisplayName(container.type, container) || container.name}
-                    </ContainerText>
-                </ContainerEntry>
-            ))}
-        </ContainerPathWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/lineageV3/LineageEntityNode/GhostEntityMenu.tsx b/datahub-web-react/src/app/lineageV3/LineageEntityNode/GhostEntityMenu.tsx
deleted file mode 100644
index 7035862df82d5c..00000000000000
--- a/datahub-web-react/src/app/lineageV3/LineageEntityNode/GhostEntityMenu.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { MoreOutlined } from '@ant-design/icons';
-import { Button, Dropdown } from 'antd';
-import React, { useContext } from 'react';
-import styled from 'styled-components';
-
-import { LineageDisplayContext, onClickPreventSelect } from '@app/lineageV3/common';
-
-const DROPDOWN_Z_INDEX = 100;
-
-const Wrapper = styled.div`
-    border-radius: 4px;
-    position: absolute;
-    right: 3px;
-    top: 8px;
-
-    :hover {
-        color: ${(p) => p.theme.styles['primary-color']};
-    }
-`;
-
-const StyledIcon = styled(MoreOutlined)`
-    background: transparent;
-`;
-
-const StyledButton = styled(Button)`
-    height: min-content;
-    padding: 0;
-    border: none;
-    box-shadow: none;
-    transition: none;
-
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .ant-dropdown {
-        top: 20px !important;
-        left: auto !important;
-        right: 0 !important;
-    }
-`;
-
-interface Props {
-    urn: string;
-}
-
-export default function GhostEntityMenu({ urn }: Props) {
-    const { displayedMenuNode, setDisplayedMenuNode } = useContext(LineageDisplayContext);
-    const isMenuVisible = displayedMenuNode === urn;
-
-    function handleMenuClick(e: React.MouseEvent<HTMLElement, MouseEvent>) {
-        onClickPreventSelect(e);
-        if (isMenuVisible) {
-            setDisplayedMenuNode(null);
-        } else {
-            setDisplayedMenuNode(urn);
-        }
-    }
-
-    return (
-        <Wrapper>
-            <StyledButton onClick={handleMenuClick} type="text">
-                <Dropdown
-                    open={isMenuVisible}
-                    overlayStyle={{ zIndex: DROPDOWN_Z_INDEX }}
-                    getPopupContainer={(t) => t.parentElement || t}
-                    menu={{
-                        items: [
-                            {
-                                key: 'copyUrn',
-                                label: 'Copy URN',
-                                onClick: () => navigator.clipboard.writeText(urn),
-                            },
-                        ],
-                    }}
-                >
-                    <StyledIcon style={{ fontSize: 'inherit' }} />
-                </Dropdown>
-            </StyledButton>
-        </Wrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/lineageV3/LineageEntityNode/NodeSkeleton.tsx b/datahub-web-react/src/app/lineageV3/LineageEntityNode/NodeSkeleton.tsx
deleted file mode 100644
index a32ac72836ad42..00000000000000
--- a/datahub-web-react/src/app/lineageV3/LineageEntityNode/NodeSkeleton.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Skeleton } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const Wrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    height: 100%;
-    width: 100%;
-
-    &&& {
-        ul {
-            margin: 0;
-        }
-
-        li {
-            height: 1em;
-            :not(:first-child) {
-                margin-top: 4px;
-            }
-        }
-    }
-`;
-
-interface Props {
-    numRows?: number;
-    className?: string;
-}
-
-export default function NodeSkeleton({ numRows = 3, className }: Props) {
-    return (
-        <Wrapper className={className}>
-            <Skeleton active title={false} paragraph={{ rows: numRows }} />
-        </Wrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/lineageV3/LineageEntityNode/SchemaFieldNodeContents.tsx b/datahub-web-react/src/app/lineageV3/LineageEntityNode/SchemaFieldNodeContents.tsx
deleted file mode 100644
index 0d527b1865a881..00000000000000
--- a/datahub-web-react/src/app/lineageV3/LineageEntityNode/SchemaFieldNodeContents.tsx
+++ /dev/null
@@ -1,397 +0,0 @@
-import { LoadingOutlined } from '@ant-design/icons';
-import { Tooltip } from '@components';
-import { Skeleton, Spin } from 'antd';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import { Handle, Position } from 'reactflow';
-import styled from 'styled-components';
-
-import { ANTD_GRAY, LINEAGE_COLORS, REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-import ContainerPath from '@app/lineageV3/LineageEntityNode/ContainerPath';
-import { ContractLineageButton } from '@app/lineageV3/LineageEntityNode/ContractLineageButton';
-import { ExpandLineageButton } from '@app/lineageV3/LineageEntityNode/ExpandLineageButton';
-import { LoadingWrapper } from '@app/lineageV3/LineageEntityNode/NodeContents';
-import NodeSkeleton from '@app/lineageV3/LineageEntityNode/NodeSkeleton';
-import { FetchStatus } from '@app/lineageV3/common';
-import { FetchedEntityV2 } from '@app/lineageV3/types';
-import { downgradeV2FieldPath, useGetLineageUrl } from '@app/lineageV3/utils/lineageUtils';
-import { COLORS } from '@app/sharedV2/colors';
-import getTypeIcon from '@app/sharedV2/icons/getTypeIcon';
-import OverflowTitle from '@app/sharedV2/text/OverflowTitle';
-import { useEntityRegistryV2 } from '@app/useEntityRegistry';
-
-import { EntityType, LineageDirection } from '@types';
-
-import LinkOut from '@images/link-out.svg?react';
-
-export const SCHEMA_FIELD_NODE_HEIGHT = 80;
-export const SCHEMA_FIELD_NODE_WIDTH = 240;
-const NODE_COLOR = COLORS.blue_7;
-
-const NodeWrapper = styled.div<{
-    selected: boolean;
-    dragging: boolean;
-    color: string;
-    isGhost: boolean;
-    isSearchedEntity: boolean;
-}>`
-    align-items: center;
-    background-color: white;
-    border: 1px solid
-        ${({ color, selected, isGhost }) => {
-            if (selected) return color;
-            if (isGhost) return `${LINEAGE_COLORS.NODE_BORDER}50`;
-            return LINEAGE_COLORS.NODE_BORDER;
-        }};
-    box-shadow: ${({ isSearchedEntity, theme }) =>
-        isSearchedEntity ? `0 0 4px 4px ${theme.styles['primary-color']}95` : 'none'};
-    outline: ${({ color, selected }) => (selected ? `1px solid ${color}` : 'none')};
-    border-left: none;
-    border-radius: 6px;
-    display: flex;
-    flex-direction: column;
-    overflow-y: hidden;
-    width: ${SCHEMA_FIELD_NODE_WIDTH}px;
-    cursor: ${({ isGhost, dragging }) => {
-        if (isGhost) return 'not-allowed';
-        if (dragging) return 'grabbing';
-        return 'grab';
-    }};
-`;
-
-const CARD_HEIGHT = SCHEMA_FIELD_NODE_HEIGHT - 2; // Inside border
-
-// Maintains height of node as CardWrapper has position: absolute
-// Also allows the expand lineage buttons to not be children of CardWrapper
-const FakeCard = styled.div`
-    min-height: ${CARD_HEIGHT}px;
-    max-height: ${CARD_HEIGHT}px;
-    width: 100%;
-`;
-
-const CardWrapper = styled.div<{ isGhost: boolean }>`
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    height: ${CARD_HEIGHT}px;
-    position: absolute;
-    padding: 8px 11px;
-    width: 100%;
-    ${({ isGhost }) => isGhost && 'opacity: 0.5;'}
-`;
-
-const EntityTypeShadow = styled.div<{ color: string }>`
-    background: ${({ color }) => color};
-    border-radius: 6px;
-    position: absolute;
-
-    height: 100%;
-    width: 22px;
-
-    left: -3px;
-    top: 0;
-    z-index: -1;
-`;
-
-const CustomHandle = styled(Handle)<{ position: Position }>`
-    background: initial;
-    border: initial;
-    top: 50%;
-    ${({ position }) => (position === Position.Left ? 'left: -3px;' : 'right: 0;')}
-`;
-
-const IconsWrapper = styled.div`
-    align-items: center;
-    color: ${ANTD_GRAY[10]};
-    display: flex;
-    flex-direction: column;
-    font-size: 24px;
-    gap: 4px;
-`;
-
-const PlatformIcon = styled.img`
-    height: 1em;
-    width: 1em;
-`;
-
-const VerticalDivider = styled.hr<{ margin: number }>`
-    align-self: stretch;
-    height: auto;
-    margin: 0 ${({ margin }) => margin}px;
-    border: 0.5px solid;
-    opacity: 0.1;
-    vertical-align: text-top;
-`;
-
-const MainTextWrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    flex-grow: 1;
-    height: 100%;
-    min-width: 0;
-`;
-
-const TitleWrapper = styled.div`
-    overflow: hidden;
-    flex: 1 0 fit-content;
-    min-height: 12px;
-`;
-
-const ParentLine = styled.span`
-    display: flex;
-    align-items: center;
-    height: min-content;
-    gap: 4px;
-
-    color: ${REDESIGN_COLORS.SUBTITLE};
-    font-weight: 600;
-`;
-
-const InvalidSchemaFieldLine = styled.span`
-    display: flex;
-    align-items: center;
-    height: min-content;
-    gap: 4px;
-
-    font-size: 1.1em;
-    font-weight: 700;
-    color: inherit;
-`;
-
-const SchemaFieldLine = styled(Link)`
-    display: flex;
-    align-items: center;
-    height: min-content;
-    width: max-content;
-    gap: 4px;
-
-    font-size: 1.1em;
-    font-weight: 700;
-    color: inherit;
-
-    :hover {
-        color: inherit;
-        text-decoration: underline;
-    }
-`;
-
-const SkeletonImage = styled(Skeleton.Avatar)`
-    line-height: 0;
-`;
-
-const StyledNodeSkeleton = styled(NodeSkeleton)`
-    font-size: 10px;
-`;
-
-const ParentContainerPath = styled(ContainerPath)`
-    font-size: 10px;
-`;
-
-const ColumnLinkWrapper = styled(Link)`
-    display: flex;
-    color: inherit;
-
-    :hover {
-        color: ${(props) => props.theme.styles['primary-color']};
-    }
-`;
-
-interface Props {
-    urn: string;
-    type: EntityType;
-    rootUrn: string;
-    selected: boolean;
-    dragging: boolean;
-    isSearchedEntity: boolean;
-    isGhost: boolean;
-    hasUpstreamChildren: boolean;
-    hasDownstreamChildren: boolean;
-    isExpanded?: Record<LineageDirection, boolean>;
-    fetchStatus: Record<LineageDirection, FetchStatus>;
-    entity?: FetchedEntityV2;
-    platformName?: string;
-    platformIcon?: string;
-    searchQuery: string;
-    setHoveredNode: (urn: string | null) => void;
-    ignoreSchemaFieldStatus: boolean;
-}
-
-export default function SchemaFieldNodeContents({
-    urn,
-    type,
-    rootUrn,
-    selected,
-    dragging,
-    isSearchedEntity,
-    isGhost,
-    hasUpstreamChildren,
-    hasDownstreamChildren,
-    isExpanded,
-    fetchStatus,
-    entity,
-    platformName,
-    platformIcon,
-    searchQuery,
-    setHoveredNode,
-    ignoreSchemaFieldStatus,
-}: Props) {
-    const entityRegistry = useEntityRegistryV2();
-
-    const isExpandedDownstream = isExpanded?.[LineageDirection.Downstream];
-    const isExpandedUpstream = isExpanded?.[LineageDirection.Upstream];
-    const isDownstreamHidden =
-        fetchStatus[LineageDirection.Downstream] === FetchStatus.COMPLETE && !isExpandedDownstream;
-    const isUpstreamHidden = fetchStatus[LineageDirection.Upstream] === FetchStatus.COMPLETE && !isExpandedUpstream;
-
-    const parent = entity?.parent;
-    const parentLineageUrl = useGetLineageUrl(parent?.urn, parent?.type);
-    const lineageUrl = useGetLineageUrl(urn, EntityType.SchemaField);
-
-    const highlightColor = isSearchedEntity ? REDESIGN_COLORS.YELLOW_500 : REDESIGN_COLORS.YELLOW_200;
-    const contents = (
-        <NodeWrapper
-            selected={selected}
-            dragging={dragging}
-            isGhost={isGhost}
-            isSearchedEntity={isSearchedEntity}
-            color={NODE_COLOR}
-        >
-            <EntityTypeShadow color={NODE_COLOR} />
-            <FakeCard />
-            <FakeCard style={{ position: 'absolute' }}>
-                {hasUpstreamChildren &&
-                    ([FetchStatus.UNFETCHED, FetchStatus.LOADING].includes(fetchStatus[LineageDirection.Upstream]) ||
-                        isUpstreamHidden) && (
-                        <ExpandLineageButton
-                            urn={urn}
-                            type={type}
-                            direction={LineageDirection.Upstream}
-                            display={
-                                fetchStatus[LineageDirection.Upstream] === FetchStatus.UNFETCHED || !isExpandedUpstream
-                            }
-                            fetchStatus={fetchStatus}
-                            ignoreSchemaFieldStatus={ignoreSchemaFieldStatus}
-                        />
-                    )}
-                {hasDownstreamChildren &&
-                    ([FetchStatus.UNFETCHED, FetchStatus.LOADING].includes(fetchStatus[LineageDirection.Downstream]) ||
-                        isDownstreamHidden) && (
-                        <ExpandLineageButton
-                            urn={urn}
-                            type={type}
-                            direction={LineageDirection.Downstream}
-                            display={
-                                fetchStatus[LineageDirection.Downstream] === FetchStatus.UNFETCHED ||
-                                !isExpandedDownstream
-                            }
-                            fetchStatus={fetchStatus}
-                            ignoreSchemaFieldStatus={ignoreSchemaFieldStatus}
-                        />
-                    )}
-                {fetchStatus[LineageDirection.Upstream] === FetchStatus.COMPLETE &&
-                    isExpandedUpstream &&
-                    hasUpstreamChildren && <ContractLineageButton urn={urn} direction={LineageDirection.Upstream} />}
-                {fetchStatus[LineageDirection.Downstream] === FetchStatus.COMPLETE &&
-                    isExpandedDownstream &&
-                    hasDownstreamChildren && (
-                        <ContractLineageButton urn={urn} direction={LineageDirection.Downstream} />
-                    )}
-                {fetchStatus[LineageDirection.Upstream] === FetchStatus.LOADING && (
-                    <LoadingWrapper className="nodrag" style={{ left: -30 }}>
-                        <Spin delay={urn === rootUrn ? undefined : 500} indicator={<LoadingOutlined />} />
-                    </LoadingWrapper>
-                )}
-                {fetchStatus[LineageDirection.Downstream] === FetchStatus.LOADING && (
-                    <LoadingWrapper className="nodrag" style={{ right: -30 }}>
-                        <Spin delay={urn === rootUrn ? undefined : 500} indicator={<LoadingOutlined />} />
-                    </LoadingWrapper>
-                )}
-            </FakeCard>
-            <CardWrapper
-                isGhost={isGhost}
-                onMouseEnter={() => setHoveredNode(urn)}
-                onMouseLeave={() => setHoveredNode(null)}
-            >
-                <CustomHandle type="target" position={Position.Left} isConnectable={false} />
-                <CustomHandle type="source" position={Position.Right} isConnectable={false} />
-                <IconsWrapper>
-                    {platformIcon ? (
-                        <PlatformIcon src={platformIcon} alt={platformName || 'platform'} title={platformName} />
-                    ) : (
-                        <SkeletonImage size="small" shape="square" style={{ borderRadius: '20%' }} />
-                    )}
-                    {parent?.type ? (
-                        getTypeIcon(entityRegistry, parent.type, parent.subTypes?.[0], true)
-                    ) : (
-                        <SkeletonImage size="small" shape="square" style={{ borderRadius: '20%' }} />
-                    )}
-                </IconsWrapper>
-                <VerticalDivider margin={8} />
-                <MainTextWrapper>
-                    <ParentContainerPath parents={parent?.parentContainers?.containers} />
-                    {!!parent && (
-                        <TitleWrapper>
-                            <ParentLine>
-                                <OverflowTitle
-                                    title={parent?.name ?? parent?.urn}
-                                    highlightText={searchQuery}
-                                    highlightColor={highlightColor}
-                                />
-                                {!!parent.urn && !!parent.type && (
-                                    <ColumnLinkWrapper
-                                        to={parentLineageUrl}
-                                        onClick={(e) => e.stopPropagation()}
-                                        target="_blank"
-                                        rel="noopener noreferrer"
-                                    >
-                                        <Tooltip title="Explore parent lineage" mouseEnterDelay={0.5}>
-                                            <LinkOut />
-                                        </Tooltip>
-                                    </ColumnLinkWrapper>
-                                )}
-                            </ParentLine>
-                        </TitleWrapper>
-                    )}
-                    {!!entity && (
-                        <TitleWrapper>
-                            {isGhost || urn === rootUrn ? (
-                                <InvalidSchemaFieldLine>
-                                    <OverflowTitle
-                                        title={downgradeV2FieldPath(entity.name)}
-                                        highlightText={searchQuery}
-                                        highlightColor={highlightColor}
-                                    />
-                                </InvalidSchemaFieldLine>
-                            ) : (
-                                <Tooltip title="Change home node" mouseEnterDelay={0.3}>
-                                    <SchemaFieldLine to={lineageUrl}>
-                                        <OverflowTitle
-                                            title={downgradeV2FieldPath(entity.name)}
-                                            highlightText={searchQuery}
-                                            highlightColor={highlightColor}
-                                        />
-                                    </SchemaFieldLine>
-                                </Tooltip>
-                            )}
-                        </TitleWrapper>
-                    )}
-                </MainTextWrapper>
-                {!entity && <StyledNodeSkeleton numRows={2} />}
-            </CardWrapper>
-        </NodeWrapper>
-    );
-
-    if (isGhost) {
-        const message =
-            entity?.status?.removed || entity?.parent?.status?.removed
-                ? 'has been deleted'
-                : 'does not exist in DataHub';
-        return (
-            <Tooltip title={`This entity ${message}`} mouseEnterDelay={0.3}>
-                {contents}
-            </Tooltip>
-        );
-    }
-    return contents;
-}
diff --git a/datahub-web-react/src/app/lineageV3/LineageEntityNode/components.tsx b/datahub-web-react/src/app/lineageV3/LineageEntityNode/components.tsx
index 2379c84f0d7fca..91f55483a5ece0 100644
--- a/datahub-web-react/src/app/lineageV3/LineageEntityNode/components.tsx
+++ b/datahub-web-react/src/app/lineageV3/LineageEntityNode/components.tsx
@@ -1,7 +1,7 @@
 import { colors } from '@components';
 import styled from 'styled-components';
 
-export const ExpandContractButton = styled.div<{ expandOnHover?: boolean }>`
+const ExpandContractButton = styled.div<{ expandOnHover?: boolean }>`
     background-color: ${colors.white};
     color: ${colors.violet[500]};
     cursor: pointer;
diff --git a/datahub-web-react/src/app/lineageV3/LineageGraphContext.tsx b/datahub-web-react/src/app/lineageV3/LineageGraphContext.tsx
index 530e4386cd4812..7aed6a5be03269 100644
--- a/datahub-web-react/src/app/lineageV3/LineageGraphContext.tsx
+++ b/datahub-web-react/src/app/lineageV3/LineageGraphContext.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-export interface LineageGraphContextType {
+interface LineageGraphContextType {
     isDAGView: boolean;
 }
 
diff --git a/datahub-web-react/src/app/lineageV3/common.ts b/datahub-web-react/src/app/lineageV3/common.ts
index 1b4c38bd20bdf5..7d35d8f9a68104 100644
--- a/datahub-web-react/src/app/lineageV3/common.ts
+++ b/datahub-web-react/src/app/lineageV3/common.ts
@@ -4,7 +4,6 @@ import React, { Dispatch, SetStateAction } from 'react';
 
 import { globalEntityRegistryV2 } from '@app/EntityRegistryProvider';
 import { GenericEntityProperties } from '@app/entity/shared/types';
-import EntityRegistry from '@app/entityV2/EntityRegistry';
 import { getPlatformUrnFromEntityUrn } from '@app/entityV2/shared/utils';
 import { DBT_CLOUD_URN } from '@app/ingest/source/builder/constants';
 import { DBT_URN } from '@app/ingestV2/source/builder/constants';
@@ -47,7 +46,7 @@ export interface Filters {
     searchUrns?: Set<string>;
 }
 
-export interface NodeBase {
+interface NodeBase {
     id: string;
     isExpanded: Record<LineageDirection, boolean>;
     direction?: LineageDirection; // Root node has no direction. One day can try to support cycles in the same way.
@@ -66,7 +65,7 @@ export interface LineageEntity extends NodeBase {
 }
 
 export const LINEAGE_FILTER_TYPE = 'lineage-filter';
-export const LINEAGE_FILTER_ID_PREFIX = 'lf:';
+const LINEAGE_FILTER_ID_PREFIX = 'lf:';
 
 export function createLineageFilterNodeId(urn: Urn, direction: LineageDirection): string {
     const dir = direction === LineageDirection.Upstream ? 'u:' : 'd:';
@@ -157,14 +156,6 @@ export function isTransformational(node: Pick<LineageNode, 'urn' | 'type'>, root
     return TRANSFORMATION_TYPES.includes(node.type) || isDbt(node);
 }
 
-export function isUrnDbt(urn: string, entityRegistry: EntityRegistry): boolean {
-    const type = getEntityTypeFromEntityUrn(urn, entityRegistry);
-    return (
-        (type === EntityType.Dataset || type === EntityType.SchemaField) &&
-        getPlatformUrnFromEntityUrn(urn) === DBT_CLOUD_URN
-    );
-}
-
 export function isUrnQuery(urn: string): boolean {
     const type = getEntityTypeFromEntityUrn(urn, globalEntityRegistryV2);
     return type === EntityType.Query;
@@ -175,11 +166,6 @@ export function isUrnDataProcessInstance(urn: string): boolean {
     return type === EntityType.DataProcessInstance;
 }
 
-export function isUrnDataJob(urn: string): boolean {
-    const type = getEntityTypeFromEntityUrn(urn, globalEntityRegistryV2);
-    return type === EntityType.DataJob;
-}
-
 export function isUrnTransformational(urn: string, rootType: EntityType): boolean {
     const type = getEntityTypeFromEntityUrn(urn, globalEntityRegistryV2);
     return !!type && isTransformational({ urn, type }, rootType);
@@ -254,7 +240,7 @@ export function reverseDirection(direction: LineageDirection): LineageDirection
     return direction === LineageDirection.Upstream ? LineageDirection.Downstream : LineageDirection.Upstream;
 }
 
-export type NeighborMap = Map<Urn, Set<Urn>>;
+type NeighborMap = Map<Urn, Set<Urn>>;
 
 export type GraphStoreFields = 'nodes' | 'edges' | 'adjacencyList';
 export type LineageToggles = 'hideTransformations' | 'showDataProcessInstances' | 'showGhostEntities';
@@ -332,16 +318,6 @@ export function removeFromAdjacencyList(
     adjacencyList[reverseDirection(direction)].get(child)?.delete(parent);
 }
 
-export function clearEdges(urn: Urn, context: Pick<NodeContext, 'edges' | 'adjacencyList'>): void {
-    const { edges, adjacencyList } = context;
-    adjacencyList[LineageDirection.Upstream].get(urn)?.forEach((upstream) => edges.delete(createEdgeId(upstream, urn)));
-    adjacencyList[LineageDirection.Downstream]
-        .get(urn)
-        ?.forEach((downstream) => edges.delete(createEdgeId(urn, downstream)));
-    adjacencyList[LineageDirection.Upstream].delete(urn);
-    adjacencyList[LineageDirection.Downstream].delete(urn);
-}
-
 // Mapping fromRef -> toRef -> operationRef represents a column-level edge (fromRef -> toRef)
 // with an operationRef attached if this is an edge to that operation's query node
 export type FineGrainedLineageMap = Map<ColumnRef, Map<ColumnRef, FineGrainedOperationRef | null>>;
@@ -407,27 +383,3 @@ export function onClickPreventSelect(event: React.MouseEvent): true {
     event.stopPropagation(); // Prevents focusing node
     return true;
 }
-
-const DATA_STORE_COLOR = '#ffd279';
-const BI_TOOL_COLOR = '#8682a2';
-const ML_COLOR = '#206de8';
-const DEFAULT_COLOR = '#ff7979';
-
-export function getNodeColor(type?: EntityType): [string, string] {
-    if (type === EntityType.Chart || type === EntityType.Dashboard) {
-        return [BI_TOOL_COLOR, 'Field'];
-    }
-    if (type === EntityType.Dataset) {
-        return [DATA_STORE_COLOR, 'Column'];
-    }
-    if (
-        type === EntityType.Mlmodel ||
-        type === EntityType.MlmodelGroup ||
-        type === EntityType.Mlfeature ||
-        type === EntityType.MlfeatureTable ||
-        type === EntityType.MlprimaryKey
-    ) {
-        return [ML_COLOR, ''];
-    }
-    return [DEFAULT_COLOR, ''];
-}
diff --git a/datahub-web-react/src/app/lineageV3/controls/LineageTimeSelector.tsx b/datahub-web-react/src/app/lineageV3/controls/LineageTimeSelector.tsx
deleted file mode 100644
index 616b993802eb3f..00000000000000
--- a/datahub-web-react/src/app/lineageV3/controls/LineageTimeSelector.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import { CalendarOutlined, CaretDownOutlined } from '@ant-design/icons';
-import { Tooltip } from '@components';
-import { Button, DatePicker, Space, Typography } from 'antd';
-import moment from 'moment';
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-import styled from 'styled-components';
-
-import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-
-const { RangePicker } = DatePicker;
-
-export type Datetime = moment.Moment | null;
-
-const ConfirmButtonWrapper = styled.div`
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    width: 100%;
-`;
-
-const ConfirmButton = styled(Button)`
-    border-radius: 15px;
-    border: 1px solid ${REDESIGN_COLORS.BLACK};
-
-    position: absolute;
-    right: 10px;
-    bottom: 13px;
-    text-align: right;
-
-    :hover {
-        border-color: ${REDESIGN_COLORS.BLUE};
-        color: ${REDESIGN_COLORS.BLUE};
-    }
-`;
-
-export type Props = {
-    onChange: (start: Datetime, end: Datetime) => void;
-    startTimeMillis?: number;
-    endTimeMillis?: number;
-};
-
-export default function LineageTimeSelector({ onChange, startTimeMillis, endTimeMillis }: Props) {
-    const [startDate, setStartDate] = useState<Datetime>(startTimeMillis ? moment(startTimeMillis) : null);
-    const [endDate, setEndDate] = useState<Datetime>(endTimeMillis ? moment(endTimeMillis) : null);
-    const [isOpen, setIsOpen] = useState<boolean>(false);
-    const ref = useRef<any>(null);
-
-    useEffect(() => {
-        setStartDate(startTimeMillis ? moment(startTimeMillis) : null);
-    }, [startTimeMillis]);
-
-    useEffect(() => {
-        setEndDate(endTimeMillis ? moment(endTimeMillis) : null);
-    }, [endTimeMillis]);
-
-    const handleOpenChange = useCallback(
-        (open: boolean) => {
-            setIsOpen(open);
-            if (!open) {
-                ref.current?.blur();
-                onChange(startDate, endDate);
-            }
-        },
-        [onChange, startDate, endDate],
-    );
-
-    const handleRangeChange = useCallback((dates: [Datetime, Datetime] | null) => {
-        const [start, end] = dates || [null, null];
-
-        start?.set({ hour: 0, minute: 0, second: 0, millisecond: 0 });
-        end?.set({ hour: 23, minute: 59, second: 59, millisecond: 999 });
-
-        setStartDate(start);
-        setEndDate(end);
-    }, []);
-
-    const showText = !isOpen && (startDate === null || endDate === null);
-
-    const [ranges] = useState<Array<[Datetime, Datetime]>>([
-        [moment().subtract(7, 'days'), null],
-        [moment().subtract(14, 'days'), null],
-        [moment().subtract(28, 'days'), null],
-        [null, null],
-    ]);
-
-    return (
-        <>
-            {showText ? ( // Conditionally render All Time selection
-                <Tooltip title="Filter lineage edges by observed date" placement="topLeft" showArrow={false}>
-                    <Button type="text" onClick={() => handleOpenChange(true)}>
-                        <CalendarOutlined style={{ marginRight: '4px' }} />
-                        <Typography.Text>
-                            <b>{getTimeRangeDescription(startDate, endDate)}</b>
-                        </Typography.Text>
-                        <CaretDownOutlined style={{ fontSize: '10px' }} />
-                    </Button>
-                </Tooltip>
-            ) : (
-                <Space direction="vertical" size={12}>
-                    <RangePicker
-                        ref={ref}
-                        open={isOpen}
-                        allowClear
-                        allowEmpty={[true, true]}
-                        bordered={false}
-                        value={[startDate, endDate]}
-                        disabledDate={(current: any) => {
-                            return current && current > moment().endOf('day');
-                        }}
-                        renderExtraFooter={() => (
-                            <ConfirmButtonWrapper>
-                                <ConfirmButton type="text" onClick={() => handleOpenChange(false)}>
-                                    <b>Confirm</b>
-                                </ConfirmButton>
-                            </ConfirmButtonWrapper>
-                        )}
-                        format="ll"
-                        ranges={Object.fromEntries(
-                            ranges.map(([start, end]) => [getTimeRangeDescription(start, end), [start, end]]),
-                        )}
-                        onChange={handleRangeChange}
-                        onOpenChange={handleOpenChange}
-                        onCalendarChange={() => handleOpenChange(true)}
-                    />
-                </Space>
-            )}
-        </>
-    );
-}
-
-function getTimeRangeDescription(startDate: moment.Moment | null, endDate: moment.Moment | null): string {
-    if (!startDate && !endDate) {
-        return 'All Time';
-    }
-
-    if (!startDate && endDate) {
-        return `Until ${endDate.format('ll')}`;
-    }
-
-    if (startDate && !endDate) {
-        const dayDiff = moment().diff(startDate, 'days');
-        if (dayDiff <= 30) {
-            return `Last ${dayDiff} days`;
-        }
-        return `From ${startDate.format('ll')}`;
-    }
-
-    return 'Unknown time range';
-}
diff --git a/datahub-web-react/src/app/lineageV3/types.ts b/datahub-web-react/src/app/lineageV3/types.ts
index 68dee569250516..513164059a4c6e 100644
--- a/datahub-web-react/src/app/lineageV3/types.ts
+++ b/datahub-web-react/src/app/lineageV3/types.ts
@@ -34,17 +34,17 @@ export interface ColumnAsset extends LineageAssetBase {
     nativeDataType?: string | null;
 }
 
-export interface EntityAsset extends LineageAssetBase {
+interface EntityAsset extends LineageAssetBase {
     type: LineageAssetType.Entity;
     entityType: EntityType;
 }
 
-export interface DataProductAsset extends LineageAssetBase {
+interface DataProductAsset extends LineageAssetBase {
     type: LineageAssetType.DataProduct;
     size?: number;
 }
 
-export type LineageAsset = ColumnAsset | EntityAsset | DataProductAsset;
+type LineageAsset = ColumnAsset | EntityAsset | DataProductAsset;
 
 export type FetchedEntityV2Relationship = LineageRelationship & { urn: string }; // Destination urn
 
diff --git a/datahub-web-react/src/app/lineageV3/useComputeGraph/NodeBuilder.ts b/datahub-web-react/src/app/lineageV3/useComputeGraph/NodeBuilder.ts
index 5021d602e8d910..6fd70924df3cd8 100644
--- a/datahub-web-react/src/app/lineageV3/useComputeGraph/NodeBuilder.ts
+++ b/datahub-web-react/src/app/lineageV3/useComputeGraph/NodeBuilder.ts
@@ -43,7 +43,7 @@ const MINI_Y_SEP_RATIO = MAIN_Y_SEP_RATIO / 2;
 const TRANSFORMATIONAL_LEAF_OFFSET = 25;
 
 export type LineageVisualizationNode = Node<LineageEntity | LineageFilter | LineageBoundingBox>;
-export type LineageVisualizationEdgeData = LineageTableEdgeData | DataJobInputOutputEdgeData;
+type LineageVisualizationEdgeData = LineageTableEdgeData | DataJobInputOutputEdgeData;
 
 export function getNodePriority(node: LineageVisualizationNode) {
     switch (node.type) {
diff --git a/datahub-web-react/src/app/lineageV3/utils/lineageUtils.ts b/datahub-web-react/src/app/lineageV3/utils/lineageUtils.ts
index 725b1058dca959..671f4793fce487 100644
--- a/datahub-web-react/src/app/lineageV3/utils/lineageUtils.ts
+++ b/datahub-web-react/src/app/lineageV3/utils/lineageUtils.ts
@@ -1,46 +1,8 @@
 import { useLocation } from 'react-router-dom';
-
-import { KEY_SCHEMA_PREFIX, VERSION_PREFIX } from '@app/entity/dataset/profile/schema/utils/constants';
-import { getFieldPathFromSchemaFieldUrn } from '@app/entityV2/schemaField/utils';
 import { useEntityRegistry } from '@app/useEntityRegistry';
 import { EntityRegistry } from '@src/entityRegistryContext';
 
-import { EntityType, SchemaField } from '@types';
-
-export function downgradeV2FieldPath(fieldPath: string): string;
-export function downgradeV2FieldPath(fieldPath?: string | null) {
-    if (!fieldPath) {
-        return fieldPath;
-    }
-
-    const cleanedFieldPath = fieldPath.replace(KEY_SCHEMA_PREFIX, '').replace(VERSION_PREFIX, '');
-
-    // strip out all annotation segments
-    return cleanedFieldPath
-        .split('.')
-        .map((segment) => (segment.startsWith('[') ? null : segment))
-        .filter(Boolean)
-        .join('.');
-}
-
-export function processDocumentationString(docString): string {
-    if (!docString) {
-        return '';
-    }
-    const fieldRegex = /'(\[version=2\.0\](?:\.\[key=True\])?\.\[type=[^\]]+\]\.[^']+)'/g;
-    return docString.replace(fieldRegex, (_, fieldPath) => `'${downgradeV2FieldPath(fieldPath)}'`);
-}
-
-export function convertFieldsToV1FieldPath(fields: SchemaField[]) {
-    return fields.map((field) => ({
-        ...field,
-        fieldPath: downgradeV2FieldPath(field.fieldPath) || '',
-    }));
-}
-
-export function getV1FieldPathFromSchemaFieldUrn(schemaFieldUrn: string) {
-    return downgradeV2FieldPath(getFieldPathFromSchemaFieldUrn(schemaFieldUrn)) as string;
-}
+import { EntityType } from '@types';
 
 export function getEntityTypeFromEntityUrn(urn: string, registry: EntityRegistry): EntityType | undefined {
     const [, , entityType] = urn.split(':');
diff --git a/datahub-web-react/src/app/lineageV3/utils/useAvoidIntersections.ts b/datahub-web-react/src/app/lineageV3/utils/useAvoidIntersections.ts
deleted file mode 100644
index 5345b62457860f..00000000000000
--- a/datahub-web-react/src/app/lineageV3/utils/useAvoidIntersections.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-import { Node, useReactFlow } from 'reactflow';
-
-import { LINEAGE_NODE_WIDTH, NodeBase } from '@app/lineageV3/common';
-
-interface ReturnType {
-    onNodeHeightChange: (id: string, height: number) => void;
-}
-
-/**
- * Pushes down nodes when node height changes, to avoid overlapping nodes.
- * Returns function onNodeHeightChange(id, y, height) to be called when a node's height changes.
- * TODO: Consider using over per-node useAvoidIntersections for performance. Not complete.
- */
-export default function useAvoidIntersections(vizVersion: number): ReturnType {
-    const { getNodes, setNodes } = useReactFlow<NodeBase & { offset?: number }>();
-
-    // Build up tree of dependencies, where nodes a -> b means b may need to be pushed down if a's height increases
-    const [dependencies] = useState(new Map<string, Set<string>>());
-
-    useEffect(() => {
-        // Reminder: Could optimize by calculating minYIntervals: [number, number][]
-        // of shape [(x, y)] that states the minimum y value for each x interval
-        // to run in O(n) time instead of O(n^2)
-        const nodes = getNodes().sort((a, b) => a.position.y - b.position.y);
-        nodes.forEach((node, i) => {
-            const overlaps = nodes.slice(i + 1).filter((n) => overlapsX(node, n));
-            dependencies.set(node.id, new Set(overlaps.map((n) => n.id)));
-        });
-    }, [vizVersion, dependencies, getNodes]);
-
-    const onNodeHeightChange = useCallback(
-        (id: string, height: number) => {
-            const allNodes = getNodes();
-            const y = allNodes.find((n) => n.id === id)?.position.y || 0;
-            const mayOverlapNodes = allNodes
-                .filter((n) => dependencies.get(id)?.has(n.id))
-                .sort((a, b) => a.position.y - b.position.y);
-            let currentY = y + height;
-
-            const offsets = new Map<string, number>();
-            mayOverlapNodes.forEach((node) => {
-                const distance = pushDownDistance(currentY, node.position.y);
-                if (distance) {
-                    currentY = node.position.y + distance + (node.height || 0);
-                }
-                offsets.set(node.id, distance);
-            });
-
-            setNodes((oldNodes) =>
-                oldNodes.map((node) => {
-                    const newOffset = offsets.get(node.id) || 0;
-                    const changeInY = newOffset - (node.data.offset || 0);
-                    if (changeInY) {
-                        return {
-                            ...node,
-                            position: {
-                                ...node.position,
-                                y: node.position.y + changeInY,
-                            },
-                            data: {
-                                ...node.data,
-                                offset: newOffset,
-                            },
-                        };
-                    }
-                    return node;
-                }),
-            );
-        },
-        [dependencies, getNodes, setNodes],
-    );
-    return { onNodeHeightChange };
-}
-
-const MIN_Y_SEP = 10;
-
-function pushDownDistance(newY: number, nodeY: number): number {
-    return Math.max(0, newY + MIN_Y_SEP - nodeY);
-}
-
-function overlapsX(a: Node, b: Node): boolean {
-    return (
-        Math.min(a.position.x + (a.width || LINEAGE_NODE_WIDTH), b.position.x + (b.width || LINEAGE_NODE_WIDTH)) >
-        Math.max(a.position.x, b.position.x)
-    );
-}
diff --git a/datahub-web-react/src/app/lineageV3/utils/useLineageV2.ts b/datahub-web-react/src/app/lineageV3/utils/useLineageV2.ts
deleted file mode 100644
index c26b9a4f3f23cc..00000000000000
--- a/datahub-web-react/src/app/lineageV3/utils/useLineageV2.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { useAppConfig } from '@app/useAppConfig';
-
-export function useLineageV2(): boolean {
-    const appConfig = useAppConfig();
-    return appConfig.config.featureFlags.lineageGraphV2;
-}
diff --git a/datahub-web-react/src/app/onboarding/OnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/OnboardingConfig.tsx
index c4c0c2938709f8..b0e7a527d130e0 100644
--- a/datahub-web-react/src/app/onboarding/OnboardingConfig.tsx
+++ b/datahub-web-react/src/app/onboarding/OnboardingConfig.tsx
@@ -30,5 +30,3 @@ export const OnboardingConfig: OnboardingStep[] = ALL_ONBOARDING_CONFIGS.reduce(
     (acc, config) => [...acc, ...config],
     [],
 );
-
-export const CURRENT_ONBOARDING_IDS: string[] = OnboardingConfig.map((step) => step.id as string);
diff --git a/datahub-web-react/src/app/onboarding/OnboardingTour.tsx b/datahub-web-react/src/app/onboarding/OnboardingTour.tsx
index 6726daeb0e9984..4f756c52fb0ec6 100644
--- a/datahub-web-react/src/app/onboarding/OnboardingTour.tsx
+++ b/datahub-web-react/src/app/onboarding/OnboardingTour.tsx
@@ -8,7 +8,6 @@ import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
 import OnboardingContext from '@app/onboarding/OnboardingContext';
 import useShouldSkipOnboardingTour from '@app/onboarding/useShouldSkipOnboardingTour';
 import { convertStepId, getConditionalStepIdsToAdd, getStepsToRender } from '@app/onboarding/utils';
-import { useIsThemeV2 } from '@app/useIsThemeV2';
 import { EducationStepsContext } from '@providers/EducationStepsContext';
 
 import { useBatchUpdateStepStatesMutation } from '@graphql/step.generated';
@@ -21,10 +20,9 @@ type Props = {
 export const OnboardingTour = ({ stepIds }: Props) => {
     const { educationSteps, setEducationSteps, educationStepIdsAllowlist } = useContext(EducationStepsContext);
     const userUrn = useUserContext()?.user?.urn;
-    const isThemeV2 = useIsThemeV2();
     const { isTourOpen, tourReshow, setTourReshow, setIsTourOpen } = useContext(OnboardingContext);
     const location = useLocation();
-    const accentColor = isThemeV2 ? REDESIGN_COLORS.BACKGROUND_PURPLE : '#5cb7b7';
+    const accentColor = REDESIGN_COLORS.BACKGROUND_PURPLE;
 
     useEffect(() => {
         function handleKeyDown(e) {
diff --git a/datahub-web-react/src/app/onboarding/config/EntityProfileOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/EntityProfileOnboardingConfig.tsx
index 2774275d0ceacc..8d1066a6f50397 100644
--- a/datahub-web-react/src/app/onboarding/config/EntityProfileOnboardingConfig.tsx
+++ b/datahub-web-react/src/app/onboarding/config/EntityProfileOnboardingConfig.tsx
@@ -4,11 +4,11 @@ import React from 'react';
 import { OnboardingStep } from '@app/onboarding/OnboardingStep';
 
 // Entity profile tabs. Note that the 'rc-tab' prefix for the ID is added by the antd library and may change in the future.
-export const ENTITY_PROFILE_ENTITIES_ID = 'entity-profile-entities';
+const ENTITY_PROFILE_ENTITIES_ID = 'entity-profile-entities';
 export const ENTITY_PROFILE_PROPERTIES_ID = 'entity-profile-properties';
-export const ENTITY_PROFILE_DOCUMENTATION_ID = 'entity-profile-documentation';
+const ENTITY_PROFILE_DOCUMENTATION_ID = 'entity-profile-documentation';
 export const ENTITY_PROFILE_LINEAGE_ID = 'entity-profile-lineage';
-export const ENTITY_PROFILE_SCHEMA_ID = 'entity-profile-schema';
+const ENTITY_PROFILE_SCHEMA_ID = 'entity-profile-schema';
 
 // Entity profile sidebar
 export const ENTITY_PROFILE_OWNERS_ID = 'entity-profile-owners';
diff --git a/datahub-web-react/src/app/onboarding/config/HomePageOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/config/HomePageOnboardingConfig.tsx
index 1689dac41f0381..91dc796964e9ac 100644
--- a/datahub-web-react/src/app/onboarding/config/HomePageOnboardingConfig.tsx
+++ b/datahub-web-react/src/app/onboarding/config/HomePageOnboardingConfig.tsx
@@ -6,14 +6,14 @@ import { OnboardingStep } from '@app/onboarding/OnboardingStep';
 
 import dataHubFlowDiagram from '@images/datahub-flow-diagram-light.png';
 
-export const GLOBAL_WELCOME_TO_DATAHUB_ID = 'global-welcome-to-datahub';
+const GLOBAL_WELCOME_TO_DATAHUB_ID = 'global-welcome-to-datahub';
 export const HOME_PAGE_INGESTION_ID = 'home-page-ingestion';
 export const HOME_PAGE_DOMAINS_ID = 'home-page-domains';
 export const HOME_PAGE_DATA_PRODUCTS_ID = 'home-page-data-products';
 export const HOME_PAGE_INSIGHTS_ID = 'home-page-insights';
 export const HOME_PAGE_PLATFORMS_ID = 'home-page-platforms';
-export const HOME_PAGE_MOST_POPULAR_ID = 'home-page-most-popular';
-export const HOME_PAGE_SEARCH_BAR_ID = 'home-page-search-bar';
+const HOME_PAGE_MOST_POPULAR_ID = 'home-page-most-popular';
+const HOME_PAGE_SEARCH_BAR_ID = 'home-page-search-bar';
 export const HOME_PAGE_ONBOARDING_CARDS_ID = 'home-page-onboarding-cards';
 
 export const HomePageOnboardingConfig: OnboardingStep[] = [
diff --git a/datahub-web-react/src/app/onboarding/configV2/EntityProfileOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/configV2/EntityProfileOnboardingConfig.tsx
index 1f980981f96ac4..81c7833c021f70 100644
--- a/datahub-web-react/src/app/onboarding/configV2/EntityProfileOnboardingConfig.tsx
+++ b/datahub-web-react/src/app/onboarding/configV2/EntityProfileOnboardingConfig.tsx
@@ -5,9 +5,8 @@ import { OnboardingStep } from '@app/onboarding/OnboardingStep';
 
 export const ENTITY_PROFILE_V2_COLUMNS_ID = 'entity-profile-v2-columns';
 export const ENTITY_PROFILE_V2_CONTENTS_ID = 'entity-profile-v2-contents';
-export const ENTITY_PROFILE_V2_SUBSCRIPTION_ID = 'entity-profile-v2-subscriptions';
 export const ENTITY_PROFILE_V2_DOCUMENTATION_ID = 'entity-profile-v2-documentation';
-export const ENTITY_PROFILE_V2_SIDEBAR_ID = 'entity-profile-v2-sidebar';
+const ENTITY_PROFILE_V2_SIDEBAR_ID = 'entity-profile-v2-sidebar';
 export const ENTITY_SIDEBAR_V2_ABOUT_TAB_ID = 'entity-profile-v2-about';
 export const ENTITY_SIDEBAR_V2_COLUMNS_TAB_ID = 'entity-sidebar-v2-columns-tab';
 export const ENTITY_SIDEBAR_V2_LINEAGE_TAB_ID = 'entity-profile-v2-lineage-tab';
diff --git a/datahub-web-react/src/app/onboarding/configV2/HomePageOnboardingConfig.tsx b/datahub-web-react/src/app/onboarding/configV2/HomePageOnboardingConfig.tsx
index ce47a83bcd0493..2b27f129a7a7d2 100644
--- a/datahub-web-react/src/app/onboarding/configV2/HomePageOnboardingConfig.tsx
+++ b/datahub-web-react/src/app/onboarding/configV2/HomePageOnboardingConfig.tsx
@@ -13,7 +13,6 @@ export const V2_HOME_PAGE_DISCOVER_ID = 'v2-home-page-discover';
 export const V2_HOME_PAGE_ANNOUNCEMENTS_ID = 'v2-home-page-announcements';
 export const V2_HOME_PAGE_PERSONAL_SIDEBAR_ID = 'v2-home-page-personal-sidebar';
 export const V2_HOME_PAGE_PENDING_TASKS_ID = 'v2-home-page-pending-tasks';
-export const V2_HOME_PAGE_LEARNING_CENTER_ID = 'v2-home-page-learning-center';
 export const GLOBAL_WELCOME_TO_ACRYL_ID = 'global-welcome-to-acryl';
 
 const HomePageOnboardingConfig: OnboardingStep[] = [
diff --git a/datahub-web-react/src/app/onboarding/useShouldSkipOnboardingTour.ts b/datahub-web-react/src/app/onboarding/useShouldSkipOnboardingTour.ts
index 78e0baa0598ff9..112c82bf65e993 100644
--- a/datahub-web-react/src/app/onboarding/useShouldSkipOnboardingTour.ts
+++ b/datahub-web-react/src/app/onboarding/useShouldSkipOnboardingTour.ts
@@ -1,5 +1,5 @@
 // this key is used in commands.js to turn off onboarding tours in cypress tests
-export const SKIP_ONBOARDING_TOUR_KEY = 'skipOnboardingTour';
+const SKIP_ONBOARDING_TOUR_KEY = 'skipOnboardingTour';
 
 export default function useShouldSkipOnboardingTour() {
     const shouldSkipOnboardingTour = localStorage.getItem(SKIP_ONBOARDING_TOUR_KEY);
diff --git a/datahub-web-react/src/app/onboarding/utils.tsx b/datahub-web-react/src/app/onboarding/utils.tsx
index 8431d419c78556..85ea34356ae80d 100644
--- a/datahub-web-react/src/app/onboarding/utils.tsx
+++ b/datahub-web-react/src/app/onboarding/utils.tsx
@@ -43,7 +43,7 @@ function hasStepBeenSeen(stepId: string, userUrn: string, educationSteps: StepSt
     return educationSteps.some((step) => step.id === convertedStepId);
 }
 
-export function hasSeenPrerequisiteStepIfExists(
+function hasSeenPrerequisiteStepIfExists(
     step: OnboardingStep,
     userUrn: string,
     educationSteps: StepStateResult[],
diff --git a/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx b/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx
index c5fae16808403a..da04718d65826f 100644
--- a/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx
+++ b/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx
@@ -81,7 +81,7 @@ const SelectContainer = styled.div`
     align-items: flex-start;
 `;
 
-export enum StatusType {
+enum StatusType {
     ALL,
     ACTIVE,
     INACTIVE,
diff --git a/datahub-web-react/src/app/permissions/policy/PolicyListItem.tsx b/datahub-web-react/src/app/permissions/policy/PolicyListItem.tsx
deleted file mode 100644
index a43adb13072dc6..00000000000000
--- a/datahub-web-react/src/app/permissions/policy/PolicyListItem.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Button, List, Space, Tag, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-import { Policy, PolicyState } from '@types';
-
-type Props = {
-    policy: Policy;
-    onView: () => void;
-};
-
-const inactiveTextColor = ANTD_GRAY[7];
-
-const PolicyItemContainer = styled.div`
-    display: flex;
-    justify-content: space-between;
-`;
-
-export default function PolicyListItem({ policy, onView }: Props) {
-    const isActive = policy.state === PolicyState.Active;
-    const isEditable = policy.editable;
-    const titleColor = isEditable ? undefined : inactiveTextColor;
-
-    const policyPreview = () => {
-        return (
-            <PolicyItemContainer style={{ width: '100%', paddingTop: 20, paddingBottom: 20 }}>
-                <Space direction="vertical" align="start">
-                    <Button type="text" style={{ padding: 0 }} onClick={onView}>
-                        <Typography.Title level={4} style={{ color: titleColor }}>
-                            {policy.name}
-                        </Typography.Title>
-                    </Button>
-                    <Typography.Text type="secondary">{policy.description}</Typography.Text>
-                </Space>
-                <Space direction="vertical" align="end">
-                    <Typography.Title level={5}>State</Typography.Title>
-                    <Tag style={{ margin: 0 }} color={isActive ? 'green' : 'red'}>
-                        {policy.state}
-                    </Tag>
-                </Space>
-            </PolicyItemContainer>
-        );
-    };
-    return <List.Item>{policyPreview()}</List.Item>;
-}
diff --git a/datahub-web-react/src/app/permissions/policy/policyUtils.ts b/datahub-web-react/src/app/permissions/policy/policyUtils.ts
index 30322039e346f7..072e41e237c2bf 100644
--- a/datahub-web-react/src/app/permissions/policy/policyUtils.ts
+++ b/datahub-web-react/src/app/permissions/policy/policyUtils.ts
@@ -83,7 +83,7 @@ export const mapResourceTypeToPrivileges = (
     return [];
 };
 
-export const createCriterion = (
+const createCriterion = (
     resourceFieldType: string,
     fieldValues: Array<PolicyMatchCriterionValue>,
 ): PolicyMatchCriterion => ({
diff --git a/datahub-web-react/src/app/preview/DefaultPreviewCard.tsx b/datahub-web-react/src/app/preview/DefaultPreviewCard.tsx
deleted file mode 100644
index a9ec5ba0e2def7..00000000000000
--- a/datahub-web-react/src/app/preview/DefaultPreviewCard.tsx
+++ /dev/null
@@ -1,419 +0,0 @@
-import { Divider, Tooltip, Typography } from 'antd';
-import React, { ReactNode, useState } from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { PreviewType } from '@app/entity/Entity';
-import { useEntityData } from '@app/entity/shared/EntityContext';
-import ExternalUrlButton from '@app/entity/shared/ExternalUrlButton';
-import { usePreviewData } from '@app/entity/shared/PreviewContext';
-import { DeprecationPill } from '@app/entity/shared/components/styled/DeprecationPill';
-import { ExpandedActorGroup } from '@app/entity/shared/components/styled/ExpandedActorGroup';
-import NoMarkdownViewer from '@app/entity/shared/components/styled/StripMarkdownText';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import EntityCount from '@app/entity/shared/containers/profile/header/EntityCount';
-import { EntityHealth } from '@app/entity/shared/containers/profile/header/EntityHealth';
-import PlatformContentView from '@app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView';
-import StructuredPropertyBadge from '@app/entity/shared/containers/profile/header/StructuredPropertyBadge';
-import { getNumberWithOrdinal } from '@app/entity/shared/utils';
-import EntityPaths from '@app/preview/EntityPaths/EntityPaths';
-import { getUniqueOwners } from '@app/preview/utils';
-import SearchTextHighlighter from '@app/search/matches/SearchTextHighlighter';
-import { DataProductLink } from '@app/shared/tags/DataProductLink';
-import TagTermGroup from '@app/shared/tags/TagTermGroup';
-import useContentTruncation from '@app/shared/useContentTruncation';
-import DataProcessInstanceInfo from '@src/app/preview/DataProcessInstanceInfo';
-
-import {
-    Container,
-    CorpUser,
-    DataProcessRunEvent,
-    DataProduct,
-    Dataset,
-    Deprecation,
-    Domain,
-    Entity,
-    EntityPath,
-    GlobalTags,
-    GlossaryTerms,
-    Health,
-    Maybe,
-    Owner,
-    ParentContainersResult,
-    SearchInsight,
-} from '@types';
-
-const PreviewContainer = styled.div`
-    display: flex;
-    width: 100%;
-    justify-content: space-between;
-    align-items: center;
-`;
-
-const LeftColumn = styled.div<{ expandWidth: boolean }>`
-    max-width: ${(props) => (props.expandWidth ? '100%' : '60%')};
-`;
-
-const RightColumn = styled.div`
-    max-width: 40%;
-    display: flex;
-`;
-
-const TitleContainer = styled.div`
-    margin-bottom: 5px;
-    line-height: 30px;
-
-    .entityCount {
-        margin-bottom: 2px;
-    }
-`;
-
-const EntityTitleContainer = styled.div`
-    display: flex;
-    align-items: center;
-    gap: 8px;
-`;
-
-const EntityTitle = styled(Typography.Text)<{ $titleSizePx?: number }>`
-    display: block;
-    &&&:hover {
-        text-decoration: underline;
-    }
-
-    &&& {
-        font-size: ${(props) => props.$titleSizePx || 16}px;
-        font-weight: 600;
-        vertical-align: middle;
-    }
-`;
-
-const CardEntityTitle = styled(EntityTitle)`
-    max-width: 350px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-`;
-
-const PlatformText = styled(Typography.Text)`
-    font-size: 12px;
-    line-height: 20px;
-    font-weight: 700;
-    color: ${ANTD_GRAY[7]};
-`;
-
-const PlatformDivider = styled.div`
-    display: inline-block;
-    padding-left: 10px;
-    margin-right: 10px;
-    border-right: 1px solid ${ANTD_GRAY[4]};
-    height: 21px;
-    vertical-align: text-top;
-`;
-
-const DescriptionContainer = styled.div`
-    color: ${ANTD_GRAY[7]};
-    margin-bottom: 8px;
-`;
-
-const TagContainer = styled.div`
-    display: inline-flex;
-    margin-left: 0px;
-    margin-top: 3px;
-    flex-wrap: wrap;
-    margin-right: 8px;
-`;
-
-const TagSeparator = styled.div`
-    margin: 2px 8px 0 0;
-    height: 17px;
-    border-right: 1px solid #cccccc;
-`;
-
-const InsightContainer = styled.div`
-    margin-top: 12px;
-`;
-
-const InsightsText = styled(Typography.Text)`
-    font-size: 12px;
-    line-height: 20px;
-    font-weight: 600;
-    color: ${ANTD_GRAY[7]};
-`;
-
-const InsightIconContainer = styled.span`
-    margin-right: 4px;
-`;
-
-const UserListContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: right;
-    margin-right: 8px;
-`;
-
-const UserListDivider = styled(Divider)`
-    padding: 4px;
-    height: auto;
-`;
-
-const UserListTitle = styled(Typography.Text)`
-    text-align: right;
-    margin-bottom: 10px;
-    padding-right: 12px;
-`;
-
-interface Props {
-    name: string;
-    urn: string;
-    logoUrl?: string;
-    logoComponent?: JSX.Element;
-    url: string;
-    description?: string;
-    type?: string;
-    typeIcon?: JSX.Element;
-    platform?: string;
-    platformInstanceId?: string;
-    platforms?: Maybe<string | undefined>[];
-    logoUrls?: Maybe<string | undefined>[];
-    qualifier?: string | null;
-    tags?: GlobalTags;
-    owners?: Array<Owner> | null;
-    deprecation?: Deprecation | null;
-    topUsers?: Array<CorpUser> | null;
-    externalUrl?: string | null;
-    entityTitleSuffix?: React.ReactNode;
-    subHeader?: React.ReactNode;
-    snippet?: React.ReactNode;
-    insights?: Array<SearchInsight> | null;
-    glossaryTerms?: GlossaryTerms;
-    container?: Container;
-    domain?: Domain | undefined | null;
-    dataProduct?: DataProduct | undefined | null;
-    entityCount?: number;
-    displayAssetCount?: boolean;
-    dataTestID?: string;
-    titleSizePx?: number;
-    onClick?: () => void;
-    // this is provided by the impact analysis view. it is used to display
-    // how the listed node is connected to the source node
-    degree?: number;
-    parentContainers?: ParentContainersResult | null;
-    parentEntities?: Entity[] | null;
-    previewType?: Maybe<PreviewType>;
-    paths?: EntityPath[];
-    health?: Health[];
-    parentDataset?: Dataset;
-    lastRunEvent?: DataProcessRunEvent | null;
-}
-
-export default function DefaultPreviewCard({
-    name,
-    urn,
-    logoUrl,
-    logoComponent,
-    url,
-    description,
-    type,
-    typeIcon,
-    platform,
-    platformInstanceId,
-    // TODO(Gabe): support qualifier in the new preview card
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    qualifier,
-    tags,
-    owners,
-    topUsers,
-    subHeader,
-    snippet,
-    insights,
-    glossaryTerms,
-    domain,
-    dataProduct,
-    container,
-    deprecation,
-    entityCount,
-    displayAssetCount,
-    titleSizePx,
-    dataTestID,
-    externalUrl,
-    entityTitleSuffix,
-    onClick,
-    degree,
-    parentContainers,
-    parentEntities,
-    platforms,
-    logoUrls,
-    previewType,
-    paths,
-    health,
-    parentDataset,
-    lastRunEvent,
-}: Props) {
-    // sometimes these lists will be rendered inside an entity container (for example, in the case of impact analysis)
-    // in those cases, we may want to enrich the preview w/ context about the container entity
-    const { entityData } = useEntityData();
-    const previewData = usePreviewData();
-    const insightViews: Array<ReactNode> = [
-        ...(insights?.map((insight) => (
-            <>
-                <InsightIconContainer>{insight.icon}</InsightIconContainer>
-                <InsightsText>{insight.text}</InsightsText>
-            </>
-        )) || []),
-    ];
-    const hasGlossaryTerms = !!glossaryTerms?.terms?.length;
-    const hasTags = !!tags?.tags?.length;
-    if (snippet) {
-        insightViews.push(snippet);
-    }
-    const [descriptionExpanded, setDescriptionExpanded] = useState(false);
-
-    const { contentRef, isContentTruncated } = useContentTruncation(container);
-
-    const onPreventMouseDown = (event) => {
-        event.preventDefault();
-        event.stopPropagation();
-    };
-
-    const shouldShowRightColumn =
-        (topUsers && topUsers.length > 0) ||
-        (owners && owners.length > 0) ||
-        lastRunEvent?.timestampMillis ||
-        lastRunEvent?.durationMillis ||
-        lastRunEvent?.result?.resultType;
-    const uniqueOwners = getUniqueOwners(owners);
-
-    return (
-        <PreviewContainer data-testid={dataTestID} onMouseDown={onPreventMouseDown}>
-            <LeftColumn key="left-column" expandWidth={!shouldShowRightColumn}>
-                <TitleContainer>
-                    <PlatformContentView
-                        platformName={platform}
-                        platformLogoUrl={logoUrl}
-                        platformNames={platforms}
-                        platformLogoUrls={logoUrls}
-                        entityLogoComponent={logoComponent}
-                        instanceId={platformInstanceId}
-                        typeIcon={typeIcon}
-                        entityType={type}
-                        parentContainers={parentContainers?.containers}
-                        parentEntities={parentEntities}
-                        parentContainersRef={contentRef}
-                        areContainersTruncated={isContentTruncated}
-                        parentDataset={parentDataset}
-                    />
-                    <EntityTitleContainer>
-                        <Link to={url}>
-                            {previewType === PreviewType.HOVER_CARD ? (
-                                <CardEntityTitle onClick={onClick} $titleSizePx={titleSizePx}>
-                                    {name || ' '}
-                                </CardEntityTitle>
-                            ) : (
-                                <EntityTitle onClick={onClick} $titleSizePx={titleSizePx}>
-                                    <SearchTextHighlighter field="name" text={name || ''} />
-                                </EntityTitle>
-                            )}
-                        </Link>
-                        {deprecation?.deprecated && (
-                            <DeprecationPill deprecation={deprecation} urn="" showUndeprecate={false} />
-                        )}
-                        {health && health.length > 0 ? <EntityHealth baseUrl={url} health={health} /> : null}
-                        <StructuredPropertyBadge structuredProperties={previewData?.structuredProperties} />
-                        {externalUrl && (
-                            <ExternalUrlButton
-                                externalUrl={externalUrl}
-                                platformName={platform}
-                                entityUrn={urn}
-                                entityType={type}
-                            />
-                        )}
-                        {entityTitleSuffix}
-                    </EntityTitleContainer>
-                    {degree !== undefined && degree !== null && (
-                        <Tooltip
-                            title={`This entity is a ${getNumberWithOrdinal(degree)} degree connection to ${
-                                entityData?.name || 'the source entity'
-                            }`}
-                        >
-                            <PlatformText>{getNumberWithOrdinal(degree)}</PlatformText>
-                        </Tooltip>
-                    )}
-                    {!!degree && entityCount && <PlatformDivider />}
-                    <EntityCount entityCount={entityCount} displayAssetsText={displayAssetCount} />
-                </TitleContainer>
-                {paths && paths.length > 0 && <EntityPaths paths={paths} resultEntityUrn={urn || ''} />}
-                {description && description.length > 0 && (
-                    <DescriptionContainer>
-                        <NoMarkdownViewer
-                            limit={descriptionExpanded ? undefined : 250}
-                            shouldWrap={previewType === PreviewType.HOVER_CARD}
-                            readMore={
-                                previewType === PreviewType.HOVER_CARD ? (
-                                    <Typography.Link
-                                        onClickCapture={(e) => {
-                                            onPreventMouseDown(e);
-                                            setDescriptionExpanded(!descriptionExpanded);
-                                        }}
-                                    >
-                                        {descriptionExpanded ? 'Show Less' : 'Show More'}
-                                    </Typography.Link>
-                                ) : undefined
-                            }
-                            customRender={(text) => <SearchTextHighlighter field="description" text={text} />}
-                        >
-                            {description}
-                        </NoMarkdownViewer>
-                    </DescriptionContainer>
-                )}
-                {(dataProduct || domain || hasGlossaryTerms || hasTags) && (
-                    <TagContainer>
-                        {/* if there's a domain and dataProduct, show dataProduct */}
-                        {dataProduct && <DataProductLink dataProduct={dataProduct} />}
-                        {!dataProduct && domain && <TagTermGroup domain={domain} maxShow={3} />}
-                        {(dataProduct || domain) && hasGlossaryTerms && <TagSeparator />}
-                        {hasGlossaryTerms && <TagTermGroup uneditableGlossaryTerms={glossaryTerms} maxShow={3} />}
-                        {((hasGlossaryTerms && hasTags) || ((dataProduct || domain) && hasTags)) && <TagSeparator />}
-                        {hasTags && <TagTermGroup uneditableTags={tags} maxShow={3} />}
-                    </TagContainer>
-                )}
-                {subHeader}
-                {insightViews.length > 0 && (
-                    <InsightContainer>
-                        {insightViews.map((insightView, index) => (
-                            <span>
-                                {insightView}
-                                {index < insightViews.length - 1 && <PlatformDivider />}
-                            </span>
-                        ))}
-                    </InsightContainer>
-                )}
-            </LeftColumn>
-            {shouldShowRightColumn && (
-                <RightColumn key="right-column">
-                    <DataProcessInstanceInfo timestampMillis={lastRunEvent?.timestampMillis || 0} {...lastRunEvent} />
-                    {topUsers && topUsers?.length > 0 && (
-                        <>
-                            <UserListContainer>
-                                <UserListTitle strong>Top Users</UserListTitle>
-                                <div>
-                                    <ExpandedActorGroup actors={topUsers} max={2} />
-                                </div>
-                            </UserListContainer>
-                        </>
-                    )}
-                    {(topUsers?.length || 0) > 0 && (uniqueOwners?.length || 0) > 0 && (
-                        <UserListDivider type="vertical" />
-                    )}
-                    {uniqueOwners && uniqueOwners?.length > 0 && (
-                        <UserListContainer>
-                            <UserListTitle strong>Owners</UserListTitle>
-                            <div>
-                                <ExpandedActorGroup actors={uniqueOwners.map((owner) => owner.owner)} max={2} />
-                            </div>
-                        </UserListContainer>
-                    )}
-                </RightColumn>
-            )}
-        </PreviewContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/preview/ERModelSidebarPreviewCard.tsx b/datahub-web-react/src/app/preview/ERModelSidebarPreviewCard.tsx
deleted file mode 100644
index afb582486740b0..00000000000000
--- a/datahub-web-react/src/app/preview/ERModelSidebarPreviewCard.tsx
+++ /dev/null
@@ -1,256 +0,0 @@
-import { Typography } from 'antd';
-import React, { useState } from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { PreviewType } from '@app/entity/Entity';
-import { usePreviewData } from '@app/entity/shared/PreviewContext';
-import { ExpandedActorGroup } from '@app/entity/shared/components/styled/ExpandedActorGroup';
-import NoMarkdownViewer from '@app/entity/shared/components/styled/StripMarkdownText';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import EntityCount from '@app/entity/shared/containers/profile/header/EntityCount';
-import PlatformContentView from '@app/entity/shared/containers/profile/header/PlatformContent/PlatformContentView';
-import StructuredPropertyBadge from '@app/entity/shared/containers/profile/header/StructuredPropertyBadge';
-import EntityPaths from '@app/preview/EntityPaths/EntityPaths';
-import { getUniqueOwners } from '@app/preview/utils';
-import SearchTextHighlighter from '@app/search/matches/SearchTextHighlighter';
-import TagTermGroup from '@app/shared/tags/TagTermGroup';
-import useContentTruncation from '@app/shared/useContentTruncation';
-
-import {
-    Container,
-    Domain,
-    EntityPath,
-    ErModelRelationshipCardinality,
-    GlobalTags,
-    GlossaryTerms,
-    Maybe,
-    Owner,
-} from '@types';
-
-const PreviewContainer = styled.div`
-    display: flex;
-    width: 100%;
-    justify-content: space-between;
-    align-items: center;
-`;
-
-const LeftColumn = styled.div<{ expandWidth: boolean }>`
-    max-width: ${(props) => (props.expandWidth ? '100%' : '60%')};
-`;
-
-const RightColumn = styled.div`
-    max-width: 40%;
-    display: flex;
-`;
-
-const TitleContainer = styled.div`
-    margin-bottom: 5px;
-    line-height: 30px;
-
-    .entityCount {
-        margin-bottom: 2px;
-    }
-`;
-
-const EntityTitleContainer = styled.div`
-    display: flex;
-    align-items: center;
-    gap: 8px;
-`;
-
-const EntityTitle = styled(Typography.Text)<{ $titleSizePx?: number }>`
-    display: block;
-    &&&:hover {
-        text-decoration: underline;
-    }
-
-    &&& {
-        font-size: ${(props) => props.$titleSizePx || 16}px;
-        font-weight: 600;
-        vertical-align: middle;
-    }
-`;
-
-const PlatformDivider = styled.div`
-    display: inline-block;
-    padding-left: 10px;
-    margin-right: 10px;
-    border-right: 1px solid ${ANTD_GRAY[4]};
-    height: 21px;
-    vertical-align: text-top;
-`;
-
-const DescriptionContainer = styled.div`
-    color: ${ANTD_GRAY[7]};
-    margin-bottom: 8px;
-`;
-
-const TagContainer = styled.div`
-    display: inline-flex;
-    margin-left: 0px;
-    margin-top: 3px;
-    flex-wrap: wrap;
-    margin-right: 8px;
-`;
-
-const TagSeparator = styled.div`
-    margin: 2px 8px 0 0;
-    height: 17px;
-    border-right: 1px solid #cccccc;
-`;
-
-const UserListContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: right;
-    margin-right: 8px;
-`;
-
-const UserListTitle = styled(Typography.Text)`
-    text-align: right;
-    margin-bottom: 10px;
-    padding-right: 12px;
-`;
-
-interface Props {
-    name: string;
-    urn: string;
-    logoComponent?: JSX.Element;
-    url: string;
-    description?: string;
-    type?: string;
-    typeIcon?: JSX.Element;
-    tags?: GlobalTags;
-    owners?: Array<Owner> | null;
-    glossaryTerms?: GlossaryTerms;
-    container?: Container;
-    domain?: Domain | undefined | null;
-    entityCount?: number;
-    displayAssetCount?: boolean;
-    dataTestID?: string;
-    titleSizePx?: number;
-    onClick?: () => void;
-    previewType?: Maybe<PreviewType>;
-    paths?: EntityPath[];
-    cardinality?: ErModelRelationshipCardinality | null;
-}
-
-export default function ERModelSidebarPreviewCard({
-    name,
-    urn,
-    logoComponent,
-    url,
-    description,
-    type,
-    typeIcon,
-    tags,
-    owners,
-    glossaryTerms,
-    domain,
-    container,
-    entityCount,
-    displayAssetCount,
-    titleSizePx,
-    dataTestID,
-    onClick,
-    previewType,
-    paths,
-    cardinality,
-}: Props) {
-    const previewData = usePreviewData();
-    const hasGlossaryTerms = !!glossaryTerms?.terms?.length;
-    const hasTags = !!tags?.tags?.length;
-    const [descriptionExpanded, setDescriptionExpanded] = useState(false);
-
-    const { contentRef, isContentTruncated } = useContentTruncation(container);
-
-    const onPreventMouseDown = (event) => {
-        event.preventDefault();
-        event.stopPropagation();
-    };
-
-    const shouldShowRightColumn = owners && owners.length > 0;
-    const uniqueOwners = getUniqueOwners(owners);
-
-    return (
-        <PreviewContainer data-testid={dataTestID} onMouseDown={onPreventMouseDown}>
-            <LeftColumn key="left-column" expandWidth={!shouldShowRightColumn}>
-                <TitleContainer>
-                    <PlatformContentView
-                        entityLogoComponent={logoComponent}
-                        typeIcon={typeIcon}
-                        entityType={type}
-                        parentContainersRef={contentRef}
-                        areContainersTruncated={isContentTruncated}
-                    />
-                    <EntityTitleContainer>
-                        <Link to={url}>
-                            (
-                            <EntityTitle onClick={onClick} $titleSizePx={titleSizePx}>
-                                <SearchTextHighlighter field="name" text={name || ''} />
-                            </EntityTitle>
-                            )
-                        </Link>
-                        <StructuredPropertyBadge structuredProperties={previewData?.structuredProperties} />
-                    </EntityTitleContainer>
-                    {entityCount && <PlatformDivider />}
-                    <EntityCount entityCount={entityCount} displayAssetsText={displayAssetCount} />
-                </TitleContainer>
-                {paths && paths.length > 0 && <EntityPaths paths={paths} resultEntityUrn={urn || ''} />}
-                {description && description.length > 0 && (
-                    <DescriptionContainer>
-                        <NoMarkdownViewer
-                            limit={descriptionExpanded ? undefined : 250}
-                            shouldWrap={previewType === PreviewType.HOVER_CARD}
-                            readMore={
-                                previewType === PreviewType.HOVER_CARD ? (
-                                    <Typography.Link
-                                        onClickCapture={(e) => {
-                                            onPreventMouseDown(e);
-                                            setDescriptionExpanded(!descriptionExpanded);
-                                        }}
-                                    >
-                                        {descriptionExpanded ? 'Show Less' : 'Show More'}
-                                    </Typography.Link>
-                                ) : undefined
-                            }
-                            customRender={(text) => <SearchTextHighlighter field="description" text={text} />}
-                        >
-                            {description}
-                        </NoMarkdownViewer>
-                    </DescriptionContainer>
-                )}
-                {cardinality && (
-                    <DescriptionContainer>
-                        <span>
-                            <b>Cardinality: </b>
-                            {cardinality}
-                        </span>
-                    </DescriptionContainer>
-                )}
-                {(hasGlossaryTerms || hasTags) && (
-                    <TagContainer>
-                        {domain && <TagTermGroup domain={domain} maxShow={3} />}
-                        {domain && hasGlossaryTerms && <TagSeparator />}
-                        {hasGlossaryTerms && <TagTermGroup uneditableGlossaryTerms={glossaryTerms} maxShow={3} />}
-                        {((hasGlossaryTerms && hasTags) || (domain && hasTags)) && <TagSeparator />}
-                        {hasTags && <TagTermGroup uneditableTags={tags} maxShow={3} />}
-                    </TagContainer>
-                )}
-            </LeftColumn>
-            {shouldShowRightColumn && (
-                <RightColumn key="right-column">
-                    {uniqueOwners && uniqueOwners?.length > 0 && (
-                        <UserListContainer>
-                            <UserListTitle strong>Owners</UserListTitle>
-                            <div>
-                                <ExpandedActorGroup actors={uniqueOwners.map((owner) => owner.owner)} max={2} />
-                            </div>
-                        </UserListContainer>
-                    )}
-                </RightColumn>
-            )}
-        </PreviewContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/preview/EntityPaths/ColumnPathsText.tsx b/datahub-web-react/src/app/preview/EntityPaths/ColumnPathsText.tsx
deleted file mode 100644
index a98b1a10d186a4..00000000000000
--- a/datahub-web-react/src/app/preview/EntityPaths/ColumnPathsText.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Tooltip } from 'antd';
-import React, { useContext } from 'react';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { LineageTabContext } from '@app/entity/shared/tabs/Lineage/LineageTabContext';
-import ColumnsRelationshipText from '@app/preview/EntityPaths/ColumnsRelationshipText';
-import DisplayedColumns from '@app/preview/EntityPaths/DisplayedColumns';
-
-import { EntityPath, EntityType, LineageDirection, SchemaFieldEntity } from '@types';
-
-export const ResultText = styled.span`
-    &:hover {
-        border-bottom: 1px solid black;
-        cursor: pointer;
-    }
-`;
-
-const DescriptionWrapper = styled.span`
-    color: ${ANTD_GRAY[8]};
-`;
-
-export function getDisplayedColumns(paths: EntityPath[], resultEntityUrn: string) {
-    return paths
-        .map((path) =>
-            path.path?.filter(
-                (entity) =>
-                    entity?.type === EntityType.SchemaField &&
-                    (entity as SchemaFieldEntity).parent.urn === resultEntityUrn,
-            ),
-        )
-        .flat();
-}
-
-interface Props {
-    paths: EntityPath[];
-    resultEntityUrn: string;
-    openModal: () => void;
-}
-
-export default function ColumnPathsText({ paths, resultEntityUrn, openModal }: Props) {
-    const { lineageDirection } = useContext(LineageTabContext);
-
-    const displayedColumns = getDisplayedColumns(paths, resultEntityUrn);
-
-    return (
-        <>
-            <DescriptionWrapper>
-                {lineageDirection === LineageDirection.Downstream ? 'Downstream' : 'Upstream'} column
-                {displayedColumns.length > 1 && 's'}
-            </DescriptionWrapper>
-            : &nbsp;
-            <ResultText onClick={openModal}>
-                <Tooltip
-                    title={
-                        <span>
-                            Click to see column path{paths.length > 1 && 's'} from{' '}
-                            <ColumnsRelationshipText displayedColumns={displayedColumns} />
-                        </span>
-                    }
-                >
-                    <span>
-                        <DisplayedColumns displayedColumns={displayedColumns} />
-                    </span>
-                </Tooltip>
-            </ResultText>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/preview/EntityPaths/ColumnsRelationshipText.tsx b/datahub-web-react/src/app/preview/EntityPaths/ColumnsRelationshipText.tsx
deleted file mode 100644
index 0758a959b734d7..00000000000000
--- a/datahub-web-react/src/app/preview/EntityPaths/ColumnsRelationshipText.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Maybe } from 'graphql/jsutils/Maybe';
-import React, { useContext } from 'react';
-import styled from 'styled-components/macro';
-
-import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils';
-import { LineageTabContext } from '@app/entity/shared/tabs/Lineage/LineageTabContext';
-import { decodeSchemaField } from '@app/lineage/utils/columnLineageUtils';
-import DisplayedColumns from '@app/preview/EntityPaths/DisplayedColumns';
-
-import { Entity, LineageDirection } from '@types';
-
-const ColumnNameWrapper = styled.span<{ isBlack?: boolean }>`
-    font-family: 'Roboto Mono', monospace;
-    font-weight: bold;
-    ${(props) => props.isBlack && 'color: black;'}
-`;
-
-interface Props {
-    displayedColumns: (Maybe<Entity> | undefined)[];
-}
-
-export default function ColumnsRelationshipText({ displayedColumns }: Props) {
-    const { selectedColumn, lineageDirection } = useContext(LineageTabContext);
-
-    const displayedFieldPath = decodeSchemaField(downgradeV2FieldPath(selectedColumn) || '');
-
-    return (
-        <>
-            {lineageDirection === LineageDirection.Downstream ? (
-                <span>
-                    <ColumnNameWrapper>{displayedFieldPath}</ColumnNameWrapper> to&nbsp;
-                    <DisplayedColumns displayedColumns={displayedColumns} />
-                </span>
-            ) : (
-                <span>
-                    <DisplayedColumns displayedColumns={displayedColumns} /> to{' '}
-                    <ColumnNameWrapper>{displayedFieldPath}</ColumnNameWrapper>
-                </span>
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/preview/EntityPaths/DisplayedColumns.tsx b/datahub-web-react/src/app/preview/EntityPaths/DisplayedColumns.tsx
deleted file mode 100644
index e900986f6c6f9d..00000000000000
--- a/datahub-web-react/src/app/preview/EntityPaths/DisplayedColumns.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Maybe } from 'graphql/jsutils/Maybe';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils';
-import { decodeSchemaField } from '@app/lineage/utils/columnLineageUtils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Entity, EntityType, SchemaFieldEntity } from '@types';
-
-const ColumnNameWrapper = styled.span<{ isBlack?: boolean }>`
-    font-family: 'Roboto Mono', monospace;
-    font-weight: bold;
-    ${(props) => props.isBlack && 'color: black;'}
-`;
-
-interface Props {
-    displayedColumns: (Maybe<Entity> | undefined)[];
-}
-
-export default function DisplayedColumns({ displayedColumns }: Props) {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <span>
-            {displayedColumns.map((entity, index) => {
-                if (entity) {
-                    return (
-                        <ColumnNameWrapper>
-                            {entity.type === EntityType.SchemaField
-                                ? decodeSchemaField(downgradeV2FieldPath((entity as SchemaFieldEntity).fieldPath) || '')
-                                : entityRegistry.getDisplayName(entity.type, entity)}
-                            {index !== displayedColumns.length - 1 && ', '}
-                        </ColumnNameWrapper>
-                    );
-                }
-                return null;
-            })}
-        </span>
-    );
-}
diff --git a/datahub-web-react/src/app/preview/EntityPaths/EntityPaths.tsx b/datahub-web-react/src/app/preview/EntityPaths/EntityPaths.tsx
deleted file mode 100644
index cf34142ed3be2f..00000000000000
--- a/datahub-web-react/src/app/preview/EntityPaths/EntityPaths.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, { useContext, useState } from 'react';
-import styled from 'styled-components/macro';
-
-import { LineageTabContext } from '@app/entity/shared/tabs/Lineage/LineageTabContext';
-import ColumnPathsText from '@app/preview/EntityPaths/ColumnPathsText';
-import EntityPathsModal from '@app/preview/EntityPaths/EntityPathsModal';
-
-import { EntityPath } from '@types';
-
-const EntityPathsWrapper = styled.div`
-    margin-bottom: 5px;
-`;
-
-interface Props {
-    paths: EntityPath[];
-    resultEntityUrn: string;
-}
-
-export default function EntityPaths({ paths, resultEntityUrn }: Props) {
-    const { isColumnLevelLineage, selectedColumn } = useContext(LineageTabContext);
-    const [isPathsModalVisible, setIsPathsModalVisible] = useState(false);
-
-    if (!isColumnLevelLineage || !selectedColumn) return null;
-
-    return (
-        <>
-            <EntityPathsWrapper>
-                <ColumnPathsText
-                    paths={paths}
-                    resultEntityUrn={resultEntityUrn}
-                    openModal={() => setIsPathsModalVisible(true)}
-                />
-            </EntityPathsWrapper>
-            {isPathsModalVisible && (
-                <EntityPathsModal
-                    paths={paths}
-                    resultEntityUrn={resultEntityUrn}
-                    hideModal={() => setIsPathsModalVisible(false)}
-                />
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/preview/EntityPaths/EntityPathsModal.tsx b/datahub-web-react/src/app/preview/EntityPaths/EntityPathsModal.tsx
deleted file mode 100644
index 00f240f76f8cbe..00000000000000
--- a/datahub-web-react/src/app/preview/EntityPaths/EntityPathsModal.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Modal } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { getDisplayedColumns } from '@app/preview/EntityPaths/ColumnPathsText';
-import ColumnsRelationshipText from '@app/preview/EntityPaths/ColumnsRelationshipText';
-import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList';
-
-import { Entity, EntityPath } from '@types';
-
-const StyledModal = styled(Modal)`
-    width: 70vw;
-    max-width: 850px;
-`;
-
-const PathWrapper = styled.div`
-    display: inline-block;
-    margin: 15px 0 15px -4px;
-    padding: 20px;
-    border: 1px solid ${ANTD_GRAY[4]};
-    border-radius: 8px;
-    box-shadow: 1px 1px 12px 4px #0000000d;
-    width: 100%;
-`;
-
-const Header = styled.div`
-    color: ${ANTD_GRAY[8]};
-    font-size: 16px;
-    padding-top: 8px;
-`;
-
-interface Props {
-    paths: EntityPath[];
-    resultEntityUrn: string;
-    hideModal: () => void;
-}
-
-export default function EntityPathsModal({ paths, resultEntityUrn, hideModal }: Props) {
-    const displayedColumns = getDisplayedColumns(paths, resultEntityUrn);
-
-    return (
-        <StyledModal
-            data-testid="entity-paths-modal"
-            title={
-                <Header>
-                    Column path{paths.length > 1 && 's'} from{' '}
-                    <ColumnsRelationshipText displayedColumns={displayedColumns} />
-                </Header>
-            }
-            width="75vw"
-            open
-            onCancel={hideModal}
-            onOk={hideModal}
-            footer={null}
-            bodyStyle={{ padding: '16px 24px' }}
-        >
-            {paths.map((path) => (
-                <PathWrapper>
-                    <CompactEntityNameList entities={path.path as Entity[]} showArrows />
-                </PathWrapper>
-            ))}{' '}
-        </StyledModal>
-    );
-}
diff --git a/datahub-web-react/src/app/preview/_tests_/ERModelSidebarPreviewCard.test.tsx b/datahub-web-react/src/app/preview/_tests_/ERModelSidebarPreviewCard.test.tsx
deleted file mode 100644
index 82a679f3bda496..00000000000000
--- a/datahub-web-react/src/app/preview/_tests_/ERModelSidebarPreviewCard.test.tsx
+++ /dev/null
@@ -1,188 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { fireEvent, render, screen } from '@testing-library/react';
-import React from 'react';
-
-import { PreviewType } from '@app/entity/Entity';
-import ERModelSidebarPreviewCard from '@app/preview/ERModelSidebarPreviewCard';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-import {
-    Domain,
-    EntityType,
-    ErModelRelationshipCardinality,
-    GlobalTags,
-    GlossaryTermAssociation,
-    GlossaryTerms,
-    Owner,
-    OwnerType,
-    TagAssociation,
-} from '@types';
-
-const mockTags: GlobalTags = {
-    tags: [{ tag: { name: 'Tag1' } }, { tag: { name: 'Tag2' } }] as TagAssociation[],
-};
-
-const mockGlossaryTerms: GlossaryTerms = {
-    terms: [{ term: { name: 'GlossaryTerm1' } }, { term: { name: 'GlossaryTerm2' } }] as GlossaryTermAssociation[],
-};
-
-const mockDomain: Domain = {
-    urn: 'urn:li:domain:domain',
-    id: 'domain',
-    type: EntityType.Domain,
-};
-
-const mockOwners: Owner[] = [
-    {
-        owner: {
-            urn: 'urn:li:corpuser:owner1',
-            type: EntityType.CorpUser,
-        } as OwnerType,
-        associatedUrn: 'urn:li:corpuser:owner1',
-    },
-];
-
-const mockCardinality: ErModelRelationshipCardinality = ErModelRelationshipCardinality.OneN;
-const mockDescription =
-    'This is a sample description for testing purposes. This is a sample description for testing purposes. This is a sample description for testing purposes. This is a sample description for testing purposes. This is a sample description for testing purposes. This is a sample description for testing purposes. This is a sample description for testing purposes.';
-
-describe('ERModelSidebarPreviewCard', () => {
-    it('renders tags, glossary terms, and domain', () => {
-        render(
-            <MockedProvider>
-                <TestPageContainer>
-                    <ERModelSidebarPreviewCard
-                        name="Test Entity"
-                        urn="test-urn"
-                        url="/test-url"
-                        tags={mockTags}
-                        glossaryTerms={mockGlossaryTerms}
-                        domain={mockDomain}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        expect(screen.getByText('Tag1')).toBeInTheDocument();
-        expect(screen.getByText('Tag2')).toBeInTheDocument();
-        expect(screen.getByText('GlossaryTerm1')).toBeInTheDocument();
-        expect(screen.getByText('GlossaryTerm2')).toBeInTheDocument();
-        expect(screen.getByText('domain')).toBeInTheDocument();
-    });
-
-    it('renders owners in the right column when provided', () => {
-        render(
-            <MockedProvider>
-                <TestPageContainer>
-                    <ERModelSidebarPreviewCard name="Test Entity" urn="test-urn" url="/test-url" owners={mockOwners} />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        expect(screen.getByText('Owners')).toBeInTheDocument();
-    });
-
-    it('renders only tags when glossary terms and domain are absent', () => {
-        render(
-            <MockedProvider>
-                <TestPageContainer>
-                    <ERModelSidebarPreviewCard name="Test Entity" urn="test-urn" url="/test-url" tags={mockTags} />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        expect(screen.getByText('Tag1')).toBeInTheDocument();
-        expect(screen.getByText('Tag2')).toBeInTheDocument();
-        expect(screen.queryByText('GlossaryTerm1')).not.toBeInTheDocument();
-        expect(screen.queryByText('domain')).not.toBeInTheDocument();
-    });
-
-    it('renders only glossary terms when tags and domain are absent', () => {
-        render(
-            <MockedProvider>
-                <TestPageContainer>
-                    <ERModelSidebarPreviewCard
-                        name="Test Entity"
-                        urn="test-urn"
-                        url="/test-url"
-                        glossaryTerms={mockGlossaryTerms}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        expect(screen.getByText('GlossaryTerm1')).toBeInTheDocument();
-        expect(screen.getByText('GlossaryTerm2')).toBeInTheDocument();
-        expect(screen.queryByText('Tag1')).not.toBeInTheDocument();
-        expect(screen.queryByText('domain')).not.toBeInTheDocument();
-    });
-
-    it('renders cardinality when provided', () => {
-        render(
-            <MockedProvider>
-                <TestPageContainer>
-                    <ERModelSidebarPreviewCard
-                        name="Test Entity"
-                        urn="test-urn"
-                        url="/test-url"
-                        cardinality={mockCardinality}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        expect(screen.getByText('Cardinality:')).toBeInTheDocument();
-        expect(screen.getByText(ErModelRelationshipCardinality.OneN)).toBeInTheDocument();
-    });
-
-    it('renders nothing when no tags, glossary terms, domain, or cardinality are provided', () => {
-        render(
-            <MockedProvider>
-                <TestPageContainer>
-                    <ERModelSidebarPreviewCard name="Test Entity" urn="test-urn" url="/test-url" />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        expect(screen.queryByText('Tag1')).not.toBeInTheDocument();
-        expect(screen.queryByText('GlossaryTerm1')).not.toBeInTheDocument();
-        expect(screen.queryByText('domain')).not.toBeInTheDocument();
-        expect(screen.queryByText('Cardinality:')).not.toBeInTheDocument();
-    });
-
-    it('renders description and toggles "Show More" and "Show Less"', () => {
-        render(
-            <MockedProvider>
-                <TestPageContainer>
-                    <ERModelSidebarPreviewCard
-                        name="Test Entity"
-                        urn="test-urn"
-                        url="/test-url"
-                        description={mockDescription}
-                        previewType={PreviewType.HOVER_CARD}
-                    />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        // Verify the description is rendered
-        expect(
-            screen.getByText(
-                'This is a sample description for testing purposes. This is a sample description for testing purposes. This is a sample description for testing purposes. This is a sample description for testing purposes. This is a sample description for testing purpo...',
-            ),
-        ).toBeInTheDocument();
-
-        // Verify "Show More" link is rendered
-        const showMoreLink = screen.getByText('Show More');
-        expect(showMoreLink).toBeInTheDocument();
-
-        // Click "Show More" and verify "Show Less" link appears
-        fireEvent.click(showMoreLink);
-        const showLessLink = screen.getByText('Show Less');
-        expect(showLessLink).toBeInTheDocument();
-
-        // Click "Show Less" and verify "Show More" link appears again
-        fireEvent.click(showLessLink);
-        expect(screen.getByText('Show More')).toBeInTheDocument();
-    });
-});
diff --git a/datahub-web-react/src/app/preview/utils.ts b/datahub-web-react/src/app/preview/utils.ts
deleted file mode 100644
index 6b4a5bbb9cbab1..00000000000000
--- a/datahub-web-react/src/app/preview/utils.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Owner } from '@types';
-
-export function getUniqueOwners(owners?: Owner[] | null) {
-    const uniqueOwnerUrns = new Set();
-    return owners?.filter((owner) => !uniqueOwnerUrns.has(owner.owner.urn) && uniqueOwnerUrns.add(owner.owner.urn));
-}
diff --git a/datahub-web-react/src/app/previewV2/CardActionCircle.tsx b/datahub-web-react/src/app/previewV2/CardActionCircle.tsx
deleted file mode 100644
index 575e8f3bada4d0..00000000000000
--- a/datahub-web-react/src/app/previewV2/CardActionCircle.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entityV2/shared/constants';
-
-type Props = {
-    icon: any;
-    onClick?: () => void;
-    enabled?: boolean;
-};
-
-const IconContainer = styled.div<{ enabled?: boolean }>`
-    width: 28px;
-    height: 28px;
-    background-color: #f7f7f7;
-    cursor: pointer;
-    border-radius: 50%;
-    text-align: center;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    & svg {
-        font-size: 14px;
-        color: #5d668b;
-    }
-    border: 1px solid #eee;
-    :hover {
-        border: 1px solid ${({ enabled }) => (enabled ? '#3F54D1' : ANTD_GRAY['4'])};
-    }
-`;
-
-const CardActionCircle = ({ icon, onClick, enabled }: Props) => {
-    return (
-        <IconContainer enabled={enabled} onClick={onClick}>
-            {icon}
-        </IconContainer>
-    );
-};
-
-export default CardActionCircle;
diff --git a/datahub-web-react/src/app/previewV2/ContextPath.tsx b/datahub-web-react/src/app/previewV2/ContextPath.tsx
index 5134d469c394ab..28cd03e3c514b3 100644
--- a/datahub-web-react/src/app/previewV2/ContextPath.tsx
+++ b/datahub-web-react/src/app/previewV2/ContextPath.tsx
@@ -26,7 +26,7 @@ const PlatformContentWrapper = styled.div`
     color: ${colors.gray[1700]};
 `;
 
-export const PlatformText = styled.div<{
+const PlatformText = styled.div<{
     $maxWidth?: number;
     $isCompactView?: boolean;
 }>`
diff --git a/datahub-web-react/src/app/previewV2/EntityHeader.tsx b/datahub-web-react/src/app/previewV2/EntityHeader.tsx
index f34073fb67c505..57e22d92e31b83 100644
--- a/datahub-web-react/src/app/previewV2/EntityHeader.tsx
+++ b/datahub-web-react/src/app/previewV2/EntityHeader.tsx
@@ -25,7 +25,7 @@ const EntityTitleContainer = styled.div`
     min-width: 15em;
 `;
 
-export const StyledLink = styled(Link)`
+const StyledLink = styled(Link)`
     min-width: 0;
 `;
 
diff --git a/datahub-web-react/src/app/previewV2/EntityPaths/ColumnPathsText.tsx b/datahub-web-react/src/app/previewV2/EntityPaths/ColumnPathsText.tsx
index daea4bbfbd7b92..0e30001f251a6e 100644
--- a/datahub-web-react/src/app/previewV2/EntityPaths/ColumnPathsText.tsx
+++ b/datahub-web-react/src/app/previewV2/EntityPaths/ColumnPathsText.tsx
@@ -9,7 +9,7 @@ import DisplayedColumns from '@app/previewV2/EntityPaths/DisplayedColumns';
 
 import { EntityPath, EntityType, LineageDirection, SchemaFieldEntity } from '@types';
 
-export const ResultText = styled.span`
+const ResultText = styled.span`
     white-space: nowrap;
     &:hover {
         border-bottom: 1px solid black;
diff --git a/datahub-web-react/src/app/previewV2/Freshness.tsx b/datahub-web-react/src/app/previewV2/Freshness.tsx
index cb393868892469..a2f4f3ce059c74 100644
--- a/datahub-web-react/src/app/previewV2/Freshness.tsx
+++ b/datahub-web-react/src/app/previewV2/Freshness.tsx
@@ -47,17 +47,6 @@ const descriptors = {
     },
 };
 
-export const getFreshnessTitle = (property: string | undefined) => {
-    switch (property) {
-        case 'lastModified':
-            return descriptors.lastModified.sectionTitle;
-        case 'lastRefreshed':
-            return descriptors.lastRefreshed.sectionTitle;
-        default: // default to "lastUpdated"
-            return descriptors.lastUpdated.sectionTitle;
-    }
-};
-
 const Freshness = ({ time, timeProperty, showDate = true }: Props) => {
     const lastUpdatedAgo = toRelativeTimeString(time);
 
diff --git a/datahub-web-react/src/app/previewV2/SearchPill.tsx b/datahub-web-react/src/app/previewV2/SearchPill.tsx
index 6292878e248425..477459c101ee6e 100644
--- a/datahub-web-react/src/app/previewV2/SearchPill.tsx
+++ b/datahub-web-react/src/app/previewV2/SearchPill.tsx
@@ -27,7 +27,7 @@ const computeColor = (enabled?: boolean, active?: boolean) => {
     return color;
 };
 
-export const PillContainer = styled.div<{ enabled?: boolean; active?: boolean; isHighlightedTextPresent: boolean }>`
+const PillContainer = styled.div<{ enabled?: boolean; active?: boolean; isHighlightedTextPresent: boolean }>`
     height: 24px;
     padding-left: 8px;
     padding-right: ${({ isHighlightedTextPresent }) => (isHighlightedTextPresent ? '0px' : '8px')};
diff --git a/datahub-web-react/src/app/previewV2/SeeSummaryButton.tsx b/datahub-web-react/src/app/previewV2/SeeSummaryButton.tsx
deleted file mode 100644
index f98ccb2b97d227..00000000000000
--- a/datahub-web-react/src/app/previewV2/SeeSummaryButton.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { FileTextOutlined } from '@ant-design/icons';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-const SummaryButton = styled.div<{ maxWidth: number }>`
-    align-items: center;
-    border: 1px solid #328980;
-    border-radius: 4px;
-    background: #328980;
-    color: white;
-    display: flex;
-    max-width: ${(props) => props.maxWidth}px;
-    padding: 6px;
-    position: relative;
-    overflow: hidden;
-    transition: max-width 0.4s ease-in-out;
-    white-space: nowrap;
-
-    :hover {
-        cursor: pointer;
-    }
-`;
-
-const SummaryButtonText = styled.span`
-    font-size: 10px;
-    font-weight: 600;
-    margin-left: 8px;
-`;
-
-export default function SeeSummaryButton() {
-    const [summaryButtonExpanded, setSummaryButtonExpanded] = useState(false);
-    return (
-        <SummaryButton
-            onMouseEnter={() => setSummaryButtonExpanded(true)}
-            onMouseLeave={() => setSummaryButtonExpanded(false)}
-            maxWidth={summaryButtonExpanded ? 102 : 26}
-        >
-            <FileTextOutlined />
-            <SummaryButtonText>View summary</SummaryButtonText>
-        </SummaryButton>
-    );
-}
diff --git a/datahub-web-react/src/app/recommendations/HoverEntityTooltipContext.tsx b/datahub-web-react/src/app/recommendations/HoverEntityTooltipContext.tsx
index e0b41e9bfb7f29..aef37ea028a2bf 100644
--- a/datahub-web-react/src/app/recommendations/HoverEntityTooltipContext.tsx
+++ b/datahub-web-react/src/app/recommendations/HoverEntityTooltipContext.tsx
@@ -1,14 +1,9 @@
-import React, { useContext } from 'react';
 
-export interface HoverEntityTooltipContextType {
+
+interface HoverEntityTooltipContextType {
     entityCount: number | undefined;
 }
 
 export const HoverEntityTooltipContext = React.createContext<HoverEntityTooltipContextType>({
     entityCount: undefined,
 });
-
-export const useHoverEntityTooltipContext = () => {
-    const { entityCount } = useContext(HoverEntityTooltipContext);
-    return { entityCount };
-};
diff --git a/datahub-web-react/src/app/recommendations/RecommendationModule.tsx b/datahub-web-react/src/app/recommendations/RecommendationModule.tsx
deleted file mode 100644
index 6578a4a3ea511e..00000000000000
--- a/datahub-web-react/src/app/recommendations/RecommendationModule.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Typography } from 'antd';
-import React, { useEffect, useMemo } from 'react';
-import { v4 as uuidv4 } from 'uuid';
-
-import analytics, { EventType } from '@app/analytics';
-import { renderTypeToRenderer } from '@app/recommendations/renderers';
-import { RecommendationDisplayType } from '@app/recommendations/types';
-
-import { RecommendationModule as RecommendationModuleType, ScenarioType } from '@types';
-
-type Props = {
-    module: RecommendationModuleType;
-    scenarioType: ScenarioType;
-    displayType?: RecommendationDisplayType;
-    showTitle?: boolean;
-};
-
-export const RecommendationModule = ({ module, scenarioType, displayType, showTitle }: Props) => {
-    const finalDisplayType = displayType || RecommendationDisplayType.DEFAULT;
-    const renderId = useMemo(() => uuidv4(), []);
-    useEffect(() => {
-        analytics.event({
-            type: EventType.RecommendationImpressionEvent,
-            moduleId: module.moduleId,
-            renderType: module.renderType,
-            scenarioType,
-        });
-    }, [module, scenarioType]);
-    const RecommendationRenderer = renderTypeToRenderer.get(module.renderType);
-    if (!RecommendationRenderer) {
-        console.error(`Failed to find renderer corresponding to renderType ${module.renderType}`);
-        return null;
-    }
-    return (
-        <>
-            {showTitle && <Typography.Title level={4}>{module.title}</Typography.Title>}
-            <RecommendationRenderer
-                renderId={renderId}
-                moduleId={module.moduleId}
-                scenarioType={scenarioType}
-                renderType={module.renderType}
-                content={module.content}
-                displayType={finalDisplayType}
-            />
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/recommendations/__tests__/Recommendations.test.tsx b/datahub-web-react/src/app/recommendations/__tests__/Recommendations.test.tsx
deleted file mode 100644
index 3048676c1dbc5e..00000000000000
--- a/datahub-web-react/src/app/recommendations/__tests__/Recommendations.test.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { render, waitFor } from '@testing-library/react';
-import React from 'react';
-import { Route } from 'react-router';
-
-import { HomePage } from '@app/home/HomePage';
-import { SearchPage } from '@app/search/SearchPage';
-import { PageRoutes } from '@conf/Global';
-import { mocks } from '@src/Mocks';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-describe('Recommendations', () => {
-    it('home renders recommendations', async () => {
-        const { getByText } = render(
-            <MockedProvider
-                mocks={mocks}
-                addTypename={false}
-                defaultOptions={{
-                    watchQuery: { fetchPolicy: 'no-cache' },
-                    query: { fetchPolicy: 'no-cache' },
-                }}
-            >
-                <TestPageContainer>
-                    <HomePage />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        await waitFor(() => expect(getByText('Datasets')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('Explore your data')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('Top Platforms')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('Snowflake')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('Popular Tags')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('TestTag')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('Most Popular')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('Some Other Dataset')).toBeInTheDocument());
-    });
-
-    it('search results renders recommendations', async () => {
-        const { getByText } = render(
-            <MockedProvider
-                mocks={mocks}
-                addTypename={false}
-                defaultOptions={{
-                    watchQuery: { fetchPolicy: 'no-cache' },
-                    query: { fetchPolicy: 'no-cache' },
-                }}
-            >
-                <TestPageContainer initialEntries={['/search?page=1&query=noresults']}>
-                    <Route path={PageRoutes.SEARCH_RESULTS} render={() => <SearchPage />} />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-        await waitFor(() => expect(getByText('More you may be interested in')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('Top Platforms')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('Snowflake')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('Popular Tags')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('TestTag')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('Most Popular')).toBeInTheDocument());
-        await waitFor(() => expect(getByText('Some Other Dataset')).toBeInTheDocument());
-    });
-
-    // TODO: Uncomment once entity sidebar recs are fully supported.
-    // eslint-disable-next-line vitest/no-commented-out-tests
-    // it('renders entity page sidebar recommendations', async () => {
-    //     const { getByText } = render(
-    //         <MockedProvider
-    //             mocks={mocks}
-    //             addTypename={false}
-    //             defaultOptions={{
-    //                 watchQuery: { fetchPolicy: 'no-cache' },
-    //                 query: { fetchPolicy: 'no-cache' },
-    //             }}
-    //         >
-    //             <TestPageContainer initialEntries={['/dataset/urn:li:dataset:3']}>
-    //                 <EntityProfile
-    //                     urn="urn:li:dataset:3"
-    //                     entityType={EntityType.Dataset}
-    //                     useEntityQuery={useGetDatasetQuery}
-    //                     useUpdateQuery={useUpdateDatasetMutation}
-    //                     getOverrideProperties={() => ({})}
-    //                     tabs={[
-    //                         {
-    //                             name: 'Schema',
-    //                             component: SchemaTab,
-    //                         },
-    //                     ]}
-    //                     sidebarSections={[
-    //                         {
-    //                             component: SidebarRecommendationsSection,
-    //                         },
-    //                     ]}
-    //                 />
-    //             </TestPageContainer>
-    //         </MockedProvider>,
-    //     );
-
-    //     // find recommendation modules
-    //     await waitFor(() => expect(getByText('Top Platforms')).toBeInTheDocument());
-    //     await waitFor(() => expect(getByText('Snowflake')).toBeInTheDocument());
-    //     await waitFor(() => expect(getByText('Popular Tags')).toBeInTheDocument());
-    //     await waitFor(() => expect(getByText('TestTag')).toBeInTheDocument());
-    //     await waitFor(() => expect(getByText('Most Popular')).toBeInTheDocument());
-    //     await waitFor(() => expect(getByText('Some Other Dataset')).toBeInTheDocument());
-    // });
-});
diff --git a/datahub-web-react/src/app/recommendations/renderer/DomainSearchListRenderer.tsx b/datahub-web-react/src/app/recommendations/renderer/DomainSearchListRenderer.tsx
deleted file mode 100644
index bbab65fbf79c58..00000000000000
--- a/datahub-web-react/src/app/recommendations/renderer/DomainSearchListRenderer.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-
-import { DomainSearchList } from '@app/recommendations/renderer/component/DomainSearchList';
-import { RecommendationRenderProps } from '@app/recommendations/types';
-import { recommendationClickEvent } from '@app/recommendations/util/recommendationClickEvent';
-
-export const DomainSearchListRenderer = ({
-    renderId,
-    moduleId,
-    scenarioType,
-    renderType,
-    content,
-}: RecommendationRenderProps) => {
-    return (
-        <DomainSearchList
-            onClick={(index) =>
-                recommendationClickEvent({
-                    renderId: renderId.slice(),
-                    moduleId,
-                    scenarioType,
-                    renderType,
-                    index,
-                })
-            }
-            content={content}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/recommendations/renderer/EntityNameListRenderer.tsx b/datahub-web-react/src/app/recommendations/renderer/EntityNameListRenderer.tsx
deleted file mode 100644
index 37edeca87770ee..00000000000000
--- a/datahub-web-react/src/app/recommendations/renderer/EntityNameListRenderer.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-
-import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList';
-import { EntityNameList } from '@app/recommendations/renderer/component/EntityNameList';
-import { RecommendationDisplayType, RecommendationRenderProps } from '@app/recommendations/types';
-import { recommendationClickEvent } from '@app/recommendations/util/recommendationClickEvent';
-
-import { Entity } from '@types';
-
-export const EntityNameListRenderer = ({
-    renderId,
-    moduleId,
-    scenarioType,
-    renderType,
-    content,
-    displayType,
-}: RecommendationRenderProps) => {
-    const entities = content.map((cnt) => cnt.entity).filter((entity) => entity !== undefined && entity !== null);
-    const EntityNameListComponent =
-        displayType === RecommendationDisplayType.COMPACT ? CompactEntityNameList : EntityNameList;
-    return (
-        <EntityNameListComponent
-            onClick={(index) =>
-                recommendationClickEvent({
-                    renderId,
-                    moduleId,
-                    scenarioType,
-                    renderType,
-                    index,
-                })
-            }
-            entities={entities as Array<Entity>}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/recommendations/renderer/GlossaryTermSearchListRenderer.tsx b/datahub-web-react/src/app/recommendations/renderer/GlossaryTermSearchListRenderer.tsx
deleted file mode 100644
index ee9612f82c4295..00000000000000
--- a/datahub-web-react/src/app/recommendations/renderer/GlossaryTermSearchListRenderer.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-
-import { GlossaryTermSearchList } from '@app/recommendations/renderer/component/GlossaryTermSearchList';
-import { RecommendationRenderProps } from '@app/recommendations/types';
-import { recommendationClickEvent } from '@app/recommendations/util/recommendationClickEvent';
-
-export const GlossaryTermSearchListRenderer = ({
-    renderId,
-    moduleId,
-    scenarioType,
-    renderType,
-    content,
-}: RecommendationRenderProps) => {
-    return (
-        <GlossaryTermSearchList
-            onClick={(index) =>
-                recommendationClickEvent({
-                    renderId: renderId.slice(),
-                    moduleId,
-                    scenarioType,
-                    renderType,
-                    index,
-                })
-            }
-            content={content}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/recommendations/renderer/PlatformListRenderer.tsx b/datahub-web-react/src/app/recommendations/renderer/PlatformListRenderer.tsx
deleted file mode 100644
index 211ed13dec1a57..00000000000000
--- a/datahub-web-react/src/app/recommendations/renderer/PlatformListRenderer.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-
-import { PlatformList } from '@app/recommendations/renderer/component/PlatformList';
-import { RecommendationRenderProps } from '@app/recommendations/types';
-import { recommendationClickEvent } from '@app/recommendations/util/recommendationClickEvent';
-
-export const PlatformListRenderer = ({
-    renderId,
-    moduleId,
-    scenarioType,
-    renderType,
-    content,
-}: RecommendationRenderProps) => {
-    return (
-        <PlatformList
-            onClick={(index) =>
-                recommendationClickEvent({
-                    renderId: renderId.slice(),
-                    moduleId,
-                    scenarioType,
-                    renderType,
-                    index,
-                })
-            }
-            content={content || []}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/recommendations/renderer/SearchQueryListRenderer.tsx b/datahub-web-react/src/app/recommendations/renderer/SearchQueryListRenderer.tsx
deleted file mode 100644
index 52b45a5fd386bd..00000000000000
--- a/datahub-web-react/src/app/recommendations/renderer/SearchQueryListRenderer.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-
-import { SearchQueryList } from '@app/recommendations/renderer/component/SearchQueryList';
-import { RecommendationRenderProps } from '@app/recommendations/types';
-import { recommendationClickEvent } from '@app/recommendations/util/recommendationClickEvent';
-
-export const SearchQueryListRenderer = ({
-    renderId,
-    moduleId,
-    scenarioType,
-    renderType,
-    content,
-}: RecommendationRenderProps) => {
-    return (
-        <SearchQueryList
-            onClick={(index) =>
-                recommendationClickEvent({
-                    renderId: renderId.slice(),
-                    moduleId,
-                    scenarioType,
-                    renderType,
-                    index,
-                })
-            }
-            content={content}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/recommendations/renderer/TagSearchListRenderer.tsx b/datahub-web-react/src/app/recommendations/renderer/TagSearchListRenderer.tsx
deleted file mode 100644
index 446e418912c71c..00000000000000
--- a/datahub-web-react/src/app/recommendations/renderer/TagSearchListRenderer.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-
-import { TagSearchList } from '@app/recommendations/renderer/component/TagSearchList';
-import { RecommendationRenderProps } from '@app/recommendations/types';
-import { recommendationClickEvent } from '@app/recommendations/util/recommendationClickEvent';
-
-export const TagSearchListRenderer = ({
-    renderId,
-    moduleId,
-    scenarioType,
-    renderType,
-    content,
-}: RecommendationRenderProps) => {
-    return (
-        <TagSearchList
-            onClick={(index) =>
-                recommendationClickEvent({
-                    renderId: renderId.slice(),
-                    moduleId,
-                    scenarioType,
-                    renderType,
-                    index,
-                })
-            }
-            content={content}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/recommendations/renderer/component/DomainSearchList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/DomainSearchList.tsx
deleted file mode 100644
index 44c0ab71cab117..00000000000000
--- a/datahub-web-react/src/app/recommendations/renderer/component/DomainSearchList.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { ArrowRightOutlined } from '@ant-design/icons';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import DomainIcon from '@app/domain/DomainIcon';
-import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip';
-import { LogoCountCard } from '@app/shared/LogoCountCard';
-import { HomePageButton } from '@app/shared/components';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { PageRoutes } from '@conf/Global';
-
-import { Domain, EntityType, RecommendationContent } from '@types';
-
-const DomainListContainer = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-    flex-wrap: wrap;
-`;
-
-const AllDomainsWrapper = styled.div`
-    color: ${(props) => props.theme.styles['primary-color']};
-    font-size: 14px;
-`;
-
-const AllDomainsText = styled.div`
-    margin-bottom: 8px;
-`;
-
-const NUM_DOMAIN_CARDS = 9;
-
-type Props = {
-    content: Array<RecommendationContent>;
-    onClick?: (index: number) => void;
-};
-
-export const DomainSearchList = ({ content, onClick }: Props) => {
-    const entityRegistry = useEntityRegistry();
-
-    const domainsWithCounts: Array<{ domain: Domain; count?: number }> = content
-        .map((cnt) => ({ domain: cnt.entity, count: cnt.params?.contentParams?.count }))
-        .filter((domainWithCount) => domainWithCount?.domain !== null)
-        .slice(0, NUM_DOMAIN_CARDS) as Array<{
-        domain: Domain;
-        count?: number;
-    }>;
-
-    return (
-        <DomainListContainer>
-            {domainsWithCounts.map((domain, index) => (
-                <HoverEntityTooltip key={domain.domain.urn} entity={domain.domain} placement="bottom">
-                    <Link
-                        to={entityRegistry.getEntityUrl(EntityType.Domain, domain.domain.urn)}
-                        onClick={() => onClick?.(index)}
-                    >
-                        <LogoCountCard
-                            name={entityRegistry.getDisplayName(EntityType.Domain, domain.domain)}
-                            logoComponent={
-                                <DomainIcon
-                                    style={{
-                                        fontSize: 16,
-                                        color: '#BFBFBF',
-                                    }}
-                                />
-                            }
-                            count={domain.count}
-                        />
-                    </Link>
-                </HoverEntityTooltip>
-            ))}
-            <Link to={PageRoutes.DOMAINS}>
-                <HomePageButton type="link">
-                    <AllDomainsWrapper>
-                        <AllDomainsText>View All Domains</AllDomainsText>
-                        <ArrowRightOutlined />
-                    </AllDomainsWrapper>
-                </HomePageButton>
-            </Link>
-        </DomainListContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/recommendations/renderer/component/EntityNameList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/EntityNameList.tsx
index 188146a3af3a70..4a3e2659ba2a92 100644
--- a/datahub-web-react/src/app/recommendations/renderer/component/EntityNameList.tsx
+++ b/datahub-web-react/src/app/recommendations/renderer/component/EntityNameList.tsx
@@ -1,15 +1,6 @@
 import { Divider, List } from 'antd';
-import React from 'react';
 import styled from 'styled-components';
 
-import { IconStyleType } from '@app/entity/Entity';
-import { getPlatformName } from '@app/entity/shared/utils';
-import DefaultPreviewCard from '@app/preview/DefaultPreviewCard';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Entity } from '@types';
-
 export const StyledList = styled(List)`
     overflow-y: auto;
     height: 100%;
@@ -54,56 +45,3 @@ export const ThinDivider = styled(Divider)`
     padding: 0px;
     margin: 0px;
 `;
-
-type Props = {
-    entities: Array<Entity>;
-    onClick?: (index: number) => void;
-};
-
-export const EntityNameList = ({ entities, onClick }: Props) => {
-    const entityRegistry = useEntityRegistry();
-
-    return (
-        <StyledList
-            dataSource={entities}
-            renderItem={(entity, index) => {
-                const genericProps = entityRegistry.getGenericEntityProperties(entity.type, entity);
-                const platformLogoUrl = genericProps?.platform?.properties?.logoUrl;
-                const platformName = getPlatformName(genericProps);
-                const entityTypeName = entityRegistry.getEntityName(entity.type);
-                const displayName = entityRegistry.getDisplayName(entity.type, entity);
-                const url = entityRegistry.getEntityUrl(entity.type, entity.urn);
-                const fallbackIcon = entityRegistry.getIcon(entity.type, 18, IconStyleType.ACCENT);
-                const subType = capitalizeFirstLetterOnly(genericProps?.subTypes?.typeNames?.[0]);
-                const entityCount = genericProps?.entityCount;
-                const deprecation = genericProps?.deprecation;
-                const health = genericProps?.health;
-
-                return (
-                    <>
-                        <ListItem isSelectMode={false}>
-                            <DefaultPreviewCard
-                                name={displayName}
-                                urn={entity.urn}
-                                logoUrl={platformLogoUrl || undefined}
-                                logoComponent={fallbackIcon}
-                                url={url}
-                                platform={platformName}
-                                type={subType || entityTypeName}
-                                titleSizePx={14}
-                                tags={genericProps?.globalTags || undefined}
-                                glossaryTerms={genericProps?.glossaryTerms || undefined}
-                                domain={genericProps?.domain?.domain}
-                                onClick={() => onClick?.(index)}
-                                entityCount={entityCount}
-                                deprecation={deprecation}
-                                health={health || undefined}
-                            />
-                        </ListItem>
-                        <ThinDivider />
-                    </>
-                );
-            }}
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/recommendations/renderer/component/EntityPreviewTag.tsx b/datahub-web-react/src/app/recommendations/renderer/component/EntityPreviewTag.tsx
index 8f968c3269bce1..4db16dd422222a 100644
--- a/datahub-web-react/src/app/recommendations/renderer/component/EntityPreviewTag.tsx
+++ b/datahub-web-react/src/app/recommendations/renderer/component/EntityPreviewTag.tsx
@@ -53,7 +53,7 @@ const ColumnName = styled.span`
     font-weight: bold;
 `;
 
-export const StyledDivider = styled(Divider)`
+const StyledDivider = styled(Divider)`
     background-color: ${ANTD_GRAY[6]};
     margin: 0 7px;
 `;
diff --git a/datahub-web-react/src/app/recommendations/renderer/component/GlossaryTermSearchList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/GlossaryTermSearchList.tsx
deleted file mode 100644
index e2b75a3f78bc47..00000000000000
--- a/datahub-web-react/src/app/recommendations/renderer/component/GlossaryTermSearchList.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { BookOutlined } from '@ant-design/icons';
-import { Button, Tag } from 'antd';
-import React from 'react';
-import { useHistory } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { UnionType } from '@app/search/utils/constants';
-import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { GlossaryTerm, RecommendationContent } from '@types';
-
-const TermSearchListContainer = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-    flex-wrap: wrap;
-`;
-
-const TermContainer = styled.div`
-    margin-bottom: 4px;
-`;
-
-const TermButton = styled(Button)`
-    margin: 0px;
-    padding: 0px;
-    font-weight: 500;
-`;
-
-const StyledBook = styled(BookOutlined)`
-    && {
-        margin-right: 3px;
-        padding-left: 2px;
-        padding-bottom: 2px;
-        font-size: 10px;
-    }
-`;
-
-type Props = {
-    content: Array<RecommendationContent>;
-    onClick?: (index: number) => void;
-};
-
-export const GlossaryTermSearchList = ({ content, onClick }: Props) => {
-    const history = useHistory();
-    const entityRegistry = useEntityRegistry();
-
-    const terms: Array<GlossaryTerm> = content
-        .map((cnt) => cnt.entity)
-        .filter((entity) => entity !== null && entity !== undefined)
-        .map((entity) => entity as GlossaryTerm);
-
-    const onClickTerm = (term: any, index: number) => {
-        onClick?.(index);
-        navigateToSearchUrl({
-            filters: [
-                {
-                    field: 'glossaryTerms',
-                    values: [term.urn],
-                },
-                {
-                    field: 'fieldGlossaryTerms',
-                    values: [term.urn],
-                },
-            ],
-            history,
-            unionType: UnionType.OR,
-        });
-    };
-
-    return (
-        <TermSearchListContainer>
-            {terms.map((term, index) => (
-                <TermContainer>
-                    <TermButton type="link" key={term.urn} onClick={() => onClickTerm(term, index)}>
-                        <Tag closable={false}>
-                            <StyledBook />
-                            {entityRegistry.getDisplayName(term.type, term)}
-                        </Tag>
-                    </TermButton>
-                </TermContainer>
-            ))}
-        </TermSearchListContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/recommendations/renderer/component/PlatformList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/PlatformList.tsx
deleted file mode 100644
index fad0d6492fcea7..00000000000000
--- a/datahub-web-react/src/app/recommendations/renderer/component/PlatformList.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { urlEncodeUrn } from '@app/entity/shared/utils';
-import { LogoCountCard } from '@app/shared/LogoCountCard';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { PageRoutes } from '@conf/Global';
-
-import { DataPlatform, RecommendationContent } from '@types';
-
-const PlatformListContainer = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-    flex-wrap: wrap;
-`;
-
-type Props = {
-    content: Array<RecommendationContent>;
-    onClick?: (index: number) => void;
-};
-
-export const PlatformList = ({ content, onClick }: Props) => {
-    const platformsWithCounts: Array<{ platform: DataPlatform; count?: number }> = content
-        .map((cnt) => ({ platform: cnt.entity, count: cnt.params?.contentParams?.count }))
-        .filter(
-            (platformWithCount) => platformWithCount.platform !== null && platformWithCount !== undefined,
-        ) as Array<{ platform: DataPlatform; count?: number }>;
-    return (
-        <PlatformListContainer>
-            {platformsWithCounts.map((platform, index) => (
-                <Link
-                    to={{
-                        pathname: `${PageRoutes.SEARCH}`,
-                        search: `?filter_platform=${urlEncodeUrn(platform.platform.urn)}`,
-                    }}
-                    key={platform.platform.urn}
-                    onClick={() => onClick?.(index)}
-                >
-                    <LogoCountCard
-                        name={
-                            platform.platform.properties?.displayName ||
-                            capitalizeFirstLetterOnly(platform.platform.name) ||
-                            ''
-                        }
-                        logoUrl={platform.platform.properties?.logoUrl || ''}
-                        count={platform.count}
-                    />
-                </Link>
-            ))}
-        </PlatformListContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/recommendations/renderer/component/SearchQueryList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/SearchQueryList.tsx
deleted file mode 100644
index 5f586b7b1dc63b..00000000000000
--- a/datahub-web-react/src/app/recommendations/renderer/component/SearchQueryList.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Button, Tag } from 'antd';
-import React from 'react';
-import { useHistory } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl';
-
-import { EntityType, FacetFilterInput, RecommendationContent, SearchParams } from '@types';
-
-const SearchQueryListContainer = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-    flex-wrap: wrap;
-`;
-
-const TagContainer = styled.div`
-    margin-bottom: 4px;
-`;
-
-const QueryButton = styled(Button)`
-    margin: 0px;
-    padding: 0px;
-`;
-
-type Props = {
-    content: Array<RecommendationContent>;
-    onClick?: (index: number) => void;
-};
-
-export const SearchQueryList = ({ content, onClick }: Props) => {
-    const history = useHistory();
-
-    const queryParams = content
-        .map((cnt) => cnt.params?.searchParams)
-        .filter((params) => params !== null && params !== undefined) as Array<SearchParams>;
-
-    const onClickQuery = (query: string, types: Array<EntityType>, filters: Array<FacetFilterInput>, index: number) => {
-        onClick?.(index);
-        navigateToSearchUrl({
-            query,
-            type: (types && types.length > 0 && types[0]) || undefined,
-            filters: filters || [],
-            history,
-        });
-    };
-
-    return (
-        <SearchQueryListContainer>
-            {queryParams.map((params, index) => (
-                <QueryButton
-                    type="text"
-                    key={params.query}
-                    onClick={() => onClickQuery(params.query, params.types || [], params.filters || [], index)}
-                >
-                    <TagContainer>
-                        <Tag closable={false}>{params.query}</Tag>
-                    </TagContainer>
-                </QueryButton>
-            ))}
-        </SearchQueryListContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/recommendations/renderer/component/TagSearchList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/TagSearchList.tsx
deleted file mode 100644
index d97ec326b01e5b..00000000000000
--- a/datahub-web-react/src/app/recommendations/renderer/component/TagSearchList.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import { Button } from 'antd';
-import React from 'react';
-import { useHistory } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { StyledTag } from '@app/entity/shared/components/styled/StyledTag';
-import { UnionType } from '@app/search/utils/constants';
-import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType, RecommendationContent, Tag } from '@types';
-
-const TagSearchListContainer = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-    flex-wrap: wrap;
-`;
-
-const TagContainer = styled.div`
-    margin-bottom: 4px;
-`;
-
-const TagButton = styled(Button)`
-    margin: 0px;
-    padding: 0px;
-    font-weight: 500;
-`;
-
-type Props = {
-    content: Array<RecommendationContent>;
-    onClick?: (index: number) => void;
-};
-
-export const TagSearchList = ({ content, onClick }: Props) => {
-    const history = useHistory();
-    const entityRegistry = useEntityRegistry();
-
-    const tags: Array<Tag> = content
-        .map((cnt) => cnt.entity)
-        .filter((entity) => entity !== null && entity !== undefined)
-        .map((entity) => entity as Tag);
-
-    const onClickTag = (tag: any, index: number) => {
-        onClick?.(index);
-        navigateToSearchUrl({
-            filters: [
-                {
-                    field: 'tags',
-                    values: [tag.urn],
-                },
-                {
-                    field: 'fieldTags',
-                    values: [tag.urn],
-                },
-            ],
-            history,
-            unionType: UnionType.OR,
-        });
-    };
-
-    return (
-        <TagSearchListContainer>
-            {tags.map((tag, index) => (
-                <TagContainer key={tag.urn}>
-                    <TagButton type="link" onClick={() => onClickTag(tag, index)}>
-                        <StyledTag $colorHash={tag?.urn} $color={tag?.properties?.colorHex} closable={false}>
-                            {entityRegistry.getDisplayName(EntityType.Tag, tag)}
-                        </StyledTag>
-                    </TagButton>
-                </TagContainer>
-            ))}
-        </TagSearchListContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/recommendations/renderers.ts b/datahub-web-react/src/app/recommendations/renderers.ts
deleted file mode 100644
index 726c90193d4c40..00000000000000
--- a/datahub-web-react/src/app/recommendations/renderers.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import React from 'react';
-
-import { DomainSearchListRenderer } from '@app/recommendations/renderer/DomainSearchListRenderer';
-import { EntityNameListRenderer } from '@app/recommendations/renderer/EntityNameListRenderer';
-import { GlossaryTermSearchListRenderer } from '@app/recommendations/renderer/GlossaryTermSearchListRenderer';
-import { PlatformListRenderer } from '@app/recommendations/renderer/PlatformListRenderer';
-import { TagSearchListRenderer } from '@app/recommendations/renderer/TagSearchListRenderer';
-import { SearchQueryList } from '@app/recommendations/renderer/component/SearchQueryList';
-import { RecommendationRenderProps } from '@app/recommendations/types';
-
-import { RecommendationRenderType } from '@types';
-
-/**
- * Renderers that are responsible for rendering recommendations of a particular RenderType!
- */
-const renderers: Array<{ renderType: RecommendationRenderType; renderer: React.FC<RecommendationRenderProps> }> = [
-    {
-        renderType: RecommendationRenderType.EntityNameList,
-        renderer: EntityNameListRenderer,
-    },
-    {
-        renderType: RecommendationRenderType.PlatformSearchList,
-        renderer: PlatformListRenderer,
-    },
-    {
-        renderType: RecommendationRenderType.TagSearchList,
-        renderer: TagSearchListRenderer,
-    },
-    {
-        renderType: RecommendationRenderType.SearchQueryList,
-        renderer: SearchQueryList,
-    },
-    {
-        renderType: RecommendationRenderType.GlossaryTermSearchList,
-        renderer: GlossaryTermSearchListRenderer,
-    },
-    {
-        renderType: RecommendationRenderType.DomainSearchList,
-        renderer: DomainSearchListRenderer,
-    },
-];
-
-export const renderTypeToRenderer: Map<RecommendationRenderType, React.FC<RecommendationRenderProps>> = new Map<
-    RecommendationRenderType,
-    React.FC<RecommendationRenderProps>
->();
-
-renderers.forEach((entry) => {
-    renderTypeToRenderer.set(entry.renderType, entry.renderer);
-});
diff --git a/datahub-web-react/src/app/recommendations/types.ts b/datahub-web-react/src/app/recommendations/types.ts
deleted file mode 100644
index 07c730c188e56d..00000000000000
--- a/datahub-web-react/src/app/recommendations/types.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { RecommendationContent, RecommendationRenderType, ScenarioType } from '@types';
-
-/**
- * The display type that should be used when rendering the recommendation.
- */
-export enum RecommendationDisplayType {
-    DEFAULT,
-    COMPACT,
-}
-
-/**
- * Props passed to every recommendation renderer
- */
-export type RecommendationRenderProps = {
-    renderId: string;
-    moduleId: string;
-    scenarioType: ScenarioType;
-    renderType: RecommendationRenderType;
-    content: Array<RecommendationContent>;
-    displayType: RecommendationDisplayType;
-};
diff --git a/datahub-web-react/src/app/recommendations/util/recommendationClickEvent.ts b/datahub-web-react/src/app/recommendations/util/recommendationClickEvent.ts
deleted file mode 100644
index c2750db94b41a4..00000000000000
--- a/datahub-web-react/src/app/recommendations/util/recommendationClickEvent.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import analytics, { EventType } from '@app/analytics';
-
-import { RecommendationRenderType, ScenarioType } from '@types';
-
-export function recommendationClickEvent({
-    renderId,
-    moduleId,
-    renderType,
-    scenarioType,
-    index,
-}: {
-    renderId: string;
-    moduleId: string;
-    renderType: RecommendationRenderType;
-    scenarioType: ScenarioType;
-    index: number;
-}) {
-    analytics.event({
-        type: EventType.RecommendationClickEvent,
-        renderId,
-        moduleId,
-        renderType,
-        scenarioType,
-        index,
-    });
-}
diff --git a/datahub-web-react/src/app/search/AnalyticsLink.tsx b/datahub-web-react/src/app/search/AnalyticsLink.tsx
deleted file mode 100644
index 3ded3bdf61dfd3..00000000000000
--- a/datahub-web-react/src/app/search/AnalyticsLink.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Tag, Typography } from 'antd';
-import * as React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-const StyledAnalyticsLink = styled(Typography.Text)`
-    display: flex;
-    margin-right: 20px;
-    text-decoration: none;
-    && {
-        font-size: 14px;
-        color: ${(props) => props.theme.styles['layout-header-color']};
-    }
-    &&:hover {
-        color: #000;
-    }
-`;
-
-export default function AnalyticsLink() {
-    return (
-        <Link to="/analytics">
-            <StyledAnalyticsLink strong>
-                Analytics <Tag>Beta</Tag>
-            </StyledAnalyticsLink>
-        </Link>
-    );
-}
diff --git a/datahub-web-react/src/app/search/BrowseEntityCard.tsx b/datahub-web-react/src/app/search/BrowseEntityCard.tsx
deleted file mode 100644
index ecaa43738f5c46..00000000000000
--- a/datahub-web-react/src/app/search/BrowseEntityCard.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import React from 'react';
-import { useHistory } from 'react-router-dom';
-import styled from 'styled-components';
-
-import analytics from '@app/analytics';
-import { EventType } from '@app/analytics/event';
-import { IconStyleType } from '@app/entity/Entity';
-import { useIsBrowseV2 } from '@app/search/useSearchAndBrowseVersion';
-import { ENTITY_SUB_TYPE_FILTER_NAME } from '@app/search/utils/constants';
-import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl';
-import { LogoCountCard } from '@app/shared/LogoCountCard';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { PageRoutes } from '@conf/Global';
-
-import { EntityType } from '@types';
-
-const BrowseEntityCardWrapper = styled.div``;
-
-export const BrowseEntityCard = ({ entityType, count }: { entityType: EntityType; count: number }) => {
-    const history = useHistory();
-    const entityRegistry = useEntityRegistry();
-    const showBrowseV2 = useIsBrowseV2();
-    const entityPathName = entityRegistry.getPathName(entityType);
-    const customCardUrlPath = entityRegistry.getCustomCardUrlPath(entityType);
-    const url = customCardUrlPath || `${PageRoutes.BROWSE}/${entityPathName}`;
-    const onBrowseEntityCardClick = () => {
-        analytics.event({
-            type: EventType.HomePageBrowseResultClickEvent,
-            entityType,
-        });
-    };
-
-    function browse() {
-        if (showBrowseV2 && !customCardUrlPath) {
-            navigateToSearchUrl({
-                query: '*',
-                filters: [{ field: ENTITY_SUB_TYPE_FILTER_NAME, values: [entityType] }],
-                history,
-            });
-        } else {
-            history.push(url);
-        }
-    }
-
-    return (
-        <BrowseEntityCardWrapper onClick={browse} data-testid={`entity-type-browse-card-${entityType}`}>
-            <LogoCountCard
-                logoComponent={entityRegistry.getIcon(entityType, 18, IconStyleType.HIGHLIGHT)}
-                name={entityRegistry.getCollectionName(entityType)}
-                count={count}
-                onClick={onBrowseEntityCardClick}
-            />
-        </BrowseEntityCardWrapper>
-    );
-};
diff --git a/datahub-web-react/src/app/search/EmptySearchResults.tsx b/datahub-web-react/src/app/search/EmptySearchResults.tsx
deleted file mode 100644
index 80942ef758fde7..00000000000000
--- a/datahub-web-react/src/app/search/EmptySearchResults.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import { RocketOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React, { useCallback } from 'react';
-import { useHistory } from 'react-router';
-import styled from 'styled-components';
-
-import analytics, { EventType } from '@app/analytics';
-import { useUserContext } from '@app/context/useUserContext';
-import { ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-import { SuggestedText } from '@app/search/suggestions/SearchQuerySugggester';
-import useGetSearchQueryInputs from '@app/search/useGetSearchQueryInputs';
-import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl';
-
-import { FacetFilterInput, SearchSuggestion } from '@types';
-
-const NoDataContainer = styled.div`
-    margin: 40px auto;
-    font-size: 16px;
-    color: ${ANTD_GRAY_V2[8]};
-`;
-
-const Section = styled.div`
-    margin-bottom: 16px;
-`;
-
-function getRefineSearchText(filters: FacetFilterInput[], viewUrn?: string | null) {
-    let text = '';
-    if (filters.length && viewUrn) {
-        text = 'clearing all filters and selected view';
-    } else if (filters.length) {
-        text = 'clearing all filters';
-    } else if (viewUrn) {
-        text = 'clearing the selected view';
-    }
-
-    return text;
-}
-
-interface Props {
-    suggestions: SearchSuggestion[];
-}
-
-export default function EmptySearchResults({ suggestions }: Props) {
-    const { query, filters, viewUrn } = useGetSearchQueryInputs();
-    const history = useHistory();
-    const userContext = useUserContext();
-    const suggestText = suggestions.length > 0 ? suggestions[0].text : '';
-    const refineSearchText = getRefineSearchText(filters, viewUrn);
-
-    const onClickExploreAll = useCallback(() => {
-        analytics.event({ type: EventType.SearchResultsExploreAllClickEvent });
-        navigateToSearchUrl({ query: '*', history });
-    }, [history]);
-
-    const searchForSuggestion = () => {
-        navigateToSearchUrl({ query: suggestText, history });
-    };
-
-    const clearFiltersAndView = () => {
-        navigateToSearchUrl({ query, history });
-        userContext.updateLocalState({
-            ...userContext.localState,
-            selectedViewUrn: undefined,
-        });
-    };
-
-    return (
-        <NoDataContainer>
-            <Section>No results found for &quot;{query}&quot;</Section>
-            {refineSearchText && (
-                <>
-                    Try <SuggestedText onClick={clearFiltersAndView}>{refineSearchText}</SuggestedText>{' '}
-                    {suggestText && (
-                        <>
-                            or searching for <SuggestedText onClick={searchForSuggestion}>{suggestText}</SuggestedText>
-                        </>
-                    )}
-                </>
-            )}
-            {!refineSearchText && suggestText && (
-                <>
-                    Did you mean <SuggestedText onClick={searchForSuggestion}>{suggestText}</SuggestedText>
-                </>
-            )}
-            {!refineSearchText && !suggestText && (
-                <Button onClick={onClickExploreAll}>
-                    <RocketOutlined /> Explore all
-                </Button>
-            )}
-        </NoDataContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/search/PostLinkCard.tsx b/datahub-web-react/src/app/search/PostLinkCard.tsx
deleted file mode 100644
index 2d22c4b57b5b1f..00000000000000
--- a/datahub-web-react/src/app/search/PostLinkCard.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import { ArrowRightOutlined } from '@ant-design/icons';
-import { Button, Image, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-import { Post } from '@types';
-
-const CardContainer = styled(Button)`
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    padding: 0px;
-    height: 100px;
-    border: 1px solid ${ANTD_GRAY[4]};
-    border-radius: 12px;
-    box-shadow: ${(props) => props.theme.styles['box-shadow']};
-    &&:hover {
-        box-shadow: ${(props) => props.theme.styles['box-shadow-hover']};
-    }
-    white-space: unset;
-`;
-
-const LogoContainer = styled.div`
-    display: flex;
-    height: 100%;
-    flex: 1;
-    justify-content: center;
-    align-items: center;
-`;
-
-const EmptyContainer = styled.div`
-    padding-left: 25px;
-`;
-
-const PlatformLogo = styled(Image)`S
-    width: auto;
-    object-fit: contain;
-    background-color: transparent;
-`;
-
-const TextContainer = styled.div`
-    display: flex;
-    flex: 2;
-`;
-
-const FlexWrapper = styled.div<{ alignCenter?: boolean }>`
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    flex: 2;
-    ${(props) => props.alignCenter && 'align-items: center;'}
-`;
-
-const TextWrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-`;
-
-const HeaderText = styled(Typography.Text)`
-    line-height: 10px;
-    display: box;
-    text-align: left;
-    margin-bottom: 8px;
-`;
-
-const Title = styled(Typography.Title)`
-    font-size: 14px;
-    text-align: left;
-`;
-
-const StyledArrowOutlined = styled(ArrowRightOutlined)`
-    align-self: center;
-    flex: 1;
-    color: black;
-`;
-
-type Props = {
-    linkPost: Post;
-};
-
-export const PostLinkCard = ({ linkPost }: Props) => {
-    const hasMedia = !!linkPost?.content?.media?.location;
-    const link = linkPost?.content?.link || '';
-
-    return (
-        <CardContainer type="link" href={link} target="_blank" rel="noopener noreferrer">
-            {hasMedia ? (
-                <LogoContainer>
-                    <PlatformLogo width={50} height={50} preview={false} src={linkPost?.content?.media?.location} />
-                </LogoContainer>
-            ) : (
-                <EmptyContainer />
-            )}
-            <TextContainer>
-                <FlexWrapper>
-                    <TextWrapper>
-                        <HeaderText type="secondary">Link</HeaderText>
-                        <Title style={{ margin: 0 }} ellipsis={{ rows: 2 }} level={5}>
-                            {linkPost?.content?.title}
-                        </Title>
-                    </TextWrapper>
-                </FlexWrapper>
-                <StyledArrowOutlined />
-            </TextContainer>
-        </CardContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/search/PostTextCard.tsx b/datahub-web-react/src/app/search/PostTextCard.tsx
deleted file mode 100644
index efb790b28093c8..00000000000000
--- a/datahub-web-react/src/app/search/PostTextCard.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-import { Post } from '@types';
-
-const CardContainer = styled.div`
-    display: flex;
-    flex-direction: row;
-    border: 1px solid ${ANTD_GRAY[4]};
-    border-radius: 12px;
-    box-shadow: ${(props) => props.theme.styles['box-shadow']};
-    &&:hover {
-        box-shadow: ${(props) => props.theme.styles['box-shadow-hover']};
-    }
-    white-space: unset;
-    padding-bottom: 4px;
-`;
-
-const TextContainer = styled.div`
-    margin-left: 12px;
-    display: flex;
-    justify-content: center;
-    align-items: start;
-    flex-direction: column;
-`;
-
-const TitleText = styled(Typography.Title)`
-    word-break: break-word;
-    min-height: 20px;
-    &&& {
-        margin-top: 8px;
-    }
-`;
-
-const HeaderText = styled(Typography.Text)`
-    margin-top: 12px;
-`;
-
-const AnnouncementText = styled(Typography.Paragraph)`
-    font-size: 12px;
-    color: ${ANTD_GRAY[7]};
-`;
-
-type Props = {
-    textPost: Post;
-};
-
-export const PostTextCard = ({ textPost }: Props) => {
-    return (
-        <CardContainer>
-            <TextContainer>
-                <HeaderText type="secondary">Announcement</HeaderText>
-                <TitleText
-                    ellipsis={{
-                        rows: 1,
-                    }}
-                    level={5}
-                >
-                    {textPost?.content?.title}
-                </TitleText>
-                <AnnouncementText>{textPost?.content?.description}</AnnouncementText>
-            </TextContainer>
-        </CardContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/search/SearchHeader.tsx b/datahub-web-react/src/app/search/SearchHeader.tsx
deleted file mode 100644
index 2154551a01a284..00000000000000
--- a/datahub-web-react/src/app/search/SearchHeader.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import { Layout } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import EntityRegistry from '@app/entity/EntityRegistry';
-import DemoButton from '@app/entity/shared/components/styled/DemoButton';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { SearchBar } from '@app/search/SearchBar';
-import AppLogoLink from '@app/shared/AppLogoLink';
-import { ManageAccount } from '@app/shared/ManageAccount';
-import { HeaderLinks } from '@app/shared/admin/HeaderLinks';
-import { useAppConfig, useIsShowAcrylInfoEnabled } from '@app/useAppConfig';
-
-import { AutoCompleteResultForEntity, EntityType } from '@types';
-
-const { Header } = Layout;
-
-const styles = {
-    header: {
-        position: 'fixed',
-        zIndex: 10,
-        width: '100%',
-        lineHeight: '20px',
-        padding: '0px 20px',
-        display: 'flex',
-        justifyContent: 'space-between',
-        alignItems: 'center',
-        borderBottom: `1px solid ${ANTD_GRAY[4.5]}`,
-    },
-};
-
-const LogoSearchContainer = styled.div`
-    display: flex;
-    flex: 1;
-`;
-
-const NavGroup = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    min-width: 200px;
-`;
-
-type Props = {
-    initialQuery: string;
-    placeholderText: string;
-    suggestions: Array<AutoCompleteResultForEntity>;
-    onSearch: (query: string, type?: EntityType) => void;
-    onQueryChange: (query: string) => void;
-    authenticatedUserUrn: string;
-    authenticatedUserPictureLink?: string | null;
-    entityRegistry: EntityRegistry;
-};
-
-const defaultProps = {
-    authenticatedUserPictureLink: undefined,
-};
-
-/**
- * A header containing a Logo, Search Bar view, & an account management dropdown.
- */
-export const SearchHeader = ({
-    initialQuery,
-    placeholderText,
-    suggestions,
-    onSearch,
-    onQueryChange,
-    authenticatedUserUrn,
-    authenticatedUserPictureLink,
-    entityRegistry,
-}: Props) => {
-    const [isSearchBarFocused, setIsSearchBarFocused] = useState(false);
-    const showAcrylInfo = useIsShowAcrylInfoEnabled();
-    const appConfig = useAppConfig();
-    const viewsEnabled = appConfig.config?.viewsConfig?.enabled || false;
-
-    return (
-        <Header style={styles.header as any}>
-            <LogoSearchContainer>
-                <AppLogoLink />
-                <SearchBar
-                    initialQuery={initialQuery}
-                    placeholderText={placeholderText}
-                    suggestions={suggestions}
-                    onSearch={onSearch}
-                    onQueryChange={onQueryChange}
-                    entityRegistry={entityRegistry}
-                    setIsSearchBarFocused={setIsSearchBarFocused}
-                    viewsEnabled={viewsEnabled}
-                    combineSiblings
-                    fixAutoComplete
-                    showQuickFilters
-                    showViewAllResults
-                    showCommandK
-                />
-            </LogoSearchContainer>
-            <NavGroup>
-                <HeaderLinks areLinksHidden={isSearchBarFocused} />
-                <ManageAccount urn={authenticatedUserUrn} pictureLink={authenticatedUserPictureLink || ''} />
-                {showAcrylInfo && <DemoButton />}
-            </NavGroup>
-        </Header>
-    );
-};
-
-SearchHeader.defaultProps = defaultProps;
diff --git a/datahub-web-react/src/app/search/SearchPage.tsx b/datahub-web-react/src/app/search/SearchPage.tsx
deleted file mode 100644
index b03da23672d0dd..00000000000000
--- a/datahub-web-react/src/app/search/SearchPage.tsx
+++ /dev/null
@@ -1,260 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { useHistory } from 'react-router';
-
-import analytics, { EventType } from '@app/analytics';
-import { EntityAndType } from '@app/entity/shared/types';
-import { OnboardingTour } from '@app/onboarding/OnboardingTour';
-import {
-    SEARCH_RESULTS_ADVANCED_SEARCH_ID,
-    SEARCH_RESULTS_BROWSE_SIDEBAR_ID,
-    SEARCH_RESULTS_FILTERS_ID,
-    SEARCH_RESULTS_FILTERS_V2_INTRO,
-} from '@app/onboarding/config/SearchOnboardingConfig';
-import { useToggleEducationStepIdsAllowList } from '@app/onboarding/useToggleEducationStepIdsAllowList';
-import { SearchResults } from '@app/search/SearchResults';
-import { useSelectedSortOption } from '@app/search/context/SearchContext';
-import SearchFilters from '@app/search/filters/SearchFilters';
-import useFilterMode from '@app/search/filters/useFilterMode';
-import useSearchFilterAnalytics from '@app/search/filters/useSearchFilterAnalytics';
-import useGetSearchQueryInputs from '@app/search/useGetSearchQueryInputs';
-import { useIsBrowseV2, useIsSearchV2, useSearchVersion } from '@app/search/useSearchAndBrowseVersion';
-import { ENTITY_SUB_TYPE_FILTER_FIELDS, UnionType } from '@app/search/utils/constants';
-import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl';
-import { DownloadSearchResults, DownloadSearchResultsInput } from '@app/search/utils/types';
-import { useDownloadScrollAcrossEntitiesSearchResults } from '@app/search/utils/useDownloadScrollAcrossEntitiesSearchResults';
-import { scrollToTop } from '@app/shared/searchUtils';
-import { SearchCfg } from '@src/conf';
-
-import { useGetSearchResultsForMultipleQuery } from '@graphql/search.generated';
-import { FacetFilterInput } from '@types';
-
-/**
- * A search results page.
- */
-export const SearchPage = () => {
-    const { trackClearAllFiltersEvent } = useSearchFilterAnalytics();
-    const showSearchFiltersV2 = useIsSearchV2();
-    const showBrowseV2 = useIsBrowseV2();
-    const searchVersion = useSearchVersion();
-    const history = useHistory();
-    const { query, unionType, filters, orFilters, viewUrn, page, activeType, sortInput } = useGetSearchQueryInputs();
-    const { filterMode, filterModeRef, setFilterMode } = useFilterMode(filters, unionType);
-    const selectedSortOption = useSelectedSortOption();
-
-    const [numResultsPerPage, setNumResultsPerPage] = useState(SearchCfg.RESULTS_PER_PAGE);
-    const [isSelectMode, setIsSelectMode] = useState(false);
-    const [selectedEntities, setSelectedEntities] = useState<EntityAndType[]>([]);
-
-    const {
-        data,
-        loading,
-        error,
-        refetch: realRefetch,
-    } = useGetSearchResultsForMultipleQuery({
-        variables: {
-            input: {
-                types: [],
-                query,
-                start: (page - 1) * numResultsPerPage,
-                count: numResultsPerPage,
-                filters: [],
-                orFilters,
-                viewUrn,
-                sortInput,
-                searchFlags: { getSuggestions: true, includeStructuredPropertyFacets: true },
-            },
-        },
-        fetchPolicy: 'cache-and-network',
-    });
-
-    const total = data?.searchAcrossEntities?.total || 0;
-
-    const searchResultEntities =
-        data?.searchAcrossEntities?.searchResults?.map((result) => ({
-            urn: result.entity.urn,
-            type: result.entity.type,
-        })) || [];
-    const searchResultUrns = searchResultEntities.map((entity) => entity.urn);
-
-    // This hook is simply used to generate a refetch callback that the DownloadAsCsv component can use to
-    // download the correct results given the current context.
-    // TODO: Use the loading indicator to log a message to the user should download to CSV fail.
-    // TODO: Revisit this pattern -- what can we push down?
-    const { refetch: refetchForDownload } = useDownloadScrollAcrossEntitiesSearchResults({
-        variables: {
-            input: {
-                types: [],
-                query,
-                count: SearchCfg.RESULTS_PER_PAGE,
-                orFilters,
-                scrollId: null,
-            },
-        },
-        skip: true,
-    });
-
-    const downloadSearchResults = (
-        input: DownloadSearchResultsInput,
-    ): Promise<DownloadSearchResults | null | undefined> => {
-        return refetchForDownload(input);
-    };
-
-    const onChangeFilters = (newFilters: Array<FacetFilterInput>) => {
-        navigateToSearchUrl({
-            type: activeType,
-            query,
-            selectedSortOption,
-            page: 1,
-            filters: newFilters,
-            history,
-            unionType,
-        });
-    };
-
-    const onClearFilters = () => {
-        trackClearAllFiltersEvent(total);
-        onChangeFilters([]);
-    };
-
-    const onChangeUnionType = (newUnionType: UnionType) => {
-        navigateToSearchUrl({
-            type: activeType,
-            query,
-            selectedSortOption,
-            page: 1,
-            filters,
-            history,
-            unionType: newUnionType,
-        });
-    };
-
-    const onChangePage = (newPage: number) => {
-        scrollToTop();
-        navigateToSearchUrl({
-            type: activeType,
-            query,
-            selectedSortOption,
-            page: newPage,
-            filters,
-            history,
-            unionType,
-        });
-    };
-
-    /**
-     * Invoked when the "select all" checkbox is clicked.
-     *
-     * This method either adds the entire current page of search results to
-     * the list of selected entities, or removes the current page from the set of selected entities.
-     */
-    const onChangeSelectAll = (selected: boolean) => {
-        if (selected) {
-            // Add current page of urns to the master selected entity list
-            const entitiesToAdd = searchResultEntities.filter(
-                (entity) =>
-                    selectedEntities.findIndex(
-                        (element) => element.urn === entity.urn && element.type === entity.type,
-                    ) < 0,
-            );
-            setSelectedEntities(Array.from(new Set(selectedEntities.concat(entitiesToAdd))));
-        } else {
-            // Filter out the current page of entity urns from the list
-            setSelectedEntities(selectedEntities.filter((entity) => searchResultUrns.indexOf(entity.urn) === -1));
-        }
-    };
-
-    useEffect(() => {
-        if (loading) return;
-
-        const entityTypes = Array.from(
-            new Set(
-                filters
-                    .filter((filter) => ENTITY_SUB_TYPE_FILTER_FIELDS.includes(filter.field))
-                    .flatMap((filter) => filter.values ?? []),
-            ),
-        );
-
-        const filterFields = Array.from(new Set(filters.map((filter) => filter.field)));
-
-        analytics.event({
-            type: EventType.SearchResultsViewEvent,
-            query,
-            total,
-            entityTypes,
-            filterFields,
-            filterCount: filters.length,
-            // Only track changes to the filters, ignore toggling the mode by itself
-            filterMode: filterModeRef.current,
-            searchVersion,
-        });
-    }, [filters, filterModeRef, loading, query, searchVersion, total]);
-
-    useEffect(() => {
-        // When the query changes, then clear the select mode state
-        setIsSelectMode(false);
-    }, [query]);
-
-    useEffect(() => {
-        if (!isSelectMode) {
-            setSelectedEntities([]);
-        }
-    }, [isSelectMode]);
-
-    // Render new search filters v2 onboarding step if the feature flag is on
-    useToggleEducationStepIdsAllowList(showSearchFiltersV2, SEARCH_RESULTS_FILTERS_V2_INTRO);
-
-    // Render new browse v2 onboarding step if the feature flag is on
-    useToggleEducationStepIdsAllowList(showBrowseV2, SEARCH_RESULTS_BROWSE_SIDEBAR_ID);
-
-    return (
-        <>
-            {!loading && (
-                <OnboardingTour
-                    stepIds={[
-                        SEARCH_RESULTS_FILTERS_ID,
-                        SEARCH_RESULTS_ADVANCED_SEARCH_ID,
-                        SEARCH_RESULTS_BROWSE_SIDEBAR_ID,
-                        SEARCH_RESULTS_FILTERS_V2_INTRO,
-                    ]}
-                />
-            )}
-            {showSearchFiltersV2 && (
-                <SearchFilters
-                    loading={loading}
-                    availableFilters={data?.searchAcrossEntities?.facets || []}
-                    activeFilters={filters}
-                    unionType={unionType}
-                    mode={filterMode}
-                    onChangeFilters={onChangeFilters}
-                    onClearFilters={onClearFilters}
-                    onChangeUnionType={onChangeUnionType}
-                    onChangeMode={setFilterMode}
-                />
-            )}
-            <SearchResults
-                unionType={unionType}
-                downloadSearchResults={downloadSearchResults}
-                page={page}
-                query={query}
-                viewUrn={viewUrn || undefined}
-                error={error}
-                searchResponse={data?.searchAcrossEntities}
-                facets={data?.searchAcrossEntities?.facets}
-                suggestions={data?.searchAcrossEntities?.suggestions || []}
-                selectedFilters={filters}
-                loading={loading}
-                onChangeFilters={onChangeFilters}
-                onChangeUnionType={onChangeUnionType}
-                onChangePage={onChangePage}
-                numResultsPerPage={numResultsPerPage}
-                setNumResultsPerPage={setNumResultsPerPage}
-                isSelectMode={isSelectMode}
-                selectedEntities={selectedEntities}
-                setSelectedEntities={setSelectedEntities}
-                setIsSelectMode={setIsSelectMode}
-                onChangeSelectAll={onChangeSelectAll}
-                refetch={realRefetch}
-            />
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/search/SearchResultList.tsx b/datahub-web-react/src/app/search/SearchResultList.tsx
deleted file mode 100644
index cfbe9686f123a3..00000000000000
--- a/datahub-web-react/src/app/search/SearchResultList.tsx
+++ /dev/null
@@ -1,152 +0,0 @@
-import { Checkbox, Divider, List, ListProps } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import analytics, { EventType } from '@app/analytics';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { SEPARATE_SIBLINGS_URL_PARAM } from '@app/entity/shared/siblingUtils';
-import { EntityAndType } from '@app/entity/shared/types';
-import { CompactEntityNameList } from '@app/recommendations/renderer/component/CompactEntityNameList';
-import EmptySearchResults from '@app/search/EmptySearchResults';
-import { useIsSearchV2 } from '@app/search/useSearchAndBrowseVersion';
-import { CombinedSearchResult } from '@app/search/utils/combineSiblingsInSearchResults';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { SearchResult, SearchSuggestion } from '@types';
-
-const ResultList = styled(List)`
-    &&& {
-        width: 100%;
-        border-color: ${(props) => props.theme.styles['border-color-base']};
-        margin-top: 8px;
-        padding: 16px 32px;
-        border-radius: 0px;
-    }
-`;
-
-const StyledCheckbox = styled(Checkbox)`
-    margin-right: 12px;
-`;
-
-const ThinDivider = styled(Divider)`
-    margin-top: 16px;
-    margin-bottom: 16px;
-`;
-
-export const ResultWrapper = styled.div<{ showUpdatedStyles: boolean }>`
-    ${(props) =>
-        props.showUpdatedStyles &&
-        `    
-        background-color: white;
-        border-radius: 5px;
-        margin: 0 auto 8px auto;
-        padding: 8px 16px;
-        border-bottom: 1px solid ${ANTD_GRAY[5]};
-    `}
-`;
-
-const SiblingResultContainer = styled.div`
-    margin-top: 6px;
-`;
-
-const ListItem = styled.div<{ isSelectMode: boolean }>`
-    display: flex;
-    align-items: center;
-    padding: 0px;
-`;
-
-type Props = {
-    loading: boolean;
-    query: string;
-    searchResults: CombinedSearchResult[];
-    totalResultCount: number;
-    isSelectMode: boolean;
-    selectedEntities: EntityAndType[];
-    setSelectedEntities: (entities: EntityAndType[]) => any;
-    suggestions: SearchSuggestion[];
-    pageNumber: number;
-};
-
-export const SearchResultList = ({
-    loading,
-    query,
-    searchResults,
-    totalResultCount,
-    isSelectMode,
-    selectedEntities,
-    setSelectedEntities,
-    suggestions,
-    pageNumber,
-}: Props) => {
-    const entityRegistry = useEntityRegistry();
-    const selectedEntityUrns = selectedEntities.map((entity) => entity.urn);
-    const showSearchFiltersV2 = useIsSearchV2();
-
-    const onClickResult = (result: SearchResult, index: number) => {
-        analytics.event({
-            type: EventType.SearchResultClickEvent,
-            query,
-            entityUrn: result.entity.urn,
-            entityType: result.entity.type,
-            index,
-            total: totalResultCount,
-            pageNumber,
-        });
-    };
-
-    /**
-     * Invoked when a new entity is selected. Simply updates the state of the list of selected entities.
-     */
-    const onSelectEntity = (selectedEntity: EntityAndType, selected: boolean) => {
-        if (selected) {
-            setSelectedEntities?.([...selectedEntities, selectedEntity]);
-        } else {
-            setSelectedEntities?.(selectedEntities?.filter((entity) => entity.urn !== selectedEntity.urn) || []);
-        }
-    };
-
-    return (
-        <>
-            <ResultList<React.FC<ListProps<CombinedSearchResult>>>
-                id="search-result-list"
-                dataSource={searchResults}
-                split={false}
-                locale={{ emptyText: (!loading && <EmptySearchResults suggestions={suggestions} />) || <></> }}
-                renderItem={(item, index) => (
-                    <ResultWrapper showUpdatedStyles={showSearchFiltersV2} className={`entityUrn-${item.entity.urn}`}>
-                        <ListItem
-                            isSelectMode={isSelectMode}
-                            onClick={() => onClickResult(item, index)}
-                            // class name for counting in test purposes only
-                            className="test-search-result"
-                        >
-                            {isSelectMode && (
-                                <StyledCheckbox
-                                    checked={selectedEntityUrns.indexOf(item.entity.urn) >= 0}
-                                    onChange={(e) =>
-                                        onSelectEntity(
-                                            { urn: item.entity.urn, type: item.entity.type },
-                                            e.target.checked,
-                                        )
-                                    }
-                                />
-                            )}
-                            {entityRegistry.renderSearchResult(item.entity.type, item)}
-                        </ListItem>
-                        {/* an entity is always going to be inserted in the sibling group, so if the sibling group is just one do not 
-                        render. */}
-                        {item.matchedEntities && item.matchedEntities.length > 1 && (
-                            <SiblingResultContainer className="test-search-result-sibling-section">
-                                <CompactEntityNameList
-                                    linkUrlParams={{ [SEPARATE_SIBLINGS_URL_PARAM]: true }}
-                                    entities={item.matchedEntities}
-                                />
-                            </SiblingResultContainer>
-                        )}
-                        {!showSearchFiltersV2 && <ThinDivider />}
-                    </ResultWrapper>
-                )}
-            />
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/search/SearchResults.tsx b/datahub-web-react/src/app/search/SearchResults.tsx
deleted file mode 100644
index f33cf5d66b2263..00000000000000
--- a/datahub-web-react/src/app/search/SearchResults.tsx
+++ /dev/null
@@ -1,301 +0,0 @@
-import { Pagination, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { useUserContext } from '@app/context/useUserContext';
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import SearchExtendedMenu from '@app/entity/shared/components/styled/search/SearchExtendedMenu';
-import { SearchSelectBar } from '@app/entity/shared/components/styled/search/SearchSelectBar';
-import { ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-import { EntityAndType } from '@app/entity/shared/types';
-import { isListSubset } from '@app/entity/shared/utils';
-import { SEARCH_RESULTS_FILTERS_ID } from '@app/onboarding/config/SearchOnboardingConfig';
-import { SearchFiltersSection } from '@app/search/SearchFiltersSection';
-import { SearchResultList } from '@app/search/SearchResultList';
-import SearchResultsLoadingSection from '@app/search/SearchResultsLoadingSection';
-import { SearchResultsRecommendations } from '@app/search/SearchResultsRecommendations';
-import ToggleSidebarButton from '@app/search/ToggleSidebarButton';
-import BrowseSidebar from '@app/search/sidebar';
-import { BrowseProvider } from '@app/search/sidebar/BrowseContext';
-import { SidebarProvider } from '@app/search/sidebar/SidebarContext';
-import SearchSortSelect from '@app/search/sorting/SearchSortSelect';
-import SearchQuerySuggester from '@app/search/suggestions/SearchQuerySugggester';
-import { useIsBrowseV2, useIsSearchV2 } from '@app/search/useSearchAndBrowseVersion';
-import useToggleSidebar from '@app/search/useToggleSidebar';
-import { combineSiblingsInSearchResults } from '@app/search/utils/combineSiblingsInSearchResults';
-import { UnionType } from '@app/search/utils/constants';
-import { generateOrFilters } from '@app/search/utils/generateOrFilters';
-import { DownloadSearchResults, DownloadSearchResultsInput } from '@app/search/utils/types';
-import { ErrorSection } from '@app/shared/error/ErrorSection';
-import { formatNumberWithoutAbbreviation } from '@app/shared/formatNumber';
-import { useIsShowSeparateSiblingsEnabled } from '@app/useAppConfig';
-import { SearchCfg } from '@src/conf';
-
-import { Entity, FacetFilterInput, FacetMetadata, MatchedField, SearchSuggestion } from '@types';
-
-const SearchResultsWrapper = styled.div<{ v2Styles: boolean }>`
-    display: flex;
-    flex: 1;
-
-    ${(props) =>
-        props.v2Styles &&
-        `
-        overflow: hidden;
-    `}
-`;
-
-const SearchBody = styled.div`
-    display: flex;
-    flex-direction: row;
-    min-height: 100%;
-    flex: 1;
-    overflow: auto;
-`;
-
-const ResultContainer = styled.div<{ v2Styles: boolean }>`
-    flex: 1;
-    overflow: auto;
-    ${(props) =>
-        props.v2Styles
-            ? `
-        display: flex;
-        flex-direction: column;
-        background-color: ${ANTD_GRAY_V2[1]};
-    `
-            : `
-        max-width: calc(100% - 260px);
-    `}
-`;
-
-const PaginationControlContainer = styled.div`
-    padding-top: 16px;
-    padding-bottom: 16px;
-    text-align: center;
-`;
-
-const PaginationInfoContainer = styled.div<{ v2Styles: boolean }>`
-    padding-left: 24px;
-    padding-right: 32px;
-    height: 47px;
-    border-bottom: 1px solid;
-    border-color: ${(props) => props.theme.styles['border-color-base']};
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    ${({ v2Styles }) => v2Styles && `background-color: white;`}
-`;
-
-const LeftControlsContainer = styled.div`
-    display: flex;
-    align-items: center;
-    gap: 12px;
-`;
-
-const SearchResultsRecommendationsContainer = styled.div`
-    margin-top: 40px;
-`;
-
-const StyledTabToolbar = styled(TabToolbar)`
-    padding-left: 32px;
-    padding-right: 32px;
-`;
-
-const SearchMenuContainer = styled.div``;
-
-const SearchResultListContainer = styled.div<{ v2Styles: boolean }>`
-    ${({ v2Styles }) =>
-        v2Styles &&
-        `
-        flex: 1;
-        overflow: auto;
-    `}
-`;
-
-interface Props {
-    loading: boolean;
-    unionType?: UnionType;
-    query: string;
-    viewUrn?: string;
-    page: number;
-    searchResponse?: {
-        start: number;
-        count: number;
-        total: number;
-        searchResults?: {
-            entity: Entity;
-            matchedFields: MatchedField[];
-        }[];
-    } | null;
-    facets?: Array<FacetMetadata> | null;
-    selectedFilters: Array<FacetFilterInput>;
-    error: any;
-    onChangeFilters: (filters: Array<FacetFilterInput>) => void;
-    onChangeUnionType: (unionType: UnionType) => void;
-    onChangePage: (page: number) => void;
-    downloadSearchResults: (input: DownloadSearchResultsInput) => Promise<DownloadSearchResults | null | undefined>;
-    numResultsPerPage: number;
-    setNumResultsPerPage: (numResults: number) => void;
-    isSelectMode: boolean;
-    selectedEntities: EntityAndType[];
-    suggestions: SearchSuggestion[];
-    setSelectedEntities: (entities: EntityAndType[]) => void;
-    setIsSelectMode: (showSelectMode: boolean) => any;
-    onChangeSelectAll: (selected: boolean) => void;
-    refetch: () => void;
-}
-
-export const SearchResults = ({
-    loading,
-    unionType = UnionType.AND,
-    query,
-    viewUrn,
-    page,
-    searchResponse,
-    facets,
-    selectedFilters,
-    error,
-    onChangeUnionType,
-    onChangeFilters,
-    onChangePage,
-    downloadSearchResults,
-    numResultsPerPage,
-    setNumResultsPerPage,
-    isSelectMode,
-    selectedEntities,
-    suggestions,
-    setIsSelectMode,
-    setSelectedEntities,
-    onChangeSelectAll,
-    refetch,
-}: Props) => {
-    const showSearchFiltersV2 = useIsSearchV2();
-    const showBrowseV2 = useIsBrowseV2();
-    const { isSidebarOpen, toggleSidebar } = useToggleSidebar();
-    const pageStart = searchResponse?.start || 0;
-    const pageSize = searchResponse?.count || 0;
-    const totalResults = searchResponse?.total || 0;
-    const lastResultIndex = pageStart + pageSize > totalResults ? totalResults : pageStart + pageSize;
-    const authenticatedUserUrn = useUserContext().user?.urn;
-    const showSeparateSiblings = useIsShowSeparateSiblingsEnabled();
-    const combinedSiblingSearchResults = combineSiblingsInSearchResults(
-        showSeparateSiblings,
-        searchResponse?.searchResults,
-    );
-
-    const searchResultUrns = combinedSiblingSearchResults.map((result) => result.entity.urn) || [];
-    const selectedEntityUrns = selectedEntities.map((entity) => entity.urn);
-
-    return (
-        <>
-            <SearchResultsWrapper v2Styles={showSearchFiltersV2}>
-                <SearchBody>
-                    {!showSearchFiltersV2 && (
-                        <div id={SEARCH_RESULTS_FILTERS_ID} data-testid="search-filters-v1">
-                            <SearchFiltersSection
-                                filters={facets}
-                                selectedFilters={selectedFilters}
-                                unionType={unionType}
-                                loading={loading}
-                                onChangeFilters={onChangeFilters}
-                                onChangeUnionType={onChangeUnionType}
-                            />
-                        </div>
-                    )}
-                    {showBrowseV2 && (
-                        <SidebarProvider selectedFilters={selectedFilters} onChangeFilters={onChangeFilters}>
-                            <BrowseProvider>
-                                <BrowseSidebar visible={isSidebarOpen} />
-                            </BrowseProvider>
-                        </SidebarProvider>
-                    )}
-                    <ResultContainer v2Styles={showSearchFiltersV2}>
-                        <PaginationInfoContainer v2Styles={showSearchFiltersV2}>
-                            <LeftControlsContainer>
-                                {showBrowseV2 && <ToggleSidebarButton isOpen={isSidebarOpen} onClick={toggleSidebar} />}
-                                <Typography.Text>
-                                    Showing{' '}
-                                    <b>
-                                        {lastResultIndex > 0 ? (page - 1) * pageSize + 1 : 0} - {lastResultIndex}
-                                    </b>{' '}
-                                    of{' '}
-                                    <b>
-                                        {totalResults >= 10000
-                                            ? `${formatNumberWithoutAbbreviation(10000)}+`
-                                            : formatNumberWithoutAbbreviation(totalResults)}
-                                    </b>{' '}
-                                    results
-                                </Typography.Text>
-                            </LeftControlsContainer>
-                            <SearchMenuContainer>
-                                <SearchSortSelect />
-                                <SearchExtendedMenu
-                                    downloadSearchResults={downloadSearchResults}
-                                    filters={generateOrFilters(unionType, selectedFilters)}
-                                    query={query}
-                                    viewUrn={viewUrn}
-                                    setShowSelectMode={setIsSelectMode}
-                                    totalResults={totalResults}
-                                />
-                            </SearchMenuContainer>
-                        </PaginationInfoContainer>
-                        {isSelectMode && (
-                            <StyledTabToolbar>
-                                <SearchSelectBar
-                                    isSelectAll={
-                                        selectedEntities.length > 0 &&
-                                        isListSubset(searchResultUrns, selectedEntityUrns)
-                                    }
-                                    selectedEntities={selectedEntities}
-                                    onChangeSelectAll={onChangeSelectAll}
-                                    onCancel={() => setIsSelectMode(false)}
-                                    refetch={refetch}
-                                />
-                            </StyledTabToolbar>
-                        )}
-                        {(error && <ErrorSection />) ||
-                            (loading && !combinedSiblingSearchResults.length && <SearchResultsLoadingSection />) ||
-                            (combinedSiblingSearchResults && (
-                                <SearchResultListContainer v2Styles={showSearchFiltersV2}>
-                                    {totalResults > 0 && <SearchQuerySuggester suggestions={suggestions} />}
-                                    <SearchResultList
-                                        loading={loading}
-                                        query={query}
-                                        searchResults={combinedSiblingSearchResults}
-                                        totalResultCount={totalResults}
-                                        isSelectMode={isSelectMode}
-                                        selectedEntities={selectedEntities}
-                                        setSelectedEntities={setSelectedEntities}
-                                        suggestions={suggestions}
-                                        pageNumber={page}
-                                    />
-                                    {totalResults > 0 && (
-                                        <PaginationControlContainer id="search-pagination">
-                                            <Pagination
-                                                current={page}
-                                                pageSize={numResultsPerPage}
-                                                total={totalResults}
-                                                showLessItems
-                                                onChange={onChangePage}
-                                                showSizeChanger={totalResults > SearchCfg.RESULTS_PER_PAGE}
-                                                onShowSizeChange={(_currNum, newNum) => setNumResultsPerPage(newNum)}
-                                                pageSizeOptions={['10', '20', '50', '100']}
-                                            />
-                                        </PaginationControlContainer>
-                                    )}
-                                    {authenticatedUserUrn && (
-                                        <SearchResultsRecommendationsContainer>
-                                            <SearchResultsRecommendations
-                                                userUrn={authenticatedUserUrn}
-                                                query={query}
-                                                filters={selectedFilters}
-                                            />
-                                        </SearchResultsRecommendationsContainer>
-                                    )}
-                                </SearchResultListContainer>
-                            ))}
-                    </ResultContainer>
-                </SearchBody>
-            </SearchResultsWrapper>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/search/SearchResultsLoadingSection.tsx b/datahub-web-react/src/app/search/SearchResultsLoadingSection.tsx
deleted file mode 100644
index 3706e3d2a6bf04..00000000000000
--- a/datahub-web-react/src/app/search/SearchResultsLoadingSection.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Skeleton } from 'antd';
-import * as React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-const Container = styled.div`
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    padding: 24px 0px 20px 40px;
-    overflow: auto;
-    flex: 1;
-`;
-
-const cardStyle = {
-    backgroundColor: ANTD_GRAY[2],
-    height: 120,
-    minWidth: '98%',
-    borderRadius: 8,
-    marginBottom: 20,
-};
-
-export default function SearchResultsLoadingSection() {
-    return (
-        <Container>
-            <Skeleton.Input active style={cardStyle} />
-            <Skeleton.Input active style={cardStyle} />
-            <Skeleton.Input active style={cardStyle} />
-            <Skeleton.Input active style={cardStyle} />
-            <Skeleton.Input active style={cardStyle} />
-        </Container>
-    );
-}
diff --git a/datahub-web-react/src/app/search/SearchResultsRecommendations.tsx b/datahub-web-react/src/app/search/SearchResultsRecommendations.tsx
deleted file mode 100644
index 38388457cd9ac8..00000000000000
--- a/datahub-web-react/src/app/search/SearchResultsRecommendations.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { Divider, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { RecommendationModule } from '@app/recommendations/RecommendationModule';
-
-import { useListRecommendationsQuery } from '@graphql/recommendations.generated';
-import { FacetFilterInput, RecommendationModule as RecommendationModuleType, ScenarioType } from '@types';
-
-const RecommendationsContainer = styled.div`
-    margin-left: 40px;
-    margin-right: 40px;
-`;
-
-const RecommendationContainer = styled.div`
-    margin-bottom: 20px;
-`;
-
-const ThinDivider = styled(Divider)`
-    margin-top: 12px;
-    margin-bottom: 12px;
-`;
-
-const RecommendationTitle = styled(Typography.Title)`
-    color: ${ANTD_GRAY[7]};
-`;
-
-type Props = {
-    userUrn: string;
-    query: string;
-    filters: Array<FacetFilterInput>;
-};
-
-export const SearchResultsRecommendations = ({ userUrn, query, filters }: Props) => {
-    const scenario = ScenarioType.SearchResults;
-    const { data } = useListRecommendationsQuery({
-        variables: {
-            input: {
-                userUrn,
-                requestContext: {
-                    scenario,
-                    searchRequestContext: {
-                        query,
-                        filters,
-                    },
-                },
-                limit: 3,
-            },
-        },
-    });
-    const recommendationModules = data?.listRecommendations?.modules;
-    return (
-        <>
-            {recommendationModules && !!recommendationModules.length && (
-                <RecommendationsContainer data-testid="recommendation-container-id">
-                    <RecommendationTitle level={3}>More you may be interested in</RecommendationTitle>
-                    {recommendationModules &&
-                        recommendationModules.map((module) => (
-                            <RecommendationContainer>
-                                <RecommendationTitle level={5}>{module.title}</RecommendationTitle>
-                                <ThinDivider />
-                                <RecommendationModule
-                                    module={module as RecommendationModuleType}
-                                    scenarioType={scenario}
-                                    showTitle={false}
-                                />
-                            </RecommendationContainer>
-                        ))}
-                </RecommendationsContainer>
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/search/SearchablePage.tsx b/datahub-web-react/src/app/search/SearchablePage.tsx
deleted file mode 100644
index cb091ba0487132..00000000000000
--- a/datahub-web-react/src/app/search/SearchablePage.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-import { debounce } from 'lodash';
-import * as QueryString from 'query-string';
-import React, { useEffect, useState } from 'react';
-import { Helmet } from 'react-helmet-async';
-import { useHistory, useLocation } from 'react-router';
-import { useTheme } from 'styled-components';
-
-import analytics, { EventType } from '@app/analytics';
-import { useUserContext } from '@app/context/useUserContext';
-import { HALF_SECOND_IN_MS } from '@app/entity/shared/tabs/Dataset/Queries/utils/constants';
-import { SearchHeader } from '@app/search/SearchHeader';
-import { useSelectedSortOption } from '@app/search/context/SearchContext';
-import { getAutoCompleteInputFromQuickFilter } from '@app/search/utils/filterUtils';
-import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl';
-import useFilters from '@app/search/utils/useFilters';
-import { useBrowserTitle } from '@app/shared/BrowserTabTitleContext';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { PageRoutes } from '@conf/Global';
-import { useQuickFiltersContext } from '@providers/QuickFiltersContext';
-
-import {
-    GetAutoCompleteMultipleResultsQuery,
-    useGetAutoCompleteMultipleResultsLazyQuery,
-} from '@graphql/search.generated';
-import { EntityType, FacetFilterInput } from '@types';
-
-const styles = {
-    children: {
-        flex: '1',
-        marginTop: 60,
-        display: 'flex',
-        flexDirection: 'column' as const,
-        maxHeight: 'calc(100vh - 60px)',
-    },
-};
-
-interface Props extends React.PropsWithChildren<any> {
-    onSearch?: (query: string, type?: EntityType) => void;
-    onAutoComplete?: (query: string) => void;
-}
-
-const defaultProps = {
-    onSearch: undefined,
-    onAutoComplete: undefined,
-};
-
-const isSearchResultPage = (path: string) => {
-    return path.startsWith(PageRoutes.SEARCH);
-};
-
-/**
- * A page that includes a sticky search header (nav bar)
- */
-export const SearchablePage = ({ onSearch, onAutoComplete, children }: Props) => {
-    const location = useLocation();
-    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
-    const paramFilters: Array<FacetFilterInput> = useFilters(params);
-    const filters = isSearchResultPage(location.pathname) ? paramFilters : [];
-    const currentQuery: string = isSearchResultPage(location.pathname)
-        ? decodeURIComponent(params.query ? (params.query as string) : '')
-        : '';
-    const selectedSortOption = useSelectedSortOption();
-
-    const history = useHistory();
-    const entityRegistry = useEntityRegistry();
-    const themeConfig = useTheme();
-    const { selectedQuickFilter } = useQuickFiltersContext();
-
-    const [getAutoCompleteResults, { data: suggestionsData }] = useGetAutoCompleteMultipleResultsLazyQuery();
-    const userContext = useUserContext();
-    const [newSuggestionData, setNewSuggestionData] = useState<GetAutoCompleteMultipleResultsQuery | undefined>();
-    const { user } = userContext;
-    const viewUrn = userContext.localState?.selectedViewUrn;
-
-    const { title, updateTitle } = useBrowserTitle();
-
-    useEffect(() => {
-        // Update the title only if it's not already set and there is a valid pathname
-        if (!title && location.pathname) {
-            const formattedPath = location.pathname
-                .split('/')
-                .filter((word) => word !== '')
-                .map((rawWord) => {
-                    // ie. personal-notifications -> Personal Notifications
-                    const words = rawWord.split('-');
-                    return words.map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(' ');
-                })
-                .join(' | ');
-
-            if (formattedPath) {
-                return updateTitle(formattedPath);
-            }
-        }
-
-        // Clean up the title when the component unmounts
-        return () => {
-            updateTitle('');
-        };
-    }, [location.pathname, title, updateTitle]);
-
-    useEffect(() => {
-        if (suggestionsData !== undefined) {
-            setNewSuggestionData(suggestionsData);
-        }
-    }, [suggestionsData]);
-
-    const search = (query: string, type?: EntityType, quickFilters?: FacetFilterInput[]) => {
-        analytics.event({
-            type: EventType.SearchEvent,
-            query,
-            pageNumber: 1,
-            originPath: location.pathname,
-            selectedQuickFilterTypes: selectedQuickFilter ? [selectedQuickFilter.field] : undefined,
-            selectedQuickFilterValues: selectedQuickFilter ? [selectedQuickFilter.value] : undefined,
-        });
-
-        const appliedFilters = quickFilters && quickFilters?.length > 0 ? quickFilters : filters;
-
-        navigateToSearchUrl({
-            type,
-            query,
-            filters: appliedFilters,
-            history,
-            selectedSortOption,
-        });
-    };
-
-    const autoComplete = debounce((query: string) => {
-        if (query && query.trim() !== '') {
-            getAutoCompleteResults({
-                variables: {
-                    input: {
-                        query,
-                        viewUrn,
-                        ...getAutoCompleteInputFromQuickFilter(selectedQuickFilter),
-                    },
-                },
-            });
-        }
-    }, HALF_SECOND_IN_MS);
-
-    // Load correct autocomplete results on initial page load.
-    useEffect(() => {
-        if (currentQuery && currentQuery.trim() !== '') {
-            getAutoCompleteResults({
-                variables: {
-                    input: {
-                        query: currentQuery,
-                        viewUrn,
-                    },
-                },
-            });
-        }
-    }, [currentQuery, getAutoCompleteResults, viewUrn]);
-
-    return (
-        <>
-            <SearchHeader
-                initialQuery={currentQuery as string}
-                placeholderText={themeConfig.content.search.searchbarMessage}
-                suggestions={
-                    (newSuggestionData &&
-                        newSuggestionData?.autoCompleteForMultiple &&
-                        newSuggestionData.autoCompleteForMultiple.suggestions) ||
-                    []
-                }
-                onSearch={onSearch || search}
-                onQueryChange={onAutoComplete || autoComplete}
-                authenticatedUserUrn={user?.urn || ''}
-                authenticatedUserPictureLink={user?.editableProperties?.pictureLink}
-                entityRegistry={entityRegistry}
-            />
-            <Helmet>
-                <title>{title}</title>
-            </Helmet>
-            <div style={styles.children}>{children}</div>
-        </>
-    );
-};
-
-SearchablePage.defaultProps = defaultProps;
diff --git a/datahub-web-react/src/app/search/ToggleSidebarButton.tsx b/datahub-web-react/src/app/search/ToggleSidebarButton.tsx
deleted file mode 100644
index 89790c63af6a99..00000000000000
--- a/datahub-web-react/src/app/search/ToggleSidebarButton.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import Icon from '@ant-design/icons/lib/components/Icon';
-import { Button, Tooltip } from 'antd';
-import React, { memo, useState } from 'react';
-import styled from 'styled-components';
-
-import CollapseIcon from '@images/collapse.svg?react';
-import ExpandIcon from '@images/expand.svg?react';
-
-const ToggleIcon = styled(Icon)`
-    color: ${(props) => props.theme.styles['primary-color']};
-    &&& {
-        font-size: 16px;
-    }
-`;
-
-type Props = {
-    isOpen: boolean;
-    onClick: () => void;
-};
-
-const ToggleSidebarButton = ({ isOpen, onClick }: Props) => {
-    const [pauseTooltip, setPauseTooltip] = useState(false);
-    const title = isOpen ? 'Hide the navigation panel' : 'Open the navigation panel';
-    const placement = isOpen ? 'bottom' : 'bottomRight';
-
-    const onClickButton = () => {
-        setPauseTooltip(true);
-        window.setTimeout(() => setPauseTooltip(false), 250);
-        onClick();
-    };
-
-    const button = (
-        <Button
-            data-testid="browse-v2-toggle"
-            size="small"
-            onClick={onClickButton}
-            icon={<ToggleIcon component={isOpen ? CollapseIcon : ExpandIcon} />}
-        />
-    );
-
-    if (pauseTooltip) return button;
-
-    return (
-        <Tooltip title={title} placement={placement} arrowPointAtCenter mouseEnterDelay={1}>
-            {button}
-        </Tooltip>
-    );
-};
-
-export default memo(ToggleSidebarButton);
diff --git a/datahub-web-react/src/app/search/__tests__/SearchPage.test.tsx b/datahub-web-react/src/app/search/__tests__/SearchPage.test.tsx
deleted file mode 100644
index 091601c5f21e64..00000000000000
--- a/datahub-web-react/src/app/search/__tests__/SearchPage.test.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { InMemoryCache } from '@apollo/client';
-import { MockedProvider } from '@apollo/client/testing';
-import { render, waitFor } from '@testing-library/react';
-import React from 'react';
-import { Route } from 'react-router';
-
-import { SearchPage } from '@app/search/SearchPage';
-import { PageRoutes } from '@conf/Global';
-import { mocksWithSearchFlagsOff } from '@src/Mocks';
-import possibleTypesResult from '@src/possibleTypes.generated';
-import TestPageContainer from '@utils/test-utils/TestPageContainer';
-
-const cache = new InMemoryCache({
-    // need to define possibleTypes to allow us to use Apollo cache with union types
-    possibleTypes: possibleTypesResult.possibleTypes,
-});
-
-describe('SearchPage', () => {
-    it('renders the selected filters as checked', async () => {
-        const { getByTestId, queryByTestId } = render(
-            <MockedProvider mocks={mocksWithSearchFlagsOff} addTypename cache={cache}>
-                <TestPageContainer
-                    initialEntries={['/search?filter__entityType=DATASET&filter_platform=kafka&page=1&query=test']}
-                >
-                    <Route path={PageRoutes.SEARCH_RESULTS} render={() => <SearchPage />} />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        await waitFor(() => expect(queryByTestId('facet-_entityType-DATASET')).toBeInTheDocument());
-
-        const datasetEntityBox = getByTestId('facet-_entityType-DATASET');
-        expect(datasetEntityBox).toHaveProperty('checked', true);
-
-        const chartEntityBox = getByTestId('facet-_entityType-CHART');
-        expect(chartEntityBox).toHaveProperty('checked', false);
-    });
-
-    it('renders the selected filters as checked using legacy URL scheme for entity (entity instead of _entityType)', async () => {
-        const { getByTestId, queryByTestId } = render(
-            <MockedProvider mocks={mocksWithSearchFlagsOff} addTypename cache={cache}>
-                <TestPageContainer
-                    initialEntries={['/search?filter_entity=DATASET&filter_platform=kafka&page=1&query=test']}
-                >
-                    <Route path={PageRoutes.SEARCH_RESULTS} render={() => <SearchPage />} />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        await waitFor(() => expect(queryByTestId('facet-_entityType-DATASET')).toBeInTheDocument());
-
-        const datasetEntityBox = getByTestId('facet-_entityType-DATASET');
-        expect(datasetEntityBox).toHaveProperty('checked', true);
-
-        const chartEntityBox = getByTestId('facet-_entityType-CHART');
-        expect(chartEntityBox).toHaveProperty('checked', false);
-    });
-
-    it('renders multiple checked filters at once', async () => {
-        const { getByTestId, queryByTestId } = render(
-            <MockedProvider mocks={mocksWithSearchFlagsOff} addTypename cache={cache}>
-                <TestPageContainer
-                    initialEntries={['/search?filter__entityType=DATASET&filter_platform=kafka,hdfs&page=1&query=test']}
-                >
-                    <Route path={PageRoutes.SEARCH_RESULTS} render={() => <SearchPage />} />
-                </TestPageContainer>
-            </MockedProvider>,
-        );
-
-        await waitFor(() => expect(queryByTestId('facet-_entityType-DATASET')).toBeInTheDocument());
-
-        const datasetEntityBox = getByTestId('facet-_entityType-DATASET');
-        expect(datasetEntityBox).toHaveProperty('checked', true);
-
-        await waitFor(() => expect(queryByTestId('facet-platform-hdfs')).toBeInTheDocument());
-        const hdfsPlatformBox = getByTestId('facet-platform-hdfs');
-        expect(hdfsPlatformBox).toHaveProperty('checked', true);
-    });
-});
diff --git a/datahub-web-react/src/app/search/__tests__/constants.test.tsx b/datahub-web-react/src/app/search/__tests__/constants.test.tsx
deleted file mode 100644
index 1de9a58fa538f2..00000000000000
--- a/datahub-web-react/src/app/search/__tests__/constants.test.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { FIELD_TO_LABEL, ORDERED_FIELDS } from '@app/search/utils/constants';
-
-describe('constants', () => {
-    it('ensure that all ordered fields have a corresponding label', () => {
-        expect(ORDERED_FIELDS.filter((field) => !Object.keys(FIELD_TO_LABEL).includes(field)).length).toEqual(0);
-    });
-});
diff --git a/datahub-web-react/src/app/search/__tests__/filterUtils.test.tsx b/datahub-web-react/src/app/search/__tests__/filterUtils.test.tsx
deleted file mode 100644
index 9607fdb5c44aed..00000000000000
--- a/datahub-web-react/src/app/search/__tests__/filterUtils.test.tsx
+++ /dev/null
@@ -1,218 +0,0 @@
-import { UnionType } from '@app/search/utils/constants';
-import { mergeFilterSets } from '@app/search/utils/filterUtils';
-
-describe('filterUtils', () => {
-    describe('mergeFilterSets', () => {
-        it('merge conjunction and conjunction', () => {
-            const conjunction1 = {
-                unionType: UnionType.AND,
-                filters: [
-                    {
-                        field: 'a',
-                        values: ['1', '2'],
-                    },
-                    {
-                        field: 'b',
-                        values: ['1', '2'],
-                    },
-                ],
-            };
-            const conjunction2 = {
-                unionType: UnionType.AND,
-                filters: [
-                    {
-                        field: 'c',
-                        values: ['1', '2'],
-                    },
-                    {
-                        field: 'd',
-                        values: ['1', '2'],
-                    },
-                ],
-            };
-            const expectedResult = [
-                {
-                    and: [
-                        {
-                            field: 'a',
-                            values: ['1', '2'],
-                        },
-                        {
-                            field: 'b',
-                            values: ['1', '2'],
-                        },
-                        {
-                            field: 'c',
-                            values: ['1', '2'],
-                        },
-                        {
-                            field: 'd',
-                            values: ['1', '2'],
-                        },
-                    ],
-                },
-            ];
-            expect(mergeFilterSets(conjunction1, conjunction2)).toEqual(expectedResult);
-        });
-        it('merge conjunction and disjunction', () => {
-            const conjunction = {
-                unionType: UnionType.AND,
-                filters: [
-                    {
-                        field: 'a',
-                        values: ['1', '2'],
-                    },
-                    {
-                        field: 'b',
-                        values: ['1', '2'],
-                    },
-                ],
-            };
-            const disjunction = {
-                unionType: UnionType.OR,
-                filters: [
-                    {
-                        field: 'c',
-                        values: ['1', '2'],
-                    },
-                    {
-                        field: 'd',
-                        values: ['1', '2'],
-                    },
-                ],
-            };
-            const expectedResult = [
-                {
-                    and: [
-                        {
-                            field: 'c',
-                            values: ['1', '2'],
-                        },
-                        {
-                            field: 'a',
-                            values: ['1', '2'],
-                        },
-                        {
-                            field: 'b',
-                            values: ['1', '2'],
-                        },
-                    ],
-                },
-                {
-                    and: [
-                        {
-                            field: 'd',
-                            values: ['1', '2'],
-                        },
-                        {
-                            field: 'a',
-                            values: ['1', '2'],
-                        },
-                        {
-                            field: 'b',
-                            values: ['1', '2'],
-                        },
-                    ],
-                },
-            ];
-            expect(mergeFilterSets(conjunction, disjunction)).toEqual(expectedResult);
-        });
-        it('merge disjunction and disjunction', () => {
-            const disjunction1 = {
-                unionType: UnionType.OR,
-                filters: [
-                    {
-                        field: 'a',
-                        values: ['1', '2'],
-                    },
-                    {
-                        field: 'b',
-                        values: ['1', '2'],
-                    },
-                ],
-            };
-            const disjunction2 = {
-                unionType: UnionType.OR,
-                filters: [
-                    {
-                        field: 'c',
-                        values: ['1', '2'],
-                    },
-                    {
-                        field: 'd',
-                        values: ['1', '2'],
-                    },
-                ],
-            };
-            const expectedResult = [
-                {
-                    and: [
-                        {
-                            field: 'a',
-                            values: ['1', '2'],
-                        },
-                        {
-                            field: 'c',
-                            values: ['1', '2'],
-                        },
-                    ],
-                },
-                {
-                    and: [
-                        {
-                            field: 'a',
-                            values: ['1', '2'],
-                        },
-                        {
-                            field: 'd',
-                            values: ['1', '2'],
-                        },
-                    ],
-                },
-                {
-                    and: [
-                        {
-                            field: 'b',
-                            values: ['1', '2'],
-                        },
-                        {
-                            field: 'c',
-                            values: ['1', '2'],
-                        },
-                    ],
-                },
-                {
-                    and: [
-                        {
-                            field: 'b',
-                            values: ['1', '2'],
-                        },
-                        {
-                            field: 'd',
-                            values: ['1', '2'],
-                        },
-                    ],
-                },
-            ];
-            expect(mergeFilterSets(disjunction1, disjunction2)).toEqual(expectedResult);
-        });
-        it('bad arguments', () => {
-            expect(
-                mergeFilterSets(
-                    {
-                        unionType: UnionType.OR,
-                        filters: [{ field: 'field', values: [] }],
-                    },
-                    null!,
-                ),
-            ).toEqual([]);
-            expect(
-                mergeFilterSets(null!, {
-                    unionType: UnionType.OR,
-                    filters: [{ field: 'field', values: [] }],
-                }),
-            ).toEqual([]);
-            expect(mergeFilterSets(null!, null!)).toEqual([]);
-        });
-    });
-});
diff --git a/datahub-web-react/src/app/search/autoComplete/AutoCompleteItem.tsx b/datahub-web-react/src/app/search/autoComplete/AutoCompleteItem.tsx
index 1146b71c7033cb..9b260b65d50d8d 100644
--- a/datahub-web-react/src/app/search/autoComplete/AutoCompleteItem.tsx
+++ b/datahub-web-react/src/app/search/autoComplete/AutoCompleteItem.tsx
@@ -11,7 +11,7 @@ import { useEntityRegistry } from '@app/useEntityRegistry';
 
 import { CorpUser, Entity, EntityType, Tag } from '@types';
 
-export const SuggestionContainer = styled.div`
+const SuggestionContainer = styled.div`
     display: flex;
     justify-content: left;
     align-items: center;
diff --git a/datahub-web-react/src/app/search/autoComplete/__tests__/utils.test.ts b/datahub-web-react/src/app/search/autoComplete/__tests__/utils.test.ts
deleted file mode 100644
index a872862775d8ff..00000000000000
--- a/datahub-web-react/src/app/search/autoComplete/__tests__/utils.test.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { getAutoCompleteEntityText } from '@app/search/autoComplete/utils';
-
-describe('utils tests', () => {
-    it('should return matched and unmatched text when the name begins with the query', () => {
-        const { matchedText, unmatchedText } = getAutoCompleteEntityText('testing123', 'test');
-        expect(matchedText).toBe('test');
-        expect(unmatchedText).toBe('ing123');
-    });
-
-    it('should return matched and unmatched text when the name begins with the query regardless of casing', () => {
-        const { matchedText, unmatchedText } = getAutoCompleteEntityText('TESTING123', 'test');
-        expect(matchedText).toBe('TEST');
-        expect(unmatchedText).toBe('ING123');
-    });
-
-    it('should return matched and unmatched text when the name is the same as the query', () => {
-        const { matchedText, unmatchedText } = getAutoCompleteEntityText('testing123', 'testing123');
-        expect(matchedText).toBe('testing123');
-        expect(unmatchedText).toBe('');
-    });
-
-    it('should return matched and unmatched text when there is no overlap', () => {
-        const { matchedText, unmatchedText } = getAutoCompleteEntityText('testing123', 'query');
-        expect(matchedText).toBe('');
-        expect(unmatchedText).toBe('testing123');
-    });
-});
diff --git a/datahub-web-react/src/app/search/autoComplete/quickFilters/utils.tsx b/datahub-web-react/src/app/search/autoComplete/quickFilters/utils.tsx
index 0d22653e41cd5d..41ca58c321e94c 100644
--- a/datahub-web-react/src/app/search/autoComplete/quickFilters/utils.tsx
+++ b/datahub-web-react/src/app/search/autoComplete/quickFilters/utils.tsx
@@ -11,7 +11,7 @@ const StyledIcon = styled.img`
     height: 14px;
 `;
 
-export enum QuickFilterField {
+enum QuickFilterField {
     Platform = 'platform',
     Entity = '_entityType',
 }
diff --git a/datahub-web-react/src/app/search/context/SearchContext.tsx b/datahub-web-react/src/app/search/context/SearchContext.tsx
index ab398aa38f813b..ac04764fc3e66a 100644
--- a/datahub-web-react/src/app/search/context/SearchContext.tsx
+++ b/datahub-web-react/src/app/search/context/SearchContext.tsx
@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 
-export type SearchContextType = {
+type SearchContextType = {
     query: string | undefined;
     selectedSortOption: string | undefined;
     setSelectedSortOption: (sortOption: string) => void;
diff --git a/datahub-web-react/src/app/search/context/SearchResultContext.tsx b/datahub-web-react/src/app/search/context/SearchResultContext.tsx
index 2aa8734ef3ddfe..5c70076a09bdce 100644
--- a/datahub-web-react/src/app/search/context/SearchResultContext.tsx
+++ b/datahub-web-react/src/app/search/context/SearchResultContext.tsx
@@ -2,7 +2,6 @@ import React, { ReactNode, createContext, useContext, useMemo } from 'react';
 
 import { MatchedFieldName } from '@app/search/matches/constants';
 import {
-    getMatchedFieldLabel,
     getMatchedFieldNames,
     getMatchedFieldsByNames,
     getMatchedFieldsByUrn,
@@ -45,7 +44,7 @@ export const useEntityType = () => {
     return useSearchResultContext()?.searchResult?.entity?.type;
 };
 
-export const useMatchedFields = () => {
+const useMatchedFields = () => {
     return useSearchResult()?.matchedFields ?? [];
 };
 
@@ -72,8 +71,3 @@ export const useHasMatchedFieldByUrn = (urn: string, fieldName: MatchedFieldName
     const matchedFields = useMatchedFieldsByGroup(fieldName);
     return getMatchedFieldsByUrn(matchedFields, urn).length > 0;
 };
-
-export const useMatchedFieldLabel = (fieldName: string) => {
-    const entityType = useEntityType();
-    return getMatchedFieldLabel(entityType, fieldName);
-};
diff --git a/datahub-web-react/src/app/search/context/constants.ts b/datahub-web-react/src/app/search/context/constants.ts
index 94a07d44aa5242..5f97232143b5f5 100644
--- a/datahub-web-react/src/app/search/context/constants.ts
+++ b/datahub-web-react/src/app/search/context/constants.ts
@@ -1,10 +1,8 @@
 import { SortOrder } from '@types';
 
 export const RELEVANCE = 'relevance';
-export const ENTITY_NAME_FIELD = '_entityName';
-export const LAST_OPERATION_TIME_FIELD = 'lastOperationTime';
-
-export const DEFAULT_SORT_OPTION = RELEVANCE;
+const ENTITY_NAME_FIELD = '_entityName';
+const LAST_OPERATION_TIME_FIELD = 'lastOperationTime';
 
 export const SORT_OPTIONS = {
     [RELEVANCE]: { label: 'Relevance (Default)', field: RELEVANCE, sortOrder: SortOrder.Descending },
diff --git a/datahub-web-react/src/app/search/filters/ActiveFilter.tsx b/datahub-web-react/src/app/search/filters/ActiveFilter.tsx
deleted file mode 100644
index 564989c6a95136..00000000000000
--- a/datahub-web-react/src/app/search/filters/ActiveFilter.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { CloseCircleOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { useFilterRendererRegistry } from '@app/search/filters/render/useFilterRenderer';
-import { IconSpacer, Label } from '@app/search/filters/styledComponents';
-import useGetBrowseV2LabelOverride from '@app/search/filters/useGetBrowseV2LabelOverride';
-import { getFilterEntity, getFilterIconAndLabel, getNewFilters } from '@app/search/filters/utils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { FacetFilterInput, FacetMetadata } from '@types';
-
-const ActiveFilterWrapper = styled.div`
-    border: 1px solid ${ANTD_GRAY[5]};
-    border-radius: 4px;
-    padding: 2px 8px;
-    display: flex;
-    align-items: center;
-    font-size: 14px;
-    height: 24px;
-    margin: 8px 8px 0 0;
-`;
-
-const StyledButton = styled(Button)`
-    border: none;
-    box-shadow: none;
-    padding: 0;
-    margin-left: 6px;
-    height: 16px;
-    width: 11px;
-`;
-
-interface ActiveFilterProps {
-    filterFacet: FacetFilterInput;
-    filterValue: string;
-    availableFilters: FacetMetadata[] | null;
-    activeFilters: FacetFilterInput[];
-    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
-}
-
-function ActiveFilter({
-    filterFacet,
-    filterValue,
-    availableFilters,
-    activeFilters,
-    onChangeFilters,
-}: ActiveFilterProps) {
-    const entityRegistry = useEntityRegistry();
-    const filterEntity = getFilterEntity(filterFacet.field, filterValue, availableFilters);
-    const filterLabelOverride = useGetBrowseV2LabelOverride(filterFacet.field, filterValue, entityRegistry);
-    const filterRenderer = useFilterRendererRegistry();
-    const facetEntity = availableFilters?.find((f) => f.field === filterFacet.field)?.entity;
-
-    const { icon, label } = !filterRenderer.hasRenderer(filterFacet.field)
-        ? getFilterIconAndLabel(
-              filterFacet.field,
-              filterValue,
-              entityRegistry,
-              filterEntity,
-              12,
-              filterLabelOverride,
-              facetEntity,
-          )
-        : {
-              icon: filterRenderer.getIcon(filterFacet.field),
-              label: filterRenderer.getValueLabel(filterFacet.field, filterValue),
-          };
-
-    function removeFilter() {
-        const newFilterValues = filterFacet.values?.filter((value) => value !== filterValue) || [];
-        onChangeFilters(getNewFilters(filterFacet.field, activeFilters, newFilterValues));
-    }
-
-    return (
-        <ActiveFilterWrapper data-testid={`active-filter-${label}`}>
-            {icon}
-            {icon && <IconSpacer />}
-            <Label ellipsis={{ tooltip: label }} style={{ maxWidth: 150 }}>
-                {label}
-            </Label>
-            <StyledButton
-                icon={<CloseCircleOutlined />}
-                onClick={removeFilter}
-                data-testid={`remove-filter-${label}`}
-            />
-        </ActiveFilterWrapper>
-    );
-}
-
-interface Props {
-    filter: FacetFilterInput;
-    availableFilters: FacetMetadata[] | null;
-    activeFilters: FacetFilterInput[];
-    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
-}
-
-export default function ActiveFilterContainer({ filter, availableFilters, activeFilters, onChangeFilters }: Props) {
-    return (
-        <>
-            {filter.values?.map((value) => (
-                <ActiveFilter
-                    key={value}
-                    filterFacet={filter}
-                    filterValue={value}
-                    availableFilters={availableFilters}
-                    activeFilters={activeFilters}
-                    onChangeFilters={onChangeFilters}
-                />
-            ))}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/search/filters/AdvancedFilters.tsx b/datahub-web-react/src/app/search/filters/AdvancedFilters.tsx
deleted file mode 100644
index 27df5f970c126e..00000000000000
--- a/datahub-web-react/src/app/search/filters/AdvancedFilters.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { useUserContext } from '@app/context/useUserContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { AdvancedFilterSelectValueModal } from '@app/search/AdvancedFilterSelectValueModal';
-import { AdvancedSearchAddFilterSelect } from '@app/search/AdvancedSearchAddFilterSelect';
-import { AdvancedSearchFilter } from '@app/search/AdvancedSearchFilter';
-import { AdvancedSearchFilterOverallUnionTypeSelect } from '@app/search/AdvancedSearchFilterOverallUnionTypeSelect';
-import { FilterButtonsWrapper, FlexSpacer, FlexWrapper } from '@app/search/filters/BasicFilters';
-import SaveViewButton from '@app/search/filters/SaveViewButton';
-import { TextButton } from '@app/search/filters/styledComponents';
-import useAdvancedSearchSelectFilters from '@app/search/useAdvancedSearchSelectFilters';
-import { UnionType } from '@app/search/utils/constants';
-import { hasAdvancedFilters } from '@app/search/utils/hasAdvancedFilters';
-
-import { FacetFilterInput, FacetMetadata } from '@types';
-
-const AnyAllToggle = styled.div`
-    font-weight: 700;
-    margin-bottom: 8px;
-`;
-
-const EmptyStateSection = styled.div`
-    padding: 6px 20px;
-    background-color: ${ANTD_GRAY[2]};
-    border-radius: 5px;
-`;
-
-interface Props {
-    availableFilters: FacetMetadata[];
-    activeFilters: FacetFilterInput[];
-    unionType: UnionType;
-    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
-    onChangeUnionType: (unionType: UnionType) => void;
-    showBasicFilters: () => void;
-}
-
-export default function AdvancedFilters({
-    availableFilters,
-    activeFilters,
-    unionType,
-    onChangeFilters,
-    showBasicFilters,
-    onChangeUnionType,
-}: Props) {
-    const { filterField, setFilterField, onFilterFieldSelect, onSelectValueFromModal } = useAdvancedSearchSelectFilters(
-        { selectedFilters: activeFilters, onFilterSelect: onChangeFilters },
-    );
-    const userContext = useUserContext();
-    const selectedViewUrn = userContext?.localState?.selectedViewUrn;
-    const showSaveViewButton = activeFilters?.length > 0 && selectedViewUrn === undefined;
-    const onlyShowAdvancedFilters = hasAdvancedFilters(activeFilters, unionType);
-
-    return (
-        <>
-            {activeFilters?.length >= 2 && (
-                <AnyAllToggle>
-                    Show results that match{' '}
-                    <AdvancedSearchFilterOverallUnionTypeSelect
-                        unionType={unionType}
-                        onUpdate={(newValue) => onChangeUnionType(newValue)}
-                    />
-                </AnyAllToggle>
-            )}
-            <FlexSpacer>
-                <FlexWrapper>
-                    <AdvancedSearchAddFilterSelect
-                        selectedFilters={activeFilters}
-                        onFilterFieldSelect={onFilterFieldSelect}
-                        isCompact
-                    />
-                    {activeFilters.map((filter) => (
-                        <AdvancedSearchFilter
-                            key={`${filter.field}-${filter.condition}-${filter.negated}-${filter.values}-${filter.value}`}
-                            facet={
-                                availableFilters.find((facet) => facet.field === filter.field) || availableFilters[0]
-                            }
-                            loading={false}
-                            filter={filter}
-                            onClose={() => {
-                                onChangeFilters(activeFilters.filter((f) => f !== filter));
-                            }}
-                            onUpdate={(newValue) => {
-                                onChangeFilters(
-                                    activeFilters.map((f) => {
-                                        if (f === filter) {
-                                            return newValue;
-                                        }
-                                        return f;
-                                    }),
-                                );
-                            }}
-                            isCompact
-                        />
-                    ))}
-                    {!activeFilters.length && <EmptyStateSection>No filters applied.</EmptyStateSection>}
-                </FlexWrapper>
-                <FilterButtonsWrapper>
-                    {showSaveViewButton && <SaveViewButton activeFilters={activeFilters} unionType={unionType} />}
-                    <TextButton disabled={onlyShowAdvancedFilters} type="text" onClick={showBasicFilters} marginTop={0}>
-                        Basic Filters
-                    </TextButton>
-                </FilterButtonsWrapper>
-            </FlexSpacer>
-            {filterField && (
-                <AdvancedFilterSelectValueModal
-                    facet={availableFilters.find((facet) => facet.field === filterField) || null}
-                    onCloseModal={() => setFilterField(null)}
-                    filterField={filterField}
-                    onSelect={onSelectValueFromModal}
-                />
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/search/filters/BasicFilters.tsx b/datahub-web-react/src/app/search/filters/BasicFilters.tsx
deleted file mode 100644
index 3de32952d121af..00000000000000
--- a/datahub-web-react/src/app/search/filters/BasicFilters.tsx
+++ /dev/null
@@ -1,160 +0,0 @@
-import { Divider } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { useUserContext } from '@app/context/useUserContext';
-import {
-    SEARCH_RESULTS_ADVANCED_SEARCH_ID,
-    SEARCH_RESULTS_FILTERS_ID,
-} from '@app/onboarding/config/SearchOnboardingConfig';
-import ActiveFilter from '@app/search/filters/ActiveFilter';
-import BasicFiltersLoadingSection from '@app/search/filters/BasicFiltersLoadingSection';
-import MoreFilters from '@app/search/filters/MoreFilters';
-import SaveViewButton from '@app/search/filters/SaveViewButton';
-import SearchFilter from '@app/search/filters/SearchFilter';
-import { SORTED_FILTERS } from '@app/search/filters/constants';
-import { FilterScenarioType } from '@app/search/filters/render/types';
-import { useFilterRendererRegistry } from '@app/search/filters/render/useFilterRenderer';
-import { TextButton } from '@app/search/filters/styledComponents';
-import { sortFacets } from '@app/search/filters/utils';
-import {
-    BROWSE_PATH_V2_FILTER_NAME,
-    ENTITY_INDEX_FILTER_NAME,
-    LEGACY_ENTITY_FILTER_NAME,
-    ORIGIN_FILTER_NAME,
-    TYPE_NAMES_FILTER_NAME,
-    UnionType,
-} from '@app/search/utils/constants';
-import { useAppConfig } from '@src/app/useAppConfig';
-
-import { FacetFilterInput, FacetMetadata } from '@types';
-
-const NUM_VISIBLE_FILTER_DROPDOWNS = 5;
-
-export const FlexWrapper = styled.div`
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-`;
-
-export const FlexSpacer = styled.div`
-    display: flex;
-    justify-content: space-between;
-`;
-
-const StyledDivider = styled(Divider)`
-    margin: 8px 0 0 0;
-`;
-
-export const FilterButtonsWrapper = styled.div`
-    display: flex;
-    flex-wrap: nowrap;
-`;
-
-// remove legacy filter options as well as new _index and browsePathV2 filter from dropdowns
-const FILTERS_TO_REMOVE = [
-    TYPE_NAMES_FILTER_NAME,
-    LEGACY_ENTITY_FILTER_NAME,
-    ENTITY_INDEX_FILTER_NAME,
-    BROWSE_PATH_V2_FILTER_NAME,
-];
-
-interface Props {
-    loading: boolean;
-    availableFilters: FacetMetadata[] | null;
-    activeFilters: FacetFilterInput[];
-    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
-    onClearFilters: () => void;
-    showAdvancedFilters: () => void;
-}
-
-export default function BasicFilters({
-    loading,
-    availableFilters,
-    activeFilters,
-    onChangeFilters,
-    onClearFilters,
-    showAdvancedFilters,
-}: Props) {
-    const userContext = useUserContext();
-    const { config } = useAppConfig();
-    const selectedViewUrn = userContext?.localState?.selectedViewUrn;
-    const showSaveViewButton = activeFilters?.length > 0 && selectedViewUrn === undefined;
-    // only want Environment filter if there's 2 or more envs
-    const filters = availableFilters
-        ?.filter((f) => (f.field === ORIGIN_FILTER_NAME ? f.aggregations.length >= 2 : true)) // only want Environment filter if there's 2 or more envs
-        .filter((f) => !FILTERS_TO_REMOVE.includes(f.field))
-        .sort((facetA, facetB) => sortFacets(facetA, facetB, SORTED_FILTERS));
-    // if there will only be one filter in the "More Filters" dropdown, show that filter instead
-    const shouldShowMoreDropdown = filters && filters.length > NUM_VISIBLE_FILTER_DROPDOWNS + 1;
-    const visibleFilters = shouldShowMoreDropdown ? filters?.slice(0, NUM_VISIBLE_FILTER_DROPDOWNS) : filters;
-    const hiddenFilters = shouldShowMoreDropdown ? filters?.slice(NUM_VISIBLE_FILTER_DROPDOWNS) : [];
-    const filterRendererRegistry = useFilterRendererRegistry();
-
-    return (
-        <span id={SEARCH_RESULTS_FILTERS_ID}>
-            <FlexSpacer>
-                <FlexWrapper>
-                    {loading && !visibleFilters?.length && <BasicFiltersLoadingSection />}
-                    {visibleFilters?.map((filter) => {
-                        return filterRendererRegistry.hasRenderer(filter.field) ? (
-                            filterRendererRegistry.render(filter.field, {
-                                scenario: FilterScenarioType.SEARCH_V2_PRIMARY,
-                                filter,
-                                activeFilters,
-                                onChangeFilters,
-                                config,
-                            })
-                        ) : (
-                            <SearchFilter
-                                key={filter.field}
-                                filter={filter}
-                                activeFilters={activeFilters}
-                                onChangeFilters={onChangeFilters}
-                            />
-                        );
-                    })}
-                    {hiddenFilters && hiddenFilters.length > 0 && (
-                        <MoreFilters
-                            filters={hiddenFilters}
-                            activeFilters={activeFilters}
-                            onChangeFilters={onChangeFilters}
-                        />
-                    )}
-                </FlexWrapper>
-                <FilterButtonsWrapper>
-                    {showSaveViewButton && <SaveViewButton activeFilters={activeFilters} unionType={UnionType.AND} />}
-                    <TextButton
-                        id={SEARCH_RESULTS_ADVANCED_SEARCH_ID}
-                        type="text"
-                        onClick={showAdvancedFilters}
-                        marginTop={0}
-                    >
-                        Advanced Filters
-                    </TextButton>
-                </FilterButtonsWrapper>
-            </FlexSpacer>
-            {activeFilters.length > 0 && (
-                <>
-                    <StyledDivider />
-                    <FlexSpacer>
-                        <FlexWrapper>
-                            {activeFilters.map((activeFilter) => (
-                                <ActiveFilter
-                                    key={activeFilter.field}
-                                    filter={activeFilter}
-                                    availableFilters={availableFilters}
-                                    activeFilters={activeFilters}
-                                    onChangeFilters={onChangeFilters}
-                                />
-                            ))}
-                        </FlexWrapper>
-                        <TextButton type="text" onClick={onClearFilters} height={14} data-testid="clear-all-filters">
-                            clear all
-                        </TextButton>
-                    </FlexSpacer>
-                </>
-            )}
-        </span>
-    );
-}
diff --git a/datahub-web-react/src/app/search/filters/BasicFiltersLoadingSection.tsx b/datahub-web-react/src/app/search/filters/BasicFiltersLoadingSection.tsx
deleted file mode 100644
index d586152c21a160..00000000000000
--- a/datahub-web-react/src/app/search/filters/BasicFiltersLoadingSection.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Skeleton } from 'antd';
-import * as React from 'react';
-import styled from 'styled-components';
-
-const Container = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const CardSkeleton = styled(Skeleton.Input)`
-    && {
-        padding: 2px 12px 2px 0px;
-        height: 32px;
-        border-radius: 8px;
-    }
-`;
-
-export default function BasicFiltersLoadingSection() {
-    return (
-        <Container>
-            <CardSkeleton active size="default" />
-            <CardSkeleton active size="default" />
-            <CardSkeleton active size="default" />
-            <CardSkeleton active size="default" />
-        </Container>
-    );
-}
diff --git a/datahub-web-react/src/app/search/filters/DateRangeMenu/DateRangeMenu.tsx b/datahub-web-react/src/app/search/filters/DateRangeMenu/DateRangeMenu.tsx
deleted file mode 100644
index 802fb3ce41445b..00000000000000
--- a/datahub-web-react/src/app/search/filters/DateRangeMenu/DateRangeMenu.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import { DatePicker } from 'antd';
-import moment from 'moment';
-import React, { useCallback, useRef, useState } from 'react';
-import styled from 'styled-components';
-
-import useDateRangeFilterValues, { Datetime } from '@app/search/filters/DateRangeMenu/useDateRangeFilterValues';
-import { useFilterDisplayName } from '@app/search/filters/utils';
-import { Text } from '@src/alchemy-components';
-import { FacetFilterInput, FacetMetadata, FilterOperator } from '@src/types.generated';
-
-const { RangePicker } = DatePicker;
-
-const Container = styled.div`
-    padding: 16px;
-    background-color: #ffffff;
-    box-shadow:
-        0 3px 6px -4px rgba(0, 0, 0, 0.12),
-        0 6px 16px 0 rgba(0, 0, 0, 0.08),
-        0 9px 28px 8px rgba(0, 0, 0, 0.05);
-    border-radius: 8px;
-    min-width: 225px;
-`;
-
-interface Props {
-    field: FacetMetadata;
-    manuallyUpdateFilters: (newValues: FacetFilterInput[]) => void;
-}
-
-export default function DateRangeMenu({ field, manuallyUpdateFilters }: Props) {
-    const displayName = useFilterDisplayName(field);
-    moment.tz.setDefault('GMT');
-
-    const [startDate, setStartDate] = useState<Datetime>(null);
-    const [endDate, setEndDate] = useState<Datetime>(null);
-    const [isOpen, setIsOpen] = useState<boolean>(false);
-    const ref = useRef<any>(null);
-
-    useDateRangeFilterValues({ filterField: field.field, setStartDate, setEndDate });
-
-    const handleOpenChange = useCallback(
-        (open: boolean) => {
-            setIsOpen(open);
-            if (!open) {
-                ref.current?.blur();
-                if (startDate && endDate) {
-                    manuallyUpdateFilters([
-                        {
-                            field: field.field,
-                            values: [startDate.valueOf().toString()],
-                            condition: FilterOperator.GreaterThan,
-                        },
-                        {
-                            field: field.field,
-                            values: [endDate.valueOf().toString()],
-                            condition: FilterOperator.LessThan,
-                        },
-                    ]);
-                }
-            }
-        },
-        [startDate, endDate, field.field, manuallyUpdateFilters],
-    );
-
-    const handleRangeChange = useCallback((dates: [Datetime, Datetime] | null) => {
-        const [start, end] = dates || [null, null];
-
-        start?.set({ hour: 0, minute: 0, second: 0, millisecond: 0 });
-        end?.set({ hour: 23, minute: 59, second: 59, millisecond: 999 });
-
-        setStartDate(start);
-        setEndDate(end);
-    }, []);
-
-    return (
-        <Container>
-            <Text weight="bold">Filter by {displayName}</Text>
-            <RangePicker
-                ref={ref}
-                open={isOpen}
-                allowClear
-                allowEmpty={[true, true]}
-                bordered={false}
-                value={[startDate, endDate]}
-                format="ll"
-                onChange={handleRangeChange}
-                onOpenChange={handleOpenChange}
-                onCalendarChange={() => handleOpenChange(true)}
-                style={{ paddingLeft: 0, paddingRight: 0 }}
-            />
-        </Container>
-    );
-}
diff --git a/datahub-web-react/src/app/search/filters/DateRangeMenu/useDateRangeFilterValues.ts b/datahub-web-react/src/app/search/filters/DateRangeMenu/useDateRangeFilterValues.ts
deleted file mode 100644
index c8761834244492..00000000000000
--- a/datahub-web-react/src/app/search/filters/DateRangeMenu/useDateRangeFilterValues.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import moment from 'moment';
-import { useEffect, useMemo } from 'react';
-
-import useGetSearchQueryInputs from '@app/search/useGetSearchQueryInputs';
-import { FilterOperator } from '@src/types.generated';
-
-export type Datetime = moment.Moment | null;
-
-interface Props {
-    filterField: string;
-    setStartDate: React.Dispatch<React.SetStateAction<Datetime>>;
-    setEndDate: React.Dispatch<React.SetStateAction<Datetime>>;
-}
-
-export default function useDateRangeFilterValues({ filterField, setStartDate, setEndDate }: Props) {
-    const { filters: activeFilters } = useGetSearchQueryInputs();
-    const matchingFilters = useMemo(
-        () => activeFilters.filter((f) => f.field === filterField),
-        [activeFilters, filterField],
-    );
-    const startDateFromFilter = useMemo(
-        () => matchingFilters.find((f) => f.condition === FilterOperator.GreaterThan)?.values?.[0],
-        [matchingFilters],
-    );
-    const endDateFromFilter = useMemo(
-        () => matchingFilters.find((f) => f.condition === FilterOperator.LessThan)?.values?.[0],
-        [matchingFilters],
-    );
-
-    useEffect(() => {
-        if (startDateFromFilter) {
-            setStartDate(
-                moment(parseInt(startDateFromFilter, 10)).set({ hour: 0, minute: 0, second: 0, millisecond: 0 }),
-            );
-        } else {
-            setStartDate(null);
-        }
-    }, [startDateFromFilter, setStartDate]);
-
-    useEffect(() => {
-        if (endDateFromFilter) {
-            setEndDate(
-                moment(parseInt(endDateFromFilter, 10)).set({ hour: 23, minute: 59, second: 59, millisecond: 999 }),
-            );
-        } else {
-            setEndDate(null);
-        }
-    }, [endDateFromFilter, setEndDate]);
-}
diff --git a/datahub-web-react/src/app/search/filters/EntityTypeFilter/EntityTypeFilter.tsx b/datahub-web-react/src/app/search/filters/EntityTypeFilter/EntityTypeFilter.tsx
deleted file mode 100644
index 2c3aa6732151f0..00000000000000
--- a/datahub-web-react/src/app/search/filters/EntityTypeFilter/EntityTypeFilter.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import React, { useEffect, useState } from 'react';
-
-import {
-    getDisplayedFilterOptions,
-    getInitialSelectedOptions,
-    getNumActiveFilters,
-} from '@app/search/filters/EntityTypeFilter/entityTypeFilterUtils';
-import SearchFilterView from '@app/search/filters/SearchFilterView';
-import { FilterOptionType } from '@app/search/filters/types';
-import { getFilterDropdownIcon, getNewFilters } from '@app/search/filters/utils';
-import useGetSearchQueryInputs from '@app/search/useGetSearchQueryInputs';
-import {
-    ENTITY_FILTER_NAME,
-    ENTITY_SUB_TYPE_FILTER_FIELDS,
-    ENTITY_SUB_TYPE_FILTER_NAME,
-    LEGACY_ENTITY_FILTER_FIELDS,
-} from '@app/search/utils/constants';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useAggregateAcrossEntitiesLazyQuery } from '@graphql/search.generated';
-import { FacetFilterInput, FacetMetadata } from '@types';
-
-interface Props {
-    filter: FacetMetadata;
-    activeFilters: FacetFilterInput[];
-    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
-}
-
-export default function EntityTypeFilter({ filter, activeFilters, onChangeFilters }: Props) {
-    const entityRegistry = useEntityRegistry();
-    const [selectedFilterOptions, setSelectedFilterOptions] = useState<FilterOptionType[]>([]);
-    const [searchQuery, setSearchQuery] = useState<string>('');
-    const [isMenuOpen, setIsMenuOpen] = useState(false);
-    const { query, orFilters, viewUrn } = useGetSearchQueryInputs(ENTITY_SUB_TYPE_FILTER_FIELDS);
-    const [aggregateAcrossEntities, { data, loading }] = useAggregateAcrossEntitiesLazyQuery();
-
-    useEffect(() => {
-        setSelectedFilterOptions(getInitialSelectedOptions(activeFilters, data));
-    }, [activeFilters, data]);
-
-    function updateIsMenuOpen(isOpen: boolean) {
-        setIsMenuOpen(isOpen);
-        setSearchQuery('');
-
-        if (isOpen) {
-            aggregateAcrossEntities({
-                variables: {
-                    input: {
-                        query,
-                        orFilters,
-                        viewUrn,
-                        facets: [ENTITY_SUB_TYPE_FILTER_NAME, ENTITY_FILTER_NAME],
-                    },
-                },
-            });
-        }
-    }
-
-    function updateFilters() {
-        const activeFiltersWithoutLegacyFacets = activeFilters.filter(
-            (f) => !LEGACY_ENTITY_FILTER_FIELDS.includes(f.field),
-        );
-        onChangeFilters(
-            getNewFilters(
-                ENTITY_SUB_TYPE_FILTER_NAME,
-                activeFiltersWithoutLegacyFacets,
-                selectedFilterOptions.map((f) => f.value),
-            ),
-        );
-        setIsMenuOpen(false);
-    }
-
-    const filterOptions = getDisplayedFilterOptions(
-        selectedFilterOptions,
-        entityRegistry,
-        setSelectedFilterOptions,
-        searchQuery,
-        data,
-    );
-    const numActiveFilters = getNumActiveFilters(activeFilters);
-    const filterIcon = getFilterDropdownIcon(filter.field);
-
-    return (
-        <SearchFilterView
-            filterOptions={filterOptions}
-            isMenuOpen={isMenuOpen}
-            numActiveFilters={numActiveFilters}
-            filterIcon={filterIcon}
-            displayName={filter.displayName || ''}
-            searchQuery={searchQuery}
-            loading={loading}
-            updateIsMenuOpen={updateIsMenuOpen}
-            setSearchQuery={setSearchQuery}
-            updateFilters={updateFilters}
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/search/filters/EntityTypeFilter/entityTypeFilterUtils.ts b/datahub-web-react/src/app/search/filters/EntityTypeFilter/entityTypeFilterUtils.ts
deleted file mode 100644
index 08663f4f4fdde5..00000000000000
--- a/datahub-web-react/src/app/search/filters/EntityTypeFilter/entityTypeFilterUtils.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import EntityRegistry from '@app/entity/EntityRegistry';
-import { mapFilterOption } from '@app/search/filters/mapFilterOption';
-import { FilterOptionType } from '@app/search/filters/types';
-import { filterOptionsWithSearch, getFilterIconAndLabel, getFilterOptions } from '@app/search/filters/utils';
-import {
-    ENTITY_FILTER_NAME,
-    ENTITY_SUB_TYPE_FILTER_NAME,
-    FILTER_DELIMITER,
-    LEGACY_ENTITY_FILTER_FIELDS,
-} from '@app/search/utils/constants';
-
-import { AggregateAcrossEntitiesQuery } from '@graphql/search.generated';
-import { AggregationMetadata, FacetFilterInput, FacetMetadata } from '@types';
-
-const BACKWARDS_COMPATIBLE_FILTER_FIELDS = [ENTITY_SUB_TYPE_FILTER_NAME, ...LEGACY_ENTITY_FILTER_FIELDS];
-
-export function getInitialSelectedOptionsFromAggregations(
-    aggregations: AggregationMetadata[],
-    activeFilterValues: string[],
-    initialSelectedOptions: FilterOptionType[],
-) {
-    return aggregations
-        .filter((agg) => activeFilterValues?.includes(agg.value))
-        .filter((agg) => !initialSelectedOptions?.find((initialFilter) => initialFilter.value === agg.value)) // make sure we don't have duplicates
-        .map((agg) => ({
-            field: ENTITY_SUB_TYPE_FILTER_NAME,
-            value: agg.value,
-            entity: agg.entity,
-            count: agg.count,
-        }));
-}
-
-export function getInitialSelectedOptions(activeFilters: FacetFilterInput[], data?: AggregateAcrossEntitiesQuery) {
-    let initialSelectedOptions: FilterOptionType[] = [];
-    const activeFilterValues = activeFilters.find((f) => BACKWARDS_COMPATIBLE_FILTER_FIELDS.includes(f.field))?.values;
-    data?.aggregateAcrossEntities?.facets?.forEach((facet) => {
-        if (BACKWARDS_COMPATIBLE_FILTER_FIELDS.includes(facet.field)) {
-            initialSelectedOptions = [
-                ...initialSelectedOptions,
-                ...getInitialSelectedOptionsFromAggregations(
-                    facet.aggregations,
-                    activeFilterValues || [],
-                    initialSelectedOptions,
-                ),
-            ];
-        }
-    });
-
-    return initialSelectedOptions;
-}
-
-function addAggregationIfNotPresent(aggregations: AggregationMetadata[], facet: FacetMetadata) {
-    facet.aggregations.forEach((agg) => {
-        if (!aggregations.find((a) => a.value === agg.value)) {
-            aggregations.push(agg);
-        }
-    });
-}
-
-function getAggregationsForFilterOptions(data?: AggregateAcrossEntitiesQuery) {
-    const aggregations: AggregationMetadata[] = [];
-    data?.aggregateAcrossEntities?.facets?.forEach((facet) => {
-        if (facet.field === ENTITY_SUB_TYPE_FILTER_NAME) {
-            addAggregationIfNotPresent(aggregations, facet);
-        } else if (facet.field === ENTITY_FILTER_NAME) {
-            addAggregationIfNotPresent(aggregations, facet);
-        }
-    });
-    return aggregations;
-}
-
-function filterNestedOptions(nestedOption: FilterOptionType, entityRegistry: EntityRegistry, searchQuery: string) {
-    const { label } = getFilterIconAndLabel(ENTITY_SUB_TYPE_FILTER_NAME, nestedOption.value, entityRegistry, null);
-    return filterOptionsWithSearch(searchQuery, (label as string) || '');
-}
-
-// transforms options to be displayed and filters them based in the search input the user types in
-export function getDisplayedFilterOptions(
-    selectedFilterOptions: FilterOptionType[],
-    entityRegistry: EntityRegistry,
-    setSelectedFilterOptions: (values: FilterOptionType[]) => void,
-    searchQuery: string,
-    data?: AggregateAcrossEntitiesQuery,
-) {
-    const aggregations = getAggregationsForFilterOptions(data);
-
-    // map aggregations to filter options, removing nested options, and placing nested options under top level options
-    const filterOptions = getFilterOptions(ENTITY_SUB_TYPE_FILTER_NAME, aggregations, selectedFilterOptions, [] as any)
-        .filter((option) => !option.value.includes(FILTER_DELIMITER)) // remove nested options
-        .map((filterOption) => {
-            const nestedOptions = aggregations
-                .filter(
-                    (option) => option.value.includes(FILTER_DELIMITER) && option.value.includes(filterOption.value),
-                )
-                .map((option) => ({ field: ENTITY_SUB_TYPE_FILTER_NAME, ...option }) as FilterOptionType)
-                .filter((o) => filterNestedOptions(o, entityRegistry, searchQuery));
-            return mapFilterOption({
-                filterOption,
-                entityRegistry,
-                selectedFilterOptions,
-                setSelectedFilterOptions,
-                nestedOptions,
-            });
-        })
-        .filter((option) => filterOptionsWithSearch(searchQuery, option.displayName as string, option.nestedOptions));
-
-    return filterOptions;
-}
-
-export function getNumActiveFilters(activeFilters: FacetFilterInput[]) {
-    const activeFilterValues = new Set(
-        activeFilters.filter((f) => BACKWARDS_COMPATIBLE_FILTER_FIELDS.includes(f.field)).flatMap((f) => f.values),
-    );
-    return activeFilterValues.size;
-}
diff --git a/datahub-web-react/src/app/search/filters/MoreFilterOption.tsx b/datahub-web-react/src/app/search/filters/MoreFilterOption.tsx
deleted file mode 100644
index 78b8bc609c1ec3..00000000000000
--- a/datahub-web-react/src/app/search/filters/MoreFilterOption.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { RightOutlined } from '@ant-design/icons';
-import { Dropdown } from 'antd';
-import React, { useRef } from 'react';
-import styled from 'styled-components';
-
-import OptionsDropdownMenu from '@app/search/filters/OptionsDropdownMenu';
-import { IconWrapper } from '@app/search/filters/SearchFilterView';
-import { MoreFilterOptionLabel } from '@app/search/filters/styledComponents';
-import useSearchFilterDropdown from '@app/search/filters/useSearchFilterDropdown';
-import { getFilterDropdownIcon, useElementDimensions, useFilterDisplayName } from '@app/search/filters/utils';
-
-import { FacetFilterInput, FacetMetadata } from '@types';
-
-const IconNameWrapper = styled.span`
-    display: flex;
-    align-items: center;
-`;
-
-interface Props {
-    filter: FacetMetadata;
-    activeFilters: FacetFilterInput[];
-    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
-}
-
-export default function MoreFilterOption({ filter, activeFilters, onChangeFilters }: Props) {
-    const labelRef = useRef<HTMLDivElement>(null);
-    const { width, height } = useElementDimensions(labelRef);
-
-    const {
-        isMenuOpen,
-        updateIsMenuOpen,
-        updateFilters,
-        filterOptions,
-        numActiveFilters,
-        areFiltersLoading,
-        searchQuery,
-        updateSearchQuery,
-        manuallyUpdateFilters,
-    } = useSearchFilterDropdown({
-        filter,
-        activeFilters,
-        onChangeFilters,
-    });
-    const filterIcon = getFilterDropdownIcon(filter.field);
-    const displayName = useFilterDisplayName(filter);
-
-    return (
-        <Dropdown
-            trigger={['click']}
-            menu={{ items: filterOptions }}
-            open={isMenuOpen}
-            onOpenChange={(open) => updateIsMenuOpen(open)}
-            dropdownRender={(menu) => (
-                <OptionsDropdownMenu
-                    style={{ left: width, position: 'absolute', top: -height }}
-                    menu={menu}
-                    updateFilters={updateFilters}
-                    searchQuery={searchQuery}
-                    updateSearchQuery={updateSearchQuery}
-                    isLoading={areFiltersLoading}
-                    searchPlaceholder={displayName || ''}
-                    filter={filter}
-                    manuallyUpdateFilters={manuallyUpdateFilters}
-                />
-            )}
-        >
-            <MoreFilterOptionLabel
-                ref={labelRef}
-                onClick={() => updateIsMenuOpen(!isMenuOpen)}
-                isActive={!!numActiveFilters}
-                isOpen={isMenuOpen}
-                data-testid={`more-filter-${displayName?.replace(/\s/g, '-')}`}
-            >
-                <IconNameWrapper>
-                    {filterIcon && <IconWrapper>{filterIcon}</IconWrapper>}
-                    {displayName} {numActiveFilters ? `(${numActiveFilters}) ` : ''}
-                </IconNameWrapper>
-                <RightOutlined style={{ fontSize: '12px', height: '12px' }} />
-            </MoreFilterOptionLabel>
-        </Dropdown>
-    );
-}
diff --git a/datahub-web-react/src/app/search/filters/MoreFilters.tsx b/datahub-web-react/src/app/search/filters/MoreFilters.tsx
deleted file mode 100644
index 5389343a59fd4e..00000000000000
--- a/datahub-web-react/src/app/search/filters/MoreFilters.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Dropdown } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import MoreFilterOption from '@app/search/filters/MoreFilterOption';
-import { FilterScenarioType } from '@app/search/filters/render/types';
-import { useFilterRendererRegistry } from '@app/search/filters/render/useFilterRenderer';
-import { SearchFilterLabel } from '@app/search/filters/styledComponents';
-import useSearchFilterAnalytics from '@app/search/filters/useSearchFilterAnalytics';
-import { getNumActiveFiltersForGroupOfFilters } from '@app/search/filters/utils';
-import { useAppConfig } from '@src/app/useAppConfig';
-
-import { FacetFilterInput, FacetMetadata } from '@types';
-
-const StyledPlus = styled(PlusOutlined)`
-    svg {
-        height: 12px;
-        width: 12px;
-    }
-`;
-
-const DropdownMenu = styled.div<{ padding?: string }>`
-    background-color: white;
-    border-radius: 5px;
-    box-shadow: ${(props) => props.theme.styles['box-shadow']};
-    overflow: hidden;
-    min-width: 200px;
-    max-width: 240px;
-
-    ${(props) => props.padding !== undefined && `padding: ${props.padding};`}
-`;
-
-interface Props {
-    filters: FacetMetadata[];
-    activeFilters: FacetFilterInput[];
-    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
-}
-
-export default function MoreFilters({ filters, activeFilters, onChangeFilters }: Props) {
-    const { trackShowMoreEvent } = useSearchFilterAnalytics();
-    const [isMenuOpen, setIsMenuOpen] = useState(false);
-    const numActiveFilters = getNumActiveFiltersForGroupOfFilters(activeFilters, filters);
-    const filterRendererRegistry = useFilterRendererRegistry();
-    const { config } = useAppConfig();
-
-    function updateFiltersAndClose(newFilters: FacetFilterInput[]) {
-        onChangeFilters(newFilters);
-        setIsMenuOpen(false);
-    }
-
-    function onOpenChange(isOpen: boolean) {
-        if (isOpen) trackShowMoreEvent(activeFilters.length, filters.length);
-        setIsMenuOpen(isOpen);
-    }
-
-    return (
-        <Dropdown
-            trigger={['click']}
-            dropdownRender={() => (
-                <DropdownMenu padding="4px 0px">
-                    {filters.map((filter) => {
-                        return filterRendererRegistry.hasRenderer(filter.field) ? (
-                            filterRendererRegistry.render(filter.field, {
-                                scenario: FilterScenarioType.SEARCH_V2_SECONDARY,
-                                filter,
-                                activeFilters,
-                                onChangeFilters: updateFiltersAndClose,
-                                config,
-                            })
-                        ) : (
-                            <MoreFilterOption
-                                key={filter.field}
-                                filter={filter}
-                                activeFilters={activeFilters}
-                                onChangeFilters={updateFiltersAndClose}
-                            />
-                        );
-                    })}
-                </DropdownMenu>
-            )}
-            open={isMenuOpen}
-            onOpenChange={onOpenChange}
-        >
-            <SearchFilterLabel data-testid="more-filters-dropdown" isActive={!!numActiveFilters}>
-                <StyledPlus />
-                More Filters {numActiveFilters ? `(${numActiveFilters}) ` : ''}
-            </SearchFilterLabel>
-        </Dropdown>
-    );
-}
diff --git a/datahub-web-react/src/app/search/filters/OptionsDropdownMenu.tsx b/datahub-web-react/src/app/search/filters/OptionsDropdownMenu.tsx
deleted file mode 100644
index f9883a152bc9f4..00000000000000
--- a/datahub-web-react/src/app/search/filters/OptionsDropdownMenu.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import { LoadingOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React, { CSSProperties } from 'react';
-import styled from 'styled-components/macro';
-
-import { SearchBar } from '@app/search/SearchBar';
-import DateRangeMenu from '@app/search/filters/DateRangeMenu/DateRangeMenu';
-import { getIsDateRangeFilter } from '@app/search/filters/utils';
-import { useEnterKeyListener } from '@app/shared/useEnterKeyListener';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { FacetFilterInput, FacetMetadata } from '@src/types.generated';
-
-const StyledButton = styled(Button)`
-    width: 100%;
-    text-align: center;
-    background-color: ${(props) => props.theme.styles['primary-color']};
-    color: white;
-    border-radius: 0;
-`;
-
-export const DropdownMenu = styled.div`
-    background-color: white;
-    border-radius: 5px;
-    box-shadow:
-        0 3px 6px -4px rgba(0, 0, 0, 0.12),
-        0 6px 16px 0 rgba(0, 0, 0, 0.08),
-        0 9px 28px 8px rgba(0, 0, 0, 0.05);
-    overflow: hidden;
-    min-width: 200px;
-
-    .ant-dropdown-menu-title-content {
-        background-color: white;
-        &:hover {
-            background-color: white;
-        }
-    }
-`;
-
-const ScrollableContent = styled.div`
-    max-height: 312px;
-    overflow: auto;
-`;
-
-const LoadingWrapper = styled.div`
-    display: flex;
-    justify-content: center;
-    padding: 9px;
-
-    svg {
-        height: 16px;
-        width: 16px;
-    }
-`;
-
-interface Props {
-    menu: React.ReactNode;
-    updateFilters: () => void;
-    isLoading: boolean;
-    searchQuery: string;
-    updateSearchQuery: (query: string) => void;
-    searchPlaceholder?: string;
-    style?: CSSProperties;
-    filter?: FacetMetadata;
-    manuallyUpdateFilters?: (newValues: FacetFilterInput[]) => void;
-}
-
-export default function OptionsDropdownMenu({
-    menu,
-    updateFilters,
-    isLoading,
-    searchQuery,
-    updateSearchQuery,
-    searchPlaceholder,
-    style,
-    filter,
-    manuallyUpdateFilters,
-}: Props) {
-    const entityRegistry = useEntityRegistry();
-
-    useEnterKeyListener({ querySelectorToExecuteClick: '#updateFiltersButton' });
-
-    if (filter && manuallyUpdateFilters && getIsDateRangeFilter(filter)) {
-        return (
-            <DropdownMenu data-testid="filter-dropdown" style={style}>
-                <DateRangeMenu field={filter} manuallyUpdateFilters={manuallyUpdateFilters} />
-            </DropdownMenu>
-        );
-    }
-
-    return (
-        <DropdownMenu data-testid="filter-dropdown" style={style}>
-            <ScrollableContent>
-                <SearchBar
-                    initialQuery={searchQuery}
-                    placeholderText={searchPlaceholder || ''}
-                    suggestions={[]}
-                    hideRecommendations
-                    style={{
-                        padding: 12,
-                        paddingBottom: 5,
-                    }}
-                    inputStyle={{
-                        height: 30,
-                        fontSize: 12,
-                        borderRadius: 8,
-                    }}
-                    onSearch={() => null}
-                    onQueryChange={(q) => updateSearchQuery(q)}
-                    entityRegistry={entityRegistry}
-                />
-                {React.cloneElement(menu as React.ReactElement, { style: { boxShadow: 'none' } })}
-                {isLoading && (
-                    <LoadingWrapper>
-                        <LoadingOutlined />
-                    </LoadingWrapper>
-                )}
-            </ScrollableContent>
-            <StyledButton id="updateFiltersButton" type="text" onClick={updateFilters} data-testid="update-filters">
-                Update
-            </StyledButton>
-        </DropdownMenu>
-    );
-}
diff --git a/datahub-web-react/src/app/search/filters/ParentEntities.tsx b/datahub-web-react/src/app/search/filters/ParentEntities.tsx
index 2cc6b0fe04ff59..e01aafca40d4be 100644
--- a/datahub-web-react/src/app/search/filters/ParentEntities.tsx
+++ b/datahub-web-react/src/app/search/filters/ParentEntities.tsx
@@ -24,7 +24,7 @@ const ParentNode = styled(Typography.Text)<{ color?: string }>`
     color: ${(props) => (props.color ? props.color : ANTD_GRAY[7])};
 `;
 
-export const ArrowWrapper = styled.span`
+const ArrowWrapper = styled.span`
     margin: 0 3px;
     display: flex;
     align-items: center;
diff --git a/datahub-web-react/src/app/search/filters/SaveViewButton.tsx b/datahub-web-react/src/app/search/filters/SaveViewButton.tsx
deleted file mode 100644
index 49fe68cfdc4136..00000000000000
--- a/datahub-web-react/src/app/search/filters/SaveViewButton.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Tooltip } from 'antd';
-import React, { useMemo, useState } from 'react';
-import styled from 'styled-components';
-
-import { ViewBuilder } from '@app/entity/view/builder/ViewBuilder';
-import { ViewBuilderMode } from '@app/entity/view/builder/types';
-import { buildInitialViewState, fromUnionType } from '@app/entity/view/builder/utils';
-import { TextButton } from '@app/search/filters/styledComponents';
-import { canCreateViewFromFilters } from '@app/search/filters/utils';
-import { UnionType } from '@app/search/utils/constants';
-import { Message } from '@app/shared/Message';
-
-import { FacetFilterInput } from '@types';
-
-const ToolTipHeader = styled.div`
-    margin-bottom: 12px;
-`;
-
-interface Props {
-    activeFilters: FacetFilterInput[];
-    unionType: UnionType;
-}
-
-export default function SaveViewButton({ activeFilters, unionType }: Props) {
-    const [isViewModalVisible, setIsViewModalVisible] = useState(false);
-    const isValidViewDefiniton = useMemo(() => canCreateViewFromFilters(activeFilters), [activeFilters]);
-
-    function toggleViewBuilder() {
-        setIsViewModalVisible(true);
-        if (!isValidViewDefiniton) {
-            // TODO: fire off analytics event
-            setTimeout(() => setIsViewModalVisible(false), 3000);
-        }
-    }
-
-    return (
-        <>
-            <Tooltip
-                placement="right"
-                title={
-                    <>
-                        <ToolTipHeader>Save these filters as a new View.</ToolTipHeader>
-                        <div>Views allow you to easily save or share search filters.</div>
-                    </>
-                }
-            >
-                <TextButton type="text" onClick={toggleViewBuilder} marginTop={0} data-testid="save-as-view">
-                    Save as a View
-                </TextButton>
-            </Tooltip>
-            {isViewModalVisible && (
-                <>
-                    {isValidViewDefiniton && (
-                        <ViewBuilder
-                            mode={ViewBuilderMode.EDITOR}
-                            initialState={buildInitialViewState(activeFilters, fromUnionType(unionType))}
-                            onSubmit={() => setIsViewModalVisible(false)}
-                            onCancel={() => setIsViewModalVisible(false)}
-                        />
-                    )}
-                    {!isValidViewDefiniton && (
-                        <Message
-                            type="error"
-                            content="This combination of filters cannot be saved as a View at this time."
-                        />
-                    )}
-                </>
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/search/filters/SearchFilter.tsx b/datahub-web-react/src/app/search/filters/SearchFilter.tsx
deleted file mode 100644
index 32142343f4eb09..00000000000000
--- a/datahub-web-react/src/app/search/filters/SearchFilter.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React from 'react';
-
-import EntityTypeFilter from '@app/search/filters/EntityTypeFilter/EntityTypeFilter';
-import SearchFilterView from '@app/search/filters/SearchFilterView';
-import useSearchFilterDropdown from '@app/search/filters/useSearchFilterDropdown';
-import { getFilterDropdownIcon, useFilterDisplayName } from '@app/search/filters/utils';
-import { ENTITY_FILTER_NAME } from '@app/search/utils/constants';
-
-import { FacetFilterInput, FacetMetadata } from '@types';
-
-interface Props {
-    filter: FacetMetadata;
-    activeFilters: FacetFilterInput[];
-    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
-}
-
-export default function SearchFilter({ filter, activeFilters, onChangeFilters }: Props) {
-    const {
-        isMenuOpen,
-        updateIsMenuOpen,
-        updateFilters,
-        filterOptions,
-        numActiveFilters,
-        areFiltersLoading,
-        searchQuery,
-        updateSearchQuery,
-        manuallyUpdateFilters,
-    } = useSearchFilterDropdown({
-        filter,
-        activeFilters,
-        onChangeFilters,
-    });
-    const filterIcon = getFilterDropdownIcon(filter.field);
-    const displayName = useFilterDisplayName(filter);
-
-    if (filter.field === ENTITY_FILTER_NAME) {
-        return <EntityTypeFilter filter={filter} activeFilters={activeFilters} onChangeFilters={onChangeFilters} />;
-    }
-
-    return (
-        <SearchFilterView
-            filterOptions={filterOptions}
-            isMenuOpen={isMenuOpen}
-            numActiveFilters={numActiveFilters}
-            filterIcon={filterIcon}
-            displayName={displayName || ''}
-            searchQuery={searchQuery}
-            loading={areFiltersLoading}
-            updateIsMenuOpen={updateIsMenuOpen}
-            setSearchQuery={updateSearchQuery}
-            updateFilters={updateFilters}
-            filter={filter}
-            manuallyUpdateFilters={manuallyUpdateFilters}
-        />
-    );
-}
diff --git a/datahub-web-react/src/app/search/filters/SearchFilterView.tsx b/datahub-web-react/src/app/search/filters/SearchFilterView.tsx
deleted file mode 100644
index caae7f934d5e1b..00000000000000
--- a/datahub-web-react/src/app/search/filters/SearchFilterView.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { CaretDownFilled } from '@ant-design/icons';
-import { Dropdown } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import OptionsDropdownMenu from '@app/search/filters/OptionsDropdownMenu';
-import { DisplayedFilterOption } from '@app/search/filters/mapFilterOption';
-import { SearchFilterLabel } from '@app/search/filters/styledComponents';
-import { FacetFilterInput, FacetMetadata } from '@src/types.generated';
-
-export const IconWrapper = styled.div`
-    margin-right: 8px;
-    display: flex;
-    svg {
-        height: 14px;
-        width: 14px;
-    }
-`;
-
-interface Props {
-    filterOptions: DisplayedFilterOption[];
-    isMenuOpen: boolean;
-    numActiveFilters: number;
-    filterIcon: JSX.Element | null;
-    displayName: string;
-    searchQuery: string;
-    loading: boolean;
-    updateIsMenuOpen: (isOpen: boolean) => void;
-    setSearchQuery: (query: string) => void;
-    updateFilters: () => void;
-    filter?: FacetMetadata;
-    manuallyUpdateFilters?: (newValues: FacetFilterInput[]) => void;
-}
-
-export default function SearchFilterView({
-    filterOptions,
-    isMenuOpen,
-    numActiveFilters,
-    filterIcon,
-    displayName,
-    searchQuery,
-    loading,
-    updateIsMenuOpen,
-    setSearchQuery,
-    updateFilters,
-    filter,
-    manuallyUpdateFilters,
-}: Props) {
-    return (
-        <Dropdown
-            trigger={['click']}
-            menu={{ items: filterOptions }}
-            open={isMenuOpen}
-            onOpenChange={(open) => updateIsMenuOpen(open)}
-            dropdownRender={(menu) => (
-                <OptionsDropdownMenu
-                    menu={menu}
-                    updateFilters={updateFilters}
-                    searchQuery={searchQuery}
-                    updateSearchQuery={setSearchQuery}
-                    isLoading={loading}
-                    searchPlaceholder={displayName}
-                    filter={filter}
-                    manuallyUpdateFilters={manuallyUpdateFilters}
-                />
-            )}
-        >
-            <SearchFilterLabel
-                onClick={() => updateIsMenuOpen(!isMenuOpen)}
-                isActive={!!numActiveFilters}
-                data-testid={`filter-dropdown-${displayName?.replace(/\s/g, '-')}`}
-            >
-                {filterIcon && <IconWrapper>{filterIcon}</IconWrapper>}
-                {displayName} {numActiveFilters ? `(${numActiveFilters}) ` : ''}
-                <CaretDownFilled style={{ fontSize: '12px', height: '12px' }} />
-            </SearchFilterLabel>
-        </Dropdown>
-    );
-}
diff --git a/datahub-web-react/src/app/search/filters/SearchFilters.tsx b/datahub-web-react/src/app/search/filters/SearchFilters.tsx
deleted file mode 100644
index 20bc4c7db27dd4..00000000000000
--- a/datahub-web-react/src/app/search/filters/SearchFilters.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { SEARCH_RESULTS_FILTERS_V2_INTRO } from '@app/onboarding/config/SearchOnboardingConfig';
-import AdvancedFilters from '@app/search/filters/AdvancedFilters';
-import BasicFilters from '@app/search/filters/BasicFilters';
-import { FilterMode, FilterModes, UnionType } from '@app/search/utils/constants';
-
-import { FacetFilterInput, FacetMetadata } from '@types';
-
-const SearchFiltersWrapper = styled.div<{ removePadding: boolean }>`
-    border-bottom: 1px solid ${ANTD_GRAY[4]};
-    padding: ${(props) => (props.removePadding ? '8px 24px 4px 24px' : '8px 24px')};
-`;
-
-interface Props {
-    loading: boolean;
-    mode: FilterMode;
-    availableFilters: FacetMetadata[];
-    activeFilters: FacetFilterInput[];
-    unionType: UnionType;
-    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
-    onClearFilters: () => void;
-    onChangeUnionType: (unionType: UnionType) => void;
-    onChangeMode: (mode: FilterMode) => void;
-}
-
-export default function SearchFilters({
-    loading,
-    mode,
-    availableFilters,
-    activeFilters,
-    unionType,
-    onChangeFilters,
-    onClearFilters,
-    onChangeUnionType,
-    onChangeMode,
-}: Props) {
-    const [finalAvailableFilters, setFinalAvailableFilters] = useState(availableFilters);
-
-    /**
-     * Only update the active filters if we are done loading. Prevents jitter!
-     */
-    useEffect(() => {
-        if (!loading && finalAvailableFilters !== availableFilters) {
-            setFinalAvailableFilters(availableFilters);
-        }
-    }, [availableFilters, loading, finalAvailableFilters]);
-
-    const isShowingBasicFilters = mode === FilterModes.BASIC;
-    return (
-        <SearchFiltersWrapper
-            id={SEARCH_RESULTS_FILTERS_V2_INTRO}
-            data-testid="search-filters-v2"
-            removePadding={!isShowingBasicFilters && !!activeFilters.length}
-        >
-            {isShowingBasicFilters && (
-                <BasicFilters
-                    loading={loading}
-                    availableFilters={finalAvailableFilters}
-                    activeFilters={activeFilters}
-                    onChangeFilters={onChangeFilters}
-                    onClearFilters={onClearFilters}
-                    showAdvancedFilters={() => onChangeMode(FilterModes.ADVANCED)}
-                />
-            )}
-            {!isShowingBasicFilters && (
-                <AdvancedFilters
-                    availableFilters={finalAvailableFilters}
-                    activeFilters={activeFilters}
-                    unionType={unionType}
-                    onChangeFilters={onChangeFilters}
-                    onChangeUnionType={onChangeUnionType}
-                    showBasicFilters={() => onChangeMode(FilterModes.BASIC)}
-                />
-            )}
-        </SearchFiltersWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/search/filters/__tests__/entityTypeFilterUtils.test.tsx b/datahub-web-react/src/app/search/filters/__tests__/entityTypeFilterUtils.test.tsx
deleted file mode 100644
index 786d2d9db50b75..00000000000000
--- a/datahub-web-react/src/app/search/filters/__tests__/entityTypeFilterUtils.test.tsx
+++ /dev/null
@@ -1,274 +0,0 @@
-import React from 'react';
-
-import {
-    getDisplayedFilterOptions,
-    getInitialSelectedOptions,
-    getInitialSelectedOptionsFromAggregations,
-    getNumActiveFilters,
-} from '@app/search/filters/EntityTypeFilter/entityTypeFilterUtils';
-import FilterOption from '@app/search/filters/FilterOption';
-import {
-    ENTITY_FILTER_NAME,
-    ENTITY_SUB_TYPE_FILTER_NAME,
-    LEGACY_ENTITY_FILTER_NAME,
-    TAGS_FILTER_NAME,
-} from '@app/search/utils/constants';
-import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer';
-
-const mockData = {
-    aggregateAcrossEntities: {
-        facets: [
-            {
-                field: ENTITY_SUB_TYPE_FILTER_NAME,
-                aggregations: [
-                    { value: 'DATASET', count: 12 },
-                    { value: 'DATASET␞table', count: 6 },
-                    { value: 'DATASET␞view', count: 6 },
-                    { value: 'CONTAINER', count: 6 },
-                    { value: 'CONTAINER␞test', count: 3 },
-                ],
-            },
-            {
-                field: ENTITY_FILTER_NAME,
-                aggregations: [
-                    { value: 'DASHBOARD', count: 5 },
-                    { value: 'CHART', count: 100 },
-                ],
-            },
-            {
-                field: TAGS_FILTER_NAME,
-                aggregations: [{ value: 'urn:li:tag:tag1', count: 20 }],
-            },
-        ],
-    },
-};
-
-describe('getDisplayedFilterOptions', () => {
-    const testEntityRegistry = getTestEntityRegistry();
-    const mockSetSelectedFilterOptions = () => {};
-
-    it('should get the list of displayed filter options with nested filters underneath their parents', () => {
-        const filterOptions = getDisplayedFilterOptions(
-            [],
-            testEntityRegistry,
-            mockSetSelectedFilterOptions,
-            '',
-            mockData,
-        );
-
-        const expectedFilterOptions = [
-            {
-                key: 'DATASET',
-                label: (
-                    <FilterOption
-                        filterOption={{ field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'DATASET', count: 12 }}
-                        selectedFilterOptions={[]}
-                        setSelectedFilterOptions={mockSetSelectedFilterOptions}
-                    />
-                ),
-                style: { padding: 0 },
-                displayName: 'Datasets',
-                nestedOptions: [
-                    { field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'DATASET␞table', count: 6 },
-                    { field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'DATASET␞view', count: 6 },
-                ],
-            },
-            {
-                key: 'CONTAINER',
-                label: (
-                    <FilterOption
-                        filterOption={{ field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'CONTAINER', count: 6 }}
-                        selectedFilterOptions={[]}
-                        setSelectedFilterOptions={mockSetSelectedFilterOptions}
-                    />
-                ),
-                style: { padding: 0 },
-                displayName: 'Containers',
-                nestedOptions: [{ field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'CONTAINER␞test', count: 3 }],
-            },
-            {
-                key: 'DASHBOARD',
-                label: (
-                    <FilterOption
-                        filterOption={{ field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'DASHBOARD', count: 5 }}
-                        selectedFilterOptions={[]}
-                        setSelectedFilterOptions={mockSetSelectedFilterOptions}
-                    />
-                ),
-                style: { padding: 0 },
-                displayName: 'Dashboards',
-                nestedOptions: [],
-            },
-            {
-                key: 'CHART',
-                label: (
-                    <FilterOption
-                        filterOption={{ field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'CHART', count: 100 }}
-                        selectedFilterOptions={[]}
-                        setSelectedFilterOptions={mockSetSelectedFilterOptions}
-                    />
-                ),
-                style: { padding: 0 },
-                displayName: 'Charts',
-                nestedOptions: [],
-            },
-        ];
-
-        expect(filterOptions).toMatchObject(expectedFilterOptions);
-    });
-
-    it('should get displayed filters and filter for nestedFilters', () => {
-        const filterOptions = getDisplayedFilterOptions(
-            [],
-            testEntityRegistry,
-            mockSetSelectedFilterOptions,
-            'vie',
-            mockData,
-        );
-
-        const expectedFilterOptions = [
-            {
-                key: 'DATASET',
-                label: (
-                    <FilterOption
-                        filterOption={{ field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'DATASET', count: 12 }}
-                        selectedFilterOptions={[]}
-                        setSelectedFilterOptions={mockSetSelectedFilterOptions}
-                    />
-                ),
-                style: { padding: 0 },
-                displayName: 'Datasets',
-                nestedOptions: [{ field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'DATASET␞view', count: 6 }],
-            },
-        ];
-
-        expect(filterOptions).toMatchObject(expectedFilterOptions);
-    });
-
-    it('should get displayed filters and filter for top level filters', () => {
-        const filterOptions = getDisplayedFilterOptions(
-            [],
-            testEntityRegistry,
-            mockSetSelectedFilterOptions,
-            'datase',
-            mockData,
-        );
-
-        const expectedFilterOptions = [
-            {
-                key: 'DATASET',
-                label: (
-                    <FilterOption
-                        filterOption={{ field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'DATASET', count: 12 }}
-                        selectedFilterOptions={[]}
-                        setSelectedFilterOptions={mockSetSelectedFilterOptions}
-                    />
-                ),
-                style: { padding: 0 },
-                displayName: 'Datasets',
-                nestedOptions: [],
-            },
-        ];
-
-        expect(filterOptions).toMatchObject(expectedFilterOptions);
-    });
-});
-
-describe('getNumActiveFilters', () => {
-    it('should get the number of active filters in a backwards compatible way', () => {
-        const activeFilters = [
-            { field: ENTITY_SUB_TYPE_FILTER_NAME, values: ['DATASET␞view', 'DATASET␞table'] },
-            { field: LEGACY_ENTITY_FILTER_NAME, values: ['DATASET', 'CONTAINER'] },
-            { field: ENTITY_FILTER_NAME, values: ['CONTAINER'] },
-            { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
-        ];
-        const numActiveFilters = getNumActiveFilters(activeFilters);
-        expect(numActiveFilters).toBe(4); // should not count duplicate values
-    });
-});
-
-describe('getInitialSelectedOptions', () => {
-    it('should get a list of options that are initially selected when opening the dropdown', () => {
-        const activeFilters = [
-            { field: ENTITY_SUB_TYPE_FILTER_NAME, values: ['DATASET␞view', 'DATASET␞table', 'DATASET'] },
-            { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
-        ];
-        const initialSelectedOptions = getInitialSelectedOptions(activeFilters, mockData);
-        expect(initialSelectedOptions).toMatchObject([
-            { field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'DATASET', count: 12, entity: undefined },
-            { field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'DATASET␞table', count: 6, entity: undefined },
-            { field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'DATASET␞view', count: 6, entity: undefined },
-        ]);
-    });
-
-    it('should get a list of options that are initially selected when opening the dropdown with ENTITY_FILTER_NAME filter', () => {
-        const activeFilters = [
-            { field: ENTITY_FILTER_NAME, values: ['DATASET', 'CONTAINER'] },
-            { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
-        ];
-        const initialSelectedOptions = getInitialSelectedOptions(activeFilters, mockData);
-        expect(initialSelectedOptions).toMatchObject([
-            { field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'DATASET', count: 12, entity: undefined },
-            { field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'CONTAINER', count: 6, entity: undefined },
-        ]);
-    });
-
-    it('should get a list of options that are initially selected when opening the dropdown with LEGACY_ENTITY_FILTER_NAME filter', () => {
-        const activeFilters = [
-            { field: LEGACY_ENTITY_FILTER_NAME, values: ['DATASET', 'CONTAINER'] },
-            { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
-        ];
-        const initialSelectedOptions = getInitialSelectedOptions(activeFilters, mockData);
-        expect(initialSelectedOptions).toMatchObject([
-            { field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'DATASET', count: 12, entity: undefined },
-            { field: ENTITY_SUB_TYPE_FILTER_NAME, value: 'CONTAINER', count: 6, entity: undefined },
-        ]);
-    });
-});
-
-describe('getInitialSelectedOptionsFromAggregations', () => {
-    const activeFilterValues = ['DATASET␞table', 'CONTAINER'];
-    const aggregations = [
-        { value: 'DATASET', count: 12, entity: null },
-        { value: 'DATASET␞table', count: 6, entity: null },
-        { value: 'DATASET␞view', count: 6, entity: null },
-        { value: 'CONTAINER', count: 6, entity: null },
-        { value: 'CONTAINER␞test', count: 3, entity: null },
-    ];
-    it('should get initially selected options from aggregations based on what is in activeFilters', () => {
-        const initialOptions = getInitialSelectedOptionsFromAggregations(aggregations, activeFilterValues, []);
-        expect(initialOptions).toMatchObject([
-            {
-                field: ENTITY_SUB_TYPE_FILTER_NAME,
-                value: 'DATASET␞table',
-                entity: null,
-                count: 6,
-            },
-            {
-                field: ENTITY_SUB_TYPE_FILTER_NAME,
-                value: 'CONTAINER',
-                entity: null,
-                count: 6,
-            },
-        ]);
-    });
-
-    it('should get initially selected options from aggregations without duplicates', () => {
-        const initialOptions = getInitialSelectedOptionsFromAggregations(aggregations, activeFilterValues, [
-            {
-                field: ENTITY_SUB_TYPE_FILTER_NAME,
-                value: 'DATASET␞table',
-                entity: null,
-                count: 6,
-            },
-        ]);
-        expect(initialOptions).toMatchObject([
-            {
-                field: ENTITY_SUB_TYPE_FILTER_NAME,
-                value: 'CONTAINER',
-                entity: null,
-                count: 6,
-            },
-        ]);
-    });
-});
diff --git a/datahub-web-react/src/app/search/filters/__tests__/utils.test.tsx b/datahub-web-react/src/app/search/filters/__tests__/utils.test.tsx
deleted file mode 100644
index c3f586dbcaa3d1..00000000000000
--- a/datahub-web-react/src/app/search/filters/__tests__/utils.test.tsx
+++ /dev/null
@@ -1,433 +0,0 @@
-import { FolderFilled } from '@ant-design/icons';
-import React from 'react';
-
-import { IconStyleType } from '@app/entity/Entity';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import {
-    PlatformIcon,
-    canCreateViewFromFilters,
-    combineAggregations,
-    filterEmptyAggregations,
-    filterOptionsWithSearch,
-    getFilterEntity,
-    getFilterIconAndLabel,
-    getFilterOptions,
-    getNewFilters,
-    getNumActiveFiltersForFilter,
-    getNumActiveFiltersForGroupOfFilters,
-    isAnyOptionSelected,
-    isFilterOptionSelected,
-} from '@app/search/filters/utils';
-import { ENTITY_SUB_TYPE_FILTER_NAME } from '@app/search/utils/constants';
-import { dataPlatform, dataPlatformInstance, dataset1, glossaryTerm1, user1 } from '@src/Mocks';
-import { getTestEntityRegistry } from '@utils/test-utils/TestPageContainer';
-
-import { EntityType } from '@types';
-
-describe('filter utils - getNewFilters', () => {
-    it('should get the correct list of filters when adding filters where the filter field did not already exist', () => {
-        const activeFilters = [{ field: 'entity', values: ['test'] }];
-        const selectedFilterValues = ['one', 'two'];
-        const newFilters = getNewFilters('platform', activeFilters, selectedFilterValues);
-        expect(newFilters).toMatchObject([
-            { field: 'entity', values: ['test'] },
-            { field: 'platform', values: ['one', 'two'] },
-        ]);
-    });
-
-    it('should get the correct list of filters when adding filters where the filter field does already exist', () => {
-        const activeFilters = [{ field: 'entity', values: ['test'] }];
-        const selectedFilterValues = ['one', 'two'];
-        const newFilters = getNewFilters('entity', activeFilters, selectedFilterValues);
-        expect(newFilters).toMatchObject([{ field: 'entity', values: ['one', 'two'] }]);
-    });
-
-    it('should get the correct list of filters when adding filters where the filter field does already exist with other filters', () => {
-        const activeFilters = [
-            { field: 'entity', values: ['test'] },
-            { field: 'platform', values: ['one'] },
-        ];
-        const selectedFilterValues = ['one', 'two'];
-        const newFilters = getNewFilters('platform', activeFilters, selectedFilterValues);
-        expect(newFilters).toMatchObject([
-            { field: 'entity', values: ['test'] },
-            { field: 'platform', values: ['one', 'two'] },
-        ]);
-    });
-
-    it('should get the correct list of filters when removing filters all of the filters for a filter type', () => {
-        const activeFilters = [
-            { field: 'entity', values: ['test'] },
-            { field: 'platform', values: ['one'] },
-        ];
-        const selectedFilterValues = [];
-        const newFilters = getNewFilters('platform', activeFilters, selectedFilterValues);
-        expect(newFilters).toMatchObject([{ field: 'entity', values: ['test'] }]);
-    });
-
-    it('should get the correct list of filters when removing filters one of multiple of the filters for a filter type', () => {
-        const activeFilters = [
-            { field: 'entity', values: ['test'] },
-            { field: 'platform', values: ['one', 'two'] },
-        ];
-        const selectedFilterValues = ['two'];
-        const newFilters = getNewFilters('platform', activeFilters, selectedFilterValues);
-        expect(newFilters).toMatchObject([
-            { field: 'entity', values: ['test'] },
-            { field: 'platform', values: ['two'] },
-        ]);
-    });
-});
-
-describe('filter utils - isFilterOptionSelected', () => {
-    const selectedFilterOptions = [
-        { value: 'one', field: 'test' },
-        { value: 'two', field: 'test' },
-        { value: 'DATASETS', field: 'test' },
-    ];
-    it('should return true if the given filter value exists in the list', () => {
-        expect(isFilterOptionSelected(selectedFilterOptions, 'two')).toBe(true);
-    });
-
-    it('should return false if the given filter value does not exist in the list', () => {
-        expect(isFilterOptionSelected(selectedFilterOptions, 'testing123')).toBe(false);
-    });
-
-    it('should return false if the given filter value does not exist in the list, even if values are similar', () => {
-        expect(isFilterOptionSelected(selectedFilterOptions, 'tw')).toBe(false);
-    });
-
-    it('should return true if a parent filter is selected', () => {
-        expect(isFilterOptionSelected(selectedFilterOptions, 'DATASETS␞view')).toBe(true);
-    });
-});
-
-describe('filter utils - isAnyOptionSelected', () => {
-    const selectedFilterOptions = [
-        { value: 'one', field: 'test' },
-        { value: 'two', field: 'test' },
-        { value: 'DATASETS', field: 'test' },
-    ];
-    it('should return true if any of the given filter values exists in the selected values list', () => {
-        expect(isAnyOptionSelected(selectedFilterOptions, ['two', 'four'])).toBe(true);
-    });
-
-    it('should return false if none of the given filter values exists in the selected values list', () => {
-        expect(isAnyOptionSelected(selectedFilterOptions, ['three', 'four'])).toBe(false);
-    });
-});
-
-describe('filter utils - getFilterIconAndLabel', () => {
-    const mockEntityRegistry = getTestEntityRegistry();
-
-    it('should get the correct icon and label for entity filters', () => {
-        const { icon, label } = getFilterIconAndLabel('entity', EntityType.Dataset, mockEntityRegistry, dataset1);
-
-        expect(icon).toMatchObject(
-            mockEntityRegistry.getIcon(EntityType.Dataset, 12, IconStyleType.ACCENT, ANTD_GRAY[9]),
-        );
-        expect(label).toBe(mockEntityRegistry.getCollectionName(EntityType.Dataset));
-    });
-
-    it('should get the correct icon and label for platform filters', () => {
-        const { icon, label } = getFilterIconAndLabel('platform', dataPlatform.urn, mockEntityRegistry, dataPlatform);
-
-        expect(icon).toMatchObject(<PlatformIcon src={dataPlatform.properties.logoUrl} />);
-        expect(label).toBe(mockEntityRegistry.getDisplayName(EntityType.DataPlatform, dataPlatform));
-    });
-
-    it('should get the correct icon and label for filters with associated entity', () => {
-        const { icon, label } = getFilterIconAndLabel('domains', glossaryTerm1.urn, mockEntityRegistry, glossaryTerm1);
-
-        expect(icon).toMatchObject(
-            mockEntityRegistry.getIcon(EntityType.GlossaryTerm, 12, IconStyleType.ACCENT, ANTD_GRAY[9]),
-        );
-        expect(label).toBe(mockEntityRegistry.getDisplayName(EntityType.GlossaryTerm, glossaryTerm1));
-    });
-
-    it('should get the correct icon and label for filters with associated data platform instance entity', () => {
-        const { icon, label } = getFilterIconAndLabel(
-            'domains',
-            glossaryTerm1.urn,
-            mockEntityRegistry,
-            dataPlatformInstance,
-        );
-
-        expect(icon).toMatchObject(<PlatformIcon src={dataPlatformInstance.platform.properties.logoUrl} />);
-        expect(label).toBe(dataPlatformInstance.instanceId);
-    });
-
-    it('should get the correct icon and label for filters with no associated entity', () => {
-        const { icon, label } = getFilterIconAndLabel('origin', 'PROD', mockEntityRegistry, null);
-
-        expect(icon).toBe(null);
-        expect(label).toBe('PROD');
-    });
-
-    it('should get the correct icon and label for browse v2 filters', () => {
-        const { icon, label } = getFilterIconAndLabel(
-            'browsePathV2',
-            '␟long-tail-companions␟view',
-            mockEntityRegistry,
-            null,
-        );
-
-        expect(icon).toMatchObject(<FolderFilled color="black" />);
-        expect(label).toBe('view');
-    });
-
-    it('should override the filter label if we provide an override', () => {
-        const { icon, label } = getFilterIconAndLabel(
-            'browsePathV2',
-            '␟long-tail-companions␟view',
-            mockEntityRegistry,
-            null,
-            12,
-            'TESTING',
-        );
-
-        expect(icon).toMatchObject(<FolderFilled size={12} color="black" />);
-        expect(label).toBe('TESTING');
-    });
-});
-
-describe('filter utils - getFilterEntity', () => {
-    const availableFilters = [
-        {
-            field: 'owners',
-            aggregations: [{ value: 'chris', count: 15 }],
-        },
-        {
-            field: 'platform',
-            aggregations: [
-                { value: 'snowflake', count: 12 },
-                { value: 'dbt', count: 4, entity: dataPlatform },
-            ],
-        },
-    ];
-
-    it('should find and return the filter entity given a filter field and value and availableFilters', () => {
-        expect(getFilterEntity('platform', 'dbt', availableFilters)).toMatchObject(dataPlatform);
-    });
-
-    it('should return null if the given filter has no associated entity in availableFilters', () => {
-        expect(getFilterEntity('platform', 'nonExistent', availableFilters)).toBe(null);
-    });
-});
-
-describe('filter utils - getNumActiveFiltersForFilter', () => {
-    const activeFilters = [
-        { field: 'owners', values: ['chris', 'john'] },
-        { field: 'platform', values: ['dbt'] },
-    ];
-
-    it('should get the number of active filters for a given filter group when there are active filters', () => {
-        const filter = {
-            field: 'owners',
-            aggregations: [
-                { value: 'chris', count: 15 },
-                { value: 'john', count: 11 },
-            ],
-        };
-
-        expect(getNumActiveFiltersForFilter(activeFilters, filter)).toBe(2);
-    });
-
-    it('should get the number of active filters for a given filter group when there are no active filters', () => {
-        const filter = {
-            field: 'tags',
-            aggregations: [{ value: 'tag', count: 15 }],
-        };
-
-        expect(getNumActiveFiltersForFilter(activeFilters, filter)).toBe(0);
-    });
-});
-
-describe('filter utils - getNumActiveFiltersForGroupOfFilters', () => {
-    const activeFilters = [
-        { field: 'owners', values: ['chris', 'john'] },
-        { field: 'platform', values: ['dbt'] },
-    ];
-
-    it('should get the number of active filters for a given filter group when there are active filters', () => {
-        const filters = [
-            {
-                field: 'owners',
-                aggregations: [
-                    { value: 'chris', count: 15 },
-                    { value: 'john', count: 11 },
-                ],
-            },
-            {
-                field: 'tags',
-                aggregations: [{ value: 'tag1', count: 15 }],
-            },
-        ];
-
-        expect(getNumActiveFiltersForGroupOfFilters(activeFilters, filters)).toBe(2);
-    });
-
-    it('should get the number of active filters for a given filter group when there are no active filters', () => {
-        const filters = [
-            {
-                field: 'tags',
-                aggregations: [{ value: 'tag', count: 15 }],
-            },
-            {
-                field: 'origin',
-                aggregations: [
-                    { value: 'prod', count: 15 },
-                    { value: 'dev', count: 15 },
-                ],
-            },
-        ];
-
-        expect(getNumActiveFiltersForGroupOfFilters(activeFilters, filters)).toBe(0);
-    });
-});
-
-describe('filter utils - combineAggregations', () => {
-    const originalAggs = [
-        { value: 'aditya', count: 10 },
-        { value: 'maggie', count: 5 },
-        { value: 'brittanie', count: 500 },
-    ];
-
-    it('should combine aggregations given some original aggregations, a list of new facets, and a filter field', () => {
-        const newFacets = [
-            {
-                field: 'platform',
-                aggregations: [{ value: 'dbt', count: 15 }],
-            },
-            {
-                field: 'owners',
-                aggregations: [
-                    { value: 'chris', count: 15 },
-                    { value: 'john', count: 20 },
-                ],
-            },
-        ];
-
-        const combinedAggregations = combineAggregations('owners', originalAggs, newFacets);
-
-        expect(combinedAggregations).toMatchObject([
-            { value: 'aditya', count: 10 },
-            { value: 'maggie', count: 5 },
-            { value: 'brittanie', count: 500 },
-            { value: 'chris', count: 15 },
-            { value: 'john', count: 20 },
-        ]);
-    });
-
-    it('should return the original aggs when newFacets are not provided', () => {
-        const combinedAggregations = combineAggregations('owners', originalAggs);
-
-        expect(combinedAggregations).toMatchObject([
-            { value: 'aditya', count: 10 },
-            { value: 'maggie', count: 5 },
-            { value: 'brittanie', count: 500 },
-        ]);
-    });
-});
-
-describe('filter utils - filterEmptyAggregations', () => {
-    const originalAggs = [
-        { value: 'aditya', count: 10 },
-        { value: 'maggie', count: 5 },
-        { value: 'brittanie', count: 0 },
-        { value: 'john', count: 0 },
-    ];
-
-    it('should filter out empty aggregations unless they are in activeFilters', () => {
-        const activeFilters = [
-            { field: 'owners', values: ['chris', 'john'] },
-            { field: 'platform', values: ['dbt'] },
-        ];
-
-        const filteredAggregations = filterEmptyAggregations(originalAggs, activeFilters);
-
-        expect(filteredAggregations).toMatchObject([
-            { value: 'aditya', count: 10 },
-            { value: 'maggie', count: 5 },
-            { value: 'john', count: 0 },
-        ]);
-    });
-});
-
-describe('filter utils - getFilterOptions', () => {
-    const originalAggs = [
-        { value: 'aditya', count: 10 },
-        { value: 'maggie', count: 5 },
-        { value: 'brittanie', count: 0 },
-        { value: 'john', count: 0 },
-    ];
-    const selectedFilterOptions = [
-        { value: 'aditya', field: 'owners' },
-        { value: 'chris', field: 'owners' },
-    ];
-
-    it('should convert aggregations into filterOptions while adding missing filterOptions to the beginning', () => {
-        const filterOptions = getFilterOptions('glossaryTerms', originalAggs, selectedFilterOptions);
-
-        expect(filterOptions).toMatchObject([
-            { value: 'chris' },
-            { value: 'aditya', count: 10 },
-            { value: 'maggie', count: 5 },
-            { value: 'brittanie', count: 0 },
-            { value: 'john', count: 0 },
-        ]);
-    });
-
-    it('should add auto complete results to the returned list', () => {
-        const autoCompleteResults = {
-            autoCompleteForMultiple: { suggestions: [{ type: EntityType.CorpUser, entities: [user1] }] },
-        };
-        const filterOptions = getFilterOptions(
-            'owners',
-            originalAggs,
-            selectedFilterOptions,
-            autoCompleteResults as any,
-        );
-
-        expect(filterOptions).toMatchObject([
-            { value: 'chris', field: 'owners' },
-            { value: 'aditya', count: 10, field: 'owners' },
-            { value: 'maggie', count: 5, field: 'owners' },
-            { value: 'brittanie', count: 0, field: 'owners' },
-            { value: 'john', count: 0, field: 'owners' },
-            { value: user1.urn, entity: user1, field: 'owners' },
-        ]);
-    });
-});
-
-describe('filter utils - filterOptionsWithSearch', () => {
-    it('should return true if the name includes the search query', () => {
-        expect(filterOptionsWithSearch('test', 'testing123')).toBe(true);
-    });
-
-    it('should return false if the name includes the search query', () => {
-        expect(filterOptionsWithSearch('test', 'hello')).toBe(false);
-    });
-
-    it('should return true if there is no search query', () => {
-        expect(filterOptionsWithSearch('', 'hello')).toBe(true);
-    });
-});
-
-describe('filter utils - canCreateViewFromFilters', () => {
-    it('should return false if there is mixing of entity type and subtypes in the nested subtypes filter', () => {
-        const activeFilters = [
-            { field: 'platform', values: ['one', 'two'] },
-            { field: ENTITY_SUB_TYPE_FILTER_NAME, values: ['DATASETS', 'CONTAINERS␞schema'] },
-        ];
-        expect(canCreateViewFromFilters(activeFilters)).toBe(false);
-    });
-
-    it('should return true if there is no mixing of entity type and subtypes in the nested subtypes filter', () => {
-        const activeFilters = [
-            { field: 'platform', values: ['one', 'two'] },
-            { field: ENTITY_SUB_TYPE_FILTER_NAME, values: ['DATASETS', 'CONTAINERS'] },
-        ];
-        expect(canCreateViewFromFilters(activeFilters)).toBe(true);
-    });
-});
diff --git a/datahub-web-react/src/app/search/filters/constants.ts b/datahub-web-react/src/app/search/filters/constants.ts
deleted file mode 100644
index 2de80d5e1dc94a..00000000000000
--- a/datahub-web-react/src/app/search/filters/constants.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {
-    CONTAINER_FILTER_NAME,
-    DOMAINS_FILTER_NAME,
-    ENTITY_FILTER_NAME,
-    GLOSSARY_TERMS_FILTER_NAME,
-    ORIGIN_FILTER_NAME,
-    OWNERS_FILTER_NAME,
-    PLATFORM_FILTER_NAME,
-    TAGS_FILTER_NAME,
-    TYPE_NAMES_FILTER_NAME,
-} from '@app/search/utils/constants';
-
-import { EntityType } from '@types';
-
-export const SORTED_FILTERS = [
-    PLATFORM_FILTER_NAME,
-    ORIGIN_FILTER_NAME,
-    DOMAINS_FILTER_NAME,
-    ENTITY_FILTER_NAME,
-    TYPE_NAMES_FILTER_NAME,
-    GLOSSARY_TERMS_FILTER_NAME,
-    OWNERS_FILTER_NAME,
-    TAGS_FILTER_NAME,
-    CONTAINER_FILTER_NAME,
-];
-
-export const FACETS_TO_ENTITY_TYPES = {
-    [DOMAINS_FILTER_NAME]: [EntityType.Domain],
-    [GLOSSARY_TERMS_FILTER_NAME]: [EntityType.GlossaryTerm],
-    [OWNERS_FILTER_NAME]: [EntityType.CorpUser, EntityType.CorpGroup],
-    [TAGS_FILTER_NAME]: [EntityType.Tag],
-    [CONTAINER_FILTER_NAME]: [EntityType.Container],
-};
diff --git a/datahub-web-react/src/app/search/filters/mapFilterOption.tsx b/datahub-web-react/src/app/search/filters/mapFilterOption.tsx
deleted file mode 100644
index e8a1a571c0c93d..00000000000000
--- a/datahub-web-react/src/app/search/filters/mapFilterOption.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from 'react';
-
-import EntityRegistry from '@app/entity/EntityRegistry';
-import FilterOption from '@app/search/filters/FilterOption';
-import { FilterOptionType } from '@app/search/filters/types';
-import { getFilterIconAndLabel } from '@app/search/filters/utils';
-
-export interface DisplayedFilterOption {
-    key: string;
-    label: React.ReactNode;
-    style: any;
-    displayName?: string | null;
-    nestedOptions?: FilterOptionType[];
-}
-
-interface CreateFilterOptionProps {
-    filterOption: FilterOptionType;
-    entityRegistry: EntityRegistry;
-    selectedFilterOptions: FilterOptionType[];
-    setSelectedFilterOptions: (values: FilterOptionType[]) => void;
-    nestedOptions?: FilterOptionType[];
-}
-
-export function mapFilterOption({
-    filterOption,
-    entityRegistry,
-    selectedFilterOptions,
-    setSelectedFilterOptions,
-    nestedOptions,
-}: CreateFilterOptionProps): DisplayedFilterOption {
-    const { label: displayName } = getFilterIconAndLabel(
-        filterOption.field,
-        filterOption.value,
-        entityRegistry,
-        filterOption.entity || null,
-    );
-
-    return {
-        key: filterOption.value,
-        label: (
-            <FilterOption
-                filterOption={filterOption}
-                selectedFilterOptions={selectedFilterOptions}
-                setSelectedFilterOptions={setSelectedFilterOptions}
-                nestedOptions={nestedOptions}
-            />
-        ),
-        style: { padding: 0 },
-        displayName: filterOption.displayName || (displayName as string),
-        nestedOptions,
-    };
-}
diff --git a/datahub-web-react/src/app/search/filters/render/__tests__/FilterRendererRegistry.test.tsx b/datahub-web-react/src/app/search/filters/render/__tests__/FilterRendererRegistry.test.tsx
deleted file mode 100644
index eda33b3d57a6d4..00000000000000
--- a/datahub-web-react/src/app/search/filters/render/__tests__/FilterRendererRegistry.test.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import React from 'react';
-
-import FilterRendererRegistry from '@app/search/filters/render/FilterRendererRegistry';
-
-describe('FilterRendererRegistry', () => {
-    let registry;
-    let renderer;
-    let props;
-
-    beforeEach(() => {
-        registry = new FilterRendererRegistry();
-
-        // Mock a FilterRenderer instance
-        renderer = {
-            field: 'mockField',
-            render: vi.fn().mockReturnValue(<div>Rendered</div>),
-            valueLabel: vi.fn().mockReturnValue(<div>ValueLabel</div>),
-            icon: vi.fn().mockReturnValue(<div>Icon</div>),
-        };
-
-        // Mock FilterRenderProps
-        props = {
-            /* assuming some props here */
-        };
-    });
-
-    describe('register', () => {
-        it('should register a new FilterRenderer', () => {
-            registry.register(renderer);
-            expect(registry.renderers).toContain(renderer);
-            expect(registry.fieldNameToRenderer.get(renderer.field)).toBe(renderer);
-        });
-    });
-
-    describe('hasRenderer', () => {
-        it('should return true if the renderer for a field is registered', () => {
-            registry.register(renderer);
-            expect(registry.hasRenderer(renderer.field)).toBe(true);
-        });
-
-        it('should return false if the renderer for a field is not registered', () => {
-            expect(registry.hasRenderer('nonexistentField')).toBe(false);
-        });
-    });
-
-    describe('render', () => {
-        it('should return the result of the renderer render method', () => {
-            registry.register(renderer);
-            expect(registry.render(renderer.field, props)).toEqual(<div>Rendered</div>);
-            expect(renderer.render).toHaveBeenCalledWith(props);
-        });
-
-        it('should throw an error if the renderer for a field is not registered', () => {
-            expect(() => registry.render('nonexistentField', props)).toThrow();
-        });
-    });
-
-    describe('getValueLabel', () => {
-        it('should return the result of the renderer valueLabel method', () => {
-            registry.register(renderer);
-            expect(registry.getValueLabel(renderer.field, 'mockValue')).toEqual(<div>ValueLabel</div>);
-            expect(renderer.valueLabel).toHaveBeenCalledWith('mockValue');
-        });
-
-        it('should throw an error if the renderer for a field is not registered', () => {
-            expect(() => registry.getValueLabel('nonexistentField', 'mockValue')).toThrow();
-        });
-    });
-
-    describe('getIcon', () => {
-        it('should return the result of the renderer icon method', () => {
-            registry.register(renderer);
-            expect(registry.getIcon(renderer.field)).toEqual(<div>Icon</div>);
-            expect(renderer.icon).toHaveBeenCalled();
-        });
-
-        it('should throw an error if the renderer for a field is not registered', () => {
-            expect(() => registry.getIcon('nonexistentField')).toThrow();
-        });
-    });
-});
diff --git a/datahub-web-react/src/app/search/filters/render/incident/HasActiveIncidentsFilter.tsx b/datahub-web-react/src/app/search/filters/render/incident/HasActiveIncidentsFilter.tsx
index 1d9f6021f2b73f..e52f251dd0ea13 100644
--- a/datahub-web-react/src/app/search/filters/render/incident/HasActiveIncidentsFilter.tsx
+++ b/datahub-web-react/src/app/search/filters/render/incident/HasActiveIncidentsFilter.tsx
@@ -7,7 +7,7 @@ import { FilterScenarioType } from '@app/search/filters/render/types';
 
 import { FacetFilter, FacetFilterInput, FacetMetadata } from '@types';
 
-export interface Props {
+interface Props {
     scenario: FilterScenarioType;
     filter: FacetMetadata;
     activeFilters: FacetFilterInput[];
diff --git a/datahub-web-react/src/app/search/filters/render/shared/BooleanMoreFilterMenu.tsx b/datahub-web-react/src/app/search/filters/render/shared/BooleanMoreFilterMenu.tsx
index 9643d5079c87f8..b5e75ba45dec35 100644
--- a/datahub-web-react/src/app/search/filters/render/shared/BooleanMoreFilterMenu.tsx
+++ b/datahub-web-react/src/app/search/filters/render/shared/BooleanMoreFilterMenu.tsx
@@ -10,7 +10,7 @@ const StyledButton = styled(Button)`
     border-radius: 0;
 `;
 
-export const DropdownMenu = styled.div`
+const DropdownMenu = styled.div`
     background-color: white;
     border-radius: 5px;
     box-shadow:
diff --git a/datahub-web-react/src/app/search/filters/render/shared/styledComponents.tsx b/datahub-web-react/src/app/search/filters/render/shared/styledComponents.tsx
deleted file mode 100644
index 4a8616e06fed74..00000000000000
--- a/datahub-web-react/src/app/search/filters/render/shared/styledComponents.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import styled from 'styled-components';
-
-import { MoreFilterOptionLabel } from '@app/search/filters/styledComponents';
-
-export const SearchFilterWrapper = styled.div`
-    padding: 0 25px 15px 25px;
-    display: flex;
-    align-items: center;
-    justify-content: left;
-`;
-
-export const Title = styled.div`
-    align-items: center;
-    font-weight: bold;
-    display: flex;
-    justify-content: left;
-    cursor: pointer;
-`;
-
-export const StyledMoreFilterOptionLabel = styled(MoreFilterOptionLabel)`
-    justify-content: left;
-`;
diff --git a/datahub-web-react/src/app/search/filters/render/siblings/HasSiblingsFilter.tsx b/datahub-web-react/src/app/search/filters/render/siblings/HasSiblingsFilter.tsx
index 2a6e0ce51ae685..4c0c9f3ad16d4c 100644
--- a/datahub-web-react/src/app/search/filters/render/siblings/HasSiblingsFilter.tsx
+++ b/datahub-web-react/src/app/search/filters/render/siblings/HasSiblingsFilter.tsx
@@ -7,7 +7,7 @@ import { FilterScenarioType } from '@app/search/filters/render/types';
 
 import { FacetFilter, FacetFilterInput, FacetMetadata } from '@types';
 
-export interface Props {
+interface Props {
     scenario: FilterScenarioType;
     filter: FacetMetadata;
     activeFilters: FacetFilterInput[];
diff --git a/datahub-web-react/src/app/search/filters/styledComponents.ts b/datahub-web-react/src/app/search/filters/styledComponents.ts
index e6a03726714cdc..fc11e0db1f1717 100644
--- a/datahub-web-react/src/app/search/filters/styledComponents.ts
+++ b/datahub-web-react/src/app/search/filters/styledComponents.ts
@@ -37,17 +37,6 @@ export const MoreFilterOptionLabel = styled.div<{ isActive: boolean; isOpen: boo
     ${(props) => props.isOpen && `background-color: ${ANTD_GRAY[3]};`}
 `;
 
-export const TextButton = styled(Button)<{ marginTop?: number; height?: number }>`
-    color: ${(props) => props.theme.styles['primary-color']};
-    padding: 0px 6px;
-    margin-top: ${(props) => (props.marginTop !== undefined ? `${props.marginTop}px` : '8px')};
-    ${(props) => props.height !== undefined && `height: ${props.height}px;`}
-
-    &:hover {
-        background-color: white;
-    }
-`;
-
 export const Label = styled(Typography.Text)`
     max-width: 125px;
 `;
diff --git a/datahub-web-react/src/app/search/filters/useFilterMode.ts b/datahub-web-react/src/app/search/filters/useFilterMode.ts
deleted file mode 100644
index 176e8d67deb326..00000000000000
--- a/datahub-web-react/src/app/search/filters/useFilterMode.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useState } from 'react';
-
-import { FilterMode, FilterModes, UnionType } from '@app/search/utils/constants';
-import { hasAdvancedFilters } from '@app/search/utils/hasAdvancedFilters';
-import useLatest from '@app/shared/useLatest';
-
-import { FacetFilterInput } from '@types';
-
-const useFilterMode = (filters: Array<FacetFilterInput>, unionType: UnionType) => {
-    const onlyShowAdvancedFilters = hasAdvancedFilters(filters, unionType);
-    const [filterMode, setFilterMode] = useState<FilterMode>(
-        onlyShowAdvancedFilters ? FilterModes.ADVANCED : FilterModes.BASIC,
-    );
-    const filterModeRef = useLatest(filterMode);
-    return { filterMode, filterModeRef, setFilterMode } as const;
-};
-
-export default useFilterMode;
diff --git a/datahub-web-react/src/app/search/filters/useSearchFilterAnalytics.ts b/datahub-web-react/src/app/search/filters/useSearchFilterAnalytics.ts
deleted file mode 100644
index 5d10460b6cef88..00000000000000
--- a/datahub-web-react/src/app/search/filters/useSearchFilterAnalytics.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { EventType } from '@app/analytics';
-import analytics from '@app/analytics/analytics';
-
-const useSearchFilterAnalytics = () => {
-    const trackClearAllFiltersEvent = (total: number) => {
-        analytics.event({
-            type: EventType.SearchFiltersClearAllEvent,
-            total,
-        });
-    };
-
-    const trackShowMoreEvent = (activeFilterCount: number, hiddenFilterCount: number) => {
-        analytics.event({
-            type: EventType.SearchFiltersShowMoreEvent,
-            activeFilterCount,
-            hiddenFilterCount,
-        });
-    };
-
-    return { trackClearAllFiltersEvent, trackShowMoreEvent } as const;
-};
-
-export default useSearchFilterAnalytics;
diff --git a/datahub-web-react/src/app/search/filters/useSearchFilterDropdown.tsx b/datahub-web-react/src/app/search/filters/useSearchFilterDropdown.tsx
deleted file mode 100644
index 82428bf551af2c..00000000000000
--- a/datahub-web-react/src/app/search/filters/useSearchFilterDropdown.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-import { useMemo, useState } from 'react';
-
-import { FACETS_TO_ENTITY_TYPES } from '@app/search/filters/constants';
-import { mapFilterOption } from '@app/search/filters/mapFilterOption';
-import { FilterOptionType } from '@app/search/filters/types';
-import {
-    combineAggregations,
-    filterEmptyAggregations,
-    filterOptionsWithSearch,
-    getFilterOptions,
-    getNewFilters,
-    getNumActiveFiltersForFilter,
-} from '@app/search/filters/utils';
-import useGetSearchQueryInputs from '@app/search/useGetSearchQueryInputs';
-import { ENTITY_FILTER_NAME } from '@app/search/utils/constants';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import {
-    GetAutoCompleteMultipleResultsQuery,
-    useAggregateAcrossEntitiesLazyQuery,
-    useGetAutoCompleteMultipleResultsLazyQuery,
-} from '@graphql/search.generated';
-import { FacetFilterInput, FacetMetadata } from '@types';
-
-interface Props {
-    filter: FacetMetadata;
-    activeFilters: FacetFilterInput[];
-    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
-}
-
-export default function useSearchFilterDropdown({ filter, activeFilters, onChangeFilters }: Props) {
-    const entityRegistry = useEntityRegistry();
-    const initialFilters = activeFilters.find((f) => f.field === filter.field)?.values;
-    const initialFilterOptions = filter.aggregations
-        .filter((agg) => initialFilters?.includes(agg.value))
-        .map((agg) => ({ field: filter.field, value: agg.value, entity: agg.entity, count: agg.count }));
-    const [selectedFilterOptions, setSelectedFilterOptions] = useState<FilterOptionType[]>(initialFilterOptions || []);
-    const [isMenuOpen, setIsMenuOpen] = useState(false);
-    const [searchQuery, setSearchQuery] = useState<string>('');
-    const { entityFilters, query, orFilters, viewUrn } = useGetSearchQueryInputs(
-        useMemo(() => [filter.field], [filter.field]),
-    );
-    const [aggregateAcrossEntities, { data, loading }] = useAggregateAcrossEntitiesLazyQuery();
-    const [autoCompleteResults, setAutoCompleteResults] = useState<GetAutoCompleteMultipleResultsQuery | undefined>(
-        undefined,
-    );
-    const [getAutoCompleteResults] = useGetAutoCompleteMultipleResultsLazyQuery({
-        onCompleted: (result) => setAutoCompleteResults(result),
-    });
-
-    const numActiveFilters = getNumActiveFiltersForFilter(activeFilters, filter);
-
-    function updateIsMenuOpen(isOpen: boolean) {
-        setIsMenuOpen(isOpen);
-        // set filters to default every time you open or close the menu without saving
-        setSelectedFilterOptions(initialFilterOptions || []);
-        setSearchQuery('');
-        setAutoCompleteResults(undefined);
-
-        if (isOpen && numActiveFilters > 0) {
-            aggregateAcrossEntities({
-                variables: {
-                    input: {
-                        types: filter.field === ENTITY_FILTER_NAME ? null : entityFilters,
-                        query,
-                        orFilters,
-                        viewUrn,
-                        facets: [filter.field],
-                    },
-                },
-            });
-        }
-    }
-
-    function updateFilters() {
-        onChangeFilters(
-            getNewFilters(
-                filter.field,
-                activeFilters,
-                selectedFilterOptions.map((f) => f.value),
-            ),
-        );
-        setIsMenuOpen(false);
-    }
-
-    function manuallyUpdateFilters(newFilters: FacetFilterInput[]) {
-        // remove any filters that are in newFilters to overwrite them
-        const filtersNotInNewFilters = activeFilters.filter(
-            (f) => !newFilters.find((newFilter) => newFilter.field === f.field),
-        );
-        onChangeFilters([...filtersNotInNewFilters, ...newFilters]);
-        setIsMenuOpen(false);
-    }
-
-    function updateSearchQuery(newQuery: string) {
-        setSearchQuery(newQuery);
-        if (newQuery && FACETS_TO_ENTITY_TYPES[filter.field]) {
-            getAutoCompleteResults({
-                variables: {
-                    input: {
-                        query: newQuery,
-                        limit: 10,
-                        types: FACETS_TO_ENTITY_TYPES[filter.field],
-                    },
-                },
-            });
-        }
-        if (!newQuery) {
-            setAutoCompleteResults(undefined);
-        }
-    }
-
-    // combine existing aggs from search response with new aggregateAcrossEntities response
-    const combinedAggregations = combineAggregations(
-        filter.field,
-        filter.aggregations,
-        data?.aggregateAcrossEntities?.facets,
-    );
-    // filter out any aggregations with a count of 0 unless it's already selected and in activeFilters
-    const finalAggregations = filterEmptyAggregations(combinedAggregations, activeFilters);
-    const filterOptions = getFilterOptions(
-        filter.field,
-        finalAggregations,
-        selectedFilterOptions,
-        autoCompleteResults,
-        filter.entity,
-    )
-        .map((filterOption) =>
-            mapFilterOption({ filterOption, entityRegistry, selectedFilterOptions, setSelectedFilterOptions }),
-        )
-        .filter((option) => filterOptionsWithSearch(searchQuery, option.displayName as string));
-
-    return {
-        isMenuOpen,
-        updateIsMenuOpen,
-        updateFilters,
-        filterOptions,
-        numActiveFilters,
-        areFiltersLoading: loading,
-        searchQuery,
-        updateSearchQuery,
-        manuallyUpdateFilters,
-    };
-}
diff --git a/datahub-web-react/src/app/search/filters/utils.tsx b/datahub-web-react/src/app/search/filters/utils.tsx
index db7a3b15c34513..1bdc88608e1b2d 100644
--- a/datahub-web-react/src/app/search/filters/utils.tsx
+++ b/datahub-web-react/src/app/search/filters/utils.tsx
@@ -1,11 +1,5 @@
 import {
-    BookOutlined,
-    DatabaseOutlined,
-    FileOutlined,
     FolderFilled,
-    FolderOutlined,
-    TagOutlined,
-    UserOutlined,
 } from '@ant-design/icons';
 import Icon from '@ant-design/icons/lib/components/Icon';
 import moment from 'moment-timezone';
@@ -15,63 +9,33 @@ import styled from 'styled-components';
 import { IconStyleType } from '@app/entity/Entity';
 import EntityRegistry from '@app/entity/EntityRegistry';
 import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { FACETS_TO_ENTITY_TYPES } from '@app/search/filters/constants';
 import { FilterOptionType } from '@app/search/filters/types';
 import {
     BROWSE_PATH_V2_FILTER_NAME,
     CONTAINER_FILTER_NAME,
-    DOMAINS_FILTER_NAME,
     ENTITY_FILTER_NAME,
     ENTITY_SUB_TYPE_FILTER_NAME,
     FILTER_DELIMITER,
-    GLOSSARY_TERMS_FILTER_NAME,
     LEGACY_ENTITY_FILTER_NAME,
-    OWNERS_FILTER_NAME,
     PLATFORM_FILTER_NAME,
     STRUCTURED_PROPERTIES_FILTER_NAME,
-    TAGS_FILTER_NAME,
-    TYPE_NAMES_FILTER_NAME,
     UNIT_SEPARATOR,
 } from '@app/search/utils/constants';
 import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
 import { removeMarkdown } from '@src/app/entity/shared/components/styled/StripMarkdownText';
-import { STRUCTURED_PROPERTY_FILTER } from '@src/app/searchV2/filters/field/fields';
 import { DATE_TYPE_URN } from '@src/app/shared/constants';
-import { useEntityRegistry } from '@src/app/useEntityRegistry';
 import TableIcon from '@src/images/table-icon.svg?react';
-
-import { GetAutoCompleteMultipleResultsQuery } from '@graphql/search.generated';
 import {
-    AggregationMetadata,
     Container,
     DataPlatform,
     DataPlatformInstance,
     Domain,
     Entity,
     EntityType,
-    FacetFilterInput,
-    FacetMetadata,
     GlossaryTerm,
     StructuredPropertyEntity,
 } from '@types';
 
-import DomainsIcon from '@images/domain.svg?react';
-
-// either adds or removes selectedFilterValues to/from activeFilters for a given filterField
-export function getNewFilters(filterField: string, activeFilters: FacetFilterInput[], selectedFilterValues: string[]) {
-    let newFilters = activeFilters;
-    if (activeFilters.find((activeFilter) => activeFilter.field === filterField)) {
-        newFilters = activeFilters
-            .map((f) => (f.field === filterField ? { ...f, values: selectedFilterValues } : f))
-            .filter((f) => !(f.values?.length === 0));
-    } else {
-        newFilters = [...activeFilters, { field: filterField, values: selectedFilterValues }].filter(
-            (f) => !(f.values?.length === 0),
-        );
-    }
-    return newFilters;
-}
-
 export function isFilterOptionSelected(selectedFilterOptions: FilterOptionType[], filterValue: string) {
     const parentFilterValues = filterValue.includes(FILTER_DELIMITER)
         ? filterValue.split(FILTER_DELIMITER).slice(0, -1)
@@ -85,14 +49,6 @@ export function isAnyOptionSelected(selectedFilterOptions: FilterOptionType[], f
     return selectedFilterOptions.some((option) => filterValues?.some((filterValue) => filterValue === option.value));
 }
 
-export function getFilterEntity(filterField: string, filterValue: string, availableFilters: FacetMetadata[] | null) {
-    return (
-        availableFilters
-            ?.find((facet) => facet.field === filterField)
-            ?.aggregations.find((agg) => agg.value === filterValue)?.entity || null
-    );
-}
-
 export const PlatformIcon = styled.img<{ size?: number }>`
     max-height: ${(props) => (props.size ? props.size : 12)}px;
     width: auto;
@@ -235,143 +191,6 @@ export function getFilterIconAndLabel(
     return { icon, label };
 }
 
-export function getNumActiveFiltersForFilter(activeFilters: FacetFilterInput[], filter: FacetMetadata) {
-    return activeFilters.find((f) => f.field === filter.field)?.values?.length || 0;
-}
-
-export function getNumActiveFiltersForGroupOfFilters(activeFilters: FacetFilterInput[], filters: FacetMetadata[]) {
-    let numActiveFilters = 0;
-    filters.forEach((filter) => {
-        numActiveFilters += getNumActiveFiltersForFilter(activeFilters, filter);
-    });
-    return numActiveFilters;
-}
-
-// combine existing aggs from search response with new aggregateAcrossEntities response
-export function combineAggregations(
-    filterField: string,
-    originalAggs: AggregationMetadata[],
-    newFacets?: FacetMetadata[] | null,
-) {
-    const combinedAggregations = [...originalAggs];
-    if (newFacets) {
-        const newAggregations = newFacets.find((facet) => facet.field === filterField)?.aggregations;
-        newAggregations?.forEach((agg) => {
-            // only add the new aggregations if it is not already in the original to avoid dupes
-            if (!originalAggs.find((existingAgg) => existingAgg.value === agg.value)) {
-                combinedAggregations.push(agg);
-            }
-        });
-    }
-    return combinedAggregations;
-}
-
-// filter out any aggregations with a count of 0 unless it's already selected and in activeFilters
-export function filterEmptyAggregations(aggregations: AggregationMetadata[], activeFilters: FacetFilterInput[]) {
-    return aggregations.filter((agg) => {
-        if (agg.count === 0) {
-            return activeFilters.find((activeFilter) => activeFilter.values?.includes(agg.value));
-        }
-        return true;
-    });
-}
-
-export function sortFacets(facetA: FacetMetadata, facetB: FacetMetadata, sortedFacetFields: string[]) {
-    if (sortedFacetFields.indexOf(facetA.field) === -1) return 1;
-    if (sortedFacetFields.indexOf(facetB.field) === -1) return -1;
-    return sortedFacetFields.indexOf(facetA.field) - sortedFacetFields.indexOf(facetB.field);
-}
-
-export function getFilterDropdownIcon(field: string) {
-    if (field.startsWith(STRUCTURED_PROPERTIES_FILTER_NAME)) {
-        return STRUCTURED_PROPERTY_FILTER.icon as JSX.Element;
-    }
-    if (field.startsWith(STRUCTURED_PROPERTIES_FILTER_NAME)) {
-        return <Icon component={TableIcon} />;
-    }
-
-    switch (field) {
-        case PLATFORM_FILTER_NAME:
-            return <DatabaseOutlined />;
-        case ENTITY_FILTER_NAME:
-            return <FileOutlined />;
-        case TYPE_NAMES_FILTER_NAME:
-            return <FileOutlined />;
-        case GLOSSARY_TERMS_FILTER_NAME:
-            return <BookOutlined />;
-        case TAGS_FILTER_NAME:
-            return <TagOutlined />;
-        case OWNERS_FILTER_NAME:
-            return <UserOutlined />;
-        case CONTAINER_FILTER_NAME:
-            return <FolderOutlined />;
-        case DOMAINS_FILTER_NAME:
-            return <Icon component={DomainsIcon} />;
-        default:
-            return null;
-    }
-}
-
-// maps aggregations and auto complete results to FilterOptionType[] and adds selected filter options if not already there
-export function getFilterOptions(
-    filterField: string,
-    aggregations: AggregationMetadata[],
-    selectedFilterOptions: FilterOptionType[],
-    autoCompleteResults?: GetAutoCompleteMultipleResultsQuery,
-    filterEntity?: Entity | null,
-) {
-    const aggregationFilterOptions = aggregations.map((agg) => ({
-        field: filterField,
-        displayName: getStructuredPropFilterDisplayName(filterField, agg.value, filterEntity),
-        ...agg,
-    }));
-
-    const searchResults = autoCompleteResults?.autoCompleteForMultiple?.suggestions?.find((suggestion) =>
-        FACETS_TO_ENTITY_TYPES[filterField]?.includes(suggestion.type),
-    );
-    const searchFilterOptions = searchResults?.entities
-        .filter((entity) => !aggregations.find((agg) => agg.value === entity.urn))
-        .map((entity) => ({ field: filterField, value: entity.urn, entity }));
-
-    let filterOptions: FilterOptionType[] = searchFilterOptions
-        ? [...aggregationFilterOptions, ...searchFilterOptions]
-        : aggregationFilterOptions;
-
-    // if a selected filter option is not in this list (because search results have changed) then insert at the beginning of the list
-    selectedFilterOptions.forEach((selectedOption) => {
-        if (!filterOptions.find((option) => option.value === selectedOption.value)) {
-            filterOptions = [selectedOption, ...filterOptions];
-        }
-    });
-
-    return filterOptions;
-}
-
-export function filterOptionsWithSearch(searchQuery: string, name: string, nestedOptions: FilterOptionType[] = []) {
-    if (searchQuery) {
-        return (
-            name.toLocaleLowerCase().includes(searchQuery.toLocaleLowerCase()) ||
-            !!nestedOptions.find((option) => option.value.toLocaleLowerCase().includes(searchQuery.toLocaleLowerCase()))
-        );
-    }
-    return true;
-}
-
-export const createBrowseV2SearchFilter = (path: Array<string>) => `${UNIT_SEPARATOR}${path.join(UNIT_SEPARATOR)}`;
-
-export function canCreateViewFromFilters(activeFilters: FacetFilterInput[]) {
-    const nestedSubTypeFilter = activeFilters.find((f) => f.field === ENTITY_SUB_TYPE_FILTER_NAME);
-    if (nestedSubTypeFilter) {
-        const entityTypes = nestedSubTypeFilter.values?.filter((value) => !value.includes(FILTER_DELIMITER));
-        const subTypes = nestedSubTypeFilter.values?.filter((value) => value.includes(FILTER_DELIMITER));
-
-        if (entityTypes?.length && subTypes?.length) {
-            return false;
-        }
-    }
-    return true;
-}
-
 export function getParentEntities(entity: Entity): Entity[] | null {
     if (!entity) {
         return null;
@@ -412,7 +231,7 @@ export function useElementDimensions(ref) {
     return dimensions;
 }
 
-export function getStructuredPropFilterDisplayName(field: string, value: string, entity?: Entity | null) {
+function getStructuredPropFilterDisplayName(field: string, value: string, entity?: Entity | null) {
     const isStructuredPropertyValue = field.startsWith('structuredProperties.');
     if (!isStructuredPropertyValue) return undefined;
 
@@ -434,20 +253,3 @@ export function getStructuredPropFilterDisplayName(field: string, value: string,
 
     return removeMarkdown(value);
 }
-
-export function useFilterDisplayName(filter: FacetMetadata, predicateDisplayName?: string) {
-    const entityRegistry = useEntityRegistry();
-
-    if (filter.entity) {
-        return entityRegistry.getDisplayName(filter.entity.type, filter.entity);
-    }
-
-    return predicateDisplayName || filter.displayName || filter.field;
-}
-
-export function getIsDateRangeFilter(field: FacetMetadata) {
-    if (field.entity && field.entity.type === EntityType.StructuredProperty) {
-        return (field.entity as StructuredPropertyEntity).definition?.valueType?.urn === DATE_TYPE_URN;
-    }
-    return false;
-}
diff --git a/datahub-web-react/src/app/search/matches/MatchedFieldList.tsx b/datahub-web-react/src/app/search/matches/MatchedFieldList.tsx
deleted file mode 100644
index 83b1427dda2e4e..00000000000000
--- a/datahub-web-react/src/app/search/matches/MatchedFieldList.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import { Tooltip, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-import { useSearchQuery } from '@app/search/context/SearchContext';
-import { useMatchedFieldLabel, useMatchedFieldsForList } from '@app/search/context/SearchResultContext';
-import { MatchesGroupedByFieldName } from '@app/search/matches/constants';
-import { getDescriptionSlice, isDescriptionField, isHighlightableEntityField } from '@app/search/matches/utils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { MatchedField } from '@types';
-
-const MatchesContainer = styled.div`
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-`;
-
-const MatchText = styled(Typography.Text)`
-    color: ${ANTD_GRAY_V2[8]};
-    background: ${(props) => props.theme.styles['highlight-color']};
-    border-radius: 4px;
-    padding: 2px 4px 2px 4px;
-    padding-right: 4px;
-`;
-
-const MATCH_GROUP_LIMIT = 3;
-const TOOLTIP_MATCH_GROUP_LIMIT = 10;
-
-type CustomFieldRenderer = (field: MatchedField) => JSX.Element | null;
-
-type Props = {
-    customFieldRenderer?: CustomFieldRenderer;
-    matchSuffix?: string;
-};
-
-const RenderedField = ({
-    customFieldRenderer,
-    field,
-}: {
-    customFieldRenderer?: CustomFieldRenderer;
-    field: MatchedField;
-}) => {
-    const entityRegistry = useEntityRegistry();
-    const query = useSearchQuery()?.trim()?.toLowerCase();
-    const customRenderedField = customFieldRenderer?.(field);
-    if (customRenderedField) return <b>{customRenderedField}</b>;
-    if (isHighlightableEntityField(field)) {
-        return field.entity ? <>{entityRegistry.getDisplayName(field.entity.type, field.entity)}</> : <></>;
-    }
-    if (isDescriptionField(field) && query) return <b>{getDescriptionSlice(field.value, query)}</b>;
-    return <b>{field.value}</b>;
-};
-
-const MatchedFieldsList = ({
-    groupedMatch,
-    limit,
-    tooltip,
-    matchSuffix = '',
-    customFieldRenderer,
-}: {
-    groupedMatch: MatchesGroupedByFieldName;
-    limit: number;
-    tooltip?: JSX.Element;
-    matchSuffix?: string;
-    customFieldRenderer?: CustomFieldRenderer;
-}) => {
-    const label = useMatchedFieldLabel(groupedMatch.fieldName);
-    const count = groupedMatch.matchedFields.length;
-    const moreCount = Math.max(count - limit, 0);
-    const andMore = (
-        <>
-            {' '}
-            & <b>more</b>
-        </>
-    );
-    return (
-        <>
-            Matches {count > 1 && `${count} `}
-            {label}
-            {count > 1 && 's'}{' '}
-            {groupedMatch.matchedFields.slice(0, limit).map((field, index) => (
-                <>
-                    {index > 0 && ', '}
-                    <>
-                        <RenderedField field={field} customFieldRenderer={customFieldRenderer} />
-                    </>
-                </>
-            ))}
-            {moreCount > 0 &&
-                (tooltip ? (
-                    <Tooltip title={tooltip} placement="bottom" mouseEnterDelay={1}>
-                        {andMore}
-                    </Tooltip>
-                ) : (
-                    <>{andMore}</>
-                ))}{' '}
-            {matchSuffix}
-        </>
-    );
-};
-
-export const MatchedFieldList = ({ customFieldRenderer, matchSuffix = '' }: Props) => {
-    const groupedMatches = useMatchedFieldsForList('fieldLabels');
-
-    return (
-        <>
-            {groupedMatches.length > 0 ? (
-                <MatchesContainer>
-                    {groupedMatches.map((groupedMatch) => {
-                        return (
-                            <MatchText key={groupedMatch.fieldName}>
-                                <MatchedFieldsList
-                                    groupedMatch={groupedMatch}
-                                    limit={MATCH_GROUP_LIMIT}
-                                    customFieldRenderer={customFieldRenderer}
-                                    matchSuffix={matchSuffix}
-                                    tooltip={
-                                        <MatchedFieldsList
-                                            groupedMatch={groupedMatch}
-                                            limit={TOOLTIP_MATCH_GROUP_LIMIT}
-                                            customFieldRenderer={customFieldRenderer}
-                                        />
-                                    }
-                                />
-                            </MatchText>
-                        );
-                    })}
-                </MatchesContainer>
-            ) : null}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/search/matches/SearchTextHighlighter.tsx b/datahub-web-react/src/app/search/matches/SearchTextHighlighter.tsx
deleted file mode 100644
index 2bf9f1c64959c8..00000000000000
--- a/datahub-web-react/src/app/search/matches/SearchTextHighlighter.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React from 'react';
-import Highlight from 'react-highlighter';
-import styled from 'styled-components';
-
-import { useSearchQuery } from '@app/search/context/SearchContext';
-import { useMatchedFieldsByGroup } from '@app/search/context/SearchResultContext';
-import { MatchedFieldName } from '@app/search/matches/constants';
-import { useAppConfig } from '@app/useAppConfig';
-
-type Props = {
-    field: MatchedFieldName;
-    text: string;
-    enableFullHighlight?: boolean;
-};
-
-const HIGHLIGHT_ALL_PATTERN = /.*/;
-
-const StyledHighlight = styled(Highlight).attrs((props) => ({
-    matchStyle: { background: props.theme.styles['highlight-color'] },
-}))``;
-
-const SearchTextHighlighter = ({ field, text, enableFullHighlight = false }: Props) => {
-    const appConfig = useAppConfig();
-    const enableNameHighlight = appConfig.config.visualConfig.searchResult?.enableNameHighlight;
-    const matchedFields = useMatchedFieldsByGroup(field);
-    const hasMatchedField = !!matchedFields?.length;
-    const normalizedSearchQuery = useSearchQuery()?.trim()?.toLowerCase();
-    const normalizedText = text.trim().toLowerCase();
-    const hasSubstring = hasMatchedField && !!normalizedSearchQuery && normalizedText.includes(normalizedSearchQuery);
-    const pattern = enableFullHighlight ? HIGHLIGHT_ALL_PATTERN : undefined;
-
-    return (
-        <>
-            {enableNameHighlight && hasMatchedField ? (
-                <StyledHighlight search={hasSubstring ? normalizedSearchQuery : pattern}>{text}</StyledHighlight>
-            ) : (
-                text
-            )}
-        </>
-    );
-};
-
-export default SearchTextHighlighter;
diff --git a/datahub-web-react/src/app/search/matches/constants.ts b/datahub-web-react/src/app/search/matches/constants.ts
index 9892ba33fe4030..b0b1ed1966e1f5 100644
--- a/datahub-web-react/src/app/search/matches/constants.ts
+++ b/datahub-web-react/src/app/search/matches/constants.ts
@@ -110,7 +110,7 @@ const DEFAULT_MATCHED_FIELD_CONFIG: Array<MatchedFieldConfig> = [
     },
 ];
 
-export const CHART_DASHBOARD_FIELD_CONFIG: Array<MatchedFieldConfig> = DEFAULT_MATCHED_FIELD_CONFIG.map((config) => {
+const CHART_DASHBOARD_FIELD_CONFIG: Array<MatchedFieldConfig> = DEFAULT_MATCHED_FIELD_CONFIG.map((config) => {
     if (config.name === 'title') return { ...config, groupInto: 'name' };
     return config;
 });
@@ -125,5 +125,3 @@ export type MatchesGroupedByFieldName = {
     fieldName: string;
     matchedFields: Array<MatchedField>;
 };
-
-export const HIGHLIGHTABLE_ENTITY_TYPES = [EntityType.Tag, EntityType.GlossaryTerm];
diff --git a/datahub-web-react/src/app/search/matches/matchedFieldPathsRenderer.tsx b/datahub-web-react/src/app/search/matches/matchedFieldPathsRenderer.tsx
deleted file mode 100644
index a962d0bbf5e0c5..00000000000000
--- a/datahub-web-react/src/app/search/matches/matchedFieldPathsRenderer.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-
-import { downgradeV2FieldPath } from '@app/entity/dataset/profile/schema/utils/utils';
-
-import { MatchedField } from '@types';
-
-export const matchedFieldPathsRenderer = (matchedField: MatchedField) => {
-    return matchedField?.name === 'fieldPaths' ? <b>{downgradeV2FieldPath(matchedField.value)}</b> : null;
-};
diff --git a/datahub-web-react/src/app/search/matches/utils.test.ts b/datahub-web-react/src/app/search/matches/utils.test.ts
deleted file mode 100644
index 4ca0b43921f3e4..00000000000000
--- a/datahub-web-react/src/app/search/matches/utils.test.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { getMatchesPrioritized } from '@app/search/matches/utils';
-
-import { EntityType } from '@types';
-
-const mapping = new Map();
-mapping.set('fieldPaths', 'column');
-mapping.set('fieldDescriptions', 'column description');
-mapping.set('fieldTags', 'column tag');
-
-const MOCK_MATCHED_FIELDS = [
-    {
-        name: 'fieldPaths',
-        value: 'rain',
-    },
-    {
-        name: 'fieldDescriptions',
-        value: 'rainbow',
-    },
-    {
-        name: 'fieldPaths',
-        value: 'rainbow',
-    },
-    {
-        name: 'fieldPaths',
-        value: 'rainbows',
-    },
-];
-
-const MOCK_MATCHED_DESCRIPTION_FIELDS = [
-    {
-        name: 'editedDescription',
-        value: 'edited description value',
-    },
-    {
-        name: 'description',
-        value: 'description value',
-    },
-    {
-        name: 'fieldDescriptions',
-        value: 'field descriptions value',
-    },
-    {
-        name: 'editedFieldDescriptions',
-        value: 'edited field descriptions value',
-    },
-];
-
-describe('utils', () => {
-    describe('getMatchPrioritizingPrimary', () => {
-        it('prioritizes exact match', () => {
-            global.window.location.search = 'query=rainbow';
-            const groupedMatches = getMatchesPrioritized(EntityType.Dataset, MOCK_MATCHED_FIELDS, 'fieldPaths');
-            expect(groupedMatches).toEqual([
-                {
-                    fieldName: 'fieldPaths',
-                    matchedFields: [
-                        { name: 'fieldPaths', value: 'rainbow' },
-                        { name: 'fieldPaths', value: 'rainbows' },
-                        { name: 'fieldPaths', value: 'rain' },
-                    ],
-                },
-                {
-                    fieldName: 'fieldDescriptions',
-                    matchedFields: [{ name: 'fieldDescriptions', value: 'rainbow' }],
-                },
-            ]);
-        });
-        it('will accept first contains match', () => {
-            global.window.location.search = 'query=bow';
-            const groupedMatches = getMatchesPrioritized(EntityType.Dataset, MOCK_MATCHED_FIELDS, 'fieldPaths');
-            expect(groupedMatches).toEqual([
-                {
-                    fieldName: 'fieldPaths',
-                    matchedFields: [
-                        { name: 'fieldPaths', value: 'rainbow' },
-                        { name: 'fieldPaths', value: 'rainbows' },
-                        { name: 'fieldPaths', value: 'rain' },
-                    ],
-                },
-                {
-                    fieldName: 'fieldDescriptions',
-                    matchedFields: [{ name: 'fieldDescriptions', value: 'rainbow' }],
-                },
-            ]);
-        });
-        it('will group by field name', () => {
-            global.window.location.search = '';
-            const groupedMatches = getMatchesPrioritized(
-                EntityType.Dataset,
-                MOCK_MATCHED_DESCRIPTION_FIELDS,
-                'fieldPaths',
-            );
-            expect(groupedMatches).toEqual([
-                {
-                    fieldName: 'description',
-                    matchedFields: [
-                        { name: 'editedDescription', value: 'edited description value' },
-                        { name: 'description', value: 'description value' },
-                    ],
-                },
-                {
-                    fieldName: 'fieldDescriptions',
-                    matchedFields: [
-                        { name: 'fieldDescriptions', value: 'field descriptions value' },
-                        { name: 'editedFieldDescriptions', value: 'edited field descriptions value' },
-                    ],
-                },
-            ]);
-        });
-    });
-});
diff --git a/datahub-web-react/src/app/search/matches/utils.ts b/datahub-web-react/src/app/search/matches/utils.ts
index 22488cbf688c52..ffce9f44eaa9aa 100644
--- a/datahub-web-react/src/app/search/matches/utils.ts
+++ b/datahub-web-react/src/app/search/matches/utils.ts
@@ -1,7 +1,6 @@
 import * as QueryString from 'query-string';
 
 import {
-    HIGHLIGHTABLE_ENTITY_TYPES,
     MATCHED_FIELD_CONFIG,
     MatchedFieldConfig,
     MatchedFieldName,
@@ -26,7 +25,7 @@ export const getMatchedFieldLabel = (entityType: EntityType | undefined, fieldNa
     return configs.find((config) => config.name === fieldName)?.label ?? '';
 };
 
-export const getGroupedFieldName = (
+const getGroupedFieldName = (
     entityType: EntityType | undefined,
     fieldName: string,
 ): MatchedFieldName | undefined => {
@@ -115,24 +114,3 @@ export const getMatchesPrioritized = (
     const matches = fromQueryGetBestMatch(matchedFields, query, prioritizedField);
     return getMatchesGroupedByFieldName(entityType, matches);
 };
-
-export const isHighlightableEntityField = (field: MatchedField) =>
-    !!field.entity && HIGHLIGHTABLE_ENTITY_TYPES.includes(field.entity.type);
-
-export const isDescriptionField = (field: MatchedField) => field.name.toLowerCase().includes('description');
-
-const SURROUNDING_DESCRIPTION_CHARS = 10;
-const MAX_DESCRIPTION_CHARS = 50;
-
-export const getDescriptionSlice = (text: string, target: string) => {
-    const queryIndex = text.indexOf(target);
-    const start = Math.max(0, queryIndex - SURROUNDING_DESCRIPTION_CHARS);
-    const end = Math.min(
-        start + MAX_DESCRIPTION_CHARS,
-        text.length,
-        queryIndex + target.length + SURROUNDING_DESCRIPTION_CHARS,
-    );
-    const startEllipsis = start > 0 ? '...' : '';
-    const endEllipsis = end < text.length ? '...' : '';
-    return `${startEllipsis}${text.slice(start, end)}${endEllipsis}`;
-};
diff --git a/datahub-web-react/src/app/search/sidebar/BrowseContext.tsx b/datahub-web-react/src/app/search/sidebar/BrowseContext.tsx
deleted file mode 100644
index d6d5aad5e9b1f1..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/BrowseContext.tsx
+++ /dev/null
@@ -1,220 +0,0 @@
-import React, { ReactNode, createContext, useContext, useMemo } from 'react';
-
-import { createBrowseV2SearchFilter } from '@app/search/filters/utils';
-import { useHasFilterValue, useOnChangeFilters, useSelectedFilters } from '@app/search/sidebar/SidebarContext';
-import { getEntitySubtypeFiltersForEntity } from '@app/search/sidebar/browseContextUtils';
-import { applyFacetFilterOverrides } from '@app/search/utils/applyFilterOverrides';
-import {
-    BROWSE_PATH_V2_FILTER_NAME,
-    ENTITY_SUB_TYPE_FILTER_NAME,
-    ORIGIN_FILTER_NAME,
-    PLATFORM_FILTER_NAME,
-} from '@app/search/utils/constants';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { AggregationMetadata, BrowseResultGroupV2, EntityType, FacetFilterInput, FilterOperator } from '@types';
-
-type BrowseContextValue = {
-    entityAggregation?: AggregationMetadata;
-    environmentAggregation?: AggregationMetadata;
-    platformAggregation?: AggregationMetadata;
-    browseResultGroup?: BrowseResultGroupV2;
-    path: Array<string>;
-};
-
-const BrowseContext = createContext<BrowseContextValue | null>(null);
-
-type Props = {
-    children: ReactNode;
-    entityAggregation?: AggregationMetadata;
-    environmentAggregation?: AggregationMetadata;
-    platformAggregation?: AggregationMetadata;
-    browseResultGroup?: BrowseResultGroupV2;
-    parentPath?: Array<string>;
-};
-
-export const BrowseProvider = ({
-    children,
-    entityAggregation,
-    environmentAggregation,
-    platformAggregation,
-    browseResultGroup,
-    parentPath,
-}: Props) => {
-    const path = useMemo(() => {
-        const basePath = parentPath ? [...parentPath] : [];
-        return browseResultGroup ? [...basePath, browseResultGroup.name] : basePath;
-    }, [browseResultGroup, parentPath]);
-
-    return (
-        <BrowseContext.Provider
-            value={{
-                entityAggregation,
-                environmentAggregation,
-                platformAggregation,
-                browseResultGroup,
-                path,
-            }}
-        >
-            {children}
-        </BrowseContext.Provider>
-    );
-};
-
-const useBrowseContext = () => {
-    const context = useContext(BrowseContext);
-    if (context === null) throw new Error(`${useBrowseContext.name} must be used under a ${BrowseProvider.name}`);
-    return context;
-};
-
-export const useMaybeEntityAggregation = () => {
-    return useBrowseContext().entityAggregation;
-};
-
-export const useMaybeEntityType = () => {
-    const entityAggregation = useMaybeEntityAggregation();
-    return entityAggregation ? (entityAggregation.value as EntityType) : null;
-};
-
-export const useEntityAggregation = () => {
-    const entityAggregation = useMaybeEntityAggregation();
-    if (!entityAggregation) throw new Error('entityAggregation is missing in context');
-    return entityAggregation;
-};
-
-export const useEntityType = () => {
-    return useEntityAggregation().value as EntityType;
-};
-
-export const useMaybeEnvironmentAggregation = () => {
-    return useBrowseContext().environmentAggregation;
-};
-
-export const useEnvironmentAggregation = () => {
-    const environmentAggregation = useMaybeEnvironmentAggregation();
-    if (!environmentAggregation) throw new Error('environmentAggregation is missing in context');
-    return environmentAggregation;
-};
-
-export const useMaybePlatformAggregation = () => {
-    return useBrowseContext().platformAggregation;
-};
-
-export const usePlatformAggregation = () => {
-    const platformAggregation = useMaybePlatformAggregation();
-    if (!platformAggregation) throw new Error('platformAggregation is missing in context');
-    return platformAggregation;
-};
-
-export const useMaybeBrowseResultGroup = () => {
-    return useBrowseContext().browseResultGroup;
-};
-
-export const useBrowseResultGroup = () => {
-    const browseResultGroup = useMaybeBrowseResultGroup();
-    if (!browseResultGroup) throw new Error('browseResultGroup is missing in context');
-    return browseResultGroup;
-};
-
-export const useBrowseDisplayName = () => {
-    const entityRegistry = useEntityRegistry();
-    const browseResultGroup = useBrowseResultGroup();
-    const { entity } = browseResultGroup;
-    return entity ? entityRegistry.getDisplayName(entity.type, entity) : browseResultGroup.name;
-};
-
-export const useBrowsePath = () => {
-    const context = useBrowseContext();
-    if (!context.path) throw new Error('path is missing in context');
-    return context.path;
-};
-
-export const useBrowsePathLength = () => {
-    return useBrowsePath().length;
-};
-
-export const useBrowseSearchFilter = () => {
-    return createBrowseV2SearchFilter(useBrowsePath());
-};
-
-export const useIsEntitySelected = () => {
-    return useHasFilterValue(ENTITY_SUB_TYPE_FILTER_NAME, useEntityAggregation().value, { prefix: true });
-};
-
-export const useIsEnvironmentSelected = () => {
-    const environmentAggregation = useMaybeEnvironmentAggregation();
-    const isEntitySelected = useIsEntitySelected();
-    const isEnvironmentSelected = useHasFilterValue(ORIGIN_FILTER_NAME, environmentAggregation?.value);
-    return isEntitySelected && (!environmentAggregation || isEnvironmentSelected);
-};
-
-export const useIsPlatformSelected = () => {
-    const isEntitySelected = useIsEntitySelected();
-    const isEnvironmentSelected = useIsEnvironmentSelected();
-    const isPlatformSelected = useHasFilterValue(PLATFORM_FILTER_NAME, usePlatformAggregation().value);
-    return isEntitySelected && isEnvironmentSelected && isPlatformSelected;
-};
-
-export const useIsBrowsePathPrefix = () => {
-    const isEntitySelected = useIsEntitySelected();
-    const isEnvironmentSelected = useIsEnvironmentSelected();
-    const isPlatformSelected = useIsPlatformSelected();
-    const isBrowsePathPrefix = useHasFilterValue(BROWSE_PATH_V2_FILTER_NAME, useBrowseSearchFilter(), {
-        prefix: true,
-    });
-    return isEntitySelected && isEnvironmentSelected && isPlatformSelected && isBrowsePathPrefix;
-};
-
-export const useIsBrowsePathSelected = () => {
-    const isEntitySelected = useIsEntitySelected();
-    const isEnvironmentSelected = useIsEnvironmentSelected();
-    const isPlatformSelected = useIsPlatformSelected();
-    const isBrowsePathSelected = useHasFilterValue(BROWSE_PATH_V2_FILTER_NAME, useBrowseSearchFilter());
-    return isEntitySelected && isEnvironmentSelected && isPlatformSelected && isBrowsePathSelected;
-};
-
-export const useOnSelectBrowsePath = () => {
-    const entityAggregation = useEntityAggregation();
-    const environmentAggregation = useMaybeEnvironmentAggregation();
-    const platformAggregation = usePlatformAggregation();
-    const browseSearchFilter = useBrowseSearchFilter();
-    const selectedFilters = useSelectedFilters();
-    const onChangeFilters = useOnChangeFilters();
-
-    return (isSelected: boolean, removeFilters: string[] = []) => {
-        const overrides: Array<FacetFilterInput> = [];
-
-        // keep entity and subType filters for this given entity only if they exist, otherwise apply this entity filter
-        const entitySubtypeFilters = getEntitySubtypeFiltersForEntity(entityAggregation.value, selectedFilters);
-        overrides.push({
-            field: ENTITY_SUB_TYPE_FILTER_NAME,
-            condition: FilterOperator.Equal,
-            values: entitySubtypeFilters || [entityAggregation.value],
-        });
-
-        if (environmentAggregation)
-            overrides.push({
-                field: ORIGIN_FILTER_NAME,
-                condition: FilterOperator.Equal,
-                values: [environmentAggregation.value],
-            });
-
-        overrides.push({
-            field: PLATFORM_FILTER_NAME,
-            condition: FilterOperator.Equal,
-            values: [platformAggregation.value],
-        });
-
-        overrides.push({
-            field: BROWSE_PATH_V2_FILTER_NAME,
-            condition: FilterOperator.Equal,
-            values: [browseSearchFilter],
-        });
-
-        const filtersWithOverrides = applyFacetFilterOverrides(selectedFilters, overrides)
-            .filter((filter) => !removeFilters.includes(filter.field))
-            .filter((filter) => isSelected || !overrides.some((override) => override.field === filter.field));
-
-        onChangeFilters(filtersWithOverrides);
-    };
-};
diff --git a/datahub-web-react/src/app/search/sidebar/BrowseNode.tsx b/datahub-web-react/src/app/search/sidebar/BrowseNode.tsx
deleted file mode 100644
index bd6b361e864131..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/BrowseNode.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-import { FolderOutlined } from '@ant-design/icons';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import {
-    BrowseProvider,
-    useBrowseDisplayName,
-    useBrowsePathLength,
-    useBrowseResultGroup,
-    useEntityAggregation,
-    useIsBrowsePathPrefix,
-    useIsBrowsePathSelected,
-    useMaybeEnvironmentAggregation,
-    useOnSelectBrowsePath,
-    usePlatformAggregation,
-} from '@app/search/sidebar/BrowseContext';
-import EntityLink from '@app/search/sidebar/EntityLink';
-import ExpandableNode from '@app/search/sidebar/ExpandableNode';
-import SidebarLoadingError from '@app/search/sidebar/SidebarLoadingError';
-import useBrowsePagination from '@app/search/sidebar/useBrowsePagination';
-import useSidebarAnalytics from '@app/search/sidebar/useSidebarAnalytics';
-import { SortBy, useSort } from '@app/search/sidebar/useSort';
-import { formatNumber } from '@app/shared/formatNumber';
-import useToggle from '@app/shared/useToggle';
-
-import { EntityType } from '@types';
-
-const FolderStyled = styled(FolderOutlined)`
-    font-size: 16px;
-    color: ${(props) => props.theme.styles['primary-color']};
-`;
-
-const Count = styled(Typography.Text)`
-    font-size: 12px;
-    color: ${(props) => props.color};
-    padding-right: 2px;
-`;
-
-interface EntityNodeProps {
-    sortBy: string;
-}
-
-const BrowseNode: React.FC<EntityNodeProps> = ({ sortBy }) => {
-    const isBrowsePathPrefix = useIsBrowsePathPrefix();
-    const isBrowsePathSelected = useIsBrowsePathSelected();
-    const onSelectBrowsePath = useOnSelectBrowsePath();
-    const entityAggregation = useEntityAggregation();
-    const environmentAggregation = useMaybeEnvironmentAggregation();
-    const platformAggregation = usePlatformAggregation();
-    const browseResultGroup = useBrowseResultGroup();
-    const { count, entity } = browseResultGroup;
-    const hasEntityLink = !!entity && entity.type !== EntityType.DataPlatformInstance;
-    const displayName = useBrowseDisplayName();
-    const { trackSelectNodeEvent, trackToggleNodeEvent } = useSidebarAnalytics();
-
-    const { isOpen, isClosing, toggle } = useToggle({
-        initialValue: isBrowsePathPrefix && !isBrowsePathSelected,
-        closeDelay: 250,
-        onToggle: (isNowOpen: boolean) => trackToggleNodeEvent(isNowOpen, 'browse'),
-    });
-
-    const onClickTriangle = () => {
-        if (count) toggle();
-    };
-
-    const onClickBrowseHeader = () => {
-        const isNowSelected = !isBrowsePathSelected;
-        onSelectBrowsePath(isNowSelected);
-        trackSelectNodeEvent(isNowSelected ? 'select' : 'deselect', 'browse');
-    };
-
-    const { error, groups, loaded, observable, path, retry } = useBrowsePagination({
-        skip: !isOpen || !browseResultGroup.hasSubGroups,
-    });
-
-    const browsePathLength = useBrowsePathLength();
-
-    const color = '#000';
-
-    const sortedGroups = useSort(groups, sortBy as SortBy);
-
-    return (
-        <ExpandableNode
-            isOpen={isOpen && !isClosing && loaded}
-            header={
-                <ExpandableNode.SelectableHeader
-                    isOpen={isOpen}
-                    isSelected={isBrowsePathSelected}
-                    onClick={onClickBrowseHeader}
-                    data-testid={`browse-node-${displayName}`}
-                >
-                    <ExpandableNode.HeaderLeft>
-                        <ExpandableNode.TriangleButton
-                            isOpen={isOpen && !isClosing}
-                            isVisible={browseResultGroup.hasSubGroups}
-                            onClick={onClickTriangle}
-                            dataTestId={`browse-node-expand-${displayName}`}
-                        />
-                        <FolderStyled />
-                        <ExpandableNode.Title
-                            color={color}
-                            size={14}
-                            depth={browsePathLength}
-                            maxWidth={hasEntityLink ? 175 : 200}
-                            padLeft
-                        >
-                            {displayName}
-                        </ExpandableNode.Title>
-                        {hasEntityLink && <EntityLink entity={entity} targetNode="browse" />}
-                    </ExpandableNode.HeaderLeft>
-                    <Count color={color}>{formatNumber(count)}</Count>
-                </ExpandableNode.SelectableHeader>
-            }
-            body={
-                <ExpandableNode.Body>
-                    {sortedGroups.map((group) => (
-                        <BrowseProvider
-                            key={group.name}
-                            entityAggregation={entityAggregation}
-                            environmentAggregation={environmentAggregation}
-                            platformAggregation={platformAggregation}
-                            browseResultGroup={group}
-                            parentPath={path}
-                        >
-                            <BrowseNode sortBy={sortBy} />
-                        </BrowseProvider>
-                    ))}
-                    {error && <SidebarLoadingError onClickRetry={retry} />}
-                    {observable}
-                </ExpandableNode.Body>
-            }
-        />
-    );
-};
-
-export default BrowseNode;
diff --git a/datahub-web-react/src/app/search/sidebar/BrowseSidebar.tsx b/datahub-web-react/src/app/search/sidebar/BrowseSidebar.tsx
deleted file mode 100644
index a8ddf219cb6e5b..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/BrowseSidebar.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-import Icon, { CaretDownFilled } from '@ant-design/icons';
-import { Select, Tooltip, Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY, ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-import { ProfileSidebarResizer } from '@app/entity/shared/containers/profile/sidebar/ProfileSidebarResizer';
-import { SEARCH_RESULTS_BROWSE_SIDEBAR_ID } from '@app/onboarding/config/SearchOnboardingConfig';
-import { BrowseProvider } from '@app/search/sidebar/BrowseContext';
-import EntityNode from '@app/search/sidebar/EntityNode';
-import SidebarLoadingError from '@app/search/sidebar/SidebarLoadingError';
-import useSidebarEntities from '@app/search/sidebar/useSidebarEntities';
-
-import SortIcon from '@images/sort.svg?react';
-
-export const MAX_BROWSER_WIDTH = 500;
-export const MIN_BROWSWER_WIDTH = 200;
-
-export const SidebarWrapper = styled.div<{ visible: boolean; width: number }>`
-    height: 100%;
-    width: ${(props) => (props.visible ? `${props.width}px` : '0')};
-    min-width: ${(props) => (props.visible ? `${props.width}px` : '0')};
-    transition: width 250ms ease-in-out;
-    background-color: ${ANTD_GRAY_V2[1]};
-    background: white;
-`;
-
-const SidebarHeader = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding-left: 24px;
-    height: 47px;
-    border-bottom: 1px solid ${(props) => props.theme.styles['border-color-base']};
-    white-space: nowrap;
-`;
-
-const SidebarBody = styled.div<{ visible: boolean }>`
-    height: calc(100% - 47px);
-    padding-left: 16px;
-    padding-right: 12px;
-    padding-bottom: 200px;
-    overflow: ${(props) => (props.visible ? 'auto' : 'hidden')};
-    white-space: nowrap;
-`;
-
-const SelectWrapper = styled.div`
-    display: inline-flex;
-    align-items: center;
-    width: 200px .ant-select-selection-item {
-        color: ${ANTD_GRAY[8]} !important;
-        font-weight: 700;
-    }
-
-    .ant-select-selection-placeholder {
-        color: ${ANTD_GRAY[8]};
-        font-weight: 700;
-    }
-`;
-
-const StyledIcon = styled(Icon)`
-    color: ${ANTD_GRAY[8]};
-    font-size: 16px;
-    margin-right: -8px;
-`;
-
-type Props = {
-    visible: boolean;
-};
-
-const BrowseSidebar = ({ visible }: Props) => {
-    const { error, entityAggregations, retry } = useSidebarEntities({
-        skip: !visible,
-    });
-    const [browserWidth, setBrowserWith] = useState(window.innerWidth * 0.2);
-    const [sortBy, setSortBy] = useState('default');
-
-    return (
-        <>
-            <SidebarWrapper
-                visible={visible}
-                width={browserWidth}
-                id={SEARCH_RESULTS_BROWSE_SIDEBAR_ID}
-                data-testid="browse-v2"
-            >
-                <SidebarHeader>
-                    <Typography.Text strong> Navigate</Typography.Text>
-                    <Tooltip title="Sort folder results" showArrow={false} placement="left">
-                        <SelectWrapper>
-                            <StyledIcon component={SortIcon} />
-                            <Select
-                                placeholder="Sort"
-                                placement="bottomRight"
-                                dropdownStyle={{ minWidth: '110px' }}
-                                onChange={(value) => setSortBy(value)}
-                                bordered={false}
-                                suffixIcon={<CaretDownFilled />}
-                            >
-                                <Select.Option key="sort" value="sort">
-                                    Size (Default)
-                                </Select.Option>
-                                <Select.Option key="AtoZ" value="AtoZ">
-                                    Name A to Z
-                                </Select.Option>
-                                <Select.Option key="ZtoA" value="ZtoA">
-                                    Name Z to A
-                                </Select.Option>
-                            </Select>
-                        </SelectWrapper>
-                    </Tooltip>
-                </SidebarHeader>
-                <SidebarBody visible={visible}>
-                    {entityAggregations && !entityAggregations.length && <div>No results found</div>}
-                    {entityAggregations
-                        ?.filter((entityAggregation) => entityAggregation?.value !== 'DATA_PRODUCT')
-                        ?.map((entityAggregation) => (
-                            <BrowseProvider key={entityAggregation?.value} entityAggregation={entityAggregation}>
-                                <EntityNode sortBy={sortBy} />
-                            </BrowseProvider>
-                        ))}
-                    {error && <SidebarLoadingError onClickRetry={retry} />}
-                </SidebarBody>
-            </SidebarWrapper>
-            <ProfileSidebarResizer
-                setSidePanelWidth={(widthProp) =>
-                    setBrowserWith(Math.min(Math.max(widthProp, MIN_BROWSWER_WIDTH), MAX_BROWSER_WIDTH))
-                }
-                initialSize={browserWidth}
-                isSidebarOnLeft
-            />
-        </>
-    );
-};
-
-export default BrowseSidebar;
diff --git a/datahub-web-react/src/app/search/sidebar/EntityLink.tsx b/datahub-web-react/src/app/search/sidebar/EntityLink.tsx
deleted file mode 100644
index 2638467a6440c9..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/EntityLink.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import Icon from '@ant-design/icons/lib/components/Icon';
-import { Tooltip } from 'antd';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { BrowseV2EntityLinkClickEvent } from '@app/analytics';
-import { useBrowseDisplayName, useIsBrowsePathSelected } from '@app/search/sidebar/BrowseContext';
-import ExpandableNode from '@app/search/sidebar/ExpandableNode';
-import useSidebarAnalytics from '@app/search/sidebar/useSidebarAnalytics';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Entity, Maybe } from '@types';
-
-import ExternalLink from '@images/link-out.svg?react';
-
-const Linkicon = styled(Icon)<{ isSelected: boolean }>`
-    && {
-        color: ${(props) => props.theme.styles['primary-color']};
-        ${(props) => !props.isSelected && 'display: none;'}
-        ${ExpandableNode.SelectableHeader}:hover & {
-            display: inherit;
-        }
-    }
-`;
-
-type Props = {
-    entity?: Maybe<Entity>;
-    targetNode: BrowseV2EntityLinkClickEvent['targetNode'];
-};
-
-// The tooltip needs some text to hold onto
-const EmptySpace = styled.span`
-    display: 'none';
-    content: ' ';
-`;
-
-const EntityLink = ({ entity, targetNode }: Props) => {
-    const registry = useEntityRegistry();
-    const isBrowsePathSelected = useIsBrowsePathSelected();
-    const displayName = useBrowseDisplayName();
-    const { trackEntityLinkClickEvent } = useSidebarAnalytics();
-    const entityUrl = entity ? registry.getEntityUrl(entity.type, entity.urn) : null;
-
-    const onClickButton = () => {
-        trackEntityLinkClickEvent(targetNode);
-    };
-
-    if (!entityUrl) return null;
-
-    return (
-        <Tooltip placement="top" title={`View ${displayName} profile`} mouseEnterDelay={1}>
-            <Link to={entityUrl}>
-                <ExpandableNode.StaticButton
-                    icon={<Linkicon isSelected={isBrowsePathSelected} component={ExternalLink} />}
-                    onClick={onClickButton}
-                />
-            </Link>
-            <EmptySpace />
-        </Tooltip>
-    );
-};
-
-export default EntityLink;
diff --git a/datahub-web-react/src/app/search/sidebar/EntityNode.tsx b/datahub-web-react/src/app/search/sidebar/EntityNode.tsx
deleted file mode 100644
index 6527ac926e29d7..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/EntityNode.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { IconStyleType } from '@app/entity/Entity';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import {
-    BrowseProvider,
-    useEntityAggregation,
-    useEntityType,
-    useIsEntitySelected,
-} from '@app/search/sidebar/BrowseContext';
-import EnvironmentNode from '@app/search/sidebar/EnvironmentNode';
-import ExpandableNode from '@app/search/sidebar/ExpandableNode';
-import PlatformNode from '@app/search/sidebar/PlatformNode';
-import { useHasFilterField } from '@app/search/sidebar/SidebarContext';
-import SidebarLoadingError from '@app/search/sidebar/SidebarLoadingError';
-import useAggregationsQuery from '@app/search/sidebar/useAggregationsQuery';
-import useSidebarAnalytics from '@app/search/sidebar/useSidebarAnalytics';
-import { MAX_COUNT_VAL, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '@app/search/utils/constants';
-import { formatNumber } from '@app/shared/formatNumber';
-import useToggle from '@app/shared/useToggle';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-const Count = styled(Typography.Text)`
-    font-size: 12px;
-    color: ${(props) => props.color};
-    padding-left: 4px;
-`;
-
-interface EntityNodeProps {
-    sortBy: string;
-}
-
-const EntityNode: React.FC<EntityNodeProps> = ({ sortBy }) => {
-    const isSelected = useIsEntitySelected();
-    const entityType = useEntityType();
-    const entityAggregation = useEntityAggregation();
-    const hasEnvironmentFilter = useHasFilterField(ORIGIN_FILTER_NAME);
-    const { count } = entityAggregation;
-    const countText = count === MAX_COUNT_VAL ? '10k+' : formatNumber(count);
-    const registry = useEntityRegistry();
-    const { trackToggleNodeEvent } = useSidebarAnalytics();
-
-    const { isOpen, isClosing, toggle } = useToggle({
-        initialValue: isSelected,
-        closeDelay: 250,
-        onToggle: (isNowOpen: boolean) => trackToggleNodeEvent(isNowOpen, 'entity'),
-    });
-
-    const onClickHeader = (e) => {
-        e.preventDefault();
-        if (count) toggle();
-    };
-
-    const { loaded, error, environmentAggregations, platformAggregations, retry } = useAggregationsQuery({
-        skip: !isOpen,
-        facets: [ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME],
-    });
-
-    const showEnvironments =
-        environmentAggregations &&
-        (environmentAggregations.length > 1 || (hasEnvironmentFilter && !!environmentAggregations.length));
-    const color = count > 0 ? '#000' : ANTD_GRAY[8];
-
-    return (
-        <ExpandableNode
-            isOpen={isOpen && !isClosing && loaded}
-            header={
-                <ExpandableNode.Header
-                    isOpen={isOpen}
-                    showBorder
-                    onClick={onClickHeader}
-                    style={{ paddingTop: '16px' }}
-                    data-testid={`browse-entity-${registry.getCollectionName(entityType)}`}
-                >
-                    <ExpandableNode.HeaderLeft>
-                        {registry.getIcon(entityType, 16, IconStyleType.HIGHLIGHT, color)}
-                        <ExpandableNode.Title color={color} size={16} padLeft>
-                            {registry.getCollectionName(entityType)}
-                        </ExpandableNode.Title>
-                        <Count color={color}>{countText}</Count>
-                    </ExpandableNode.HeaderLeft>
-                    <ExpandableNode.CircleButton isOpen={isOpen && !isClosing} color={color} />
-                </ExpandableNode.Header>
-            }
-            body={
-                <ExpandableNode.Body>
-                    {showEnvironments
-                        ? environmentAggregations?.map((environmentAggregation) => (
-                              <BrowseProvider
-                                  key={environmentAggregation.value}
-                                  entityAggregation={entityAggregation}
-                                  environmentAggregation={environmentAggregation}
-                              >
-                                  <EnvironmentNode sortBy={sortBy} />
-                              </BrowseProvider>
-                          ))
-                        : platformAggregations?.map((platformAggregation) => (
-                              <BrowseProvider
-                                  key={platformAggregation.value}
-                                  entityAggregation={entityAggregation}
-                                  platformAggregation={platformAggregation}
-                              >
-                                  <PlatformNode sortBy={sortBy} />
-                              </BrowseProvider>
-                          ))}
-                    {error && <SidebarLoadingError onClickRetry={retry} />}
-                </ExpandableNode.Body>
-            }
-        />
-    );
-};
-
-export default EntityNode;
diff --git a/datahub-web-react/src/app/search/sidebar/EnvironmentNode.tsx b/datahub-web-react/src/app/search/sidebar/EnvironmentNode.tsx
deleted file mode 100644
index a91c544a739b3c..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/EnvironmentNode.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import {
-    BrowseProvider,
-    useEntityAggregation,
-    useEnvironmentAggregation,
-    useIsEnvironmentSelected,
-} from '@app/search/sidebar/BrowseContext';
-import ExpandableNode from '@app/search/sidebar/ExpandableNode';
-import PlatformNode from '@app/search/sidebar/PlatformNode';
-import SidebarLoadingError from '@app/search/sidebar/SidebarLoadingError';
-import useAggregationsQuery from '@app/search/sidebar/useAggregationsQuery';
-import useSidebarAnalytics from '@app/search/sidebar/useSidebarAnalytics';
-import { PLATFORM_FILTER_NAME } from '@app/search/utils/constants';
-import { formatNumber } from '@app/shared/formatNumber';
-import useToggle from '@app/shared/useToggle';
-
-const Count = styled(Typography.Text)`
-    font-size: 12px;
-    color: ${(props) => props.color};
-    padding-right: 8px;
-`;
-
-interface EntityNodeProps {
-    sortBy: string;
-}
-
-const EnvironmentNode: React.FC<EntityNodeProps> = ({ sortBy }) => {
-    const isSelected = useIsEnvironmentSelected();
-    const entityAggregation = useEntityAggregation();
-    const environmentAggregation = useEnvironmentAggregation();
-    const { count } = environmentAggregation;
-    const { trackToggleNodeEvent } = useSidebarAnalytics();
-    const { isOpen, isClosing, toggle } = useToggle({
-        initialValue: isSelected,
-        closeDelay: 250,
-        onToggle: (isNowOpen: boolean) => trackToggleNodeEvent(isNowOpen, 'environment'),
-    });
-
-    const onClickHeader = () => {
-        if (count) toggle();
-    };
-
-    const { loaded, error, platformAggregations, retry } = useAggregationsQuery({
-        skip: !isOpen,
-        facets: [PLATFORM_FILTER_NAME],
-    });
-
-    const color = '#000';
-
-    return (
-        <ExpandableNode
-            isOpen={isOpen && !isClosing && loaded}
-            header={
-                <ExpandableNode.Header isOpen={isOpen} showBorder onClick={onClickHeader}>
-                    <ExpandableNode.HeaderLeft>
-                        <ExpandableNode.TriangleButton
-                            isOpen={isOpen && !isClosing}
-                            isVisible={!!count}
-                            onClick={onClickHeader}
-                        />
-                        <ExpandableNode.Title color={color} size={14}>
-                            {environmentAggregation?.value}
-                        </ExpandableNode.Title>
-                    </ExpandableNode.HeaderLeft>
-                    <Count color={color}>{formatNumber(count)}</Count>
-                </ExpandableNode.Header>
-            }
-            body={
-                <ExpandableNode.Body>
-                    {platformAggregations?.map((platformAggregation) => (
-                        <BrowseProvider
-                            key={platformAggregation.value}
-                            entityAggregation={entityAggregation}
-                            environmentAggregation={environmentAggregation}
-                            platformAggregation={platformAggregation}
-                        >
-                            <PlatformNode sortBy={sortBy} />
-                        </BrowseProvider>
-                    ))}
-                    {error && <SidebarLoadingError onClickRetry={retry} />}
-                </ExpandableNode.Body>
-            }
-        />
-    );
-};
-
-export default EnvironmentNode;
diff --git a/datahub-web-react/src/app/search/sidebar/ExpandableNode.tsx b/datahub-web-react/src/app/search/sidebar/ExpandableNode.tsx
deleted file mode 100644
index ceaa233bbf4869..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/ExpandableNode.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-import { UpCircleOutlined } from '@ant-design/icons';
-import { Typography } from 'antd';
-import React, { MouseEventHandler, ReactNode } from 'react';
-import { VscTriangleRight } from 'react-icons/vsc';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { BaseButton, BodyContainer, BodyGridExpander, RotatingButton } from '@app/shared/components';
-
-const Layout = styled.div`
-    margin-left: 8px;
-`;
-
-const HeaderContainer = styled.div``;
-
-type ExpandableNodeProps = {
-    isOpen: boolean;
-    header: ReactNode;
-    body: ReactNode;
-};
-
-const ExpandableNode = ({ isOpen, header, body }: ExpandableNodeProps) => {
-    return (
-        <Layout>
-            <HeaderContainer>{header}</HeaderContainer>
-            <BodyGridExpander isOpen={isOpen}>
-                <BodyContainer>{body}</BodyContainer>
-            </BodyGridExpander>
-        </Layout>
-    );
-};
-
-ExpandableNode.Header = styled.div<{ isOpen: boolean; isSelected?: boolean; showBorder?: boolean }>`
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    cursor: pointer;
-    user-select: none;
-    padding-top: 2px;
-    padding-bottom: 2px;
-    padding-right: 2px;
-    border-bottom: 1px solid ${(props) => (props.isOpen || !props.showBorder ? 'transparent' : ANTD_GRAY[4])};
-`;
-
-ExpandableNode.SelectableHeader = styled(ExpandableNode.Header)<{ isSelected: boolean }>`
-    & {
-        border: 1px solid ${(props) => (props.isSelected ? props.theme.styles['primary-color'] : 'transparent')};
-        background-color: ${(props) => (props.isSelected ? props.theme.styles['primary-color-light'] : 'transparent')};
-        border-radius: 8px;
-    }
-
-    &:hover {
-        background-color: ${(props) => props.theme.styles['primary-color-light']};
-    }
-`;
-
-ExpandableNode.HeaderLeft = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-ExpandableNode.StaticButton = ({ icon, onClick }: { icon: JSX.Element; onClick?: () => void }) => {
-    const onClickButton: MouseEventHandler = (e) => {
-        e.stopPropagation();
-        onClick?.();
-    };
-    return <BaseButton ghost size="small" type="ghost" icon={icon} onClick={onClickButton} />;
-};
-
-ExpandableNode.TriangleButton = ({
-    isOpen,
-    isVisible,
-    onClick,
-    dataTestId,
-}: {
-    isOpen: boolean;
-    isVisible: boolean;
-    onClick?: () => void;
-    dataTestId?: string;
-}) => {
-    const onClickButton: MouseEventHandler = (e) => {
-        e.stopPropagation();
-        onClick?.();
-    };
-    return (
-        <RotatingButton
-            ghost
-            size="small"
-            type="ghost"
-            deg={isOpen ? 90 : 0}
-            icon={<VscTriangleRight style={{ color: '#000', visibility: isVisible ? 'visible' : 'hidden' }} />}
-            onClick={onClickButton}
-            data-testid={dataTestId}
-        />
-    );
-};
-
-ExpandableNode.CircleButton = ({ isOpen, color }: { isOpen: boolean; color: string }) => {
-    return (
-        <RotatingButton
-            ghost
-            size="small"
-            type="ghost"
-            deg={isOpen ? 0 : 180}
-            icon={<UpCircleOutlined style={{ color }} />}
-        />
-    );
-};
-
-// Reduce the ellipsis tolerance the deeper we get into the browse path
-const BaseTitleContainer = styled.div<{ depth: number; maxWidth: number; padLeft: boolean }>`
-    max-width: ${(props) => props.maxWidth - props.depth * 8}px;
-    padding-left: ${(props) => (props.padLeft ? 4 : 0)}px;
-`;
-
-const BaseTitle = styled(Typography.Text)<{ color: string; size: number }>`
-    font-size: ${(props) => props.size}px;
-    color: ${(props) => props.color};
-`;
-
-ExpandableNode.Title = ({
-    color,
-    size,
-    depth = 0,
-    children,
-    maxWidth = 200,
-    padLeft = false,
-}: {
-    color: string;
-    size: number;
-    depth?: number;
-    children: ReactNode;
-    maxWidth?: number;
-    padLeft?: boolean;
-}) => {
-    return (
-        <BaseTitleContainer depth={depth} maxWidth={maxWidth} padLeft={padLeft}>
-            <BaseTitle ellipsis={{ tooltip: { mouseEnterDelay: 1 } }} color={color} size={size}>
-                {children}
-            </BaseTitle>
-        </BaseTitleContainer>
-    );
-};
-
-ExpandableNode.Body = styled.div``;
-
-export default ExpandableNode;
diff --git a/datahub-web-react/src/app/search/sidebar/PlatformNode.tsx b/datahub-web-react/src/app/search/sidebar/PlatformNode.tsx
deleted file mode 100644
index b32883e4623400..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/PlatformNode.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { getFilterIconAndLabel } from '@app/search/filters/utils';
-import {
-    BrowseProvider,
-    useEntityAggregation,
-    useIsPlatformSelected,
-    useMaybeEnvironmentAggregation,
-    useOnSelectBrowsePath,
-    usePlatformAggregation,
-} from '@app/search/sidebar/BrowseContext';
-import BrowseNode from '@app/search/sidebar/BrowseNode';
-import ExpandableNode from '@app/search/sidebar/ExpandableNode';
-import { useHasFilterField } from '@app/search/sidebar/SidebarContext';
-import SidebarLoadingError from '@app/search/sidebar/SidebarLoadingError';
-import useBrowsePagination from '@app/search/sidebar/useBrowsePagination';
-import useSidebarAnalytics from '@app/search/sidebar/useSidebarAnalytics';
-import { SortBy, useSort } from '@app/search/sidebar/useSort';
-import { BROWSE_PATH_V2_FILTER_NAME, PLATFORM_FILTER_NAME } from '@app/search/utils/constants';
-import { formatNumber } from '@app/shared/formatNumber';
-import useToggle from '@app/shared/useToggle';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-const PlatformIconContainer = styled.div`
-    width: 16px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-`;
-const Count = styled(Typography.Text)`
-    font-size: 12px;
-    color: ${(props) => props.color};
-    padding-right: 8px;
-`;
-
-interface EntityNodeProps {
-    sortBy: string;
-}
-
-const PlatformNode: React.FC<EntityNodeProps> = ({ sortBy }) => {
-    const isPlatformSelected = useIsPlatformSelected();
-    const hasBrowseFilter = useHasFilterField(BROWSE_PATH_V2_FILTER_NAME);
-    const isPlatformAndPathSelected = isPlatformSelected && hasBrowseFilter;
-    const isPlatformOnlySelected = isPlatformSelected && !hasBrowseFilter;
-    const entityAggregation = useEntityAggregation();
-    const environmentAggregation = useMaybeEnvironmentAggregation();
-    const platformAggregation = usePlatformAggregation();
-    const { count } = platformAggregation;
-    const registry = useEntityRegistry();
-    const { trackToggleNodeEvent, trackSelectNodeEvent } = useSidebarAnalytics();
-    const onSelectBrowsePath = useOnSelectBrowsePath();
-
-    const { icon, label } = getFilterIconAndLabel(
-        PLATFORM_FILTER_NAME,
-        platformAggregation.value,
-        registry,
-        platformAggregation.entity ?? null,
-        16,
-    );
-
-    const { isOpen, isClosing, toggle } = useToggle({
-        initialValue: isPlatformAndPathSelected,
-        closeDelay: 250,
-        onToggle: (isNowOpen: boolean) => trackToggleNodeEvent(isNowOpen, 'platform'),
-    });
-
-    const onClickTriangle = () => {
-        if (count) toggle();
-    };
-
-    const onClickHeader = () => {
-        const isNowPlatformOnlySelected = !isPlatformOnlySelected;
-        onSelectBrowsePath(isNowPlatformOnlySelected, [BROWSE_PATH_V2_FILTER_NAME]);
-        trackSelectNodeEvent(isNowPlatformOnlySelected ? 'select' : 'deselect', 'platform');
-    };
-
-    const { error, groups, loaded, observable, path, retry } = useBrowsePagination({ skip: !isOpen });
-
-    const color = '#000';
-
-    const sortedGroups = useSort(groups, sortBy as SortBy);
-    console.log({ groups, sortedGroups });
-
-    return (
-        <ExpandableNode
-            isOpen={isOpen && !isClosing && loaded}
-            header={
-                <ExpandableNode.SelectableHeader
-                    isOpen={isOpen}
-                    isSelected={isPlatformOnlySelected}
-                    showBorder
-                    onClick={onClickHeader}
-                >
-                    <ExpandableNode.HeaderLeft>
-                        <ExpandableNode.TriangleButton
-                            isOpen={isOpen && !isClosing}
-                            isVisible={!!platformAggregation.count}
-                            onClick={onClickTriangle}
-                            dataTestId={`browse-platform-${label}`}
-                        />
-                        <PlatformIconContainer>{icon}</PlatformIconContainer>
-                        <ExpandableNode.Title color={color} size={14} padLeft>
-                            {label}
-                        </ExpandableNode.Title>
-                    </ExpandableNode.HeaderLeft>
-                    <Count color={color}>{formatNumber(platformAggregation.count)}</Count>
-                </ExpandableNode.SelectableHeader>
-            }
-            body={
-                <ExpandableNode.Body>
-                    {sortedGroups.map((group) => (
-                        <BrowseProvider
-                            key={group.name}
-                            entityAggregation={entityAggregation}
-                            environmentAggregation={environmentAggregation}
-                            platformAggregation={platformAggregation}
-                            browseResultGroup={group}
-                            parentPath={path}
-                        >
-                            <BrowseNode sortBy={sortBy} />
-                        </BrowseProvider>
-                    ))}
-                    {error && <SidebarLoadingError onClickRetry={retry} />}
-                    {observable}
-                </ExpandableNode.Body>
-            }
-        />
-    );
-};
-
-export default PlatformNode;
diff --git a/datahub-web-react/src/app/search/sidebar/SidebarContext.tsx b/datahub-web-react/src/app/search/sidebar/SidebarContext.tsx
deleted file mode 100644
index 4c7ba3007740c9..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/SidebarContext.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import React, { ReactNode, createContext, useContext } from 'react';
-
-import { FacetFilterInput, FilterOperator } from '@types';
-
-type SidebarContextValue = {
-    selectedFilters: Array<FacetFilterInput>;
-    onChangeFilters: (filters: Array<FacetFilterInput>) => void;
-};
-
-const SidebarContext = createContext<SidebarContextValue | null>(null);
-
-type Props = {
-    children: ReactNode;
-    selectedFilters: Array<FacetFilterInput>;
-    onChangeFilters: (filters: Array<FacetFilterInput>) => void;
-};
-
-export const SidebarProvider = ({ children, selectedFilters, onChangeFilters }: Props) => {
-    return (
-        <SidebarContext.Provider
-            value={{
-                selectedFilters,
-                onChangeFilters,
-            }}
-        >
-            {children}
-        </SidebarContext.Provider>
-    );
-};
-
-const useSidebarContext = () => {
-    const context = useContext(SidebarContext);
-    if (context === null) throw new Error(`${useSidebarContext.name} must be used under a ${SidebarProvider.name}`);
-    return context;
-};
-
-export const useSelectedFilters = () => {
-    return useSidebarContext().selectedFilters;
-};
-
-export const useHasFilterField = (field: string) => {
-    const selectedFilters = useSelectedFilters();
-    return selectedFilters.some(
-        (filter) => filter.field === field && filter.condition === FilterOperator.Equal && !filter.negated,
-    );
-};
-
-export const useHasFilterValue = (field: string, value: string | undefined, { prefix = false } = {}) => {
-    const selectedFilters = useSelectedFilters();
-    return (
-        !!value &&
-        selectedFilters.some(
-            (filter) =>
-                filter.field === field &&
-                filter.condition === FilterOperator.Equal &&
-                !filter.negated &&
-                (prefix ? filter.values?.some((f) => f.startsWith(value)) : filter.values?.includes(value)),
-        )
-    );
-};
-
-export const useOnChangeFilters = () => {
-    return useSidebarContext().onChangeFilters;
-};
diff --git a/datahub-web-react/src/app/search/sidebar/SidebarLoadingError.tsx b/datahub-web-react/src/app/search/sidebar/SidebarLoadingError.tsx
deleted file mode 100644
index 6b762b03a56f34..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/SidebarLoadingError.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Alert, Button } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const StyledAlert = styled(Alert)`
-    white-space: normal;
-`;
-
-type Props = {
-    onClickRetry?: () => void;
-};
-
-const SidebarLoadingError = ({ onClickRetry }: Props) => {
-    return (
-        <StyledAlert
-            message="The sidebar failed to load."
-            showIcon
-            type="error"
-            action={
-                onClickRetry && (
-                    <Button size="small" danger onClick={onClickRetry}>
-                        Retry
-                    </Button>
-                )
-            }
-        />
-    );
-};
-
-export default SidebarLoadingError;
diff --git a/datahub-web-react/src/app/search/sidebar/__tests__/browseContextUtils.test.ts b/datahub-web-react/src/app/search/sidebar/__tests__/browseContextUtils.test.ts
deleted file mode 100644
index de0667d6d1e4b3..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/__tests__/browseContextUtils.test.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { getEntitySubtypeFiltersForEntity } from '@app/search/sidebar/browseContextUtils';
-import { ENTITY_SUB_TYPE_FILTER_NAME, TAGS_FILTER_NAME } from '@app/search/utils/constants';
-
-describe('browseContextUtils', () => {
-    it('should remove any different entity types from the filter and keep anything related to our given entityType', () => {
-        const existingFilters = [
-            {
-                field: ENTITY_SUB_TYPE_FILTER_NAME,
-                values: ['DATASET␞table', 'CONTAINER', 'DATASET', 'CHART', 'DATASET␞view'],
-            },
-            {
-                field: TAGS_FILTER_NAME,
-                values: ['urn:li:tag:test'],
-            },
-        ];
-        const entitySubtypeFilters = getEntitySubtypeFiltersForEntity('DATASET', existingFilters);
-
-        expect(entitySubtypeFilters).toMatchObject(['DATASET␞table', 'DATASET', 'DATASET␞view']);
-    });
-});
diff --git a/datahub-web-react/src/app/search/sidebar/browseContextUtils.ts b/datahub-web-react/src/app/search/sidebar/browseContextUtils.ts
deleted file mode 100644
index 9b5f9a804c08fb..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/browseContextUtils.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ENTITY_SUB_TYPE_FILTER_NAME } from '@app/search/utils/constants';
-
-import { FacetFilterInput } from '@types';
-
-export function getEntitySubtypeFiltersForEntity(entityType: string, existingFilters: FacetFilterInput[]) {
-    return existingFilters
-        .find((f) => f.field === ENTITY_SUB_TYPE_FILTER_NAME)
-        ?.values?.filter((value) => value.includes(entityType));
-}
diff --git a/datahub-web-react/src/app/search/sidebar/constants.ts b/datahub-web-react/src/app/search/sidebar/constants.ts
deleted file mode 100644
index a215f56bf1aaa8..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/constants.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const BROWSE_PAGE_SIZE = 20;
-export const MAX_AGGREGATION_VALUES = 100;
-
-export const BROWSE_LOAD_MORE_MARGIN = '200px';
diff --git a/datahub-web-react/src/app/search/sidebar/index.tsx b/datahub-web-react/src/app/search/sidebar/index.tsx
deleted file mode 100644
index c2812c73aebe5d..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/index.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-import BrowseSidebar from '@app/search/sidebar/BrowseSidebar';
-
-export default BrowseSidebar;
diff --git a/datahub-web-react/src/app/search/sidebar/types.ts b/datahub-web-react/src/app/search/sidebar/types.ts
deleted file mode 100644
index 6a108cded6ba34..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import useGetSearchQueryInputs from '@app/search/useGetSearchQueryInputs';
-
-export type SidebarFilters = Pick<
-    ReturnType<typeof useGetSearchQueryInputs>,
-    'entityFilters' | 'query' | 'orFilters' | 'viewUrn'
->;
diff --git a/datahub-web-react/src/app/search/sidebar/useAggregationsQuery.ts b/datahub-web-react/src/app/search/sidebar/useAggregationsQuery.ts
deleted file mode 100644
index 428aa40763170f..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/useAggregationsQuery.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { GLOSSARY_ENTITY_TYPES } from '@app/entity/shared/constants';
-import { MAX_AGGREGATION_VALUES } from '@app/search/sidebar/constants';
-import { useSidebarFilters } from '@app/search/sidebar/useSidebarFilters';
-import { ENTITY_FILTER_NAME, ORIGIN_FILTER_NAME, PLATFORM_FILTER_NAME } from '@app/search/utils/constants';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useAggregateAcrossEntitiesQuery } from '@graphql/search.generated';
-import { EntityType } from '@types';
-
-type Props = {
-    facets: string[];
-    skip: boolean;
-    excludeFilters?: boolean;
-};
-
-const useAggregationsQuery = ({ facets, excludeFilters = false, skip }: Props) => {
-    const registry = useEntityRegistry();
-    const sidebarFilters = useSidebarFilters();
-
-    const {
-        data: newData,
-        previousData,
-        loading,
-        error,
-        refetch,
-    } = useAggregateAcrossEntitiesQuery({
-        skip,
-        fetchPolicy: 'cache-first',
-        variables: {
-            input: {
-                ...(excludeFilters ? {} : { types: sidebarFilters.entityFilters }),
-                facets,
-                ...(excludeFilters ? {} : { orFilters: sidebarFilters.orFilters }),
-                ...(excludeFilters ? {} : { viewUrn: sidebarFilters.viewUrn }),
-                query: excludeFilters ? '*' : sidebarFilters.query,
-                searchFlags: {
-                    maxAggValues: MAX_AGGREGATION_VALUES,
-                },
-            },
-        },
-    });
-
-    const retry = () => {
-        if (refetch) refetch();
-    };
-
-    // This approach of falling back to previousData is needed to avoid a full re-mount of the sidebar entities
-    const data = error ? null : (newData ?? previousData);
-    const loaded = !!data || !!error;
-
-    const entityAggregations = data?.aggregateAcrossEntities?.facets
-        ?.find((facet) => facet.field === ENTITY_FILTER_NAME)
-        ?.aggregations.filter((aggregation) => {
-            const type = aggregation.value as EntityType;
-            return (
-                registry.getEntity(type).isBrowseEnabled() &&
-                !GLOSSARY_ENTITY_TYPES.includes(type) &&
-                EntityType.BusinessAttribute !== type
-            );
-        })
-        .sort((a, b) => {
-            const nameA = registry.getCollectionName(a.value as EntityType);
-            const nameB = registry.getCollectionName(b.value as EntityType);
-            return nameA.localeCompare(nameB);
-        });
-
-    const environmentAggregations = data?.aggregateAcrossEntities?.facets
-        ?.find((facet) => facet.field === ORIGIN_FILTER_NAME)
-        ?.aggregations.filter((aggregation) => aggregation.count)
-        .sort((a, b) => a.value.localeCompare(b.value));
-
-    const platformAggregations = data?.aggregateAcrossEntities?.facets
-        ?.find((facet) => facet.field === PLATFORM_FILTER_NAME)
-        ?.aggregations.filter((aggregation) => aggregation.count)
-        .sort((a, b) => {
-            const nameA = a.entity ? registry.getDisplayName(EntityType.DataPlatform, a.entity) : a.value;
-            const nameB = b.entity ? registry.getDisplayName(EntityType.DataPlatform, b.entity) : b.value;
-            return nameA.localeCompare(nameB);
-        });
-
-    return {
-        loading,
-        loaded,
-        error,
-        entityAggregations,
-        environmentAggregations,
-        platformAggregations,
-        retry,
-    } as const;
-};
-
-export default useAggregationsQuery;
diff --git a/datahub-web-react/src/app/search/sidebar/useBrowsePagination.tsx b/datahub-web-react/src/app/search/sidebar/useBrowsePagination.tsx
deleted file mode 100644
index b5e510c02a198e..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/useBrowsePagination.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-
-import { useBrowsePath, useEntityType } from '@app/search/sidebar/BrowseContext';
-import { BROWSE_LOAD_MORE_MARGIN, BROWSE_PAGE_SIZE } from '@app/search/sidebar/constants';
-import { useSidebarFilters } from '@app/search/sidebar/useSidebarFilters';
-import useIntersect from '@app/shared/useIntersect';
-
-import { GetBrowseResultsV2Query, useGetBrowseResultsV2LazyQuery } from '@graphql/browseV2.generated';
-
-type Props = {
-    skip: boolean;
-};
-
-const useBrowsePagination = ({ skip }: Props) => {
-    const initializing = useRef(true);
-    const type = useEntityType();
-    const path = useBrowsePath();
-    const sidebarFilters = useSidebarFilters();
-    const [startToBrowseMap, setStartToBrowseMap] = useState<Record<number, GetBrowseResultsV2Query | undefined>>({});
-    const startList = useMemo(
-        () =>
-            Object.keys(startToBrowseMap)
-                .map(Number)
-                .sort((a, b) => a - b),
-        [startToBrowseMap],
-    );
-    const groups = useMemo(
-        () => startList.flatMap((start) => startToBrowseMap[start]?.browseV2?.groups ?? []),
-        [startList, startToBrowseMap],
-    );
-    const latestStart = startList.length ? startList[startList.length - 1] : -1;
-    const latestData = latestStart >= 0 ? startToBrowseMap[latestStart] : null;
-    const total = latestData?.browseV2?.total ?? -1;
-    const done = !!latestData && groups.length >= total;
-
-    const [getBrowseResultsV2, { data, error, refetch }] = useGetBrowseResultsV2LazyQuery({
-        fetchPolicy: 'cache-first',
-    });
-
-    const retry = () => {
-        if (refetch) refetch();
-    };
-
-    const getBrowseResultsV2WithDeps = useCallback(
-        (start: number) => {
-            if (skip) return;
-            getBrowseResultsV2({
-                variables: {
-                    input: {
-                        type,
-                        path,
-                        start,
-                        count: BROWSE_PAGE_SIZE,
-                        orFilters: sidebarFilters.orFilters,
-                        viewUrn: sidebarFilters.viewUrn,
-                        query: sidebarFilters.query,
-                    },
-                },
-            });
-        },
-        [getBrowseResultsV2, path, sidebarFilters.orFilters, sidebarFilters.query, sidebarFilters.viewUrn, skip, type],
-    );
-
-    useEffect(() => {
-        initializing.current = true;
-        getBrowseResultsV2WithDeps(0);
-    }, [getBrowseResultsV2WithDeps]);
-
-    useEffect(() => {
-        const newStart = data?.browseV2?.start ?? -1;
-        if (newStart === 0) initializing.current = false;
-        if (initializing.current || !data || newStart < 0) return;
-
-        setStartToBrowseMap((previousMap) => {
-            const newMap: typeof previousMap = { [newStart]: data };
-
-            Object.keys(previousMap)
-                .map(Number)
-                .forEach((previousStart) => {
-                    if (previousStart < newStart) newMap[previousStart] = previousMap[previousStart];
-                });
-
-            return newMap;
-        });
-    }, [data]);
-
-    const advancePage = useCallback(() => {
-        const newStart = latestStart + BROWSE_PAGE_SIZE;
-        if (initializing.current || error || done || latestStart < 0 || total <= 0 || newStart >= total) return;
-        getBrowseResultsV2WithDeps(newStart);
-    }, [done, error, getBrowseResultsV2WithDeps, latestStart, total]);
-
-    const { observableRef } = useIntersect({
-        skip,
-        options: { rootMargin: BROWSE_LOAD_MORE_MARGIN },
-        onIntersect: advancePage,
-    });
-
-    return {
-        loaded: !!latestData || !!error,
-        error,
-        groups,
-        path: latestData?.browseV2?.metadata?.path,
-        observable: <div ref={observableRef} style={{ width: '1px', height: '1px' }} />,
-        retry,
-    } as const;
-};
-
-export default useBrowsePagination;
diff --git a/datahub-web-react/src/app/search/sidebar/useSidebarAnalytics.ts b/datahub-web-react/src/app/search/sidebar/useSidebarAnalytics.ts
deleted file mode 100644
index 317a3efc767990..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/useSidebarAnalytics.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import {
-    BrowseV2EntityLinkClickEvent,
-    BrowseV2SelectNodeEvent,
-    BrowseV2ToggleNodeEvent,
-    EventType,
-} from '@app/analytics';
-import analytics from '@app/analytics/analytics';
-import {
-    useBrowsePathLength,
-    useEntityType,
-    useMaybeEnvironmentAggregation,
-    useMaybePlatformAggregation,
-} from '@app/search/sidebar/BrowseContext';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType } from '@types';
-
-const useSidebarAnalytics = () => {
-    const registry = useEntityRegistry();
-    const entityType = useEntityType();
-    const environmentAggregation = useMaybeEnvironmentAggregation();
-    const platformAggregation = useMaybePlatformAggregation();
-    const entityDisplayName = registry.getCollectionName(entityType);
-    const environmentDisplayName = environmentAggregation?.value;
-    const platformDisplayName = platformAggregation?.entity
-        ? registry.getDisplayName(EntityType.DataPlatform, platformAggregation.entity)
-        : platformAggregation?.value;
-    const targetDepth = (environmentAggregation ? 1 : 0) + (platformAggregation ? 1 : 0) + useBrowsePathLength();
-
-    const trackToggleNodeEvent = (isOpen: boolean, targetNode: BrowseV2ToggleNodeEvent['targetNode']) => {
-        analytics.event({
-            type: EventType.BrowseV2ToggleNodeEvent,
-            targetNode,
-            action: isOpen ? 'open' : 'close',
-            entity: entityDisplayName,
-            environment: environmentDisplayName,
-            platform: platformDisplayName,
-            targetDepth,
-        });
-    };
-
-    const trackSelectNodeEvent = (
-        action: BrowseV2SelectNodeEvent['action'],
-        targetNode: BrowseV2SelectNodeEvent['targetNode'],
-    ) => {
-        analytics.event({
-            type: EventType.BrowseV2SelectNodeEvent,
-            targetNode,
-            action,
-            entity: entityDisplayName,
-            environment: environmentDisplayName,
-            platform: platformDisplayName,
-            targetDepth,
-        });
-    };
-
-    const trackEntityLinkClickEvent = (targetNode: BrowseV2EntityLinkClickEvent['targetNode']) => {
-        analytics.event({
-            type: EventType.BrowseV2EntityLinkClickEvent,
-            targetNode,
-            entity: entityDisplayName,
-            environment: environmentDisplayName,
-            platform: platformDisplayName,
-            targetDepth,
-        });
-    };
-
-    return { trackToggleNodeEvent, trackSelectNodeEvent, trackEntityLinkClickEvent } as const;
-};
-
-export default useSidebarAnalytics;
diff --git a/datahub-web-react/src/app/search/sidebar/useSidebarEntities.ts b/datahub-web-react/src/app/search/sidebar/useSidebarEntities.ts
deleted file mode 100644
index c605eed94098e0..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/useSidebarEntities.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useMemo } from 'react';
-
-import useAggregationsQuery from '@app/search/sidebar/useAggregationsQuery';
-import { ENTITY_FILTER_NAME } from '@app/search/utils/constants';
-
-type Props = {
-    skip: boolean;
-};
-
-const useSidebarEntities = ({ skip }: Props) => {
-    const {
-        error: filteredError,
-        entityAggregations: filteredAggs,
-        retry: retryFilteredAggs,
-    } = useAggregationsQuery({
-        skip,
-        facets: [ENTITY_FILTER_NAME],
-    });
-
-    const { error: baseError, entityAggregations: baseAggs } = useAggregationsQuery({
-        skip,
-        facets: [ENTITY_FILTER_NAME],
-        excludeFilters: true,
-    });
-
-    const result = useMemo(() => {
-        if (filteredError || baseError) return filteredAggs; // Fallback to filtered aggs on any error
-        if (!filteredAggs || !baseAggs) return null; // If we're loading one of the queries, wait to render
-        return filteredAggs.filter((agg) => baseAggs.some((base) => base.value === agg.value && !!base.count));
-    }, [baseAggs, baseError, filteredAggs, filteredError]);
-
-    return { error: filteredError, entityAggregations: result, retry: retryFilteredAggs } as const;
-};
-
-export default useSidebarEntities;
diff --git a/datahub-web-react/src/app/search/sidebar/useSidebarFilters.ts b/datahub-web-react/src/app/search/sidebar/useSidebarFilters.ts
deleted file mode 100644
index d51e9bdad38b67..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/useSidebarFilters.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import isEqual from 'lodash/isEqual';
-import { useEffect, useMemo, useState } from 'react';
-
-import {
-    useMaybeEntityType,
-    useMaybeEnvironmentAggregation,
-    useMaybePlatformAggregation,
-} from '@app/search/sidebar/BrowseContext';
-import { SidebarFilters } from '@app/search/sidebar/types';
-import useGetSearchQueryInputs from '@app/search/useGetSearchQueryInputs';
-import { applyOrFilterOverrides } from '@app/search/utils/applyFilterOverrides';
-import {
-    BROWSE_PATH_V2_FILTER_NAME,
-    ENTITY_FILTER_NAME,
-    ORIGIN_FILTER_NAME,
-    PLATFORM_FILTER_NAME,
-} from '@app/search/utils/constants';
-
-export const useSidebarFilters = (): SidebarFilters => {
-    const entityType = useMaybeEntityType();
-    const environment = useMaybeEnvironmentAggregation()?.value;
-    const platform = useMaybePlatformAggregation()?.value;
-
-    const filterOverrides = useMemo(
-        () => [
-            ...(entityType ? [{ field: ENTITY_FILTER_NAME, value: entityType }] : []),
-            ...(environment ? [{ field: ORIGIN_FILTER_NAME, value: environment }] : []),
-            ...(platform ? [{ field: PLATFORM_FILTER_NAME, value: platform }] : []),
-        ],
-        [entityType, environment, platform],
-    );
-
-    const excludedFilterFields = useMemo(
-        () => filterOverrides.map((filter) => filter.field).concat(BROWSE_PATH_V2_FILTER_NAME),
-        [filterOverrides],
-    );
-
-    const {
-        entityFilters: latestEntityFilters,
-        query: latestQuery,
-        orFilters: latestOrFilters,
-        viewUrn: latestViewUrn,
-    } = useGetSearchQueryInputs(excludedFilterFields);
-
-    const latestSidebarFilters = useMemo(
-        () => ({
-            // todo(josh): remove this and move it to a normal filterOverride when _entityType is fully wired up on the backend
-            entityFilters: entityType ? [entityType] : latestEntityFilters,
-            query: latestQuery,
-            orFilters: applyOrFilterOverrides(latestOrFilters, filterOverrides),
-            viewUrn: latestViewUrn,
-        }),
-        [entityType, filterOverrides, latestEntityFilters, latestOrFilters, latestQuery, latestViewUrn],
-    );
-
-    const [sidebarFilters, setSidebarFilters] = useState(latestSidebarFilters);
-
-    // Ensures we only trigger filter updates in the sidebar if they truly changed (clicking browse could trigger this when we don't want)
-    useEffect(() => {
-        if (!isEqual(latestSidebarFilters, sidebarFilters)) setSidebarFilters(latestSidebarFilters);
-    }, [latestSidebarFilters, sidebarFilters]);
-
-    return sidebarFilters;
-};
diff --git a/datahub-web-react/src/app/search/sidebar/useSort.ts b/datahub-web-react/src/app/search/sidebar/useSort.ts
deleted file mode 100644
index 654d1ed8a5633f..00000000000000
--- a/datahub-web-react/src/app/search/sidebar/useSort.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { useEffect, useState } from 'react';
-
-export type SortBy = 'AtoZ' | 'ZtoA';
-
-export const useSort = (initialData, sortBy: SortBy) => {
-    const [sortedData, setSortedData] = useState([...initialData]);
-
-    useEffect(() => {
-        const sortData = () => {
-            const newData = [...initialData];
-            if (sortBy === 'AtoZ') {
-                newData?.sort((a, b) => {
-                    const nameA = a?.entity?.properties?.name || a.name;
-                    const nameB = b?.entity?.properties?.name || b.name;
-                    return nameA?.localeCompare(nameB);
-                });
-            } else if (sortBy === 'ZtoA') {
-                newData?.sort((a, b) => {
-                    const nameA = a?.entity?.properties?.name || a.name;
-                    const nameB = b?.entity?.properties?.name || b.name;
-                    return nameB?.localeCompare(nameA);
-                });
-            }
-            setSortedData(newData);
-        };
-        sortData();
-    }, [initialData, sortBy]);
-
-    return sortedData;
-};
diff --git a/datahub-web-react/src/app/search/sorting/SearchSortSelect.tsx b/datahub-web-react/src/app/search/sorting/SearchSortSelect.tsx
deleted file mode 100644
index 50dba06086f80d..00000000000000
--- a/datahub-web-react/src/app/search/sorting/SearchSortSelect.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import Icon, { CaretDownFilled } from '@ant-design/icons';
-import { Select, Tooltip } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { useSearchContext } from '@app/search/context/SearchContext';
-import { DEFAULT_SORT_OPTION, SORT_OPTIONS } from '@app/search/context/constants';
-
-import SortIcon from '@images/sort.svg?react';
-
-const SelectWrapper = styled.span`
-    display: inline-flex;
-    align-items: center;
-    margin-right: 8px;
-
-    .ant-select-selection-item {
-        // !important is necessary because updating Select styles for antd is impossible
-        color: ${ANTD_GRAY[8]} !important;
-        font-weight: 700;
-    }
-
-    .ant-select-selection-placeholder {
-        color: ${ANTD_GRAY[8]};
-        font-weight: 700;
-    }
-`;
-
-const StyledIcon = styled(Icon)`
-    color: ${ANTD_GRAY[8]};
-    font-size: 16px;
-    margin-right: -8px;
-`;
-
-export default function SearchSortSelect() {
-    const { selectedSortOption, setSelectedSortOption } = useSearchContext();
-
-    const options = Object.entries(SORT_OPTIONS).map(([value, option]) => ({ value, label: option.label }));
-
-    return (
-        <Tooltip title="Sort search results" showArrow={false} placement="left">
-            <SelectWrapper>
-                <StyledIcon component={SortIcon} />
-                <Select
-                    placeholder="Sort"
-                    value={selectedSortOption === DEFAULT_SORT_OPTION ? null : selectedSortOption}
-                    options={options}
-                    bordered={false}
-                    onChange={(sortOption) => setSelectedSortOption(sortOption)}
-                    dropdownStyle={{ minWidth: 'max-content' }}
-                    placement="bottomRight"
-                    suffixIcon={<CaretDownFilled />}
-                />
-            </SelectWrapper>
-        </Tooltip>
-    );
-}
diff --git a/datahub-web-react/src/app/search/suggestions/SearchQuerySugggester.tsx b/datahub-web-react/src/app/search/suggestions/SearchQuerySugggester.tsx
deleted file mode 100644
index 46225d99a0d4ce..00000000000000
--- a/datahub-web-react/src/app/search/suggestions/SearchQuerySugggester.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import { useHistory } from 'react-router';
-import styled from 'styled-components';
-
-import { ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-import { navigateToSearchUrl } from '@app/search/utils/navigateToSearchUrl';
-
-import { SearchSuggestion } from '@types';
-
-const TextWrapper = styled.div`
-    font-size: 14px;
-    color: ${ANTD_GRAY_V2[8]};
-    margin: 16px 0 -8px 32px;
-`;
-
-export const SuggestedText = styled.span`
-    color: ${(props) => props.theme.styles['primary-color']};
-    text-decoration: underline ${(props) => props.theme.styles['primary-color']};
-    cursor: pointer;
-`;
-
-interface Props {
-    suggestions: SearchSuggestion[];
-}
-
-export default function SearchQuerySuggester({ suggestions }: Props) {
-    const history = useHistory();
-
-    if (suggestions.length === 0) return null;
-    const suggestText = suggestions[0].text;
-
-    function searchForSuggestion() {
-        navigateToSearchUrl({ query: suggestText, history });
-    }
-
-    return (
-        <TextWrapper>
-            Did you mean <SuggestedText onClick={searchForSuggestion}>{suggestText}</SuggestedText>
-        </TextWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/search/useSearchAndBrowseVersion.ts b/datahub-web-react/src/app/search/useSearchAndBrowseVersion.ts
index 6f3782f4b27c6a..12529ed335de10 100644
--- a/datahub-web-react/src/app/search/useSearchAndBrowseVersion.ts
+++ b/datahub-web-react/src/app/search/useSearchAndBrowseVersion.ts
@@ -11,19 +11,3 @@ const useSearchAndBrowseVersion = () => {
 export const useSearchVersion = () => {
     return useSearchAndBrowseVersion().searchVersion;
 };
-
-export const useBrowseVersion = () => {
-    return useSearchAndBrowseVersion().browseVersion;
-};
-
-export const useIsSearchV2 = () => {
-    return useSearchVersion() === 'v2';
-};
-
-// only show browseV2 if search filtersV2 is also enabled
-export const useIsBrowseV2 = () => {
-    const browseVersion = useBrowseVersion();
-    const searchFiltersVersion = useSearchVersion();
-
-    return browseVersion === 'v2' && searchFiltersVersion === 'v2';
-};
diff --git a/datahub-web-react/src/app/search/useToggleSidebar.ts b/datahub-web-react/src/app/search/useToggleSidebar.ts
deleted file mode 100644
index c7f692343ea5f4..00000000000000
--- a/datahub-web-react/src/app/search/useToggleSidebar.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { EventType } from '@app/analytics';
-import analytics from '@app/analytics/analytics';
-import { useUserContext } from '@app/context/useUserContext';
-import useToggle from '@app/shared/useToggle';
-
-const useToggleSidebar = () => {
-    const { localState, updateLocalState } = useUserContext();
-
-    const { isOpen: isSidebarOpen, toggle: toggleSidebar } = useToggle({
-        initialValue: localState.showBrowseV2Sidebar ?? true,
-        onToggle: (isNowOpen: boolean) => {
-            analytics.event({
-                type: EventType.BrowseV2ToggleSidebarEvent,
-                action: isNowOpen ? 'open' : 'close',
-            });
-            updateLocalState({ ...localState, showBrowseV2Sidebar: isNowOpen });
-        },
-    });
-
-    return { isSidebarOpen, toggleSidebar } as const;
-};
-
-export default useToggleSidebar;
diff --git a/datahub-web-react/src/app/search/utils/__tests__/applyFilterOverrides.test.ts b/datahub-web-react/src/app/search/utils/__tests__/applyFilterOverrides.test.ts
deleted file mode 100644
index dafae9a5dd416e..00000000000000
--- a/datahub-web-react/src/app/search/utils/__tests__/applyFilterOverrides.test.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { applyFacetFilterOverrides, applyOrFilterOverrides } from '@app/search/utils/applyFilterOverrides';
-import {
-    CONTAINER_FILTER_NAME,
-    ORIGIN_FILTER_NAME,
-    PLATFORM_FILTER_NAME,
-    UnionType,
-} from '@app/search/utils/constants';
-import { generateOrFilters } from '@app/search/utils/generateOrFilters';
-
-describe('applyFacetFilterOverrides', () => {
-    it('should concatenate overrides to an empty list', () => {
-        const filterOverrides = [
-            { field: PLATFORM_FILTER_NAME, value: 'looker' },
-            { field: CONTAINER_FILTER_NAME, value: 'parent' },
-        ];
-        const baseFilters = [];
-        const orFiltersWithOverrides = applyFacetFilterOverrides(baseFilters, filterOverrides);
-
-        expect(orFiltersWithOverrides).toMatchObject([
-            { field: PLATFORM_FILTER_NAME, value: 'looker' },
-            { field: CONTAINER_FILTER_NAME, value: 'parent' },
-        ]);
-    });
-
-    it('should apply new overrides to the end of the list', () => {
-        const filterOverrides = [{ field: ORIGIN_FILTER_NAME, value: 'PROD' }];
-        const baseFilters = [
-            { field: PLATFORM_FILTER_NAME, value: 'looker' },
-            { field: CONTAINER_FILTER_NAME, value: 'parent' },
-        ];
-        const orFiltersWithOverrides = applyFacetFilterOverrides(baseFilters, filterOverrides);
-
-        expect(orFiltersWithOverrides).toMatchObject([
-            { field: PLATFORM_FILTER_NAME, value: 'looker' },
-            { field: CONTAINER_FILTER_NAME, value: 'parent' },
-            { field: ORIGIN_FILTER_NAME, value: 'PROD' },
-        ]);
-    });
-
-    it('should replace existing filters and concatenate new ones', () => {
-        const filterOverrides = [
-            { field: PLATFORM_FILTER_NAME, value: 'hive' },
-            { field: ORIGIN_FILTER_NAME, value: 'PROD' },
-        ];
-        const baseFilters = [
-            { field: PLATFORM_FILTER_NAME, value: 'looker' },
-            { field: CONTAINER_FILTER_NAME, value: 'parent' },
-        ];
-        const orFiltersWithOverrides = applyFacetFilterOverrides(baseFilters, filterOverrides);
-
-        expect(orFiltersWithOverrides).toMatchObject([
-            { field: PLATFORM_FILTER_NAME, value: 'hive' },
-            { field: CONTAINER_FILTER_NAME, value: 'parent' },
-            { field: ORIGIN_FILTER_NAME, value: 'PROD' },
-        ]);
-    });
-});
-
-describe('applyOrFilterOverrides', () => {
-    it('should apply overrides to each OR block of orFilters', () => {
-        const filterOverrides = [{ field: ORIGIN_FILTER_NAME, value: 'PROD' }];
-        const baseFilters = [
-            { field: PLATFORM_FILTER_NAME, value: 'looker' },
-            { field: CONTAINER_FILTER_NAME, value: 'parent' },
-        ];
-        const orFiltersWithoutOverrides = generateOrFilters(UnionType.OR, baseFilters);
-        const orFiltersWithOverrides = applyOrFilterOverrides(orFiltersWithoutOverrides, filterOverrides);
-
-        expect(orFiltersWithOverrides).toMatchObject([
-            {
-                and: [
-                    { field: PLATFORM_FILTER_NAME, value: 'looker' },
-                    { field: ORIGIN_FILTER_NAME, value: 'PROD' },
-                ],
-            },
-            {
-                and: [
-                    { field: CONTAINER_FILTER_NAME, value: 'parent' },
-                    { field: ORIGIN_FILTER_NAME, value: 'PROD' },
-                ],
-            },
-        ]);
-    });
-
-    it('should apply overrides to empty orFilters', () => {
-        const filterOverrides = [{ field: ORIGIN_FILTER_NAME, value: 'PROD' }];
-        const baseFilters = [];
-        const orFiltersWithoutOverrides = generateOrFilters(UnionType.OR, baseFilters);
-        const orFiltersWithOverrides = applyOrFilterOverrides(orFiltersWithoutOverrides, filterOverrides);
-
-        expect(orFiltersWithOverrides).toMatchObject([
-            {
-                and: [{ field: ORIGIN_FILTER_NAME, value: 'PROD' }],
-            },
-        ]);
-    });
-
-    it('should not modify orFilters on empty overrides', () => {
-        const filterOverrides = [];
-        const baseFilters = [{ field: PLATFORM_FILTER_NAME, value: 'looker' }];
-        const orFiltersWithoutOverrides = generateOrFilters(UnionType.OR, baseFilters);
-        const orFiltersWithOverrides = applyOrFilterOverrides(orFiltersWithoutOverrides, filterOverrides);
-
-        expect(orFiltersWithOverrides).toMatchObject([
-            {
-                and: [{ field: PLATFORM_FILTER_NAME, value: 'looker' }],
-            },
-        ]);
-    });
-});
diff --git a/datahub-web-react/src/app/search/utils/__tests__/filterUtils.test.ts b/datahub-web-react/src/app/search/utils/__tests__/filterUtils.test.ts
deleted file mode 100644
index 40b8e1c7daeac8..00000000000000
--- a/datahub-web-react/src/app/search/utils/__tests__/filterUtils.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { QuickFilterField } from '@app/search/autoComplete/quickFilters/utils';
-import { getAutoCompleteInputFromQuickFilter, getFiltersWithQuickFilter } from '@app/search/utils/filterUtils';
-
-describe('getAutoCompleteInputFromQuickFilter', () => {
-    it('should create a platform filter if the selected quick filter is a platform', () => {
-        const selectedQuickFilter = { field: QuickFilterField.Platform, value: 'urn:li:dataPlatform:dbt' };
-        const filterResult = getAutoCompleteInputFromQuickFilter(selectedQuickFilter);
-
-        expect(filterResult).toMatchObject({
-            filters: [{ field: selectedQuickFilter.field, values: [selectedQuickFilter.value] }],
-            types: [],
-        });
-    });
-
-    it('should create an entity type filter if the selected quick filter is an entity', () => {
-        const selectedQuickFilter = { field: QuickFilterField.Entity, value: 'DASHBOARD' };
-        const filterResult = getAutoCompleteInputFromQuickFilter(selectedQuickFilter);
-
-        expect(filterResult).toMatchObject({
-            filters: [],
-            types: [selectedQuickFilter.value],
-        });
-    });
-
-    it('should return empty filters if there is no selected quick filter', () => {
-        const filterResult = getAutoCompleteInputFromQuickFilter(null);
-
-        expect(filterResult).toMatchObject({ filters: [], types: [] });
-    });
-});
-
-describe('getFiltersWithQuickFilter', () => {
-    it('should create a filters list with a quick filter as a FacetFilter when there is a quick filter', () => {
-        const selectedQuickFilter = { field: QuickFilterField.Platform, value: 'urn:li:dataPlatform:dbt' };
-        const filterResult = getFiltersWithQuickFilter(selectedQuickFilter);
-
-        expect(filterResult).toMatchObject([{ field: selectedQuickFilter.field, values: [selectedQuickFilter.value] }]);
-    });
-
-    it('should return empty filters if there is no selected quick filter', () => {
-        const filterResult = getFiltersWithQuickFilter(null);
-
-        expect(filterResult).toMatchObject([]);
-    });
-});
diff --git a/datahub-web-react/src/app/search/utils/__tests__/generateOrFilters.test.ts b/datahub-web-react/src/app/search/utils/__tests__/generateOrFilters.test.ts
deleted file mode 100644
index 54f08bd7dc5bf6..00000000000000
--- a/datahub-web-react/src/app/search/utils/__tests__/generateOrFilters.test.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import {
-    DOMAINS_FILTER_NAME,
-    ENTITY_FILTER_NAME,
-    ENTITY_SUB_TYPE_FILTER_NAME,
-    TAGS_FILTER_NAME,
-    UnionType,
-} from '@app/search/utils/constants';
-import { generateOrFilters } from '@app/search/utils/generateOrFilters';
-
-describe('generateOrFilters', () => {
-    it('should generate orFilters with UnionType.AND', () => {
-        const filters = [
-            { field: ENTITY_FILTER_NAME, values: ['DATASET', 'CONTAINER'] },
-            { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
-        ];
-        const orFilters = generateOrFilters(UnionType.AND, filters);
-
-        expect(orFilters).toMatchObject([
-            {
-                and: filters,
-            },
-        ]);
-    });
-
-    it('should generate orFilters with UnionType.OR', () => {
-        const filters = [
-            { field: ENTITY_FILTER_NAME, values: ['DATASET', 'CONTAINER'] },
-            { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
-        ];
-        const orFilters = generateOrFilters(UnionType.OR, filters);
-
-        expect(orFilters).toMatchObject([
-            {
-                and: [filters[0]],
-            },
-            {
-                and: [filters[1]],
-            },
-        ]);
-    });
-
-    it('should generate orFilters with UnionType.AND and nestedFilters', () => {
-        const filters = [
-            { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
-            { field: DOMAINS_FILTER_NAME, values: ['urn:li:domains:domain1'] },
-            { field: ENTITY_SUB_TYPE_FILTER_NAME, values: ['CONTAINER', 'DATASET␞table'] },
-        ];
-        // const nestedFilters = [{ field: ENTITY_SUB_TYPE_FILTER_NAME, values: ['CONTAINER', 'DATASET␞table'] }];
-        const orFilters = generateOrFilters(UnionType.AND, filters);
-
-        expect(orFilters).toMatchObject([
-            {
-                and: [
-                    { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
-                    { field: DOMAINS_FILTER_NAME, values: ['urn:li:domains:domain1'] },
-                    { field: '_entityType', values: ['CONTAINER'] },
-                ],
-            },
-            {
-                and: [
-                    { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
-                    { field: DOMAINS_FILTER_NAME, values: ['urn:li:domains:domain1'] },
-                    { field: '_entityType', values: ['DATASET'] },
-                    { field: 'typeNames', values: ['table'] },
-                ],
-            },
-        ]);
-    });
-
-    it('should generate orFilters with UnionType.OR and nestedFilters', () => {
-        const filters = [
-            { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
-            { field: DOMAINS_FILTER_NAME, values: ['urn:li:domains:domain1'] },
-            { field: ENTITY_SUB_TYPE_FILTER_NAME, values: ['CONTAINER', 'DATASET␞table'] },
-        ];
-        const orFilters = generateOrFilters(UnionType.OR, filters);
-
-        expect(orFilters).toMatchObject([
-            {
-                and: [{ field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] }],
-            },
-            {
-                and: [{ field: DOMAINS_FILTER_NAME, values: ['urn:li:domains:domain1'] }],
-            },
-            {
-                and: [{ field: '_entityType', values: ['CONTAINER'] }],
-            },
-            {
-                and: [
-                    { field: '_entityType', values: ['DATASET'] },
-                    { field: 'typeNames', values: ['table'] },
-                ],
-            },
-        ]);
-    });
-
-    it('should generate orFilters and exclude filters with a provided exclude field', () => {
-        const filters = [
-            { field: ENTITY_FILTER_NAME, values: ['DATASET', 'CONTAINER'] },
-            { field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] },
-        ];
-        const orFilters = generateOrFilters(UnionType.AND, filters, [ENTITY_FILTER_NAME]);
-
-        expect(orFilters).toMatchObject([
-            {
-                and: [{ field: TAGS_FILTER_NAME, values: ['urn:li:tag:tag1'] }],
-            },
-        ]);
-    });
-});
diff --git a/datahub-web-react/src/app/search/utils/applyFilterOverrides.ts b/datahub-web-react/src/app/search/utils/applyFilterOverrides.ts
deleted file mode 100644
index ffda478cfadf61..00000000000000
--- a/datahub-web-react/src/app/search/utils/applyFilterOverrides.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { UnionType } from '@app/search/utils/constants';
-import { generateOrFilters } from '@app/search/utils/generateOrFilters';
-
-import { AndFilterInput, FacetFilterInput } from '@types';
-
-// Swap in new overrides at the same filter positions, with the remainder at the end
-// Assumes we find matches just by field name, so if multiple filters for the same field were passed, we replace those
-export const applyFacetFilterOverrides = (filters: Array<FacetFilterInput>, overrides: Array<FacetFilterInput>) => {
-    const added = new Set<string>();
-    const overrideMap = new Map<string, FacetFilterInput>();
-
-    overrides.forEach((override) => {
-        if (!overrideMap.has(override.field)) overrideMap.set(override.field, override);
-    });
-
-    return filters
-        .map((filter) => {
-            const override = overrideMap.get(filter.field);
-            if (!override) return filter;
-            added.add(override.field);
-            return override;
-        })
-        .concat(overrides.filter((override) => !added.has(override.field)));
-};
-
-export const applyOrFilterOverrides = (orFilters: Array<AndFilterInput>, overrides: Array<FacetFilterInput>) => {
-    if (!orFilters.length) return generateOrFilters(UnionType.AND, overrides);
-
-    return orFilters.map((orFilter) => ({
-        and: applyFacetFilterOverrides(orFilter.and ?? [], overrides),
-    }));
-};
diff --git a/datahub-web-react/src/app/search/utils/combineSiblingsInAutoComplete.ts b/datahub-web-react/src/app/search/utils/combineSiblingsInAutoComplete.ts
index f752f40da6dd56..3e66b4c400c04f 100644
--- a/datahub-web-react/src/app/search/utils/combineSiblingsInAutoComplete.ts
+++ b/datahub-web-react/src/app/search/utils/combineSiblingsInAutoComplete.ts
@@ -2,7 +2,7 @@ import { CombinedEntity, createSiblingEntityCombiner } from '@app/entity/shared/
 
 import { AutoCompleteResultForEntity, EntityType } from '@types';
 
-export type CombinedSuggestion = {
+type CombinedSuggestion = {
     type: EntityType;
     combinedEntities: Array<CombinedEntity>;
     suggestions?: AutoCompleteResultForEntity['suggestions'];
diff --git a/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.test.ts b/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.test.ts
deleted file mode 100644
index bf816c3ce4dc84..00000000000000
--- a/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.test.ts
+++ /dev/null
@@ -1,551 +0,0 @@
-import { combineSiblingsInSearchResults } from '@app/search/utils/combineSiblingsInSearchResults';
-
-const searchResultWithSiblings = [
-    {
-        entity: {
-            urn: 'urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.raw_orders,PROD)',
-            exists: true,
-            type: 'DATASET',
-            name: 'cypress_project.jaffle_shop.raw_orders',
-            origin: 'PROD',
-            uri: null,
-            platform: {
-                urn: 'urn:li:dataPlatform:bigquery',
-                type: 'DATA_PLATFORM',
-                name: 'bigquery',
-                properties: {
-                    type: 'RELATIONAL_DB',
-                    displayName: 'BigQuery',
-                    datasetNameDelimiter: '.',
-                    logoUrl: 'assets/platforms/bigquerylogo.png',
-                    __typename: 'DataPlatformProperties',
-                },
-                displayName: null,
-                info: null,
-                __typename: 'DataPlatform',
-            },
-            dataPlatformInstance: null,
-            editableProperties: null,
-            platformNativeType: null,
-            properties: {
-                name: 'raw_orders',
-                description: null,
-                qualifiedName: null,
-                customProperties: [],
-                __typename: 'DatasetProperties',
-            },
-            ownership: null,
-            globalTags: null,
-            glossaryTerms: null,
-            subTypes: {
-                typeNames: ['table'],
-                __typename: 'SubTypes',
-            },
-            domain: null,
-            container: {
-                urn: 'urn:li:container:348c96555971d3f5c1ffd7dd2e7446cb',
-                platform: {
-                    urn: 'urn:li:dataPlatform:bigquery',
-                    type: 'DATA_PLATFORM',
-                    name: 'bigquery',
-                    properties: {
-                        type: 'RELATIONAL_DB',
-                        displayName: 'BigQuery',
-                        datasetNameDelimiter: '.',
-                        logoUrl: 'assets/platforms/bigquerylogo.png',
-                        __typename: 'DataPlatformProperties',
-                    },
-                    displayName: null,
-                    info: null,
-                    __typename: 'DataPlatform',
-                },
-                properties: {
-                    name: 'jaffle_shop',
-                    __typename: 'ContainerProperties',
-                },
-                subTypes: {
-                    typeNames: ['Dataset'],
-                    __typename: 'SubTypes',
-                },
-                deprecation: null,
-                __typename: 'Container',
-            },
-            parentContainers: {
-                count: 2,
-                containers: [
-                    {
-                        urn: 'urn:li:container:348c96555971d3f5c1ffd7dd2e7446cb',
-                        platform: {
-                            urn: 'urn:li:dataPlatform:bigquery',
-                            type: 'DATA_PLATFORM',
-                            name: 'bigquery',
-                            properties: {
-                                type: 'RELATIONAL_DB',
-                                displayName: 'BigQuery',
-                                datasetNameDelimiter: '.',
-                                logoUrl: 'assets/platforms/bigquerylogo.png',
-                                __typename: 'DataPlatformProperties',
-                            },
-                            displayName: null,
-                            info: null,
-                            __typename: 'DataPlatform',
-                        },
-                        properties: {
-                            name: 'jaffle_shop',
-                            __typename: 'ContainerProperties',
-                        },
-                        subTypes: {
-                            typeNames: ['Dataset'],
-                            __typename: 'SubTypes',
-                        },
-                        deprecation: null,
-                        __typename: 'Container',
-                    },
-                    {
-                        urn: 'urn:li:container:b5e95fce839e7d78151ed7e0a7420d84',
-                        platform: {
-                            urn: 'urn:li:dataPlatform:bigquery',
-                            type: 'DATA_PLATFORM',
-                            name: 'bigquery',
-                            properties: {
-                                type: 'RELATIONAL_DB',
-                                displayName: 'BigQuery',
-                                datasetNameDelimiter: '.',
-                                logoUrl: 'assets/platforms/bigquerylogo.png',
-                                __typename: 'DataPlatformProperties',
-                            },
-                            displayName: null,
-                            info: null,
-                            __typename: 'DataPlatform',
-                        },
-                        properties: {
-                            name: 'cypress_project',
-                            __typename: 'ContainerProperties',
-                        },
-                        subTypes: {
-                            typeNames: ['Project'],
-                            __typename: 'SubTypes',
-                        },
-                        deprecation: null,
-                        __typename: 'Container',
-                    },
-                ],
-                __typename: 'ParentContainersResult',
-            },
-            deprecation: null,
-            siblings: {
-                isPrimary: false,
-                siblings: [
-                    {
-                        urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
-                        type: 'DATASET',
-                    },
-                ],
-                __typename: 'SiblingProperties',
-            },
-            siblingsSearch: {
-                searchResults: [
-                    {
-                        entity: {
-                            urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
-                            exists: true,
-                            type: 'DATASET',
-                            platform: {
-                                urn: 'urn:li:dataPlatform:dbt',
-                                type: 'DATA_PLATFORM',
-                                name: 'dbt',
-                                properties: {
-                                    type: 'OTHERS',
-                                    displayName: 'dbt',
-                                    datasetNameDelimiter: '.',
-                                    logoUrl: 'assets/platforms/dbtlogo.png',
-                                    __typename: 'DataPlatformProperties',
-                                },
-                                displayName: null,
-                                info: null,
-                                __typename: 'DataPlatform',
-                            },
-                            name: 'cypress_project.jaffle_shop.raw_orders',
-                            properties: {
-                                name: 'raw_orders',
-                                description: '',
-                                qualifiedName: null,
-                                __typename: 'DatasetProperties',
-                            },
-                            __typename: 'Dataset',
-                        },
-                    },
-                ],
-            },
-            __typename: 'Dataset',
-        },
-        matchedFields: [
-            {
-                name: 'name',
-                value: 'raw_orders',
-                __typename: 'MatchedField',
-            },
-            {
-                name: 'id',
-                value: 'cypress_project.jaffle_shop.raw_orders',
-                __typename: 'MatchedField',
-            },
-        ],
-        insights: [],
-        __typename: 'SearchResult',
-    },
-    {
-        entity: {
-            urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
-            exists: true,
-            type: 'DATASET',
-            name: 'cypress_project.jaffle_shop.raw_orders',
-            origin: 'PROD',
-            uri: null,
-            platform: {
-                urn: 'urn:li:dataPlatform:dbt',
-                type: 'DATA_PLATFORM',
-                name: 'dbt',
-                properties: {
-                    type: 'OTHERS',
-                    displayName: 'dbt',
-                    datasetNameDelimiter: '.',
-                    logoUrl: 'assets/platforms/dbtlogo.png',
-                    __typename: 'DataPlatformProperties',
-                },
-                displayName: null,
-                info: null,
-                __typename: 'DataPlatform',
-            },
-            dataPlatformInstance: null,
-            editableProperties: null,
-            platformNativeType: null,
-            properties: {
-                name: 'raw_orders',
-                description: '',
-                qualifiedName: null,
-                customProperties: [
-                    {
-                        key: 'catalog_version',
-                        value: '1.0.4',
-                        __typename: 'StringMapEntry',
-                    },
-                    {
-                        key: 'node_type',
-                        value: 'seed',
-                        __typename: 'StringMapEntry',
-                    },
-                    {
-                        key: 'materialization',
-                        value: 'seed',
-                        __typename: 'StringMapEntry',
-                    },
-                    {
-                        key: 'dbt_file_path',
-                        value: 'data/raw_orders.csv',
-                        __typename: 'StringMapEntry',
-                    },
-                    {
-                        key: 'catalog_schema',
-                        value: 'https://schemas.getdbt.com/dbt/catalog/v1.json',
-                        __typename: 'StringMapEntry',
-                    },
-                    {
-                        key: 'catalog_type',
-                        value: 'table',
-                        __typename: 'StringMapEntry',
-                    },
-                    {
-                        key: 'manifest_version',
-                        value: '1.0.4',
-                        __typename: 'StringMapEntry',
-                    },
-                    {
-                        key: 'manifest_schema',
-                        value: 'https://schemas.getdbt.com/dbt/manifest/v4.json',
-                        __typename: 'StringMapEntry',
-                    },
-                ],
-                __typename: 'DatasetProperties',
-            },
-            ownership: null,
-            globalTags: null,
-            glossaryTerms: null,
-            subTypes: {
-                typeNames: ['seed'],
-                __typename: 'SubTypes',
-            },
-            domain: null,
-            container: null,
-            parentContainers: {
-                count: 0,
-                containers: [],
-                __typename: 'ParentContainersResult',
-            },
-            deprecation: null,
-            siblings: {
-                isPrimary: true,
-                siblings: [
-                    {
-                        urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
-                        type: 'DATASET',
-                    },
-                ],
-                __typename: 'SiblingProperties',
-            },
-            siblingsSearch: {
-                searchResults: [
-                    {
-                        entity: {
-                            urn: 'urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.raw_orders,PROD)',
-                            type: 'DATASET',
-                            platform: {
-                                urn: 'urn:li:dataPlatform:bigquery',
-                                type: 'DATA_PLATFORM',
-                                name: 'bigquery',
-                                properties: {
-                                    type: 'RELATIONAL_DB',
-                                    displayName: 'BigQuery',
-                                    datasetNameDelimiter: '.',
-                                    logoUrl: 'assets/platforms/bigquerylogo.png',
-                                    __typename: 'DataPlatformProperties',
-                                },
-                                displayName: null,
-                                info: null,
-                                __typename: 'DataPlatform',
-                            },
-                            name: 'cypress_project.jaffle_shop.raw_orders',
-                            properties: {
-                                name: 'raw_orders',
-                                description: null,
-                                qualifiedName: null,
-                                __typename: 'DatasetProperties',
-                            },
-                            __typename: 'Dataset',
-                        },
-                    },
-                ],
-            },
-            __typename: 'Dataset',
-        },
-        matchedFields: [
-            {
-                name: 'name',
-                value: 'raw_orders',
-                __typename: 'MatchedField',
-            },
-            {
-                name: 'id',
-                value: 'cypress_project.jaffle_shop.raw_orders',
-                __typename: 'MatchedField',
-            },
-        ],
-        insights: [],
-        __typename: 'SearchResult',
-    },
-];
-
-const searchResultWithGhostSiblings = [
-    {
-        entity: {
-            urn: 'urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.raw_orders,PROD)',
-            exists: true,
-            type: 'DATASET',
-            name: 'cypress_project.jaffle_shop.raw_orders',
-            origin: 'PROD',
-            uri: null,
-            platform: {
-                urn: 'urn:li:dataPlatform:bigquery',
-                type: 'DATA_PLATFORM',
-                name: 'bigquery',
-                properties: {
-                    type: 'RELATIONAL_DB',
-                    displayName: 'BigQuery',
-                    datasetNameDelimiter: '.',
-                    logoUrl: 'assets/platforms/bigquerylogo.png',
-                    __typename: 'DataPlatformProperties',
-                },
-                displayName: null,
-                info: null,
-                __typename: 'DataPlatform',
-            },
-            dataPlatformInstance: null,
-            editableProperties: null,
-            platformNativeType: null,
-            properties: {
-                name: 'raw_orders',
-                description: null,
-                qualifiedName: null,
-                customProperties: [],
-                __typename: 'DatasetProperties',
-            },
-            ownership: null,
-            globalTags: null,
-            glossaryTerms: null,
-            subTypes: {
-                typeNames: ['table'],
-                __typename: 'SubTypes',
-            },
-            domain: null,
-            container: {
-                urn: 'urn:li:container:348c96555971d3f5c1ffd7dd2e7446cb',
-                platform: {
-                    urn: 'urn:li:dataPlatform:bigquery',
-                    type: 'DATA_PLATFORM',
-                    name: 'bigquery',
-                    properties: {
-                        type: 'RELATIONAL_DB',
-                        displayName: 'BigQuery',
-                        datasetNameDelimiter: '.',
-                        logoUrl: 'assets/platforms/bigquerylogo.png',
-                        __typename: 'DataPlatformProperties',
-                    },
-                    displayName: null,
-                    info: null,
-                    __typename: 'DataPlatform',
-                },
-                properties: {
-                    name: 'jaffle_shop',
-                    __typename: 'ContainerProperties',
-                },
-                subTypes: {
-                    typeNames: ['Dataset'],
-                    __typename: 'SubTypes',
-                },
-                deprecation: null,
-                __typename: 'Container',
-            },
-            parentContainers: {
-                count: 2,
-                containers: [
-                    {
-                        urn: 'urn:li:container:348c96555971d3f5c1ffd7dd2e7446cb',
-                        platform: {
-                            urn: 'urn:li:dataPlatform:bigquery',
-                            type: 'DATA_PLATFORM',
-                            name: 'bigquery',
-                            properties: {
-                                type: 'RELATIONAL_DB',
-                                displayName: 'BigQuery',
-                                datasetNameDelimiter: '.',
-                                logoUrl: 'assets/platforms/bigquerylogo.png',
-                                __typename: 'DataPlatformProperties',
-                            },
-                            displayName: null,
-                            info: null,
-                            __typename: 'DataPlatform',
-                        },
-                        properties: {
-                            name: 'jaffle_shop',
-                            __typename: 'ContainerProperties',
-                        },
-                        subTypes: {
-                            typeNames: ['Dataset'],
-                            __typename: 'SubTypes',
-                        },
-                        deprecation: null,
-                        __typename: 'Container',
-                    },
-                    {
-                        urn: 'urn:li:container:b5e95fce839e7d78151ed7e0a7420d84',
-                        platform: {
-                            urn: 'urn:li:dataPlatform:bigquery',
-                            type: 'DATA_PLATFORM',
-                            name: 'bigquery',
-                            properties: {
-                                type: 'RELATIONAL_DB',
-                                displayName: 'BigQuery',
-                                datasetNameDelimiter: '.',
-                                logoUrl: 'assets/platforms/bigquerylogo.png',
-                                __typename: 'DataPlatformProperties',
-                            },
-                            displayName: null,
-                            info: null,
-                            __typename: 'DataPlatform',
-                        },
-                        properties: {
-                            name: 'cypress_project',
-                            __typename: 'ContainerProperties',
-                        },
-                        subTypes: {
-                            typeNames: ['Project'],
-                            __typename: 'SubTypes',
-                        },
-                        deprecation: null,
-                        __typename: 'Container',
-                    },
-                ],
-                __typename: 'ParentContainersResult',
-            },
-            deprecation: null,
-            siblings: {
-                isPrimary: false,
-                siblings: [
-                    {
-                        urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
-                        type: 'DATASET',
-                    },
-                ],
-                __typename: 'SiblingProperties',
-            },
-            siblingsSearch: {
-                searchResults: [
-                    {
-                        entity: {
-                            urn: 'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
-                            exists: false,
-                            type: 'DATASET',
-                        },
-                    },
-                ],
-            },
-            __typename: 'Dataset',
-        },
-        matchedFields: [
-            {
-                name: 'name',
-                value: 'raw_orders',
-                __typename: 'MatchedField',
-            },
-            {
-                name: 'id',
-                value: 'cypress_project.jaffle_shop.raw_orders',
-                __typename: 'MatchedField',
-            },
-        ],
-        insights: [],
-        __typename: 'SearchResult',
-    },
-];
-
-describe('siblingUtils', () => {
-    describe('combineSiblingsInSearchResults', () => {
-        it('combines search results to deduplicate siblings', () => {
-            const result = combineSiblingsInSearchResults(false, searchResultWithSiblings as any);
-
-            expect(result).toHaveLength(1);
-            expect(result?.[0]?.matchedEntities?.[0]?.urn).toEqual(
-                'urn:li:dataset:(urn:li:dataPlatform:dbt,cypress_project.jaffle_shop.raw_orders,PROD)',
-            );
-            expect(result?.[0]?.matchedEntities?.[1]?.urn).toEqual(
-                'urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.raw_orders,PROD)',
-            );
-
-            expect(result?.[0]?.matchedEntities).toHaveLength(2);
-
-            expect(result?.[0]?.matchedFields).toHaveLength(2);
-        });
-
-        it('will not combine an entity with a ghost node', () => {
-            const result = combineSiblingsInSearchResults(false, searchResultWithGhostSiblings as any);
-
-            expect(result).toHaveLength(1);
-            expect(result?.[0]?.matchedEntities?.[0]?.urn).toEqual(
-                'urn:li:dataset:(urn:li:dataPlatform:bigquery,cypress_project.jaffle_shop.raw_orders,PROD)',
-            );
-            expect(result?.[0]?.matchedEntities).toHaveLength(1);
-
-            expect(result?.[0]?.matchedFields).toHaveLength(2);
-        });
-    });
-});
diff --git a/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.ts b/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.ts
index a8f3554b9a1e2d..12a4b1b9a49fbe 100644
--- a/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.ts
+++ b/datahub-web-react/src/app/search/utils/combineSiblingsInSearchResults.ts
@@ -7,7 +7,7 @@ type UncombinedSeaerchResults = {
     matchedFields: Array<MatchedField>;
 };
 
-export type CombinedSearchResult = CombinedEntity & Pick<UncombinedSeaerchResults, 'matchedFields'>;
+type CombinedSearchResult = CombinedEntity & Pick<UncombinedSeaerchResults, 'matchedFields'>;
 
 export function combineSiblingsInSearchResults(
     showSeparateSiblings: boolean,
diff --git a/datahub-web-react/src/app/search/utils/constants.ts b/datahub-web-react/src/app/search/utils/constants.ts
index c0da055ecb81b7..9ddb91b09f8355 100644
--- a/datahub-web-react/src/app/search/utils/constants.ts
+++ b/datahub-web-react/src/app/search/utils/constants.ts
@@ -17,12 +17,12 @@ export const OWNERS_FILTER_NAME = 'owners';
 export const TYPE_NAMES_FILTER_NAME = 'typeNames';
 export const PLATFORM_FILTER_NAME = 'platform';
 export const FIELD_TAGS_FILTER_NAME = 'fieldTags';
-export const EDITED_FIELD_TAGS_FILTER_NAME = 'editedFieldTags';
+const EDITED_FIELD_TAGS_FILTER_NAME = 'editedFieldTags';
 export const FIELD_GLOSSARY_TERMS_FILTER_NAME = 'fieldGlossaryTerms';
-export const EDITED_FIELD_GLOSSARY_TERMS_FILTER_NAME = 'editedFieldGlossaryTerms';
+const EDITED_FIELD_GLOSSARY_TERMS_FILTER_NAME = 'editedFieldGlossaryTerms';
 export const FIELD_PATHS_FILTER_NAME = 'fieldPaths';
 export const FIELD_DESCRIPTIONS_FILTER_NAME = 'fieldDescriptions';
-export const EDITED_FIELD_DESCRIPTIONS_FILTER_NAME = 'editedFieldDescriptions';
+const EDITED_FIELD_DESCRIPTIONS_FILTER_NAME = 'editedFieldDescriptions';
 export const DESCRIPTION_FILTER_NAME = 'description';
 export const REMOVED_FILTER_NAME = 'removed';
 export const ORIGIN_FILTER_NAME = 'origin';
@@ -32,21 +32,13 @@ export const STRUCTURED_PROPERTIES_FILTER_NAME = 'structuredProperties.';
 export const ENTITY_TYPES_FILTER_NAME = 'entityTypes';
 export const IS_HIDDEN_PROPERTY_FILTER_NAME = 'isHidden';
 export const SHOW_IN_COLUMNS_TABLE_PROPERTY_FILTER_NAME = 'showInColumnsTable';
-export const SHOW_IN_ASSET_SUMMARY_PROPERTY_FILTER_NAME = 'showInAssetSummary';
 export const VALUE_TYPE_FIELD_NAME = 'valueType';
 export const HAS_ACTIVE_INCIDENTS_FILTER_NAME = 'hasActiveIncidents';
 export const HAS_FAILING_ASSERTIONS_FILTER_NAME = 'hasFailingAssertions';
 export const OUTPUT_PORTS_FIELD = 'isOutputPort';
-export const COMPLETED_FORMS_FILTER_NAME = 'completedForms';
-export const INCOMPLETE_FORMS_FILTER_NAME = 'incompleteForms';
-export const VERIFIED_FORMS_FILTER_NAME = 'verifiedForms';
-export const COMPLETED_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME = 'completedFormsCompletedPromptIds';
-export const INCOMPLETE_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME = 'incompleteFormsCompletedPromptIds';
 export const SCHEMA_FIELD_ALIASES_FILTER_NAME = 'schemaFieldAliases';
 export const IS_DEPRECATED_FILTER_NAME = 'deprecated';
 
-export const LEGACY_ENTITY_FILTER_FIELDS = [ENTITY_FILTER_NAME, LEGACY_ENTITY_FILTER_NAME];
-
 export const FILTER_DELIMITER = '␞';
 
 export const ENTITY_SUB_TYPE_FILTER_FIELDS = [
@@ -55,17 +47,6 @@ export const ENTITY_SUB_TYPE_FILTER_FIELDS = [
     LEGACY_ENTITY_FILTER_NAME,
     TYPE_NAMES_FILTER_NAME,
 ];
-
-export const FILTERS_TO_TRUNCATE = [
-    TAGS_FILTER_NAME,
-    GLOSSARY_TERMS_FILTER_NAME,
-    CONTAINER_FILTER_NAME,
-    DOMAINS_FILTER_NAME,
-    OWNERS_FILTER_NAME,
-    ENTITY_FILTER_NAME,
-    TYPE_NAMES_FILTER_NAME,
-    PLATFORM_FILTER_NAME,
-];
 export const TRUNCATED_FILTER_LENGTH = 5;
 
 export const ORDERED_FIELDS = [
@@ -138,7 +119,7 @@ export enum UnionType {
 
 export const UNIT_SEPARATOR = '␟';
 
-export const FilterModes = {
+const FilterModes = {
     BASIC: 'basic',
     ADVANCED: 'advanced',
 } as const;
diff --git a/datahub-web-react/src/app/search/utils/filterUtils.ts b/datahub-web-react/src/app/search/utils/filterUtils.ts
index 01a70879bd0880..1b0c906b311b50 100644
--- a/datahub-web-react/src/app/search/utils/filterUtils.ts
+++ b/datahub-web-react/src/app/search/utils/filterUtils.ts
@@ -1,8 +1,7 @@
 import { FilterSet } from '@app/entity/shared/components/styled/search/types';
-import { QuickFilterField } from '@app/search/autoComplete/quickFilters/utils';
 import { UnionType } from '@app/search/utils/constants';
 
-import { AndFilterInput, EntityType, FacetFilterInput, QuickFilter } from '@types';
+import { AndFilterInput, FacetFilterInput, QuickFilter } from '@types';
 
 /**
  * Combines 2 sets of conjunctive filters in Disjunctive Normal Form
@@ -180,17 +179,3 @@ export function getFiltersWithQuickFilter(selectedQuickFilter: QuickFilter | nul
     }
     return filters;
 }
-
-export function getAutoCompleteInputFromQuickFilter(selectedQuickFilter: QuickFilter | null) {
-    const filters: FacetFilterInput[] = [];
-    const types: EntityType[] = [];
-    if (selectedQuickFilter) {
-        if (selectedQuickFilter.field === QuickFilterField.Entity) {
-            types.push(selectedQuickFilter.value as EntityType);
-        } else if (selectedQuickFilter.field === QuickFilterField.Platform) {
-            filters.push(generateFilterInputFromQuickFilter(selectedQuickFilter));
-        }
-    }
-
-    return { filters, types };
-}
diff --git a/datahub-web-react/src/app/searchV2/AnalyticsLink.tsx b/datahub-web-react/src/app/searchV2/AnalyticsLink.tsx
deleted file mode 100644
index 65cad7f1da0516..00000000000000
--- a/datahub-web-react/src/app/searchV2/AnalyticsLink.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Typography } from 'antd';
-import * as React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-const StyledAnalyticsLink = styled(Typography.Text)`
-    display: flex;
-    margin-right: 20px;
-    text-decoration: none;
-    && {
-        font-size: 14px;
-        color: ${(props) => props.theme.styles['layout-header-color']};
-    }
-    &&:hover {
-        color: #000;
-    }
-`;
-
-export default function AnalyticsLink() {
-    return (
-        <Link to="/analytics">
-            <StyledAnalyticsLink strong>Analytics</StyledAnalyticsLink>
-        </Link>
-    );
-}
diff --git a/datahub-web-react/src/app/searchV2/BrowseEntityCard.tsx b/datahub-web-react/src/app/searchV2/BrowseEntityCard.tsx
deleted file mode 100644
index 0f4b6f1da68370..00000000000000
--- a/datahub-web-react/src/app/searchV2/BrowseEntityCard.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import React from 'react';
-import { useHistory } from 'react-router-dom';
-import styled from 'styled-components';
-
-import analytics from '@app/analytics';
-import { EventType } from '@app/analytics/event';
-import { IconStyleType } from '@app/entity/Entity';
-import { useIsBrowseV2 } from '@app/searchV2/useSearchAndBrowseVersion';
-import { ENTITY_SUB_TYPE_FILTER_NAME } from '@app/searchV2/utils/constants';
-import { navigateToSearchUrl } from '@app/searchV2/utils/navigateToSearchUrl';
-import { LogoCountCard } from '@app/shared/LogoCountCard';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { PageRoutes } from '@conf/Global';
-
-import { EntityType } from '@types';
-
-const BrowseEntityCardWrapper = styled.div``;
-
-export const BrowseEntityCard = ({
-    entityType,
-    count,
-    showGlossary,
-}: {
-    entityType: EntityType;
-    count: number;
-    showGlossary?: boolean;
-}) => {
-    const history = useHistory();
-    const entityRegistry = useEntityRegistry();
-    const showBrowseV2 = useIsBrowseV2();
-    const isGlossaryEntityCard = entityType === EntityType.GlossaryTerm;
-    const entityPathName = entityRegistry.getPathName(entityType);
-    const url = isGlossaryEntityCard ? PageRoutes.GLOSSARY : `${PageRoutes.BROWSE}/${entityPathName}`;
-    const onBrowseEntityCardClick = () => {
-        analytics.event({
-            type: EventType.HomePageBrowseResultClickEvent,
-            entityType,
-        });
-    };
-
-    function browse() {
-        if (showBrowseV2 && !isGlossaryEntityCard) {
-            navigateToSearchUrl({
-                query: '*',
-                filters: [{ field: ENTITY_SUB_TYPE_FILTER_NAME, values: [entityType] }],
-                history,
-            });
-        } else {
-            history.push(url);
-        }
-    }
-
-    if (isGlossaryEntityCard && !showGlossary) {
-        return null;
-    }
-
-    return (
-        <BrowseEntityCardWrapper onClick={browse} data-testid={`entity-type-browse-card-${entityType}`}>
-            <LogoCountCard
-                logoComponent={entityRegistry.getIcon(entityType, 18, IconStyleType.HIGHLIGHT)}
-                name={entityRegistry.getCollectionName(entityType)}
-                count={count}
-                onClick={onBrowseEntityCardClick}
-            />
-        </BrowseEntityCardWrapper>
-    );
-};
diff --git a/datahub-web-react/src/app/searchV2/ChooseEntityTypeModal.tsx b/datahub-web-react/src/app/searchV2/ChooseEntityTypeModal.tsx
deleted file mode 100644
index 877d5c1243d3a9..00000000000000
--- a/datahub-web-react/src/app/searchV2/ChooseEntityTypeModal.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import { Button, Modal, Select } from 'antd';
-import React, { useState } from 'react';
-
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType } from '@types';
-
-type Props = {
-    onCloseModal: () => void;
-    onOk?: (results: string[]) => void;
-    title?: string;
-    defaultValues?: string[];
-};
-
-const { Option } = Select;
-
-export const ChooseEntityTypeModal = ({ defaultValues, onCloseModal, onOk, title }: Props) => {
-    const entityRegistry = useEntityRegistry();
-    const entityTypes = entityRegistry.getSearchEntityTypes();
-
-    const [stagedValues, setStagedValues] = useState(defaultValues || []);
-
-    const addEntityType = (newType) => {
-        setStagedValues([...stagedValues, newType]);
-    };
-
-    const removeEntityType = (type) => {
-        setStagedValues(stagedValues.filter((stagedValue) => stagedValue !== type));
-    };
-
-    return (
-        <Modal
-            title={title}
-            visible
-            onCancel={onCloseModal}
-            keyboard
-            footer={
-                <>
-                    <Button onClick={onCloseModal} type="text">
-                        Cancel
-                    </Button>
-                    <Button disabled={stagedValues.length === 0} onClick={() => onOk?.(stagedValues)}>
-                        Done
-                    </Button>
-                </>
-            }
-        >
-            <Select
-                mode="multiple"
-                style={{ width: '100%' }}
-                placeholder="Datasets, Dashboards, Charts, and more..."
-                onSelect={(newValue) => addEntityType(newValue)}
-                onDeselect={(newValue) => removeEntityType(newValue)}
-                value={stagedValues.map((stagedEntityType) => ({
-                    value: stagedEntityType,
-                    label: entityRegistry.getCollectionName(stagedEntityType as EntityType),
-                }))}
-                dropdownMatchSelectWidth={false}
-            >
-                {entityTypes.map((type) => (
-                    <Option key={type} value={type}>
-                        {entityRegistry.getCollectionName(type)}
-                    </Option>
-                ))}
-            </Select>
-        </Modal>
-    );
-};
diff --git a/datahub-web-react/src/app/searchV2/EditTextModal.tsx b/datahub-web-react/src/app/searchV2/EditTextModal.tsx
deleted file mode 100644
index 43580d2e2b497e..00000000000000
--- a/datahub-web-react/src/app/searchV2/EditTextModal.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Button, Input, Modal } from 'antd';
-import React, { useState } from 'react';
-
-type Props = {
-    onCloseModal: () => void;
-    onOk?: (result: string) => void;
-    title?: string;
-    defaultValue?: string;
-};
-
-export const EditTextModal = ({ defaultValue, onCloseModal, onOk, title }: Props) => {
-    const [stagedValue, setStagedValue] = useState(defaultValue || '');
-    return (
-        <Modal
-            title={title}
-            visible
-            onCancel={onCloseModal}
-            keyboard
-            footer={
-                <>
-                    <Button onClick={onCloseModal} type="text">
-                        Cancel
-                    </Button>
-                    <Button
-                        data-testid="edit-text-done-btn"
-                        disabled={stagedValue.trim().length === 0}
-                        onClick={() => onOk?.(stagedValue)}
-                    >
-                        Done
-                    </Button>
-                </>
-            }
-        >
-            <Input data-testid="edit-text-input" onChange={(e) => setStagedValue(e.target.value)} value={stagedValue} />
-        </Modal>
-    );
-};
diff --git a/datahub-web-react/src/app/searchV2/EmbeddedSearchBar.tsx b/datahub-web-react/src/app/searchV2/EmbeddedSearchBar.tsx
deleted file mode 100644
index 2bfd4cdc526f6e..00000000000000
--- a/datahub-web-react/src/app/searchV2/EmbeddedSearchBar.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { SearchOutlined } from '@ant-design/icons';
-import { Input } from 'antd';
-import * as QueryString from 'query-string';
-import React, { useEffect, useState } from 'react';
-import { useHistory, useLocation } from 'react-router';
-import styled from 'styled-components/macro';
-
-import useGetSearchQueryInputs from '@app/searchV2/useGetSearchQueryInputs';
-import filterSearchQuery from '@app/searchV2/utils/filterSearchQuery';
-
-const SearchIcon = styled(SearchOutlined)`
-    color: #8088a3;
-`;
-
-const SearchInput = styled(Input)`
-    width: 400px;
-    box-shadow: 0px 1px 2px 0px rgba(33, 23, 95, 0.07);
-    border-radius: 70px;
-`;
-
-interface Props {
-    style?: React.CSSProperties;
-}
-
-export const EmbeddedSearchBar = ({ style }: Props) => {
-    const history = useHistory();
-    const location = useLocation();
-    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
-    const { query: urlQuery } = useGetSearchQueryInputs();
-
-    const [searchQuery, setSearchQuery] = useState<string>(urlQuery);
-
-    useEffect(() => {
-        setSearchQuery(urlQuery);
-    }, [urlQuery]);
-
-    function handleSearch(query: string) {
-        const search = QueryString.stringify(
-            {
-                ...params,
-                query: encodeURIComponent(filterSearchQuery(query) || ''),
-                page: 1,
-            },
-            { arrayFormat: 'comma' },
-        );
-
-        history.push({ search });
-    }
-
-    return (
-        <SearchInput
-            placeholder="Search Assets..."
-            onChange={(e) => setSearchQuery(e.target.value)}
-            onPressEnter={() => {
-                handleSearch(searchQuery || '');
-            }}
-            value={searchQuery}
-            allowClear
-            style={style}
-            prefix={
-                <SearchIcon
-                    onClick={() => {
-                        handleSearch(searchQuery);
-                    }}
-                />
-            }
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/searchV2/SaveAsViewButton.tsx b/datahub-web-react/src/app/searchV2/SaveAsViewButton.tsx
deleted file mode 100644
index b2b44fa8eb7d72..00000000000000
--- a/datahub-web-react/src/app/searchV2/SaveAsViewButton.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { FilterOutlined } from '@ant-design/icons';
-import { Tooltip } from '@components';
-import { Button } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const StyledButton = styled(Button)`
-    && {
-        margin: 0px;
-        margin-left: 6px;
-        padding: 0px;
-    }
-`;
-
-const StyledFilterOutlined = styled(FilterOutlined)`
-    && {
-        font-size: 12px;
-    }
-`;
-
-const SaveAsViewText = styled.span`
-    &&& {
-        margin-left: 4px;
-    }
-`;
-
-const ToolTipHeader = styled.div`
-    margin-bottom: 12px;
-`;
-
-type Props = {
-    onClick: () => void;
-};
-
-export const SaveAsViewButton = ({ onClick }: Props) => {
-    return (
-        <Tooltip
-            placement="right"
-            title={
-                <>
-                    <ToolTipHeader>Save these filters as a new View.</ToolTipHeader>
-                    <div>Views allow you to easily save or share search filters.</div>
-                </>
-            }
-        >
-            <StyledButton type="link" onClick={onClick}>
-                <StyledFilterOutlined />
-                <SaveAsViewText>Save as View</SaveAsViewText>
-            </StyledButton>
-        </Tooltip>
-    );
-};
diff --git a/datahub-web-react/src/app/searchV2/SearchResultList.tsx b/datahub-web-react/src/app/searchV2/SearchResultList.tsx
index 84a9e461493593..9295292bd09697 100644
--- a/datahub-web-react/src/app/searchV2/SearchResultList.tsx
+++ b/datahub-web-react/src/app/searchV2/SearchResultList.tsx
@@ -40,7 +40,7 @@ const ThinDivider = styled(Divider)`
     margin-bottom: 16px;
 `;
 
-export const ResultWrapper = styled.div<{
+const ResultWrapper = styled.div<{
     showUpdatedStyles: boolean;
     selected: boolean;
     areMatchesExpanded: boolean;
diff --git a/datahub-web-react/src/app/searchV2/SearchResultsRecommendations.tsx b/datahub-web-react/src/app/searchV2/SearchResultsRecommendations.tsx
deleted file mode 100644
index b12dd9c98f915a..00000000000000
--- a/datahub-web-react/src/app/searchV2/SearchResultsRecommendations.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { Divider, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { RecommendationModule } from '@app/recommendations/RecommendationModule';
-
-import { useListRecommendationsQuery } from '@graphql/recommendations.generated';
-import { FacetFilterInput, RecommendationModule as RecommendationModuleType, ScenarioType } from '@types';
-
-const RecommendationsContainer = styled.div`
-    margin-left: 40px;
-    margin-right: 40px;
-`;
-
-const RecommendationContainer = styled.div`
-    margin-bottom: 20px;
-`;
-
-const ThinDivider = styled(Divider)`
-    margin-top: 12px;
-    margin-bottom: 12px;
-`;
-
-const RecommendationTitle = styled(Typography.Title)`
-    color: ${ANTD_GRAY[7]};
-`;
-
-type Props = {
-    userUrn: string;
-    query: string;
-    filters: Array<FacetFilterInput>;
-};
-
-export const SearchResultsRecommendations = ({ userUrn, query, filters }: Props) => {
-    const scenario = ScenarioType.SearchResults;
-    const { data } = useListRecommendationsQuery({
-        variables: {
-            input: {
-                userUrn,
-                requestContext: {
-                    scenario,
-                    searchRequestContext: {
-                        query,
-                        filters,
-                    },
-                },
-                limit: 3,
-            },
-        },
-    });
-    const recommendationModules = data?.listRecommendations?.modules;
-    return (
-        <>
-            {!!recommendationModules?.length && (
-                <RecommendationsContainer data-testid="recommendation-container-id">
-                    <RecommendationTitle level={3}>More you may be interested in</RecommendationTitle>
-                    {recommendationModules.map((module) => (
-                        <RecommendationContainer key={module.moduleId}>
-                            <RecommendationTitle level={5}>{module.title}</RecommendationTitle>
-                            <ThinDivider />
-                            <RecommendationModule
-                                module={module as RecommendationModuleType}
-                                scenarioType={scenario}
-                                showTitle={false}
-                            />
-                        </RecommendationContainer>
-                    ))}
-                </RecommendationsContainer>
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/searchV2/SimpleSearchFilter.tsx b/datahub-web-react/src/app/searchV2/SimpleSearchFilter.tsx
deleted file mode 100644
index 062a931f574ad2..00000000000000
--- a/datahub-web-react/src/app/searchV2/SimpleSearchFilter.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import { DownOutlined, UpOutlined } from '@ant-design/icons';
-import { Button, Checkbox } from 'antd';
-import { CheckboxChangeEvent } from 'antd/lib/checkbox';
-import * as React from 'react';
-import { useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import { SearchFilterLabel } from '@app/searchV2/SearchFilterLabel';
-import { TRUNCATED_FILTER_LENGTH } from '@app/searchV2/utils/constants';
-
-import { FacetFilterInput, FacetMetadata } from '@types';
-
-const GRAPH_DEGREE_FILTER_FIELD = 'degree';
-
-const isGraphDegreeFilter = (field: string) => {
-    return GRAPH_DEGREE_FILTER_FIELD === field;
-};
-
-type Props = {
-    facet: FacetMetadata;
-    selectedFilters: Array<FacetFilterInput>;
-    onFilterSelect: (selected: boolean, field: string, value: string) => void;
-    defaultDisplayFilters: boolean;
-};
-
-const SearchFilterWrapper = styled.div`
-    padding: 0 25px 15px 25px;
-`;
-
-const Title = styled.div`
-    align-items: center;
-    font-weight: bold;
-    margin-bottom: 10px;
-    display: flex;
-    justify-content: space-between;
-    cursor: pointer;
-`;
-
-const CheckBox = styled(Checkbox)`
-    margin: 5px 0;
-`;
-
-const ExpandButton = styled(Button)`
-    &&& {
-        padding: 4px;
-        font-size: 12px;
-    }
-`;
-
-const StyledUpOutlined = styled(UpOutlined)`
-    font-size: 10px;
-`;
-
-const StyledDownOutlined = styled(DownOutlined)`
-    font-size: 10px;
-`;
-
-export const SimpleSearchFilter = ({ facet, selectedFilters, onFilterSelect, defaultDisplayFilters }: Props) => {
-    const [areFiltersVisible, setAreFiltersVisible] = useState(defaultDisplayFilters);
-    const [expanded, setExpanded] = useState(false);
-
-    const isFacetSelected = (field, value) => {
-        return selectedFilters.find((f) => f.field === field && f.values?.includes(value)) !== undefined;
-    };
-
-    // Aggregations filtered for count > 0 or selected = true
-    const filteredAggregations = facet.aggregations.filter(
-        (agg) => agg.count > 0 || isFacetSelected(facet.field, agg.value) || isGraphDegreeFilter(facet.field),
-    );
-
-    // By default, render a Filter as open if it is selected
-    const isFilterSelected = !!filteredAggregations.find((agg) => isFacetSelected(facet.field, agg.value));
-    useEffect(() => {
-        if (isFilterSelected) {
-            setAreFiltersVisible(true);
-        }
-    }, [isFilterSelected]);
-
-    const shouldTruncate = filteredAggregations.length > TRUNCATED_FILTER_LENGTH;
-
-    return (
-        <SearchFilterWrapper key={facet.field}>
-            <Title onClick={() => setAreFiltersVisible((prevState) => !prevState)}>
-                {facet?.displayName}
-                {areFiltersVisible ? (
-                    <StyledUpOutlined />
-                ) : (
-                    <StyledDownOutlined data-testid={`expand-facet-${facet.field}`} />
-                )}
-            </Title>
-            {areFiltersVisible && (
-                <>
-                    {facet.aggregations
-                        .filter(
-                            (agg) =>
-                                agg.count > 0 ||
-                                isFacetSelected(facet.field, agg.value) ||
-                                isGraphDegreeFilter(facet.field),
-                        )
-                        .map((aggregation, i) => {
-                            if (i >= TRUNCATED_FILTER_LENGTH && !expanded) {
-                                return null;
-                            }
-                            return (
-                                <span key={`${facet.field}-${aggregation.value}`}>
-                                    <CheckBox
-                                        data-testid={`facet-${facet.field}-${aggregation.value}`}
-                                        checked={isFacetSelected(facet.field, aggregation.value)}
-                                        onChange={(e: CheckboxChangeEvent) =>
-                                            onFilterSelect(e.target.checked, facet.field, aggregation.value)
-                                        }
-                                    >
-                                        <SearchFilterLabel
-                                            field={facet.field}
-                                            value={aggregation.value}
-                                            count={aggregation.count}
-                                            entity={aggregation.entity}
-                                        />
-                                    </CheckBox>
-                                    <br />
-                                </span>
-                            );
-                        })}
-                    {shouldTruncate && (
-                        <ExpandButton type="text" onClick={() => setExpanded(!expanded)}>
-                            {expanded ? '- Less' : '+ More'}
-                        </ExpandButton>
-                    )}
-                </>
-            )}
-        </SearchFilterWrapper>
-    );
-};
diff --git a/datahub-web-react/src/app/searchV2/SimpleSearchFilters.tsx b/datahub-web-react/src/app/searchV2/SimpleSearchFilters.tsx
deleted file mode 100644
index 84c9aef48f7819..00000000000000
--- a/datahub-web-react/src/app/searchV2/SimpleSearchFilters.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import * as React from 'react';
-import { useEffect, useState } from 'react';
-
-import { SCHEMA_FIELD_ALIASES_FILTER_NAME } from '@app/search/utils/constants';
-import { SimpleSearchFilter } from '@app/searchV2/SimpleSearchFilter';
-import { FilterScenarioType } from '@app/searchV2/filters/render/types';
-import { useFilterRendererRegistry } from '@app/searchV2/filters/render/useFilterRenderer';
-import {
-    DEGREE_FILTER_NAME,
-    ENTITY_FILTER_NAME,
-    ENTITY_INDEX_FILTER_NAME,
-    ENTITY_SUB_TYPE_FILTER_NAME,
-    LEGACY_ENTITY_FILTER_NAME,
-} from '@app/searchV2/utils/constants';
-import { useAppConfig } from '@app/useAppConfig';
-
-import { FacetFilterInput, FacetMetadata } from '@types';
-
-const TOP_FILTERS = ['degree', ENTITY_FILTER_NAME, 'platform', 'tags', 'glossaryTerms', 'domains', 'owners'];
-
-const FILTERS_TO_EXCLUDE = [
-    LEGACY_ENTITY_FILTER_NAME,
-    ENTITY_INDEX_FILTER_NAME,
-    ENTITY_SUB_TYPE_FILTER_NAME,
-    SCHEMA_FIELD_ALIASES_FILTER_NAME,
-];
-
-interface Props {
-    facets: Array<FacetMetadata>;
-    selectedFilters: Array<FacetFilterInput>;
-    onFilterSelect: (newFilters: Array<FacetFilterInput>) => void;
-    loading: boolean;
-}
-
-export const SimpleSearchFilters = ({ facets, selectedFilters, onFilterSelect, loading }: Props) => {
-    const { config } = useAppConfig();
-    const [cachedProps, setCachedProps] = useState<{
-        facets: Array<FacetMetadata>;
-        selectedFilters: Array<FacetFilterInput>;
-    }>({
-        facets,
-        selectedFilters,
-    });
-
-    // we want to persist the selected filters through the loading jitter
-    useEffect(() => {
-        if (!loading) {
-            setCachedProps({ facets, selectedFilters });
-        }
-    }, [facets, selectedFilters, loading]);
-
-    const onFilterSelectAndSetCache = (selected: boolean, field: string, value: string) => {
-        const newFilters = selected
-            ? [...selectedFilters, { field, values: [value] }]
-            : selectedFilters
-                  .map((filter) =>
-                      filter.field === field
-                          ? { ...filter, values: filter.values?.filter((val) => val !== value) }
-                          : filter,
-                  )
-                  .filter((filter) => filter.field !== field || !(filter.values?.length === 0));
-
-        // Do not let user unselect all degree filters
-        if (field === DEGREE_FILTER_NAME && !selected) {
-            const hasDegreeFilter = newFilters.find((filter) => filter.field === DEGREE_FILTER_NAME);
-            if (!hasDegreeFilter) {
-                return;
-            }
-        }
-
-        setCachedProps({ ...cachedProps, selectedFilters: newFilters });
-        onFilterSelect(newFilters);
-    };
-
-    const filteredFacets = cachedProps.facets.filter((facet) => !FILTERS_TO_EXCLUDE.includes(facet.field));
-
-    const sortedFacets = filteredFacets.sort((facetA, facetB) => {
-        if (TOP_FILTERS.indexOf(facetA.field) === -1) return 1;
-        if (TOP_FILTERS.indexOf(facetB.field) === -1) return -1;
-        return TOP_FILTERS.indexOf(facetA.field) - TOP_FILTERS.indexOf(facetB.field);
-    });
-
-    const filterRendererRegistry = useFilterRendererRegistry();
-
-    return (
-        <>
-            {sortedFacets.map((facet) => {
-                return filterRendererRegistry.hasRenderer(facet.field) ? (
-                    filterRendererRegistry.render(facet.field, {
-                        scenario: FilterScenarioType.SEARCH_V1,
-                        filter: facet,
-                        activeFilters: selectedFilters,
-                        onChangeFilters: onFilterSelect,
-                        config,
-                    })
-                ) : (
-                    <SimpleSearchFilter
-                        key={`${facet.displayName}-${facet.field}`}
-                        facet={facet}
-                        selectedFilters={cachedProps.selectedFilters}
-                        onFilterSelect={onFilterSelectAndSetCache}
-                        defaultDisplayFilters={TOP_FILTERS.includes(facet.field)}
-                    />
-                );
-            })}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/searchV2/ToggleSidebarButton.tsx b/datahub-web-react/src/app/searchV2/ToggleSidebarButton.tsx
deleted file mode 100644
index d6b581def4a003..00000000000000
--- a/datahub-web-react/src/app/searchV2/ToggleSidebarButton.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import Icon from '@ant-design/icons/lib/components/Icon';
-import { Tooltip } from '@components';
-import { Button } from 'antd';
-import React, { memo, useState } from 'react';
-import styled from 'styled-components';
-
-import CollapseIcon from '@images/collapse.svg?react';
-import ExpandIcon from '@images/expand.svg?react';
-
-const ToggleIcon = styled(Icon)`
-    color: ${(props) => props.theme.styles['primary-color']};
-    &&& {
-        font-size: 16px;
-    }
-`;
-
-type Props = {
-    isOpen: boolean;
-    onClick: () => void;
-};
-
-const ToggleSidebarButton = ({ isOpen, onClick }: Props) => {
-    const [pauseTooltip, setPauseTooltip] = useState(false);
-    const title = isOpen ? 'Hide the navigation panel' : 'Open the navigation panel';
-    const placement = isOpen ? 'bottom' : 'bottomRight';
-
-    const onClickButton = () => {
-        setPauseTooltip(true);
-        window.setTimeout(() => setPauseTooltip(false), 250);
-        onClick();
-    };
-
-    const button = (
-        <Button
-            data-testid="browse-v2-toggle"
-            size="small"
-            onClick={onClickButton}
-            icon={<ToggleIcon component={isOpen ? CollapseIcon : ExpandIcon} />}
-        />
-    );
-
-    if (pauseTooltip) return button;
-
-    return (
-        <Tooltip title={title} placement={placement} arrowPointAtCenter mouseEnterDelay={1}>
-            {button}
-        </Tooltip>
-    );
-};
-
-export default memo(ToggleSidebarButton);
diff --git a/datahub-web-react/src/app/searchV2/advanced/AdvancedFilterCloseButton.tsx b/datahub-web-react/src/app/searchV2/advanced/AdvancedFilterCloseButton.tsx
deleted file mode 100644
index 8173231d0dd495..00000000000000
--- a/datahub-web-react/src/app/searchV2/advanced/AdvancedFilterCloseButton.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { CloseOutlined } from '@ant-design/icons';
-import React from 'react';
-import styled from 'styled-components';
-
-const CloseSpan = styled.span`
-    :hover {
-        color: black;
-        cursor: pointer;
-    }
-`;
-
-interface Props {
-    onClose: () => void;
-}
-
-export default function AdvancedFilterCloseButton({ onClose }: Props) {
-    return (
-        <CloseSpan
-            role="button"
-            onClick={(e) => {
-                e.preventDefault();
-                e.stopPropagation();
-                onClose();
-            }}
-            tabIndex={0}
-            onKeyPress={onClose}
-        >
-            <CloseOutlined />
-        </CloseSpan>
-    );
-}
diff --git a/datahub-web-react/src/app/searchV2/advanced/EntitySubTypeAdvancedFilterLabel.tsx b/datahub-web-react/src/app/searchV2/advanced/EntitySubTypeAdvancedFilterLabel.tsx
deleted file mode 100644
index 4c24588455594c..00000000000000
--- a/datahub-web-react/src/app/searchV2/advanced/EntitySubTypeAdvancedFilterLabel.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import React, { useMemo } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import AdvancedFilterCloseButton from '@app/searchV2/advanced/AdvancedFilterCloseButton';
-import { FilterContainer } from '@app/searchV2/advanced/styles';
-import { FILTER_DELIMITER } from '@app/searchV2/utils/constants';
-import { capitalizeFirstLetterOnly } from '@app/shared/textUtil';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType, FacetFilterInput } from '@types';
-
-const FilterFieldLabel = styled.span`
-    font-weight: 600;
-    margin-right: 4px;
-`;
-
-const FilterWrapper = styled.span`
-    padding: 2px 4px;
-    display: flex;
-    align-items: center;
-`;
-
-const FilterValuesWrapper = styled.div`
-    color: ${ANTD_GRAY[9]};
-    margin: 4px;
-`;
-
-const ConditionWrapper = styled.div`
-    padding: 0 7px;
-    border-radius: 5px;
-    height: 24px;
-    display: flex;
-    align-items: center;
-    color: ${ANTD_GRAY[9]};
-    background: ${ANTD_GRAY[2]};
-`;
-
-function getEntityTypeToSubType(nestedSubTypes?: string[]): { [key: string]: string[] } {
-    const entityTypeToSubTypes = {};
-    nestedSubTypes?.forEach((nestedSubType) => {
-        const [entityType, subType] = nestedSubType.split(FILTER_DELIMITER);
-        entityTypeToSubTypes[entityType] = [...(entityTypeToSubTypes[entityType] || []), subType];
-    });
-    return entityTypeToSubTypes;
-}
-
-interface Props {
-    filter: FacetFilterInput;
-    isCompact: boolean;
-    disabled: boolean;
-    onClose: () => void;
-}
-
-export default function EntitySubTypeAdvancedFilterLabel({ filter, isCompact, disabled, onClose }: Props) {
-    const entityRegistry = useEntityRegistry();
-    const entityTypes = useMemo(
-        () => filter.values?.filter((value) => !value.includes(FILTER_DELIMITER)),
-        [filter.values],
-    );
-    const nestedSubTypes = useMemo(
-        () => filter.values?.filter((value) => value.includes(FILTER_DELIMITER)),
-        [filter.values],
-    );
-    const entityTypeToSubTypes = useMemo(() => getEntityTypeToSubType(nestedSubTypes), [nestedSubTypes]);
-
-    return (
-        <FilterContainer $isCompact={isCompact} isDisabled>
-            <FilterWrapper>
-                {entityTypes && entityTypes.length > 0 && (
-                    <>
-                        <FilterFieldLabel>Type</FilterFieldLabel>
-                        <ConditionWrapper>is any of</ConditionWrapper>
-                        <FilterValuesWrapper>
-                            {entityTypes?.map((entityType, index) => (
-                                <>
-                                    {entityRegistry.getCollectionName(entityType as EntityType)}
-                                    {index !== entityTypes.length - 1 && ', '}
-                                </>
-                            ))}
-                        </FilterValuesWrapper>
-                    </>
-                )}
-                {Object.entries(entityTypeToSubTypes).map(([entityType, subTypes]) => (
-                    <>
-                        <FilterFieldLabel>Type</FilterFieldLabel>
-                        <ConditionWrapper>is</ConditionWrapper>
-                        <FilterValuesWrapper>
-                            {entityRegistry.getCollectionName(entityType as EntityType)}
-                        </FilterValuesWrapper>
-                        <FilterFieldLabel>SubType</FilterFieldLabel>
-                        <ConditionWrapper>is any of</ConditionWrapper>
-                        <FilterValuesWrapper>
-                            {subTypes.map((v, index) => (
-                                <>
-                                    {capitalizeFirstLetterOnly(v)}
-                                    {index !== subTypes.length - 1 && ', '}
-                                </>
-                            ))}
-                        </FilterValuesWrapper>
-                    </>
-                ))}
-                {!disabled && <AdvancedFilterCloseButton onClose={onClose} />}
-            </FilterWrapper>
-        </FilterContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/searchV2/advanced/styles.ts b/datahub-web-react/src/app/searchV2/advanced/styles.ts
deleted file mode 100644
index ef7bfe570ab130..00000000000000
--- a/datahub-web-react/src/app/searchV2/advanced/styles.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-export const FilterContainer = styled.div<{ $isCompact: boolean; isDisabled?: boolean }>`
-    box-shadow: 0px 0px 4px 0px #00000010;
-    border-radius: 10px;
-    border: 1px solid ${ANTD_GRAY[4]};
-    padding: ${(props) => (props.$isCompact ? '0 4px' : '4px')};
-    margin: ${(props) => (props.$isCompact ? '2px 4px 2px 4px' : '4px')};
-
-    ${(props) =>
-        props.isDisabled
-            ? `background: ${ANTD_GRAY[4]};`
-            : `
-            :hover {
-                cursor: pointer;
-                background: ${ANTD_GRAY[2]};
-            }
-    `}
-`;
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteItem.tsx b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteItem.tsx
index acc19a62a3c490..333b0982692bbc 100644
--- a/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteItem.tsx
+++ b/datahub-web-react/src/app/searchV2/autoComplete/AutoCompleteItem.tsx
@@ -11,7 +11,7 @@ import { useEntityRegistry } from '@app/useEntityRegistry';
 
 import { CorpUser, Entity, EntityType, Tag } from '@types';
 
-export const SuggestionContainer = styled.div`
+const SuggestionContainer = styled.div`
     display: flex;
     justify-content: left;
     align-items: center;
diff --git a/datahub-web-react/src/app/searchV2/autoComplete/ParentContainers.tsx b/datahub-web-react/src/app/searchV2/autoComplete/ParentContainers.tsx
index f32f08b99b532b..215fab79175788 100644
--- a/datahub-web-react/src/app/searchV2/autoComplete/ParentContainers.tsx
+++ b/datahub-web-react/src/app/searchV2/autoComplete/ParentContainers.tsx
@@ -1,60 +1,6 @@
-import { FolderOpenOutlined } from '@ant-design/icons';
-import { Typography } from 'antd';
-import React, { Fragment } from 'react';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY_V2 } from '@app/entity/shared/constants';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Container, EntityType } from '@types';
-
-const NUM_VISIBLE_CONTAINERS = 2;
-
-const ParentContainersWrapper = styled.div`
-    font-size: 12px;
-    color: ${ANTD_GRAY_V2[8]};
-    display: flex;
-    align-items: center;
-`;
 
-const ParentContainer = styled(Typography.Text)`
-    color: ${ANTD_GRAY_V2[8]};
-    margin-left: 4px;
-    font-weight: 500;
-`;
+import styled from 'styled-components/macro';
 
 export const ArrowWrapper = styled.span`
     margin: 0 3px;
 `;
-
-interface Props {
-    parentContainers: Container[];
-}
-
-export default function ParentContainers({ parentContainers }: Props) {
-    const entityRegistry = useEntityRegistry();
-
-    const visibleIndex = Math.max(parentContainers.length - NUM_VISIBLE_CONTAINERS, 0);
-    const visibleContainers = parentContainers.slice(visibleIndex);
-    const hiddenContainers = parentContainers.slice(0, visibleIndex);
-
-    return (
-        <ParentContainersWrapper>
-            {hiddenContainers.map((container) => (
-                <Fragment key={container.urn}>
-                    <FolderOpenOutlined />
-                    <ArrowWrapper>{'>'}</ArrowWrapper>
-                </Fragment>
-            ))}
-            {visibleContainers.map((container, index) => (
-                <Fragment key={container.urn}>
-                    <FolderOpenOutlined />
-                    <ParentContainer ellipsis={{ tooltip: '' }}>
-                        {entityRegistry.getDisplayName(EntityType.Container, container)}
-                    </ParentContainer>
-                    {index !== visibleContainers.length - 1 && <ArrowWrapper>{'>'}</ArrowWrapper>}
-                </Fragment>
-            ))}
-        </ParentContainersWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/searchV2/autoCompleteV2/constants.ts b/datahub-web-react/src/app/searchV2/autoCompleteV2/constants.ts
index 1e82d3f4d9fe41..fe6697258517f6 100644
--- a/datahub-web-react/src/app/searchV2/autoCompleteV2/constants.ts
+++ b/datahub-web-react/src/app/searchV2/autoCompleteV2/constants.ts
@@ -1,6 +1,6 @@
 import { VariantElementsPropsMapping, VariantProps } from '@app/searchV2/autoCompleteV2/types';
 
-export const DEFAULT_STYLES: VariantProps = {
+const DEFAULT_STYLES: VariantProps = {
     showEntityPopover: true,
     nameColor: 'gray',
     nameColorLevel: 600,
diff --git a/datahub-web-react/src/app/searchV2/context/constants.ts b/datahub-web-react/src/app/searchV2/context/constants.ts
index c4ee8fa9a45cc1..a344e08d4e5a8e 100644
--- a/datahub-web-react/src/app/searchV2/context/constants.ts
+++ b/datahub-web-react/src/app/searchV2/context/constants.ts
@@ -2,7 +2,7 @@ import { SortOrder } from '@types';
 
 export const RELEVANCE = 'relevance';
 export const ENTITY_NAME_FIELD = '_entityName';
-export const LAST_MODIFIED_TIME_FIELD = 'lastModifiedAt';
+const LAST_MODIFIED_TIME_FIELD = 'lastModifiedAt';
 
 export const DEFAULT_SORT_OPTION = RELEVANCE;
 
diff --git a/datahub-web-react/src/app/searchV2/filters/ActiveFilter.tsx b/datahub-web-react/src/app/searchV2/filters/ActiveFilter.tsx
deleted file mode 100644
index b983591504b68d..00000000000000
--- a/datahub-web-react/src/app/searchV2/filters/ActiveFilter.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { CloseCircleOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { useFilterRendererRegistry } from '@app/searchV2/filters/render/useFilterRenderer';
-import { IconSpacer, Label } from '@app/searchV2/filters/styledComponents';
-import useGetBrowseV2LabelOverride from '@app/searchV2/filters/useGetBrowseV2LabelOverride';
-import { getFilterEntity, getFilterIconAndLabel, getNewFilters } from '@app/searchV2/filters/utils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { FacetFilterInput, FacetMetadata } from '@types';
-
-const ActiveFilterWrapper = styled.div`
-    border: 1px solid ${ANTD_GRAY[5]};
-    border-radius: 4px;
-    padding: 2px 8px;
-    display: flex;
-    align-items: center;
-    font-size: 14px;
-    height: 24px;
-    margin: 8px 8px 0 0;
-`;
-
-const StyledButton = styled(Button)`
-    border: none;
-    box-shadow: none;
-    padding: 0;
-    margin-left: 6px;
-    height: 16px;
-    width: 11px;
-`;
-
-interface ActiveFilterProps {
-    filterFacet: FacetFilterInput;
-    filterValue: string;
-    availableFilters: FacetMetadata[] | null;
-    activeFilters: FacetFilterInput[];
-    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
-}
-
-function ActiveFilter({
-    filterFacet,
-    filterValue,
-    availableFilters,
-    activeFilters,
-    onChangeFilters,
-}: ActiveFilterProps) {
-    const entityRegistry = useEntityRegistry();
-    const filterEntity = getFilterEntity(filterFacet.field, filterValue, availableFilters);
-    const filterLabelOverride = useGetBrowseV2LabelOverride(filterFacet.field, filterValue, entityRegistry);
-    const filterRenderer = useFilterRendererRegistry();
-
-    const { icon, label } = !filterRenderer.hasRenderer(filterFacet.field)
-        ? getFilterIconAndLabel(filterFacet.field, filterValue, entityRegistry, filterEntity, 12, filterLabelOverride)
-        : {
-              icon: filterRenderer.getIcon(filterFacet.field),
-              label: filterRenderer.getValueLabel(filterFacet.field, filterValue),
-          };
-
-    function removeFilter() {
-        const newFilterValues = filterFacet.values?.filter((value) => value !== filterValue) || [];
-        onChangeFilters(getNewFilters(filterFacet.field, activeFilters, newFilterValues));
-    }
-
-    return (
-        <ActiveFilterWrapper data-testid={`active-filter-${label}`}>
-            {icon}
-            {icon && <IconSpacer />}
-            <Label ellipsis={{ tooltip: label }} style={{ maxWidth: 150 }}>
-                {label}
-            </Label>
-            <StyledButton
-                icon={<CloseCircleOutlined />}
-                onClick={removeFilter}
-                data-testid={`remove-filter-${label}`}
-            />
-        </ActiveFilterWrapper>
-    );
-}
-
-interface Props {
-    filter: FacetFilterInput;
-    availableFilters: FacetMetadata[] | null;
-    activeFilters: FacetFilterInput[];
-    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
-}
-
-export default function ActiveFilterContainer({ filter, availableFilters, activeFilters, onChangeFilters }: Props) {
-    return (
-        <>
-            {filter.values?.map((value) => (
-                <ActiveFilter
-                    key={value}
-                    filterFacet={filter}
-                    filterValue={value}
-                    availableFilters={availableFilters}
-                    activeFilters={activeFilters}
-                    onChangeFilters={onChangeFilters}
-                />
-            ))}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/searchV2/filters/OptionsDropdownMenu.tsx b/datahub-web-react/src/app/searchV2/filters/OptionsDropdownMenu.tsx
index 9c11b399adad9b..4371c9bd4091b6 100644
--- a/datahub-web-react/src/app/searchV2/filters/OptionsDropdownMenu.tsx
+++ b/datahub-web-react/src/app/searchV2/filters/OptionsDropdownMenu.tsx
@@ -16,7 +16,7 @@ const StyledButton = styled(Button)`
     border-radius: 0;
 `;
 
-export const DropdownMenu = styled.div<{ type: 'card' | 'default' }>`
+const DropdownMenu = styled.div<{ type: 'card' | 'default' }>`
     background-color: white;
     ${(props) => props.type === 'card' && 'border-radius: 5px;'}
     ${(props) =>
diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFilterOptions.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFilterOptions.tsx
index b6dadb4ac6794d..4e8faf62c6eb16 100644
--- a/datahub-web-react/src/app/searchV2/filters/SearchFilterOptions.tsx
+++ b/datahub-web-react/src/app/searchV2/filters/SearchFilterOptions.tsx
@@ -18,18 +18,18 @@ import { FacetFilterInput, FacetMetadata } from '@types';
 
 const NUM_VISIBLE_FILTER_DROPDOWNS = 6;
 
-export const FlexWrapper = styled.div`
+const FlexWrapper = styled.div`
     display: flex;
     flex-wrap: wrap;
     align-items: center;
 `;
 
-export const FlexSpacer = styled.div`
+const FlexSpacer = styled.div`
     display: flex;
     justify-content: space-between;
 `;
 
-export const FilterButtonsWrapper = styled.div`
+const FilterButtonsWrapper = styled.div`
     display: flex;
     flex-wrap: nowrap;
 `;
diff --git a/datahub-web-react/src/app/searchV2/filters/SearchFiltersBuilder.tsx b/datahub-web-react/src/app/searchV2/filters/SearchFiltersBuilder.tsx
index 78714294a25ca9..991441cf5e7360 100644
--- a/datahub-web-react/src/app/searchV2/filters/SearchFiltersBuilder.tsx
+++ b/datahub-web-react/src/app/searchV2/filters/SearchFiltersBuilder.tsx
@@ -25,16 +25,11 @@ const VerticalWrapper = styled.div`
     gap: 4px;
 `;
 
-export const FlexSpacer = styled.div`
+const FlexSpacer = styled.div`
     display: flex;
     justify-content: space-between;
 `;
 
-export const FilterButtonsWrapper = styled.div`
-    display: flex;
-    flex-wrap: nowrap;
-`;
-
 const AnyAllToggle = styled.div`
     margin-top: 8px;
 `;
diff --git a/datahub-web-react/src/app/searchV2/filters/field/fields.tsx b/datahub-web-react/src/app/searchV2/filters/field/fields.tsx
index b2498bc4e8c6ec..65c7085da797c3 100644
--- a/datahub-web-react/src/app/searchV2/filters/field/fields.tsx
+++ b/datahub-web-react/src/app/searchV2/filters/field/fields.tsx
@@ -49,28 +49,28 @@ import TableIcon from '@src/images/table-icon.svg?react';
 
 import { EntityType } from '@types';
 
-export const ENTITY_SUB_TYPE_FILTER: FilterField = {
+const ENTITY_SUB_TYPE_FILTER: FilterField = {
     field: ENTITY_SUB_TYPE_FILTER_NAME,
     displayName: FIELD_TO_LABEL[ENTITY_SUB_TYPE_FILTER_NAME],
     type: FieldType.NESTED_ENTITY_TYPE,
     icon: <FileOutlined />,
 };
 
-export const ENTITY_TYPE_FILTER: FilterField = {
+const ENTITY_TYPE_FILTER: FilterField = {
     field: ENTITY_FILTER_NAME,
     displayName: FIELD_TO_LABEL[ENTITY_FILTER_NAME],
     type: FieldType.ENTITY_TYPE,
     icon: <FileOutlined />,
 };
 
-export const TYPE_NAMES_FILTER: FilterField = {
+const TYPE_NAMES_FILTER: FilterField = {
     field: TYPE_NAMES_FILTER_NAME,
     displayName: FIELD_TO_LABEL[TYPE_NAMES_FILTER_NAME],
     type: FieldType.ENUM,
     icon: <FileOutlined />,
 };
 
-export const PLATFORM_FILTER: FilterField = {
+const PLATFORM_FILTER: FilterField = {
     field: PLATFORM_FILTER_NAME,
     displayName: FIELD_TO_LABEL[PLATFORM_FILTER_NAME],
     type: FieldType.ENTITY,
@@ -78,7 +78,7 @@ export const PLATFORM_FILTER: FilterField = {
     icon: <DatabaseOutlined />,
 };
 
-export const OWNERS_FILTER: FilterField = {
+const OWNERS_FILTER: FilterField = {
     field: OWNERS_FILTER_NAME,
     displayName: FIELD_TO_LABEL[OWNERS_FILTER_NAME],
     type: FieldType.ENTITY,
@@ -86,7 +86,7 @@ export const OWNERS_FILTER: FilterField = {
     icon: <UserOutlined />,
 };
 
-export const DOMAINS_FILTER: FilterField = {
+const DOMAINS_FILTER: FilterField = {
     field: DOMAINS_FILTER_NAME,
     displayName: FIELD_TO_LABEL[DOMAINS_FILTER_NAME],
     type: FieldType.ENTITY,
@@ -94,7 +94,7 @@ export const DOMAINS_FILTER: FilterField = {
     icon: <Globe />,
 };
 
-export const TAGS_FILTER: FilterField = {
+const TAGS_FILTER: FilterField = {
     field: TAGS_FILTER_NAME,
     displayName: FIELD_TO_LABEL[TAGS_FILTER_NAME],
     type: FieldType.ENTITY,
@@ -102,7 +102,7 @@ export const TAGS_FILTER: FilterField = {
     icon: <TagOutlined />,
 };
 
-export const GLOSSARY_TERMS_FILTER: FilterField = {
+const GLOSSARY_TERMS_FILTER: FilterField = {
     field: GLOSSARY_TERMS_FILTER_NAME,
     displayName: FIELD_TO_LABEL[GLOSSARY_TERMS_FILTER_NAME],
     type: FieldType.ENTITY,
@@ -110,7 +110,7 @@ export const GLOSSARY_TERMS_FILTER: FilterField = {
     icon: <BookmarkSimple />,
 };
 
-export const CONTAINER_FILTER: FilterField = {
+const CONTAINER_FILTER: FilterField = {
     field: CONTAINER_FILTER_NAME,
     displayName: FIELD_TO_LABEL[CONTAINER_FILTER_NAME],
     type: FieldType.ENTITY,
@@ -118,14 +118,14 @@ export const CONTAINER_FILTER: FilterField = {
     icon: <FolderOutlined />,
 };
 
-export const FIELD_PATHS_FILTER: FilterField = {
+const FIELD_PATHS_FILTER: FilterField = {
     field: FIELD_PATHS_FILTER_NAME,
     displayName: FIELD_TO_LABEL[FIELD_PATHS_FILTER_NAME],
     type: FieldType.TEXT,
     icon: <LayoutOutlined />,
 };
 
-export const FIELD_TAGS_FILTER: FilterField = {
+const FIELD_TAGS_FILTER: FilterField = {
     field: FIELD_TAGS_FILTER_NAME,
     displayName: FIELD_TO_LABEL[FIELD_TAGS_FILTER_NAME],
     type: FieldType.ENTITY,
@@ -133,7 +133,7 @@ export const FIELD_TAGS_FILTER: FilterField = {
     icon: <TagOutlined />,
 };
 
-export const FIELD_GLOSSARY_TERMS_FILTER: FilterField = {
+const FIELD_GLOSSARY_TERMS_FILTER: FilterField = {
     field: FIELD_GLOSSARY_TERMS_FILTER_NAME,
     displayName: FIELD_TO_LABEL[FIELD_GLOSSARY_TERMS_FILTER_NAME],
     type: FieldType.ENTITY,
@@ -141,49 +141,49 @@ export const FIELD_GLOSSARY_TERMS_FILTER: FilterField = {
     icon: <BookmarkSimple />,
 };
 
-export const DESCRIPTION_FILTER: FilterField = {
+const DESCRIPTION_FILTER: FilterField = {
     field: DESCRIPTION_FILTER_NAME,
     displayName: FIELD_TO_LABEL[DESCRIPTION_FILTER_NAME],
     type: FieldType.TEXT,
     icon: <FileTextOutlined />,
 };
 
-export const FIELD_DESCRIPTIONS_FILTER: FilterField = {
+const FIELD_DESCRIPTIONS_FILTER: FilterField = {
     field: FIELD_DESCRIPTIONS_FILTER_NAME,
     displayName: FIELD_TO_LABEL[FIELD_DESCRIPTIONS_FILTER_NAME],
     type: FieldType.TEXT,
     icon: <FileTextOutlined />,
 };
 
-export const REMOVED_FILTER: FilterField = {
+const REMOVED_FILTER: FilterField = {
     field: REMOVED_FILTER_NAME,
     displayName: FIELD_TO_LABEL[REMOVED_FILTER_NAME],
     type: FieldType.BOOLEAN,
     icon: <DeleteOutlined />,
 };
 
-export const HAS_ACTIVE_INCIDENTS_FILTER: FilterField = {
+const HAS_ACTIVE_INCIDENTS_FILTER: FilterField = {
     field: HAS_ACTIVE_INCIDENTS_FILTER_NAME,
     displayName: FIELD_TO_LABEL[HAS_ACTIVE_INCIDENTS_FILTER_NAME],
     type: FieldType.BOOLEAN,
     icon: <WarningOutlined />,
 };
 
-export const HAS_FAILING_ASSERTIONS_FILTER: FilterField = {
+const HAS_FAILING_ASSERTIONS_FILTER: FilterField = {
     field: HAS_FAILING_ASSERTIONS_FILTER_NAME,
     displayName: FIELD_TO_LABEL[HAS_FAILING_ASSERTIONS_FILTER_NAME],
     type: FieldType.BOOLEAN,
     icon: <CloseCircleOutlined />,
 };
 
-export const ORIGIN_FILTER: FilterField = {
+const ORIGIN_FILTER: FilterField = {
     field: ORIGIN_FILTER_NAME,
     displayName: FIELD_TO_LABEL[ORIGIN_FILTER_NAME],
     type: FieldType.ENUM,
     icon: <EnvironmentOutlined />,
 };
 
-export const DATA_PLATFORM_INSTANCE_FILTER: FilterField = {
+const DATA_PLATFORM_INSTANCE_FILTER: FilterField = {
     field: DATA_PLATFORM_INSTANCE_FILTER_NAME,
     displayName: FIELD_TO_LABEL[DATA_PLATFORM_INSTANCE_FILTER_NAME],
     type: FieldType.ENTITY,
@@ -191,7 +191,7 @@ export const DATA_PLATFORM_INSTANCE_FILTER: FilterField = {
     entityTypes: [EntityType.DataPlatformInstance],
 };
 
-export const DATA_PRODUCT_FILTER: FilterField = {
+const DATA_PRODUCT_FILTER: FilterField = {
     field: DATA_PRODUCT_FILTER_NAME,
     displayName: FIELD_TO_LABEL[DATA_PRODUCT_FILTER_NAME],
     type: FieldType.ENTITY,
@@ -205,7 +205,7 @@ export const STRUCTURED_PROPERTY_FILTER: FilterField = {
     icon: <Icon component={TableIcon} />,
 };
 
-export const HAS_SIBLINGS_FILTER: FilterField = {
+const HAS_SIBLINGS_FILTER: FilterField = {
     field: HAS_SIBLINGS_FILTER_NAME,
     displayName: FIELD_TO_LABEL[HAS_SIBLINGS_FILTER_NAME],
     type: FieldType.BOOLEAN,
@@ -256,7 +256,7 @@ export const LAST_MODIFIED_FILTER: FilterField = {
     ],
 };
 
-export const BROWSE_FILTER: FilterField = {
+const BROWSE_FILTER: FilterField = {
     field: BROWSE_PATH_V2_FILTER_NAME,
     displayName: FIELD_TO_LABEL[BROWSE_PATH_V2_FILTER_NAME],
     type: FieldType.BROWSE_PATH,
diff --git a/datahub-web-react/src/app/searchV2/filters/mapFilterOption.tsx b/datahub-web-react/src/app/searchV2/filters/mapFilterOption.tsx
index ee58ec23167cc1..3ae10e013e1b86 100644
--- a/datahub-web-react/src/app/searchV2/filters/mapFilterOption.tsx
+++ b/datahub-web-react/src/app/searchV2/filters/mapFilterOption.tsx
@@ -5,7 +5,7 @@ import { FilterOptionType } from '@app/searchV2/filters/types';
 import { getFilterIconAndLabel } from '@app/searchV2/filters/utils';
 import { EntityRegistry } from '@src/entityRegistryContext';
 
-export interface DisplayedFilterOption {
+interface DisplayedFilterOption {
     key: string;
     label: React.ReactNode;
     style: any;
diff --git a/datahub-web-react/src/app/searchV2/filters/operator/operator.tsx b/datahub-web-react/src/app/searchV2/filters/operator/operator.tsx
index 1e72bf6ccc89a9..49b39a770e4e97 100644
--- a/datahub-web-react/src/app/searchV2/filters/operator/operator.tsx
+++ b/datahub-web-react/src/app/searchV2/filters/operator/operator.tsx
@@ -76,7 +76,7 @@ export const NOT_EXISTS_OPERATOR = {
     icon: <StopOutlined />,
 };
 
-export const CONTAINS_OPERATOR = {
+const CONTAINS_OPERATOR = {
     type: FilterOperatorType.CONTAINS,
     text: 'contains',
     pluralText: 'contains any of',
@@ -86,7 +86,7 @@ export const CONTAINS_OPERATOR = {
     },
 };
 
-export const NOT_CONTAINS_OPERATOR = {
+const NOT_CONTAINS_OPERATOR = {
     type: FilterOperatorType.NOT_CONTAINS,
     text: 'does not contain',
     pluralText: 'does not contain any of',
@@ -96,7 +96,7 @@ export const NOT_CONTAINS_OPERATOR = {
     },
 };
 
-export const GREATER_THAN_OPERATOR = {
+const GREATER_THAN_OPERATOR = {
     type: FilterOperatorType.GREATER_THAN,
     text: 'is greater than',
     filter: {
@@ -105,7 +105,7 @@ export const GREATER_THAN_OPERATOR = {
     },
 };
 
-export const GREATER_THAN_OR_EQUALS_OPERATOR = {
+const GREATER_THAN_OR_EQUALS_OPERATOR = {
     type: FilterOperatorType.GREATER_THAN_OR_EQUALS,
     text: 'is greater than or equal to',
     filter: {
@@ -114,7 +114,7 @@ export const GREATER_THAN_OR_EQUALS_OPERATOR = {
     },
 };
 
-export const LESS_THAN_OPERATOR = {
+const LESS_THAN_OPERATOR = {
     type: FilterOperatorType.LESS_THAN,
     text: 'is less than',
     filter: {
@@ -123,7 +123,7 @@ export const LESS_THAN_OPERATOR = {
     },
 };
 
-export const LESS_THAN_OR_EQUALS_OPERATOR = {
+const LESS_THAN_OR_EQUALS_OPERATOR = {
     type: FilterOperatorType.LESS_THAN_OR_EQUALS,
     text: 'is less than or equal to',
     filter: {
@@ -132,7 +132,7 @@ export const LESS_THAN_OR_EQUALS_OPERATOR = {
     },
 };
 
-export const SUPPORTED_OPERATORS: FilterOperatorInfo[] = [
+const SUPPORTED_OPERATORS: FilterOperatorInfo[] = [
     EQUALS_OPERATOR,
     ALL_EQUALS_OPERATOR,
     NOT_EQUALS_OPERATOR,
@@ -151,7 +151,7 @@ export const SEARCH_FILTER_CONDITION_TYPE_TO_INFO = new Map<FilterOperatorType,
 );
 
 // Fallback used when we don't know the type of the field.
-export const BASE_CONDITION_TYPES = [
+const BASE_CONDITION_TYPES = [
     FilterOperatorType.EQUALS,
     FilterOperatorType.ALL_EQUALS,
     FilterOperatorType.NOT_EQUALS,
@@ -159,34 +159,21 @@ export const BASE_CONDITION_TYPES = [
     FilterOperatorType.NOT_EXISTS,
 ];
 
-export const TEXT_CONDITION_TYPES = [
+const TEXT_CONDITION_TYPES = [
     FilterOperatorType.CONTAINS,
     FilterOperatorType.NOT_CONTAINS,
     ...BASE_CONDITION_TYPES,
 ];
 
-export const BUCKETED_TIMESTAMP_CONDITION_TYPES = [FilterOperatorType.GREATER_THAN, FilterOperatorType.LESS_THAN];
+const BUCKETED_TIMESTAMP_CONDITION_TYPES = [FilterOperatorType.GREATER_THAN, FilterOperatorType.LESS_THAN];
 
-export const NUMBER_CONDITION_TYPES = [
-    ...BASE_CONDITION_TYPES,
-    FilterOperatorType.GREATER_THAN,
-    FilterOperatorType.GREATER_THAN_OR_EQUALS,
-    FilterOperatorType.LESS_THAN,
-    FilterOperatorType.LESS_THAN_OR_EQUALS,
-    FilterOperatorType.IS_ANY_OF,
-    FilterOperatorType.IS_NOT_ANY_OF,
-];
-
-export const BROWSE_CONDITION_TYPES = [FilterOperatorType.EQUALS];
-
-export const BOOLEAN_CONDITION_TYPES = [FilterOperatorType.EQUALS, FilterOperatorType.NOT_EQUALS];
+const BROWSE_CONDITION_TYPES = [FilterOperatorType.EQUALS];
 
-// todo
-export const DATE_CONDITION_TYPES = [...BASE_CONDITION_TYPES];
+const BOOLEAN_CONDITION_TYPES = [FilterOperatorType.EQUALS, FilterOperatorType.NOT_EQUALS];
 
-export const PLURAL_ONLY_CONDITION_TYPES = [FilterOperatorType.ALL_EQUALS];
+const PLURAL_ONLY_CONDITION_TYPES = [FilterOperatorType.ALL_EQUALS];
 
-export const FIELDS_WITHOUT_ALL_EQUALS_OPERATOR = [PLATFORM_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME];
+const FIELDS_WITHOUT_ALL_EQUALS_OPERATOR = [PLATFORM_FILTER_NAME, ENTITY_SUB_TYPE_FILTER_NAME];
 
 const applyFiltersToOperatorOptions = (fieldName: string, operatorOptions: FilterOperatorInfo[], isPlural: boolean) => {
     const excludePluralConditions = FIELDS_WITHOUT_ALL_EQUALS_OPERATOR.includes(fieldName);
@@ -236,18 +223,6 @@ export const getOperatorOptionsForPredicate = (predicate: FilterPredicate, isPlu
     return applyFiltersToOperatorOptions(predicate.field.field, operatorOptions, isPlural);
 };
 
-export const convertBackendToFrontendOperatorInfo = ({
-    operator,
-    negated,
-}: {
-    operator: FilterOperator;
-    negated: boolean;
-}): FilterOperatorInfo | undefined => {
-    return SUPPORTED_OPERATORS.find((info) => {
-        return info.filter.operator === operator && info.filter.negated === negated;
-    });
-};
-
 export const convertBackendToFrontendOperatorType = ({
     operator,
     negated,
diff --git a/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsFilter.tsx
index d331f3930ce21f..0284381f54a074 100644
--- a/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsFilter.tsx
+++ b/datahub-web-react/src/app/searchV2/filters/render/assertion/HasFailingAssertionsFilter.tsx
@@ -7,7 +7,7 @@ import { FilterScenarioType } from '@app/searchV2/filters/render/types';
 
 import { FacetFilter, FacetFilterInput, FacetMetadata } from '@types';
 
-export interface Props {
+interface Props {
     scenario: FilterScenarioType;
     filter: FacetMetadata;
     activeFilters: FacetFilterInput[];
diff --git a/datahub-web-react/src/app/searchV2/filters/render/deprecation/DeprecationFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/deprecation/DeprecationFilter.tsx
index f7243045294e0c..fd8e07858f1f73 100644
--- a/datahub-web-react/src/app/searchV2/filters/render/deprecation/DeprecationFilter.tsx
+++ b/datahub-web-react/src/app/searchV2/filters/render/deprecation/DeprecationFilter.tsx
@@ -7,7 +7,7 @@ import { FilterScenarioType } from '@app/searchV2/filters/render/types';
 
 import { FacetFilter, FacetFilterInput, FacetMetadata } from '@types';
 
-export interface Props {
+interface Props {
     scenario: FilterScenarioType;
     filter: FacetMetadata;
     activeFilters: FacetFilterInput[];
diff --git a/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsFilter.tsx
index 10fc659b29b87b..096e973f030935 100644
--- a/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsFilter.tsx
+++ b/datahub-web-react/src/app/searchV2/filters/render/incident/HasActiveIncidentsFilter.tsx
@@ -7,7 +7,7 @@ import { FilterScenarioType } from '@app/searchV2/filters/render/types';
 
 import { FacetFilter, FacetFilterInput, FacetMetadata } from '@types';
 
-export interface Props {
+interface Props {
     scenario: FilterScenarioType;
     filter: FacetMetadata;
     activeFilters: FacetFilterInput[];
diff --git a/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilterMenu.tsx b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilterMenu.tsx
index f63d4fbd38e8ad..9d3f28ebec360f 100644
--- a/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilterMenu.tsx
+++ b/datahub-web-react/src/app/searchV2/filters/render/shared/BooleanMoreFilterMenu.tsx
@@ -10,7 +10,7 @@ const StyledButton = styled(Button)`
     border-radius: 0;
 `;
 
-export const DropdownMenu = styled.div`
+const DropdownMenu = styled.div`
     background-color: white;
     border-radius: 5px;
     box-shadow:
diff --git a/datahub-web-react/src/app/searchV2/filters/render/shared/styledComponents.tsx b/datahub-web-react/src/app/searchV2/filters/render/shared/styledComponents.tsx
deleted file mode 100644
index b9bb894728795c..00000000000000
--- a/datahub-web-react/src/app/searchV2/filters/render/shared/styledComponents.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import styled from 'styled-components';
-
-import { MoreFilterOptionLabel } from '@app/searchV2/filters/styledComponents';
-
-export const SearchFilterWrapper = styled.div`
-    padding: 0 25px 15px 25px;
-    display: flex;
-    align-items: center;
-    justify-content: left;
-`;
-
-export const Title = styled.div`
-    align-items: center;
-    font-weight: bold;
-    display: flex;
-    justify-content: left;
-    cursor: pointer;
-`;
-
-export const StyledMoreFilterOptionLabel = styled(MoreFilterOptionLabel)`
-    justify-content: left;
-`;
diff --git a/datahub-web-react/src/app/searchV2/filters/render/siblings/HasSiblingsFilter.tsx b/datahub-web-react/src/app/searchV2/filters/render/siblings/HasSiblingsFilter.tsx
index a9dda633a24307..bf384c7afdb5e6 100644
--- a/datahub-web-react/src/app/searchV2/filters/render/siblings/HasSiblingsFilter.tsx
+++ b/datahub-web-react/src/app/searchV2/filters/render/siblings/HasSiblingsFilter.tsx
@@ -7,7 +7,7 @@ import { FilterScenarioType } from '@app/searchV2/filters/render/types';
 
 import { FacetFilter, FacetFilterInput, FacetMetadata } from '@types';
 
-export interface Props {
+interface Props {
     scenario: FilterScenarioType;
     filter: FacetMetadata;
     activeFilters: FacetFilterInput[];
diff --git a/datahub-web-react/src/app/searchV2/filters/styledComponents.ts b/datahub-web-react/src/app/searchV2/filters/styledComponents.ts
index 8908d84813d5a6..8cddb01c9647da 100644
--- a/datahub-web-react/src/app/searchV2/filters/styledComponents.ts
+++ b/datahub-web-react/src/app/searchV2/filters/styledComponents.ts
@@ -54,7 +54,3 @@ export const TextButton = styled(Button)<{ marginTop?: number; height?: number }
 export const Label = styled(Typography.Text)`
     max-width: 125px;
 `;
-
-export const IconSpacer = styled.span`
-    width: 4px;
-`;
diff --git a/datahub-web-react/src/app/searchV2/filters/types.ts b/datahub-web-react/src/app/searchV2/filters/types.ts
index f565bfb0718cc2..0199237661a48d 100644
--- a/datahub-web-react/src/app/searchV2/filters/types.ts
+++ b/datahub-web-react/src/app/searchV2/filters/types.ts
@@ -8,12 +8,6 @@ export interface FilterOptionType {
     displayName?: string | null;
 }
 
-export interface Filter {
-    field: string;
-    displayName: string;
-    options?: FilterOptionType[];
-}
-
 export interface FilterValue {
     value: string;
     entity: Entity | null;
@@ -54,7 +48,7 @@ interface FilterFieldBase {
     entity?: Entity; // if the filter itself is an entity ie. Structured Properties
 }
 
-export interface BasicFilterField extends FilterFieldBase {
+interface BasicFilterField extends FilterFieldBase {
     type: Exclude<FieldType, FieldType.BUCKETED_TIMESTAMP | FieldType.ENTITY>;
 }
 
diff --git a/datahub-web-react/src/app/searchV2/filters/utils.tsx b/datahub-web-react/src/app/searchV2/filters/utils.tsx
index 5bc9928347084e..71b6915d472d6c 100644
--- a/datahub-web-react/src/app/searchV2/filters/utils.tsx
+++ b/datahub-web-react/src/app/searchV2/filters/utils.tsx
@@ -546,7 +546,7 @@ export function getStructuredPropFilterDisplayName(field: string, value: string,
  * @param availableFilters - An array of available facet filters metadata.
  * @returns The resulting FilterPredicate.
  */
-export function convertToFilterPredicate(filter: FacetFilterInput, availableFilters: FacetMetadata[]): FilterPredicate {
+function convertToFilterPredicate(filter: FacetFilterInput, availableFilters: FacetMetadata[]): FilterPredicate {
     // First, check whether this is a well-supported filter field.
     const field = getKnownFilterField(filter.field) || getDynamicFilterField(filter.field, availableFilters);
     const operator =
diff --git a/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersContext.tsx b/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersContext.tsx
index 5ec9cb8ce59588..7cc6a88ae1817c 100644
--- a/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersContext.tsx
+++ b/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersContext.tsx
@@ -11,7 +11,7 @@ import {
     FiltersRenderer,
 } from '@app/searchV2/filtersV2/types';
 
-export type SearchFiltersContextType = {
+type SearchFiltersContextType = {
     // Fields to show in filters
     fields: FieldName[];
     // Applied view
diff --git a/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersProvider.tsx b/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersProvider.tsx
index 6ad4fd02979377..3c8040d6974ecc 100644
--- a/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersProvider.tsx
+++ b/datahub-web-react/src/app/searchV2/filtersV2/context/SearchFiltersProvider.tsx
@@ -13,7 +13,7 @@ import {
     FiltersRenderer,
 } from '@app/searchV2/filtersV2/types';
 
-export interface Props {
+interface Props {
     fields: FieldName[];
     viewUrn?: string | null;
     fieldToAppliedFiltersMap?: FieldToAppliedFieldFiltersMap;
diff --git a/datahub-web-react/src/app/searchV2/filtersV2/context/index.ts b/datahub-web-react/src/app/searchV2/filtersV2/context/index.ts
index 8931633ba3cb59..5b514d3d294280 100644
--- a/datahub-web-react/src/app/searchV2/filtersV2/context/index.ts
+++ b/datahub-web-react/src/app/searchV2/filtersV2/context/index.ts
@@ -1,5 +1,5 @@
-import SearchFiltersContext from '@app/searchV2/filtersV2/context/SearchFiltersContext';
+
 import SearchFiltersProvider from '@app/searchV2/filtersV2/context/SearchFiltersProvider';
 import useSearchFiltersContext from '@app/searchV2/filtersV2/context/useSearchFiltersContext';
 
-export { SearchFiltersContext, useSearchFiltersContext, SearchFiltersProvider };
+export {  useSearchFiltersContext, SearchFiltersProvider };
diff --git a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/utils.ts b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/utils.ts
index 7af60b5fae224a..189d67e6913c7f 100644
--- a/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/utils.ts
+++ b/datahub-web-react/src/app/searchV2/filtersV2/filters/DomainFilter/utils.ts
@@ -1,5 +1,4 @@
 import { getUniqueItemsByKey } from '@app/searchV2/filtersV2/utils';
-import { NestedSelectOption } from '@src/alchemy-components/components/Select/Nested/types';
 import { isDomain } from '@src/app/entityV2/domain/utils';
 import { Domain } from '@src/types.generated';
 
@@ -28,11 +27,3 @@ export function extractParentDomains(domains: Domain[]) {
 
     return getUniqueItemsByKey(allParentDomains, domainKeyAccessor);
 }
-
-export function domainFilteringPredicate(option: NestedSelectOption, query: string) {
-    const { entity } = option;
-    if (!isDomain(entity)) return false;
-
-    const searchText = (entity.properties?.name ?? '').toLowerCase();
-    return searchText.includes(query.toLowerCase()) || entity.urn.toLowerCase().includes(query.toLowerCase());
-}
diff --git a/datahub-web-react/src/app/searchV2/filtersV2/types.ts b/datahub-web-react/src/app/searchV2/filtersV2/types.ts
index 685b65ca61e885..a6fd44bb17b59b 100644
--- a/datahub-web-react/src/app/searchV2/filtersV2/types.ts
+++ b/datahub-web-react/src/app/searchV2/filtersV2/types.ts
@@ -4,14 +4,6 @@ import { FacetFilterInput, FacetMetadata } from '@src/types.generated';
 
 export type FieldName = string;
 
-export type FacetsGetterResponse = {
-    facets?: FacetMetadata[] | undefined;
-    loading?: boolean;
-};
-export type FacetsGetter = (fieldNames: FieldName[]) => FieldToFacetStateMap | undefined;
-
-export type FilterValue = string;
-
 export interface AppliedFieldFilterValue {
     filters: FacetFilterInput[];
 }
@@ -44,8 +36,6 @@ export type FeildFacetState = {
 
 export type FieldToFacetStateMap = Map<FieldName, FeildFacetState>;
 
-export type FieldFacetGetter = (fieldName: FieldName) => FeildFacetState | undefined;
-
 export type FiltersRenderer = React.FC<FiltersRendererProps>;
 
 export type FiltersAppliedHandler = (appliedFilters: FieldToAppliedFieldFiltersMap | undefined) => void;
diff --git a/datahub-web-react/src/app/searchV2/matches/constants.ts b/datahub-web-react/src/app/searchV2/matches/constants.ts
index 71fa1b99483a90..629e5d3388c7d7 100644
--- a/datahub-web-react/src/app/searchV2/matches/constants.ts
+++ b/datahub-web-react/src/app/searchV2/matches/constants.ts
@@ -114,7 +114,7 @@ const DEFAULT_MATCHED_FIELD_CONFIG: Array<MatchedFieldConfig> = [
     },
 ];
 
-export const CHART_DASHBOARD_FIELD_CONFIG: Array<MatchedFieldConfig> = DEFAULT_MATCHED_FIELD_CONFIG.map((config) => {
+const CHART_DASHBOARD_FIELD_CONFIG: Array<MatchedFieldConfig> = DEFAULT_MATCHED_FIELD_CONFIG.map((config) => {
     if (config.name === 'title') return { ...config, groupInto: 'name' };
     return config;
 });
diff --git a/datahub-web-react/src/app/searchV2/recommendation/utils.ts b/datahub-web-react/src/app/searchV2/recommendation/utils.ts
deleted file mode 100644
index 4731c017c3ddfc..00000000000000
--- a/datahub-web-react/src/app/searchV2/recommendation/utils.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-const colors = ['#3a9c7b', '#487a56', '#3a829c', '#3a4c9c', '#783a9c', '#d15858'];
-
-export const getFilterColor = (field: string, value: string) => {
-    const typeStr = field + value;
-
-    let hash = 0;
-    for (let i = 0; i < typeStr.length; i++) {
-        /* eslint-disable no-bitwise */
-        hash = (hash << 5) - hash + typeStr.charCodeAt(i);
-        /* eslint-disable no-bitwise */
-        hash |= 0; // Convert to 32bit integer
-    }
-
-    const colorIndex = Math.abs(hash) % colors.length;
-    return colors[colorIndex];
-};
diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/components/Filters.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/components/Filters.tsx
index 69a3b71e68ad9b..c033371820c101 100644
--- a/datahub-web-react/src/app/searchV2/searchBarV2/components/Filters.tsx
+++ b/datahub-web-react/src/app/searchV2/searchBarV2/components/Filters.tsx
@@ -19,7 +19,7 @@ import {
 } from '@app/searchV2/utils/constants';
 import { FacetMetadata } from '@src/types.generated';
 
-export const FILTER_FIELDS = [
+const FILTER_FIELDS = [
     PLATFORM_FILTER_NAME,
     ENTITY_SUB_TYPE_FILTER_NAME,
     OWNERS_FILTER_NAME,
diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/components/SearchBarInput.tsx b/datahub-web-react/src/app/searchV2/searchBarV2/components/SearchBarInput.tsx
index 55abb965d4d88d..591f90a7545e1a 100644
--- a/datahub-web-react/src/app/searchV2/searchBarV2/components/SearchBarInput.tsx
+++ b/datahub-web-react/src/app/searchV2/searchBarV2/components/SearchBarInput.tsx
@@ -37,7 +37,7 @@ const StyledSearchBar = styled(SearchBar)<{ $isShowNavBarRedesign?: boolean }>`
 
 const ViewSelectContainer = styled.div``;
 
-export const Wrapper = styled.div<{ $open?: boolean; $isShowNavBarRedesign?: boolean }>`
+const Wrapper = styled.div<{ $open?: boolean; $isShowNavBarRedesign?: boolean }>`
     background: transparent;
     width: 100%;
     min-width: 500px;
diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/constants.ts b/datahub-web-react/src/app/searchV2/searchBarV2/constants.ts
index f6639d57f73671..1ae69691fe1aa6 100644
--- a/datahub-web-react/src/app/searchV2/searchBarV2/constants.ts
+++ b/datahub-web-react/src/app/searchV2/searchBarV2/constants.ts
@@ -21,8 +21,6 @@ export const AUTOCOMPLETE_DROPDOWN_ALIGN: AutocompleteDropdownAlign = {
 export const EXACT_AUTOCOMPLETE_OPTION_TYPE = 'exact_query';
 export const RELEVANCE_QUERY_OPTION_TYPE = 'recommendation';
 
-export const DEBOUNCE_ON_SEARCH_TIMEOUT_MS = 100;
-
 export const BOX_SHADOW = `0px -3px 12px 0px rgba(236, 240, 248, 0.5) inset,
 0px 3px 12px 0px rgba(255, 255, 255, 0.5) inset,
 0px 20px 60px 0px rgba(0, 0, 0, 0.12)`;
diff --git a/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useSearchBarData.ts b/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useSearchBarData.ts
index 1a35a93bfff6d3..38f372567ba3ee 100644
--- a/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useSearchBarData.ts
+++ b/datahub-web-react/src/app/searchV2/searchBarV2/hooks/useSearchBarData.ts
@@ -25,7 +25,7 @@ type APIResponse = {
     loading?: boolean;
 };
 
-export type SearchResponse = {
+type SearchResponse = {
     facets?: FacetMetadata[];
     entitiesWithMatchedFields?: EntityWithMatchedFields[];
     loading?: boolean;
diff --git a/datahub-web-react/src/app/searchV2/sidebar/BrowseContext.tsx b/datahub-web-react/src/app/searchV2/sidebar/BrowseContext.tsx
index 31174dd3537285..a486cbcc62d42f 100644
--- a/datahub-web-react/src/app/searchV2/sidebar/BrowseContext.tsx
+++ b/datahub-web-react/src/app/searchV2/sidebar/BrowseContext.tsx
@@ -71,17 +71,12 @@ const useBrowseContext = () => {
     return context;
 };
 
-export const useBrowseMode = () => {
-    const { mode } = useBrowseContext();
-    return mode;
-};
-
 export const useIsPlatformBrowseMode = () => {
     const { mode } = useBrowseContext();
     return mode === BrowseMode.PLATFORM;
 };
 
-export const useMaybeEntityAggregation = () => {
+const useMaybeEntityAggregation = () => {
     return useBrowseContext().entityAggregation;
 };
 
@@ -119,7 +114,7 @@ export const usePlatformAggregation = () => {
     return platformAggregation;
 };
 
-export const useMaybeBrowseResultGroup = () => {
+const useMaybeBrowseResultGroup = () => {
     return useBrowseContext().browseResultGroup;
 };
 
@@ -146,7 +141,7 @@ export const useBrowsePathLength = () => {
     return useBrowsePath().length;
 };
 
-export const useBrowseSearchFilter = () => {
+const useBrowseSearchFilter = () => {
     return createBrowseV2SearchFilter(useBrowsePath());
 };
 
diff --git a/datahub-web-react/src/app/searchV2/sidebar/BrowseSidebar.tsx b/datahub-web-react/src/app/searchV2/sidebar/BrowseSidebar.tsx
index c1cf1f70fcb122..00db9e49ca147d 100644
--- a/datahub-web-react/src/app/searchV2/sidebar/BrowseSidebar.tsx
+++ b/datahub-web-react/src/app/searchV2/sidebar/BrowseSidebar.tsx
@@ -11,8 +11,8 @@ import { ProfileSidebarResizer } from '@src/app/entityV2/shared/containers/profi
 import { useShowNavBarRedesign } from '@src/app/useShowNavBarRedesign';
 
 const PLATFORM_BROWSE_TRANSITION_MS = 200;
-export const MAX_BROWSER_WIDTH = 500;
-export const MIN_BROWSWER_WIDTH = 260;
+const MAX_BROWSER_WIDTH = 500;
+const MIN_BROWSWER_WIDTH = 260;
 
 const StyledEntitySidebarContainer = styled.div<{
     isCollapsed: boolean;
@@ -50,7 +50,7 @@ const StyledEntitySidebarContainer = styled.div<{
             : '0px 0px 5px rgba(0, 0, 0, 0.08)'};
 `;
 
-export const StyledSidebar = styled.div`
+const StyledSidebar = styled.div`
     overflow: auto;
     height: 100%;
     display: flex;
diff --git a/datahub-web-react/src/app/searchV2/useAdvancedSearchSelectFilters.tsx b/datahub-web-react/src/app/searchV2/useAdvancedSearchSelectFilters.tsx
deleted file mode 100644
index 184c5a6af6bd67..00000000000000
--- a/datahub-web-react/src/app/searchV2/useAdvancedSearchSelectFilters.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { useState } from 'react';
-
-import { TEXT_FIELDS } from '@app/searchV2/utils/constants';
-
-import { FacetFilterInput, FilterOperator } from '@types';
-
-interface Props {
-    selectedFilters: FacetFilterInput[];
-    onFilterSelect: (newFilters: FacetFilterInput[]) => void;
-}
-
-export default function useAdvancedSearchSelectFilters({ selectedFilters, onFilterSelect }: Props) {
-    const [filterField, setFilterField] = useState<null | string>(null);
-
-    const onFilterFieldSelect = (value) => {
-        setFilterField(value.value);
-    };
-
-    const onSelectValueFromModal = (values) => {
-        if (!filterField) return;
-
-        const newFilter: FacetFilterInput = {
-            field: filterField,
-            values: values as string[],
-            condition: TEXT_FIELDS.has(filterField) ? FilterOperator.Contain : FilterOperator.Equal,
-        };
-        onFilterSelect([...selectedFilters, newFilter]);
-    };
-
-    return { filterField, setFilterField, onFilterFieldSelect, onSelectValueFromModal };
-}
diff --git a/datahub-web-react/src/app/searchV2/useSearchAndBrowseVersion.ts b/datahub-web-react/src/app/searchV2/useSearchAndBrowseVersion.ts
index 0245b8a8dc27f8..5e7d0cd2f70fc8 100644
--- a/datahub-web-react/src/app/searchV2/useSearchAndBrowseVersion.ts
+++ b/datahub-web-react/src/app/searchV2/useSearchAndBrowseVersion.ts
@@ -12,7 +12,7 @@ export const useSearchVersion = () => {
     return useSearchAndBrowseVersion().searchVersion;
 };
 
-export const useBrowseVersion = () => {
+const useBrowseVersion = () => {
     return useSearchAndBrowseVersion().browseVersion;
 };
 
diff --git a/datahub-web-react/src/app/searchV2/useToggleSidebar.ts b/datahub-web-react/src/app/searchV2/useToggleSidebar.ts
deleted file mode 100644
index c7f692343ea5f4..00000000000000
--- a/datahub-web-react/src/app/searchV2/useToggleSidebar.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { EventType } from '@app/analytics';
-import analytics from '@app/analytics/analytics';
-import { useUserContext } from '@app/context/useUserContext';
-import useToggle from '@app/shared/useToggle';
-
-const useToggleSidebar = () => {
-    const { localState, updateLocalState } = useUserContext();
-
-    const { isOpen: isSidebarOpen, toggle: toggleSidebar } = useToggle({
-        initialValue: localState.showBrowseV2Sidebar ?? true,
-        onToggle: (isNowOpen: boolean) => {
-            analytics.event({
-                type: EventType.BrowseV2ToggleSidebarEvent,
-                action: isNowOpen ? 'open' : 'close',
-            });
-            updateLocalState({ ...localState, showBrowseV2Sidebar: isNowOpen });
-        },
-    });
-
-    return { isSidebarOpen, toggleSidebar } as const;
-};
-
-export default useToggleSidebar;
diff --git a/datahub-web-react/src/app/searchV2/utils/combineSiblingsInAutoComplete.ts b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInAutoComplete.ts
index f752f40da6dd56..3e66b4c400c04f 100644
--- a/datahub-web-react/src/app/searchV2/utils/combineSiblingsInAutoComplete.ts
+++ b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInAutoComplete.ts
@@ -2,7 +2,7 @@ import { CombinedEntity, createSiblingEntityCombiner } from '@app/entity/shared/
 
 import { AutoCompleteResultForEntity, EntityType } from '@types';
 
-export type CombinedSuggestion = {
+type CombinedSuggestion = {
     type: EntityType;
     combinedEntities: Array<CombinedEntity>;
     suggestions?: AutoCompleteResultForEntity['suggestions'];
diff --git a/datahub-web-react/src/app/searchV2/utils/combineSiblingsInEntitiesWithMatchedFields.ts b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInEntitiesWithMatchedFields.ts
index 3c9c1d509f59d0..32be5e2cc11ac4 100644
--- a/datahub-web-react/src/app/searchV2/utils/combineSiblingsInEntitiesWithMatchedFields.ts
+++ b/datahub-web-react/src/app/searchV2/utils/combineSiblingsInEntitiesWithMatchedFields.ts
@@ -7,7 +7,7 @@ export type EntityWithMatchedFields = {
     matchedFields?: MatchedField[];
 };
 
-export type CombinedEntityWithMatchedFields = CombinedEntity & Pick<EntityWithMatchedFields, 'matchedFields'>;
+type CombinedEntityWithMatchedFields = CombinedEntity & Pick<EntityWithMatchedFields, 'matchedFields'>;
 
 export function combineSiblingsInEntitiesWithMatchedFields(
     entities: EntityWithMatchedFields[] | undefined,
diff --git a/datahub-web-react/src/app/searchV2/utils/constants.ts b/datahub-web-react/src/app/searchV2/utils/constants.ts
index 0861d5a224d884..30277e5d6eb009 100644
--- a/datahub-web-react/src/app/searchV2/utils/constants.ts
+++ b/datahub-web-react/src/app/searchV2/utils/constants.ts
@@ -22,12 +22,12 @@ export const TYPE_NAMES_FILTER_NAME = 'typeNames';
 export const PLATFORM_FILTER_NAME = 'platform';
 export const DATA_PLATFORM_INSTANCE_FILTER_NAME = 'platformInstance';
 export const FIELD_TAGS_FILTER_NAME = 'fieldTags';
-export const EDITED_FIELD_TAGS_FILTER_NAME = 'editedFieldTags';
+const EDITED_FIELD_TAGS_FILTER_NAME = 'editedFieldTags';
 export const FIELD_GLOSSARY_TERMS_FILTER_NAME = 'fieldGlossaryTerms';
-export const EDITED_FIELD_GLOSSARY_TERMS_FILTER_NAME = 'editedFieldGlossaryTerms';
+const EDITED_FIELD_GLOSSARY_TERMS_FILTER_NAME = 'editedFieldGlossaryTerms';
 export const FIELD_PATHS_FILTER_NAME = 'fieldPaths';
 export const FIELD_DESCRIPTIONS_FILTER_NAME = 'fieldDescriptions';
-export const EDITED_FIELD_DESCRIPTIONS_FILTER_NAME = 'editedFieldDescriptions';
+const EDITED_FIELD_DESCRIPTIONS_FILTER_NAME = 'editedFieldDescriptions';
 export const DESCRIPTION_FILTER_NAME = 'description';
 export const REMOVED_FILTER_NAME = 'removed';
 export const ORIGIN_FILTER_NAME = 'origin';
@@ -39,8 +39,6 @@ export const HAS_SIBLINGS_FILTER_NAME = 'hasSiblings';
 export const CHART_TYPE_FILTER_NAME = 'type';
 export const LAST_MODIFIED_FILTER_NAME = 'lastModifiedAt';
 export const STRUCTURED_PROPERTIES_FILTER_NAME = 'structuredProperties.';
-export const ENTITY_TYPES_FILTER_NAME = 'entityTypes';
-export const IS_HIDDEN_PROPERTY_FILTER_NAME = 'isHidden';
 export const SHOW_IN_COLUMNS_TABLE_PROPERTY_FILTER_NAME = 'showInColumnsTable';
 export const SHOW_IN_ASSET_SUMMARY_PROPERTY_FILTER_NAME = 'showInAssetSummary';
 export const COMPLETED_FORMS_FILTER_NAME = 'completedForms';
@@ -49,8 +47,6 @@ export const VERIFIED_FORMS_FILTER_NAME = 'verifiedForms';
 export const COMPLETED_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME = 'completedFormsCompletedPromptIds';
 export const INCOMPLETE_FORMS_COMPLETED_PROMPT_IDS_FILTER_NAME = 'incompleteFormsCompletedPromptIds';
 
-export const LEGACY_ENTITY_FILTER_FIELDS = [ENTITY_FILTER_NAME, LEGACY_ENTITY_FILTER_NAME];
-
 export const FILTER_DELIMITER = '␞';
 
 export const ENTITY_SUB_TYPE_FILTER_FIELDS = [
@@ -60,18 +56,6 @@ export const ENTITY_SUB_TYPE_FILTER_FIELDS = [
     TYPE_NAMES_FILTER_NAME,
 ];
 
-export const FILTERS_TO_TRUNCATE = [
-    TAGS_FILTER_NAME,
-    GLOSSARY_TERMS_FILTER_NAME,
-    CONTAINER_FILTER_NAME,
-    DOMAINS_FILTER_NAME,
-    OWNERS_FILTER_NAME,
-    ENTITY_FILTER_NAME,
-    TYPE_NAMES_FILTER_NAME,
-    PLATFORM_FILTER_NAME,
-];
-export const TRUNCATED_FILTER_LENGTH = 5;
-
 export const ORDERED_FIELDS = [
     ENTITY_FILTER_NAME,
     PLATFORM_FILTER_NAME,
diff --git a/datahub-web-react/src/app/searchV2/utils/csvUtils.ts b/datahub-web-react/src/app/searchV2/utils/csvUtils.ts
deleted file mode 100644
index f701b90ab78e4c..00000000000000
--- a/datahub-web-react/src/app/searchV2/utils/csvUtils.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-export function downloadFile(data: string, title: string) {
-    const blobx = new Blob([data], { type: 'text/plain' }); // ! Blob
-    const elemx = window.document.createElement('a');
-    elemx.href = window.URL.createObjectURL(blobx); // ! createObjectURL
-    elemx.download = title;
-    elemx.style.display = 'none';
-    document.body.appendChild(elemx);
-    elemx.click();
-    document.body.removeChild(elemx);
-}
-
-function createCsvContents(fieldNames: string[], rows: string[][]): string {
-    let contents = `${fieldNames.join(',')}\n`;
-    rows.forEach((row) => {
-        // quotes need to be escaped for csvs -> " becomes ""
-        contents = contents.concat(`${row.map((rowEl) => `"${rowEl.replace(/"/g, '""')}"`).join(',')}\n`);
-    });
-
-    return contents;
-}
-
-export function downloadRowsAsCsv(fieldNames: string[], rows: string[][], title: string) {
-    const csvFileContents = createCsvContents(fieldNames, rows);
-    downloadFile(csvFileContents, title);
-}
diff --git a/datahub-web-react/src/app/settings/AccessTokenModal.tsx b/datahub-web-react/src/app/settings/AccessTokenModal.tsx
deleted file mode 100644
index a72b11f9fe9e5e..00000000000000
--- a/datahub-web-react/src/app/settings/AccessTokenModal.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import { InfoCircleOutlined } from '@ant-design/icons';
-import { Alert, Button, Modal, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { resolveRuntimePath } from '@utils/runtimeBasePath';
-
-const ModalSection = styled.div`
-    display: flex;
-    flex-direction: column;
-    padding-bottom: 12px;
-`;
-
-const ModalSectionHeader = styled(Typography.Text)`
-    &&&& {
-        padding: 0px;
-        margin: 0px;
-        margin-bottom: 4px;
-    }
-`;
-
-const ModalSectionParagraph = styled(Typography.Paragraph)`
-    &&&& {
-        padding: 0px;
-        margin: 0px;
-    }
-`;
-
-const StyledAlert = styled(Alert)`
-    padding-top: 12px;
-    padding-bottom: 12px;
-    margin-bottom: 20px;
-`;
-
-const StyledInfoCircleOutlined = styled(InfoCircleOutlined)`
-    margin-right: 8px;
-`;
-
-type Props = {
-    open: boolean;
-    onClose: () => void;
-    accessToken: string;
-    expiresInText: string;
-};
-
-export const AccessTokenModal = ({ open, onClose, accessToken, expiresInText }: Props) => {
-    const baseUrl = window.location.origin;
-    const accessTokenCurl = `curl -X POST '${baseUrl}${resolveRuntimePath('/api/graphql')}' \\
---header 'Authorization: Bearer ${accessToken}' \\
---header 'Content-Type: application/json' \\
---data-raw '{"query":"{\\n  me {\\n    corpUser {\\n        username\\n    }\\n  }\\n}","variables":{}}'`;
-
-    return (
-        <Modal
-            width={700}
-            title={
-                <Typography.Text>
-                    <b> New Personal Access Token</b>
-                </Typography.Text>
-            }
-            open={open}
-            onCancel={onClose}
-            footer={
-                <>
-                    <Button id="createTokenButton" onClick={onClose} data-testid="access-token-modal-close-button">
-                        Close
-                    </Button>
-                </>
-            }
-        >
-            <ModalSection>
-                <StyledAlert
-                    type="info"
-                    message={
-                        <span>
-                            <StyledInfoCircleOutlined />
-                            Make sure to copy your personal access token now. You won’t be able to see it again.
-                        </span>
-                    }
-                />
-            </ModalSection>
-            <ModalSection>
-                <ModalSectionHeader strong>Token</ModalSectionHeader>
-                <ModalSectionParagraph>{expiresInText}</ModalSectionParagraph>
-                <Typography.Paragraph copyable={{ text: accessToken }}>
-                    <pre data-testid="access-token-value">{accessToken}</pre>
-                </Typography.Paragraph>
-            </ModalSection>
-            <ModalSection>
-                <ModalSectionHeader strong>Usage</ModalSectionHeader>
-                <ModalSectionParagraph>
-                    To use the token, provide it as a <Typography.Text keyboard>Bearer</Typography.Text> token in the{' '}
-                    <Typography.Text keyboard>Authorization</Typography.Text> header when making API requests:
-                </ModalSectionParagraph>
-                <Typography.Paragraph copyable={{ text: accessTokenCurl }}>
-                    <pre>{accessTokenCurl}</pre>
-                </Typography.Paragraph>
-            </ModalSection>
-            <ModalSection>
-                <ModalSectionHeader strong>Learn More</ModalSectionHeader>
-                <ModalSectionParagraph>
-                    To learn more about the DataHub APIs, check out the
-                    <a href="https://www.datahubproject.io/docs/"> DataHub Docs.</a>
-                </ModalSectionParagraph>
-            </ModalSection>
-        </Modal>
-    );
-};
diff --git a/datahub-web-react/src/app/settings/AccessTokens.tsx b/datahub-web-react/src/app/settings/AccessTokens.tsx
deleted file mode 100644
index 5fa333b9d7b557..00000000000000
--- a/datahub-web-react/src/app/settings/AccessTokens.tsx
+++ /dev/null
@@ -1,435 +0,0 @@
-import { red } from '@ant-design/colors';
-import { DeleteOutlined, InfoCircleOutlined, PlusOutlined } from '@ant-design/icons';
-import { Alert, Button, Divider, Empty, Modal, Pagination, Select, Typography, message } from 'antd';
-import React, { useEffect, useMemo, useState } from 'react';
-import styled from 'styled-components';
-
-import analytics, { EventType } from '@app/analytics';
-import { useUserContext } from '@app/context/useUserContext';
-import { StyledTable } from '@app/entity/shared/components/styled/StyledTable';
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import CreateTokenModal from '@app/settings/CreateTokenModal';
-import { Message } from '@app/shared/Message';
-import { OwnerLabel } from '@app/shared/OwnerLabel';
-import { scrollToTop } from '@app/shared/searchUtils';
-import { getLocaleTimezone } from '@app/shared/time/timeUtils';
-import { useAppConfig } from '@app/useAppConfig';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useListAccessTokensQuery, useRevokeAccessTokenMutation } from '@graphql/auth.generated';
-import { useListUsersQuery } from '@graphql/user.generated';
-import { EntityType, FacetFilterInput } from '@types';
-
-const SourceContainer = styled.div`
-    width: 100%;
-    padding-top: 20px;
-    padding-right: 40px;
-    padding-left: 40px;
-    display: flex;
-    flex-direction: column;
-    overflow: auto;
-`;
-
-const TokensContainer = styled.div`
-    padding-top: 0px;
-`;
-
-const TokensHeaderContainer = styled.div`
-    && {
-        padding-left: 0px;
-    }
-`;
-
-const TokensTitle = styled(Typography.Title)`
-    && {
-        margin-bottom: 8px;
-    }
-`;
-
-const StyledAlert = styled(Alert)`
-    padding-top: 12px;
-    padding-bottom: 12px;
-    margin-bottom: 20px;
-`;
-
-const StyledSelectOwner = styled(Select)`
-    margin-right: 15px;
-    width: 200px;
-`;
-
-const StyledSelect = styled(Select)`
-    margin-right: 15px;
-    min-width: 75px;
-`;
-
-const StyledInfoCircleOutlined = styled(InfoCircleOutlined)`
-    margin-right: 8px;
-`;
-
-const PersonTokenDescriptionText = styled(Typography.Paragraph)`
-    && {
-        max-width: 700px;
-        margin-top: 12px;
-        margin-bottom: 16px;
-    }
-`;
-
-const ActionButtonContainer = styled.div`
-    display: flex;
-    justify-content: right;
-`;
-
-const PaginationContainer = styled.div`
-    display: flex;
-    justify-content: center;
-`;
-
-const NeverExpireText = styled.span`
-    color: ${red[5]};
-`;
-
-const SelectContainer = styled.div`
-    display: flex;
-    align-items: flex-start;
-`;
-
-const DEFAULT_PAGE_SIZE = 10;
-
-export enum StatusType {
-    ALL,
-    EXPIRED,
-}
-
-export const AccessTokens = () => {
-    const [isCreatingToken, setIsCreatingToken] = useState(false);
-    const [removedTokens, setRemovedTokens] = useState<string[]>([]);
-    const [statusFilter, setStatusFilter] = useState(StatusType.ALL);
-    const [owner, setOwner] = useState('All');
-    const [filters, setFilters] = useState<Array<FacetFilterInput> | null>(null);
-    const [query, setQuery] = useState<undefined | string>(undefined);
-    // Current User Urn
-    const authenticatedUser = useUserContext();
-    const entityRegistry = useEntityRegistry();
-    const currentUserUrn = authenticatedUser?.user?.urn || '';
-
-    useEffect(() => {
-        if (currentUserUrn) {
-            setFilters([
-                {
-                    field: 'ownerUrn',
-                    values: [currentUserUrn],
-                },
-            ]);
-        }
-    }, [currentUserUrn]);
-
-    const isTokenAuthEnabled = useAppConfig().config?.authConfig?.tokenAuthEnabled;
-    const canGeneratePersonalAccessTokens =
-        isTokenAuthEnabled && authenticatedUser?.platformPrivileges?.generatePersonalAccessTokens;
-
-    const canManageToken = authenticatedUser?.platformPrivileges?.manageTokens;
-
-    // Access Tokens list paging.
-    const [page, setPage] = useState(1);
-    const pageSize = DEFAULT_PAGE_SIZE;
-    const start = (page - 1) * pageSize;
-
-    // Call list Access Token Mutation
-    const {
-        loading: tokensLoading,
-        error: tokensError,
-        data: tokensData,
-        refetch: tokensRefetch,
-    } = useListAccessTokensQuery({
-        skip: !canGeneratePersonalAccessTokens || !filters,
-        variables: {
-            input: {
-                start,
-                count: pageSize,
-                filters,
-            },
-        },
-    });
-
-    const { data: usersData } = useListUsersQuery({
-        skip: !canGeneratePersonalAccessTokens || !canManageToken,
-        variables: {
-            input: {
-                start,
-                count: 10,
-                query: (query?.length && query) || undefined,
-            },
-        },
-        fetchPolicy: 'no-cache',
-    });
-
-    useEffect(() => {
-        const timestamp = Date.now();
-        const lessThanStatus = { field: 'expiresAt', values: [`${timestamp}`], condition: 'LESS_THAN' };
-        if (canManageToken) {
-            const newFilters: any = owner && owner !== 'All' ? [{ field: 'ownerUrn', values: [owner] }] : [];
-            if (statusFilter === StatusType.EXPIRED) {
-                newFilters.push(lessThanStatus);
-            }
-            setFilters(newFilters);
-        } else if (filters && statusFilter === StatusType.EXPIRED) {
-            const currentUserFilters: any = [...filters];
-            currentUserFilters.push(lessThanStatus);
-            setFilters(currentUserFilters);
-        } else if (filters) {
-            setFilters(filters.filter((filter) => filter?.field !== 'expiresAt'));
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [canManageToken, owner, statusFilter]);
-
-    const renderSearchResult = (entity: any) => {
-        const { editableProperties } = entity;
-        const displayNameSearchResult = entityRegistry.getDisplayName(EntityType.CorpUser, entity);
-        const avatarUrl = editableProperties?.pictureLink || undefined;
-        return (
-            <Select.Option value={entity.urn} key={entity.urn}>
-                <OwnerLabel name={displayNameSearchResult} avatarUrl={avatarUrl} type={entity.type} />
-            </Select.Option>
-        );
-    };
-    const ownerResult = usersData?.listUsers?.users;
-
-    const ownerSearchOptions = ownerResult?.map((result) => {
-        return renderSearchResult(result);
-    });
-
-    const totalTokens = tokensData?.listAccessTokens?.total || 0;
-    const tokens = useMemo(() => tokensData?.listAccessTokens?.tokens || [], [tokensData]);
-    const filteredTokens = tokens.filter((token) => !removedTokens.includes(token.id));
-
-    const [revokeAccessToken, { error: revokeTokenError }] = useRevokeAccessTokenMutation();
-
-    // Revoke token Handler
-    const onRemoveToken = (token: any) => {
-        Modal.confirm({
-            title: 'Are you sure you want to revoke this token?',
-            content: `Anyone using this token will no longer be able to access the DataHub API. You cannot undo this action.`,
-            onOk() {
-                // Hack to deal with eventual consistency.
-                const newTokenIds = [...removedTokens, token.id];
-                setRemovedTokens(newTokenIds);
-
-                revokeAccessToken({ variables: { tokenId: token.id } })
-                    .then(({ errors }) => {
-                        if (!errors) {
-                            analytics.event({ type: EventType.RevokeAccessTokenEvent });
-                        }
-                    })
-                    .catch((e) => {
-                        message.destroy();
-                        message.error({ content: `Failed to revoke Token!: \n ${e.message || ''}`, duration: 3 });
-                    })
-                    .finally(() => {
-                        setTimeout(() => {
-                            tokensRefetch?.();
-                        }, 3000);
-                    });
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    const tableData = filteredTokens?.map((token) => ({
-        urn: token.urn,
-        type: token.type,
-        id: token.id,
-        name: token.name,
-        description: token.description,
-        actorUrn: token.actorUrn,
-        ownerUrn: token.ownerUrn,
-        createdAt: token.createdAt,
-        expiresAt: token.expiresAt,
-    }));
-
-    const tableColumns = [
-        {
-            title: 'Name',
-            dataIndex: 'name',
-            key: 'name',
-            render: (name: string) => <b>{name}</b>,
-        },
-        {
-            title: 'Description',
-            dataIndex: 'description',
-            key: 'description',
-            render: (description: string) => description || '',
-        },
-        {
-            title: 'Expires At',
-            dataIndex: 'expiresAt',
-            key: 'expiresAt',
-            render: (expiresAt: string) => {
-                if (expiresAt === null) return <NeverExpireText>Never</NeverExpireText>;
-                const localeTimezone = getLocaleTimezone();
-                const formattedExpireAt = new Date(expiresAt);
-                return (
-                    <span>{`${formattedExpireAt.toLocaleDateString()} at ${formattedExpireAt.toLocaleTimeString()} (${localeTimezone})`}</span>
-                );
-            },
-        },
-        {
-            title: 'Owner',
-            dataIndex: 'ownerUrn',
-            key: 'ownerUrn',
-            render: (ownerUrn: string) => {
-                if (!ownerUrn) return '';
-                const displayName = ownerUrn?.replace('urn:li:corpuser:', '');
-                const link = `/user/${ownerUrn}/owner of`;
-                const ownerName = displayName || '';
-                return <a href={link}>{ownerName}</a>;
-            },
-        },
-        {
-            title: '',
-            dataIndex: '',
-            key: 'x',
-            render: (_, record: any) => (
-                <ActionButtonContainer>
-                    <Button
-                        onClick={() => onRemoveToken(record)}
-                        icon={<DeleteOutlined />}
-                        danger
-                        data-testid="revoke-token-button"
-                    >
-                        Revoke
-                    </Button>
-                </ActionButtonContainer>
-            ),
-        },
-    ];
-
-    const filterColumns = canManageToken ? tableColumns : tableColumns.filter((column) => column.key !== 'ownerUrn');
-
-    const onChangePage = (newPage: number) => {
-        scrollToTop();
-        setPage(newPage);
-    };
-
-    return (
-        <SourceContainer>
-            {tokensLoading && !tokensData && (
-                <Message type="loading" content="Loading tokens..." style={{ marginTop: '10%' }} />
-            )}
-            {tokensError && message.error('Failed to load tokens :(')}
-            {revokeTokenError && message.error('Failed to update the Token :(')}
-            <TokensContainer>
-                <TokensHeaderContainer>
-                    <TokensTitle level={2}>Manage Access Tokens</TokensTitle>
-                    <Typography.Paragraph type="secondary">
-                        Manage Access Tokens for use with DataHub APIs.
-                    </Typography.Paragraph>
-                </TokensHeaderContainer>
-            </TokensContainer>
-            <Divider />
-            {isTokenAuthEnabled === false && (
-                <StyledAlert
-                    type="error"
-                    message={
-                        <span>
-                            <StyledInfoCircleOutlined />
-                            Token based authentication is currently disabled. Contact your DataHub administrator to
-                            enable this feature.
-                        </span>
-                    }
-                />
-            )}
-            <Typography.Title level={5}>Personal Access Tokens</Typography.Title>
-            <PersonTokenDescriptionText type="secondary">
-                Personal Access Tokens allow you to make programmatic requests to DataHub&apos;s APIs. They inherit your
-                privileges and have a finite lifespan. Do not share Personal Access Tokens.
-            </PersonTokenDescriptionText>
-            <TabToolbar>
-                <div>
-                    <Button
-                        type="text"
-                        onClick={() => setIsCreatingToken(true)}
-                        data-testid="add-token-button"
-                        disabled={!canGeneratePersonalAccessTokens}
-                    >
-                        <PlusOutlined /> Generate new token
-                    </Button>
-                </div>
-                <SelectContainer>
-                    {canGeneratePersonalAccessTokens && canManageToken && (
-                        <>
-                            <StyledSelectOwner
-                                showSearch
-                                placeholder="Search for owner"
-                                optionFilterProp="children"
-                                allowClear
-                                filterOption={false}
-                                defaultActiveFirstOption={false}
-                                onSelect={(ownerData: any) => {
-                                    setOwner(ownerData);
-                                }}
-                                onClear={() => {
-                                    setQuery('');
-                                    setOwner('All');
-                                }}
-                                onSearch={(value: string) => {
-                                    setQuery(value.trim());
-                                }}
-                                style={{ width: 200 }}
-                            >
-                                {ownerSearchOptions}
-                            </StyledSelectOwner>
-                        </>
-                    )}
-                    {canGeneratePersonalAccessTokens && (
-                        <StyledSelect
-                            value={statusFilter}
-                            onChange={(selection) => setStatusFilter(selection as StatusType)}
-                            style={{ width: 100 }}
-                        >
-                            <Select.Option value={StatusType.ALL} key="ALL">
-                                All
-                            </Select.Option>
-                            <Select.Option value={StatusType.EXPIRED} key="EXPIRED">
-                                Expired
-                            </Select.Option>
-                        </StyledSelect>
-                    )}
-                </SelectContainer>
-            </TabToolbar>
-            <StyledTable
-                columns={filterColumns}
-                dataSource={tableData}
-                rowKey="urn"
-                locale={{
-                    emptyText: <Empty description="No Access Tokens!" image={Empty.PRESENTED_IMAGE_SIMPLE} />,
-                }}
-                pagination={false}
-            />
-            <PaginationContainer>
-                <Pagination
-                    style={{ margin: 40 }}
-                    current={page}
-                    pageSize={pageSize}
-                    total={totalTokens}
-                    showLessItems
-                    onChange={onChangePage}
-                    showSizeChanger={false}
-                />
-            </PaginationContainer>
-            <CreateTokenModal
-                currentUserUrn={currentUserUrn}
-                open={isCreatingToken}
-                onClose={() => setIsCreatingToken(false)}
-                onCreateToken={() => {
-                    // Hack to deal with eventual consistency.
-                    setTimeout(() => {
-                        tokensRefetch?.();
-                    }, 3000);
-                }}
-            />
-        </SourceContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/settings/CreateTokenModal.tsx b/datahub-web-react/src/app/settings/CreateTokenModal.tsx
deleted file mode 100644
index 8045315b427819..00000000000000
--- a/datahub-web-react/src/app/settings/CreateTokenModal.tsx
+++ /dev/null
@@ -1,203 +0,0 @@
-import { red } from '@ant-design/colors';
-import { Button, Form, Input, Modal, Select, Typography, message } from 'antd';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import analytics, { EventType } from '@app/analytics';
-import { AccessTokenModal } from '@app/settings/AccessTokenModal';
-import { ACCESS_TOKEN_DURATIONS, getTokenExpireDate } from '@app/settings/utils';
-import { useEnterKeyListener } from '@app/shared/useEnterKeyListener';
-
-import { useCreateAccessTokenMutation } from '@graphql/auth.generated';
-import { AccessTokenDuration, AccessTokenType, CreateAccessTokenInput } from '@types';
-
-type Props = {
-    currentUserUrn: string;
-    open: boolean;
-    onClose: () => void;
-    onCreateToken: () => void;
-};
-
-type FormProps = {
-    name: string;
-    description?: string;
-    duration: AccessTokenDuration;
-};
-
-const ExpirationSelectContainer = styled.div`
-    padding: 1px;
-`;
-
-const ExpirationDurationSelect = styled(Select)`
-    && {
-        width: 100%;
-        margin-top: 1em;
-        margin-bottom: 1em;
-    }
-`;
-
-const OptionText = styled.span<{ isRed: boolean }>`
-    ${(props) => props.isRed && `color: ${red[5]};`}
-`;
-
-export default function CreateTokenModal({ currentUserUrn, open, onClose, onCreateToken }: Props) {
-    const [selectedTokenDuration, setSelectedTokenDuration] = useState<AccessTokenDuration | null>(null);
-
-    const [showModal, setShowModal] = useState(false);
-    const [createButtonEnabled, setCreateButtonEnabled] = useState(true);
-
-    const [createAccessToken, { data }] = useCreateAccessTokenMutation();
-
-    const [form] = Form.useForm<FormProps>();
-
-    // Check and show the modal once the data for createAccessToken will generate
-    useEffect(() => {
-        if (data && data.createAccessToken?.accessToken) {
-            setShowModal(true);
-        }
-    }, [data, setShowModal]);
-
-    // Function to handle the close or cross button of Access Token Modal
-    const onDetailModalClose = () => {
-        setSelectedTokenDuration(null);
-        setShowModal(false);
-        onClose();
-    };
-
-    // Function to handle the close or cross button of Create Token Modal
-    const onModalClose = () => {
-        form.resetFields();
-        onClose();
-    };
-
-    const onCreateNewToken = () => {
-        const { duration, name, description } = form.getFieldsValue();
-        const input: CreateAccessTokenInput = {
-            actorUrn: currentUserUrn,
-            type: AccessTokenType.Personal,
-            duration,
-            name,
-            description,
-        };
-        createAccessToken({ variables: { input } })
-            .then(({ errors }) => {
-                if (!errors) {
-                    setSelectedTokenDuration(duration);
-                    analytics.event({
-                        type: EventType.CreateAccessTokenEvent,
-                        accessTokenType: AccessTokenType.Personal,
-                        duration,
-                    });
-                }
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to create Token!: \n ${e.message || ''}`, duration: 3 });
-            })
-            .finally(() => {
-                onCreateToken();
-            });
-        onModalClose();
-    };
-
-    const accessToken = data && data.createAccessToken?.accessToken;
-    const selectedExpiresInText = selectedTokenDuration && getTokenExpireDate(selectedTokenDuration);
-
-    // Handle the Enter press
-    useEnterKeyListener({
-        querySelectorToExecuteClick: '#createTokenButton',
-    });
-
-    const hasSelectedNoExpiration = selectedTokenDuration === AccessTokenDuration.NoExpiry;
-
-    return (
-        <>
-            <Modal
-                title="Create new Token"
-                open={open}
-                onCancel={onModalClose}
-                footer={
-                    <>
-                        <Button onClick={onModalClose} type="text" data-testid="cancel-create-access-token-button">
-                            Cancel
-                        </Button>
-                        <Button
-                            id="createTokenButton"
-                            onClick={onCreateNewToken}
-                            disabled={createButtonEnabled}
-                            data-testid="create-access-token-button"
-                        >
-                            Create
-                        </Button>
-                    </>
-                }
-            >
-                <Form
-                    form={form}
-                    initialValues={{ duration: ACCESS_TOKEN_DURATIONS[2].duration }}
-                    layout="vertical"
-                    onFieldsChange={() =>
-                        setCreateButtonEnabled(form.getFieldsError().some((field) => field.errors.length > 0))
-                    }
-                >
-                    <Form.Item label={<Typography.Text strong>Name</Typography.Text>}>
-                        <Typography.Paragraph>Give your new token a name. </Typography.Paragraph>
-                        <Form.Item
-                            name="name"
-                            rules={[
-                                {
-                                    required: true,
-                                    message: 'Enter a token name.',
-                                },
-                                { whitespace: true },
-                                { min: 1, max: 50 },
-                            ]}
-                            hasFeedback
-                        >
-                            <Input placeholder="A name for your token" data-testid="create-access-token-name" />
-                        </Form.Item>
-                    </Form.Item>
-                    <Form.Item label={<Typography.Text strong>Description</Typography.Text>}>
-                        <Typography.Paragraph>An optional description for your new token.</Typography.Paragraph>
-                        <Form.Item name="description" rules={[{ whitespace: true }, { min: 1, max: 500 }]} hasFeedback>
-                            <Input
-                                placeholder="A description for your token"
-                                data-testid="create-access-token-description"
-                            />
-                        </Form.Item>
-                    </Form.Item>
-                    <ExpirationSelectContainer>
-                        <Typography.Text strong>Expires in</Typography.Text>
-                        <Form.Item name="duration" data-testid="create-access-token-duration" noStyle>
-                            <ExpirationDurationSelect>
-                                {ACCESS_TOKEN_DURATIONS.map((duration) => (
-                                    <Select.Option key={duration.text} value={duration.duration}>
-                                        <OptionText isRed={duration.duration === AccessTokenDuration.NoExpiry}>
-                                            {duration.text}
-                                        </OptionText>
-                                    </Select.Option>
-                                ))}
-                            </ExpirationDurationSelect>
-                        </Form.Item>
-                        <Form.Item shouldUpdate={(prev, cur) => prev.duration !== cur.duration} noStyle>
-                            {({ getFieldValue }) => (
-                                <Typography.Text
-                                    type="secondary"
-                                    style={hasSelectedNoExpiration ? { color: `${red[5]}` } : {}}
-                                >
-                                    {getFieldValue('duration') && getTokenExpireDate(getFieldValue('duration'))}
-                                </Typography.Text>
-                            )}
-                        </Form.Item>
-                    </ExpirationSelectContainer>
-                </Form>
-            </Modal>
-            <AccessTokenModal
-                open={showModal}
-                onClose={onDetailModalClose}
-                accessToken={accessToken || ''}
-                expiresInText={selectedExpiresInText || ''}
-            />
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/settings/Preferences.tsx b/datahub-web-react/src/app/settings/Preferences.tsx
deleted file mode 100644
index 05691499f91464..00000000000000
--- a/datahub-web-react/src/app/settings/Preferences.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-import { Card, Divider, Switch, Typography, message } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import analytics, { EventType } from '@app/analytics';
-import { useUserContext } from '@app/context/useUserContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { useIsThemeV2, useIsThemeV2EnabledForUser, useIsThemeV2Toggleable } from '@app/useIsThemeV2';
-
-import { useUpdateUserSettingMutation } from '@graphql/me.generated';
-import { UserSetting } from '@types';
-
-const Page = styled.div`
-    width: 100%;
-    display: flex;
-    justify-content: center;
-`;
-
-const SourceContainer = styled.div`
-    width: 80%;
-    padding-top: 20px;
-    padding-right: 40px;
-    padding-left: 40px;
-`;
-
-const TokensContainer = styled.div`
-    padding-top: 0px;
-`;
-
-const TokensHeaderContainer = styled.div`
-    && {
-        padding-left: 0px;
-    }
-`;
-
-const TokensTitle = styled(Typography.Title)`
-    && {
-        margin-bottom: 8px;
-    }
-`;
-
-const UserSettingRow = styled.div`
-    display: flex;
-    justify-content: space-between;
-`;
-
-const DescriptionText = styled(Typography.Text)`
-    color: ${ANTD_GRAY[7]};
-    font-size: 11px;
-`;
-
-const SettingText = styled(Typography.Text)`
-    font-size: 14px;
-`;
-
-export const Preferences = () => {
-    // Current User Urn
-    const { user, refetchUser } = useUserContext();
-    const isThemeV2 = useIsThemeV2();
-    const [isThemeV2Toggleable] = useIsThemeV2Toggleable();
-    const [isThemeV2EnabledForUser] = useIsThemeV2EnabledForUser();
-    const showSimplifiedHomepage = !!user?.settings?.appearance?.showSimplifiedHomepage;
-
-    const [updateUserSettingMutation] = useUpdateUserSettingMutation();
-
-    const showSimplifiedHomepageSetting = !isThemeV2;
-
-    return (
-        <Page>
-            <SourceContainer>
-                <TokensContainer>
-                    <TokensHeaderContainer>
-                        <TokensTitle level={2}>Appearance</TokensTitle>
-                        <Typography.Paragraph type="secondary">Manage your appearance settings.</Typography.Paragraph>
-                    </TokensHeaderContainer>
-                </TokensContainer>
-                <Divider />
-                {showSimplifiedHomepageSetting && (
-                    <Card>
-                        <UserSettingRow>
-                            <span>
-                                <SettingText>Show simplified homepage </SettingText>
-                                <div>
-                                    <DescriptionText>
-                                        Limits entity browse cards on homepage to Domains, Charts, Datasets, Dashboards
-                                        and Glossary Terms
-                                    </DescriptionText>
-                                </div>
-                            </span>
-                            <Switch
-                                checked={showSimplifiedHomepage}
-                                onChange={async () => {
-                                    await updateUserSettingMutation({
-                                        variables: {
-                                            input: {
-                                                name: UserSetting.ShowSimplifiedHomepage,
-                                                value: !showSimplifiedHomepage,
-                                            },
-                                        },
-                                    });
-                                    analytics.event({
-                                        type: showSimplifiedHomepage
-                                            ? EventType.ShowStandardHomepageEvent
-                                            : EventType.ShowSimplifiedHomepageEvent,
-                                    });
-                                    message.success({ content: 'Setting updated!', duration: 2 });
-                                    refetchUser?.();
-                                }}
-                            />
-                        </UserSettingRow>
-                    </Card>
-                )}
-                {isThemeV2Toggleable && (
-                    <>
-                        <Card style={{ marginTop: 20 }}>
-                            <UserSettingRow>
-                                <span>
-                                    <SettingText>Try New User Experience</SettingText>
-                                    <div>
-                                        <DescriptionText>
-                                            Enable an early preview of the new DataHub UX - a complete makeover for your
-                                            app with a sleek new design and advanced features. Flip the switch and
-                                            refresh your browser to try it out!
-                                        </DescriptionText>
-                                    </div>
-                                </span>
-                                <Switch
-                                    checked={isThemeV2EnabledForUser}
-                                    onChange={async () => {
-                                        await updateUserSettingMutation({
-                                            variables: {
-                                                input: {
-                                                    name: UserSetting.ShowThemeV2,
-                                                    value: !isThemeV2EnabledForUser,
-                                                },
-                                            },
-                                        });
-                                        // clicking this button toggles, so event is whatever is opposite to what isThemeV2EnabledForUser currently is
-                                        analytics.event({
-                                            type: isThemeV2EnabledForUser
-                                                ? EventType.RevertV2ThemeEvent
-                                                : EventType.ShowV2ThemeEvent,
-                                        });
-                                        message.success({ content: 'Setting updated!', duration: 2 });
-                                        refetchUser?.();
-                                    }}
-                                />
-                            </UserSettingRow>
-                        </Card>
-                    </>
-                )}
-                {!showSimplifiedHomepageSetting && !isThemeV2Toggleable && (
-                    <div style={{ color: ANTD_GRAY[7] }}>No appearance settings found.</div>
-                )}
-            </SourceContainer>
-        </Page>
-    );
-};
diff --git a/datahub-web-react/src/app/settings/SettingsPage.tsx b/datahub-web-react/src/app/settings/SettingsPage.tsx
deleted file mode 100644
index 21ec0afa55d6f3..00000000000000
--- a/datahub-web-react/src/app/settings/SettingsPage.tsx
+++ /dev/null
@@ -1,211 +0,0 @@
-import {
-    BankOutlined,
-    ControlOutlined,
-    FilterOutlined,
-    PushpinOutlined,
-    SafetyCertificateOutlined,
-    TeamOutlined,
-    ToolOutlined,
-    UsergroupAddOutlined,
-} from '@ant-design/icons';
-import { Divider, Menu, Typography } from 'antd';
-import React from 'react';
-import { Redirect, Route, Switch, useHistory, useLocation, useRouteMatch } from 'react-router';
-import styled from 'styled-components';
-
-import { useUserContext } from '@app/context/useUserContext';
-import { ManageOwnership } from '@app/entity/ownership/ManageOwnership';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { ManageViews } from '@app/entity/view/ManageViews';
-import { ManageIdentities } from '@app/identity/ManageIdentities';
-import { ManagePermissions } from '@app/permissions/ManagePermissions';
-import { AccessTokens } from '@app/settings/AccessTokens';
-import { Preferences } from '@app/settings/Preferences';
-import { Features } from '@app/settings/features/Features';
-import ManagePosts from '@app/settings/posts/ManagePosts';
-import { useAppConfig } from '@app/useAppConfig';
-
-const MenuItem = styled(Menu.Item)`
-    display: flex;
-    align-items: center;
-`;
-
-const PageContainer = styled.div`
-    display: flex;
-    overflow: auto;
-    flex: 1;
-`;
-
-const SettingsBarContainer = styled.div`
-    padding-top: 20px;
-    border-right: 1px solid ${ANTD_GRAY[5]};
-    display: flex;
-    flex-direction: column;
-`;
-
-const SettingsBarHeader = styled.div`
-    && {
-        padding-left: 24px;
-    }
-    margin-bottom: 20px;
-`;
-
-const PageTitle = styled(Typography.Title)`
-    && {
-        margin-bottom: 8px;
-    }
-`;
-
-const ThinDivider = styled(Divider)`
-    padding: 0px;
-    margin: 0px;
-`;
-
-const ItemTitle = styled.span`
-    margin-left: 8px;
-`;
-
-const menuStyle = { width: 256, 'margin-top': 8, overflow: 'hidden auto' };
-
-const NewTag = styled.span`
-    padding: 4px 8px;
-    margin-left: 8px;
-
-    border-radius: 24px;
-    background: #f1fbfe;
-
-    color: #09739a;
-    font-size: 12px;
-`;
-
-/**
- * URL Paths for each settings page.
- */
-const PATHS = [
-    { path: 'tokens', content: <AccessTokens /> },
-    { path: 'identities', content: <ManageIdentities version="v1" /> },
-    { path: 'permissions', content: <ManagePermissions /> },
-    { path: 'preferences', content: <Preferences /> },
-    { path: 'views', content: <ManageViews /> },
-    { path: 'ownership', content: <ManageOwnership /> },
-    { path: 'posts', content: <ManagePosts /> },
-    { path: 'features', content: <Features /> },
-];
-
-/**
- * The default selected path
- */
-const DEFAULT_PATH = PATHS[0];
-
-export const SettingsPage = () => {
-    const { path, url } = useRouteMatch();
-    const { pathname } = useLocation();
-
-    const history = useHistory();
-    const subRoutes = PATHS.map((p) => p.path.replace('/', ''));
-    const currPathName = pathname.replace(path, '');
-    const trimmedPathName = currPathName.endsWith('/') ? pathname.slice(0, pathname.length - 1) : currPathName;
-    const splitPathName = trimmedPathName.split('/');
-    const providedPath = splitPathName[1];
-    const activePath = subRoutes.includes(providedPath) ? providedPath : DEFAULT_PATH.path.replace('/', '');
-
-    const me = useUserContext();
-    const { config } = useAppConfig();
-
-    const isPoliciesEnabled = config?.policiesConfig?.enabled;
-    const isIdentityManagementEnabled = config?.identityManagementConfig?.enabled;
-    const isViewsEnabled = config?.viewsConfig?.enabled;
-    const { readOnlyModeEnabled } = config.featureFlags;
-
-    const showPolicies = (isPoliciesEnabled && me && me?.platformPrivileges?.managePolicies) || false;
-    const showUsersGroups = (isIdentityManagementEnabled && me && me?.platformPrivileges?.manageIdentities) || false;
-    const showViews = isViewsEnabled || false;
-    const showOwnershipTypes = me && me?.platformPrivileges?.manageOwnershipTypes;
-    const showHomePagePosts = me && me?.platformPrivileges?.manageGlobalAnnouncements && !readOnlyModeEnabled;
-    const showFeatures = me?.platformPrivileges?.manageIngestion; // TODO: Add feature flag for this
-
-    return (
-        <PageContainer>
-            <SettingsBarContainer>
-                <SettingsBarHeader>
-                    <PageTitle level={3}>Settings</PageTitle>
-                    <Typography.Paragraph type="secondary">Manage your DataHub settings.</Typography.Paragraph>
-                </SettingsBarHeader>
-                <ThinDivider />
-                <Menu
-                    selectable={false}
-                    mode="inline"
-                    style={menuStyle}
-                    selectedKeys={[activePath]}
-                    onClick={(newPath) => {
-                        history.replace(`${url}/${newPath.key}`);
-                    }}
-                >
-                    <Menu.ItemGroup title="Developer">
-                        <Menu.Item key="tokens">
-                            <SafetyCertificateOutlined />
-                            <ItemTitle>Access Tokens</ItemTitle>
-                        </Menu.Item>
-                    </Menu.ItemGroup>
-                    {(showPolicies || showUsersGroups) && (
-                        <Menu.ItemGroup title="Access">
-                            {showUsersGroups && (
-                                <Menu.Item key="identities">
-                                    <UsergroupAddOutlined />
-                                    <ItemTitle>Users & Groups</ItemTitle>
-                                </Menu.Item>
-                            )}
-                            {showPolicies && (
-                                <Menu.Item key="permissions">
-                                    <BankOutlined />
-                                    <ItemTitle>Permissions</ItemTitle>
-                                </Menu.Item>
-                            )}
-                        </Menu.ItemGroup>
-                    )}
-                    {(showViews || showOwnershipTypes || showHomePagePosts || showFeatures) && (
-                        <Menu.ItemGroup title="Manage">
-                            {showFeatures && (
-                                <MenuItem key="features">
-                                    <ControlOutlined />
-                                    <ItemTitle>Features</ItemTitle>
-                                    <NewTag>New!</NewTag>
-                                </MenuItem>
-                            )}
-                            {showViews && (
-                                <Menu.Item key="views">
-                                    <FilterOutlined /> <ItemTitle>My Views</ItemTitle>
-                                </Menu.Item>
-                            )}
-                            {showOwnershipTypes && (
-                                <Menu.Item key="ownership">
-                                    <TeamOutlined /> <ItemTitle>Ownership Types</ItemTitle>
-                                </Menu.Item>
-                            )}
-                            {showHomePagePosts && (
-                                <Menu.Item key="posts">
-                                    <PushpinOutlined /> <ItemTitle>Home Page Posts</ItemTitle>
-                                </Menu.Item>
-                            )}
-                        </Menu.ItemGroup>
-                    )}
-
-                    <Menu.ItemGroup title="Preferences">
-                        <Menu.Item key="preferences">
-                            <ToolOutlined />
-                            <ItemTitle>Appearance</ItemTitle>
-                        </Menu.Item>
-                    </Menu.ItemGroup>
-                </Menu>
-            </SettingsBarContainer>
-            <Switch>
-                <Route exact path={path}>
-                    <Redirect to={`${pathname}${pathname.endsWith('/') ? '' : '/'}${DEFAULT_PATH.path}`} />
-                </Route>
-                {PATHS.map((p) => (
-                    <Route path={`${path}/${p.path.replace('/', '')}`} render={() => p.content} key={p.path} />
-                ))}
-            </Switch>
-        </PageContainer>
-    );
-};
diff --git a/datahub-web-react/src/app/settings/features/Feature.tsx b/datahub-web-react/src/app/settings/features/Feature.tsx
deleted file mode 100644
index da8fab65749bda..00000000000000
--- a/datahub-web-react/src/app/settings/features/Feature.tsx
+++ /dev/null
@@ -1,183 +0,0 @@
-import { ArrowRightOutlined } from '@ant-design/icons';
-import { Button, Card, Divider, Switch, Tooltip, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-const Title = styled(Typography.Title)`
-    && {
-        margin-bottom: 8px;
-    }
-`;
-
-const FeatureRow = styled.div`
-    display: flex;
-    align-items: flex-start;
-    justify-content: space-between;
-`;
-
-const FeatureOptionRow = styled.div`
-    display: flex;
-    justify-content: space-between;
-
-    &:not(:last-child) {
-        margin-bottom: 8px;
-    }
-`;
-
-const SettingsOptionRow = styled.div`
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 16px;
-
-    &:not(:last-child) {
-        margin-bottom: 8px;
-    }
-`;
-
-const DescriptionText = styled(Typography.Text)`
-    color: ${ANTD_GRAY[7]};
-    font-size: 11px;
-`;
-
-const SettingTitle = styled.div`
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    font-size: 14px;
-    margin-bottom: 4px;
-`;
-
-const OptionTitle = styled(Typography.Text)`
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    font-size: 12px;
-`;
-
-const learnMoreLinkStyle = {
-    flex: 1,
-    display: 'flex',
-    alignItems: 'center',
-    gap: '8px',
-    color: '#1890FF',
-    fontSize: '12px',
-    cursor: 'pointer',
-};
-
-const NewTag = styled.div`
-    padding: 4px 8px;
-
-    border-radius: 24px;
-    background: #f1fbfe;
-
-    color: #09739a;
-    font-size: 12px;
-`;
-
-const DataHubOnlyTag = styled.div`
-    padding: 2px 8px;
-
-    border-radius: 24px;
-    background: #c9fff2;
-
-    color: #50a494;
-    font-size: 12px;
-`;
-
-export interface FeatureType {
-    key: string;
-    title: string;
-    description: string;
-    settings: Array<{
-        key: string;
-        title: string;
-        isAvailable: boolean;
-        buttonText: string;
-        onClick?: () => void;
-    }>;
-    options: Array<{
-        key: string;
-        title: string;
-        description: string;
-        isAvailable: boolean;
-        isDisabled: boolean;
-        disabledMessage?: string;
-        checked: boolean;
-        onChange?: (checked: boolean) => void;
-    }>;
-    isNew: boolean;
-    learnMoreLink?: string;
-}
-
-export const Feature = ({ key, title, description, settings, options, isNew, learnMoreLink }: FeatureType) => (
-    <Card style={{ marginBottom: '1rem' }} key={key}>
-        <FeatureRow>
-            <div style={{ flex: 1 }}>
-                <SettingTitle>
-                    <Title level={5} style={{ marginBottom: 0 }}>
-                        {title}
-                    </Title>
-                    {isNew && <NewTag>New!</NewTag>}
-                </SettingTitle>
-                <div>
-                    <Typography.Paragraph type="secondary">{description}</Typography.Paragraph>
-                </div>
-            </div>
-            <div>
-                {learnMoreLink && (
-                    <a href={learnMoreLink} target="_blank" style={learnMoreLinkStyle} rel="noreferrer">
-                        Learn more <ArrowRightOutlined />
-                    </a>
-                )}
-            </div>
-        </FeatureRow>
-        <Divider style={{ margin: `8px 0 24px 0` }} />
-        <Card style={{ margin: `16px auto` }}>
-            {options.map((option, index) => (
-                <>
-                    <FeatureOptionRow key={option.key}>
-                        <span>
-                            <OptionTitle>
-                                <span>{option.title}</span>
-                                {!option.isAvailable && (
-                                    <DataHubOnlyTag>Only available on DataHub Cloud</DataHubOnlyTag>
-                                )}
-                            </OptionTitle>
-                            <div>
-                                <DescriptionText>{option.description}</DescriptionText>
-                            </div>
-                        </span>
-                        <Tooltip title={option.disabledMessage}>
-                            <Switch
-                                checked={option.checked}
-                                onChange={(checked) => (option.onChange ? option.onChange(checked) : null)}
-                                disabled={!option.isAvailable || option.isDisabled}
-                            />
-                        </Tooltip>
-                    </FeatureOptionRow>
-                    {index !== options.length - 1 && <Divider />}
-                </>
-            ))}
-        </Card>
-        {settings.map((option) => (
-            <>
-                <SettingsOptionRow key={option.key}>
-                    <span>
-                        <OptionTitle>
-                            <span>{option.title}</span>
-                            <DataHubOnlyTag>Only available on DataHub Cloud</DataHubOnlyTag>
-                        </OptionTitle>
-                    </span>
-                    <Tooltip title={option.isAvailable ? '' : 'Only available on DataHub Cloud'}>
-                        <Button onClick={option.onClick} disabled={!option.isAvailable}>
-                            {option.buttonText}
-                        </Button>
-                    </Tooltip>
-                </SettingsOptionRow>
-            </>
-        ))}
-    </Card>
-);
diff --git a/datahub-web-react/src/app/settings/features/Features.tsx b/datahub-web-react/src/app/settings/features/Features.tsx
deleted file mode 100644
index 3bd1a088e396f3..00000000000000
--- a/datahub-web-react/src/app/settings/features/Features.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import { Divider, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-import { v4 as uuidv4 } from 'uuid';
-
-import { Feature, FeatureType } from '@app/settings/features/Feature';
-import {
-    useGetDocPropagationSettings,
-    useUpdateDocPropagationSettings,
-} from '@app/settings/features/useDocPropagationSettings';
-
-const Page = styled.div`
-    width: 100%;
-    display: flex;
-    justify-content: center;
-`;
-
-const SourceContainer = styled.div`
-    width: 80%;
-    padding-top: 20px;
-    padding-right: 40px;
-    padding-left: 40px;
-`;
-const Container = styled.div`
-    padding-top: 0px;
-`;
-
-const Title = styled(Typography.Title)`
-    && {
-        margin-bottom: 8px;
-    }
-`;
-
-export const Features = () => {
-    /*
-     * Note: When adding new features, make sure to update the features array below
-     * and create a hook file for the new feature in the same directory
-     */
-
-    // Hooks to get and update the document propagation settings
-    const { isColPropagateChecked, setIsColPropagateChecked } = useGetDocPropagationSettings();
-    const { updateDocPropagation } = useUpdateDocPropagationSettings();
-
-    // Features to display
-    const features: FeatureType[] = [
-        {
-            key: uuidv4(),
-            title: 'Documentation Propagation',
-            description: 'Automatically propagate documentation from upstream to downstream columns and assets.',
-            settings: [
-                {
-                    key: uuidv4(),
-                    title: 'Rollback Propagation Changes',
-                    isAvailable: false,
-                    buttonText: 'Rollback',
-                },
-                {
-                    key: uuidv4(),
-                    title: 'Backfill existing documentation from upstream to downstream columns/assets',
-                    isAvailable: false,
-                    buttonText: 'Initialize',
-                },
-            ],
-            options: [
-                {
-                    key: uuidv4(),
-                    title: 'Column Level Propagation',
-                    description:
-                        'Propagate new documentation from upstream to downstream columns based on column-level lineage relationships.',
-                    isAvailable: true,
-                    checked: isColPropagateChecked,
-                    onChange: (checked: boolean) => {
-                        setIsColPropagateChecked(checked);
-                        updateDocPropagation(checked);
-                    },
-                    isDisabled: false,
-                    disabledMessage: undefined,
-                },
-                {
-                    key: uuidv4(),
-                    title: 'Asset Level Propagation',
-                    description:
-                        'Propagate new documentation from upstream to downstream assets based on data lineage relationships.',
-                    checked: false,
-                    onChange: (_: boolean) => null,
-                    isAvailable: true,
-                    isDisabled: true,
-                    disabledMessage: 'Coming soon!',
-                },
-            ],
-            isNew: true,
-            learnMoreLink:
-                'https://docs.datahub.com/docs/automations/docs-propagation?utm_source=datahub_core&utm_medium=docs&utm_campaign=features',
-        },
-    ];
-
-    // Render
-    return (
-        <Page>
-            <SourceContainer>
-                <Container>
-                    <div>
-                        <Title level={2}>Features</Title>
-                        <Typography.Paragraph type="secondary">
-                            Explore and configure specific features
-                        </Typography.Paragraph>
-                    </div>
-                </Container>
-                <Divider />
-                {features.map((feature) => (
-                    <Feature {...feature} />
-                ))}
-            </SourceContainer>
-        </Page>
-    );
-};
diff --git a/datahub-web-react/src/app/settings/features/useDocPropagationSettings.ts b/datahub-web-react/src/app/settings/features/useDocPropagationSettings.ts
deleted file mode 100644
index b5aa4123f94b02..00000000000000
--- a/datahub-web-react/src/app/settings/features/useDocPropagationSettings.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { message } from 'antd';
-import { useEffect, useState } from 'react';
-
-import { useGetDocPropagationSettingsQuery, useUpdateDocPropagationSettingsMutation } from '@graphql/app.generated';
-
-// Hook to get the document propagation settings & manage state
-export const useGetDocPropagationSettings = () => {
-    const { data, refetch } = useGetDocPropagationSettingsQuery();
-    const [isColPropagateChecked, setIsColPropagateChecked] = useState<boolean>(false);
-
-    useEffect(() => {
-        const docPropSetting = data?.docPropagationSettings?.docColumnPropagation;
-        if (docPropSetting !== undefined) setIsColPropagateChecked(!!docPropSetting);
-    }, [data]);
-
-    return {
-        isColPropagateChecked,
-        setIsColPropagateChecked,
-        refetch,
-    };
-};
-
-// Hook to update the document propagation settings
-export const useUpdateDocPropagationSettings = () => {
-    const [updateDocPropagationSettings] = useUpdateDocPropagationSettingsMutation();
-    const { refetch } = useGetDocPropagationSettingsQuery();
-
-    const updateDocPropagation = async (checked: boolean) => {
-        try {
-            await updateDocPropagationSettings({
-                variables: {
-                    input: {
-                        docColumnPropagation: checked,
-                    },
-                },
-            });
-            refetch();
-            message.success('Successfully updated documentation propagation settings');
-        } catch (e) {
-            message.error('Failed to update documentation propagation settings');
-            refetch();
-        }
-    };
-
-    return { updateDocPropagation };
-};
diff --git a/datahub-web-react/src/app/settings/posts/CreatePostForm.tsx b/datahub-web-react/src/app/settings/posts/CreatePostForm.tsx
deleted file mode 100644
index 841a872b32f71a..00000000000000
--- a/datahub-web-react/src/app/settings/posts/CreatePostForm.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import { Form, FormInstance, Input, Radio, Typography } from 'antd';
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import {
-    DESCRIPTION_FIELD_NAME,
-    LINK_FIELD_NAME,
-    LOCATION_FIELD_NAME,
-    TITLE_FIELD_NAME,
-    TYPE_FIELD_NAME,
-} from '@app/settings/posts/constants';
-
-import { PostContentType } from '@types';
-
-const TopFormItem = styled(Form.Item)`
-    margin-bottom: 24px;
-`;
-
-const SubFormItem = styled(Form.Item)`
-    margin-bottom: 0;
-`;
-
-type Props = {
-    setCreateButtonEnabled: (isEnabled: boolean) => void;
-    form: FormInstance;
-    contentType: PostContentType;
-};
-
-export default function CreatePostForm({ setCreateButtonEnabled, form, contentType }: Props) {
-    const [postType, setPostType] = useState<PostContentType>(PostContentType.Text);
-
-    useEffect(() => {
-        if (contentType) {
-            setPostType(contentType);
-        }
-    }, [contentType]);
-
-    return (
-        <Form
-            form={form}
-            initialValues={{}}
-            layout="vertical"
-            onFieldsChange={() => {
-                setCreateButtonEnabled(!form.getFieldsError().some((field) => field.errors.length > 0));
-            }}
-        >
-            <TopFormItem name={TYPE_FIELD_NAME} label={<Typography.Text strong>Post Type</Typography.Text>}>
-                <Radio.Group
-                    onChange={(e) => setPostType(e.target.value)}
-                    value={postType}
-                    defaultValue={postType}
-                    optionType="button"
-                    buttonStyle="solid"
-                >
-                    <Radio value={PostContentType.Text}>Announcement</Radio>
-                    <Radio value={PostContentType.Link}>Link</Radio>
-                </Radio.Group>
-            </TopFormItem>
-
-            <TopFormItem label={<Typography.Text strong>Title</Typography.Text>}>
-                <Typography.Paragraph>The title for your new post.</Typography.Paragraph>
-                <SubFormItem name={TITLE_FIELD_NAME} rules={[{ required: true }]} hasFeedback>
-                    <Input data-testid="create-post-title" placeholder="Your post title" />
-                </SubFormItem>
-            </TopFormItem>
-            {postType === PostContentType.Text && (
-                <TopFormItem label={<Typography.Text strong>Description</Typography.Text>}>
-                    <Typography.Paragraph>The main content for your new post.</Typography.Paragraph>
-                    <SubFormItem name={DESCRIPTION_FIELD_NAME} rules={[{ min: 0, max: 500 }]} hasFeedback>
-                        <Input.TextArea placeholder="Your post description" />
-                    </SubFormItem>
-                </TopFormItem>
-            )}
-            {postType === PostContentType.Link && (
-                <>
-                    <TopFormItem label={<Typography.Text strong>Link URL</Typography.Text>}>
-                        <Typography.Paragraph>
-                            Where users will be directed when they click this post.
-                        </Typography.Paragraph>
-                        <SubFormItem name={LINK_FIELD_NAME} rules={[{ type: 'url', warningOnly: true }]} hasFeedback>
-                            <Input data-testid="create-post-link" placeholder="Your post link URL" />
-                        </SubFormItem>
-                    </TopFormItem>
-                    <SubFormItem label={<Typography.Text strong>Image URL</Typography.Text>}>
-                        <Typography.Paragraph>
-                            A URL to an image you want to display on your link post.
-                        </Typography.Paragraph>
-                        <SubFormItem
-                            name={LOCATION_FIELD_NAME}
-                            rules={[{ type: 'url', warningOnly: true }]}
-                            hasFeedback
-                        >
-                            <Input data-testid="create-post-media-location" placeholder="Your post image URL" />
-                        </SubFormItem>
-                    </SubFormItem>
-                </>
-            )}
-        </Form>
-    );
-}
diff --git a/datahub-web-react/src/app/settings/posts/CreatePostModal.tsx b/datahub-web-react/src/app/settings/posts/CreatePostModal.tsx
deleted file mode 100644
index 7a7f5a5ba14c67..00000000000000
--- a/datahub-web-react/src/app/settings/posts/CreatePostModal.tsx
+++ /dev/null
@@ -1,182 +0,0 @@
-import { Button, Form, Modal, message } from 'antd';
-import React, { useEffect, useState } from 'react';
-
-import CreatePostForm from '@app/settings/posts/CreatePostForm';
-import { PostEntry } from '@app/settings/posts/PostsListColumns';
-import {
-    CREATE_POST_BUTTON_ID,
-    DESCRIPTION_FIELD_NAME,
-    LINK_FIELD_NAME,
-    LOCATION_FIELD_NAME,
-    TITLE_FIELD_NAME,
-    TYPE_FIELD_NAME,
-} from '@app/settings/posts/constants';
-import handleGraphQLError from '@app/shared/handleGraphQLError';
-import { useEnterKeyListener } from '@app/shared/useEnterKeyListener';
-
-import { useCreatePostMutation, useUpdatePostMutation } from '@graphql/mutations.generated';
-import { MediaType, PostContentType, PostType } from '@types';
-
-type Props = {
-    editData: PostEntry;
-    onClose: () => void;
-    onCreate: (
-        contentType: string,
-        title: string,
-        description: string | undefined,
-        link: string | undefined,
-        location: string | undefined,
-    ) => void;
-    onEdit: () => void;
-};
-
-export default function CreatePostModal({ onClose, onCreate, editData, onEdit }: Props) {
-    const [createPostMutation] = useCreatePostMutation();
-    const [updatePostMutation] = useUpdatePostMutation();
-    const [createButtonEnabled, setCreateButtonEnabled] = useState(false);
-    const [form] = Form.useForm();
-
-    useEffect(() => {
-        if (editData) {
-            form.setFieldsValue({
-                description: editData.description,
-                title: editData.title,
-                link: editData.link,
-                location: editData.imageUrl,
-                type: editData.contentType,
-            });
-        }
-    }, [editData, form]);
-
-    const onCreatePost = () => {
-        const contentTypeValue = form.getFieldValue(TYPE_FIELD_NAME) ?? PostContentType.Text;
-        const mediaValue =
-            form.getFieldValue(TYPE_FIELD_NAME) && form.getFieldValue(LOCATION_FIELD_NAME)
-                ? {
-                      type: MediaType.Image,
-                      location: form.getFieldValue(LOCATION_FIELD_NAME) ?? null,
-                  }
-                : null;
-        createPostMutation({
-            variables: {
-                input: {
-                    postType: PostType.HomePageAnnouncement,
-                    content: {
-                        contentType: contentTypeValue,
-                        title: form.getFieldValue(TITLE_FIELD_NAME),
-                        description: form.getFieldValue(DESCRIPTION_FIELD_NAME) ?? null,
-                        link: form.getFieldValue(LINK_FIELD_NAME) ?? null,
-                        media: mediaValue,
-                    },
-                },
-            },
-        })
-            .then(({ errors }) => {
-                if (!errors) {
-                    message.success({
-                        content: `Created Post!`,
-                        duration: 3,
-                    });
-                    onCreate(
-                        form.getFieldValue(TYPE_FIELD_NAME) ?? PostContentType.Text,
-                        form.getFieldValue(TITLE_FIELD_NAME),
-                        form.getFieldValue(DESCRIPTION_FIELD_NAME),
-                        form.getFieldValue(LINK_FIELD_NAME),
-                        form.getFieldValue(LOCATION_FIELD_NAME),
-                    );
-                    form.resetFields();
-                }
-            })
-            .catch((error) => {
-                handleGraphQLError({
-                    error,
-                    defaultMessage: 'Failed to create Post! An unexpected error occurred',
-                    permissionMessage: 'Unauthorized to create Post. Please contact your DataHub administrator.',
-                });
-            });
-        onClose();
-    };
-
-    const onUpdatePost = () => {
-        const contentTypeValue = form.getFieldValue(TYPE_FIELD_NAME) ?? PostContentType.Text;
-        const mediaValue =
-            form.getFieldValue(TYPE_FIELD_NAME) && form.getFieldValue(LOCATION_FIELD_NAME)
-                ? {
-                      type: MediaType.Image,
-                      location: form.getFieldValue(LOCATION_FIELD_NAME) ?? null,
-                  }
-                : null;
-        updatePostMutation({
-            variables: {
-                input: {
-                    urn: editData?.urn,
-                    postType: PostType.HomePageAnnouncement,
-                    content: {
-                        contentType: contentTypeValue,
-                        title: form.getFieldValue(TITLE_FIELD_NAME),
-                        description: form.getFieldValue(DESCRIPTION_FIELD_NAME) ?? null,
-                        link: form.getFieldValue(LINK_FIELD_NAME) ?? null,
-                        media: mediaValue,
-                    },
-                },
-            },
-        })
-            .then(({ errors }) => {
-                if (!errors) {
-                    message.success({
-                        content: `Updated Post!`,
-                        duration: 3,
-                    });
-                    onEdit();
-                    form.resetFields();
-                }
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: 'Failed to update Post! An unknown error occured.', duration: 3 });
-                console.error('Failed to update Post:', e.message);
-            });
-        onClose();
-    };
-
-    // Handle the Enter press
-    useEnterKeyListener({
-        querySelectorToExecuteClick: '#createPostButton',
-    });
-
-    const onCloseModal = () => {
-        form.resetFields();
-        onClose();
-    };
-
-    const titleText = editData ? 'Edit Post' : 'Create new Post';
-
-    return (
-        <Modal
-            title={titleText}
-            open
-            onCancel={onCloseModal}
-            footer={
-                <>
-                    <Button onClick={onCloseModal} type="text">
-                        Cancel
-                    </Button>
-                    <Button
-                        id={CREATE_POST_BUTTON_ID}
-                        data-testid={!editData ? 'create-post-button' : 'update-post-button'}
-                        onClick={!editData ? onCreatePost : onUpdatePost}
-                        disabled={!createButtonEnabled}
-                    >
-                        {!editData ? 'Create' : 'Update'}
-                    </Button>
-                </>
-            }
-        >
-            <CreatePostForm
-                setCreateButtonEnabled={setCreateButtonEnabled}
-                form={form}
-                contentType={editData?.contentType as PostContentType}
-            />
-        </Modal>
-    );
-}
diff --git a/datahub-web-react/src/app/settings/posts/ManagePosts.tsx b/datahub-web-react/src/app/settings/posts/ManagePosts.tsx
deleted file mode 100644
index c97a54b6752761..00000000000000
--- a/datahub-web-react/src/app/settings/posts/ManagePosts.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import { PostList } from '@app/settings/posts/PostsList';
-
-const PageContainer = styled.div`
-    padding-top: 20px;
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    overflow: auto;
-`;
-
-const PageHeaderContainer = styled.div`
-    && {
-        padding-left: 24px;
-    }
-`;
-
-const PageTitle = styled(Typography.Title)`
-    && {
-        margin-bottom: 12px;
-    }
-`;
-
-const ListContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    overflow: auto;
-`;
-
-export default function ManagePosts() {
-    return (
-        <PageContainer>
-            <PageHeaderContainer>
-                <PageTitle level={3}>Home Page Posts</PageTitle>
-                <Typography.Paragraph type="secondary">
-                    View and manage pinned posts that appear to all users on the landing page.
-                </Typography.Paragraph>
-            </PageHeaderContainer>
-            <ListContainer>
-                <PostList />
-            </ListContainer>
-        </PageContainer>
-    );
-}
diff --git a/datahub-web-react/src/app/settings/posts/PostItemMenu.tsx b/datahub-web-react/src/app/settings/posts/PostItemMenu.tsx
deleted file mode 100644
index def9f6181321b8..00000000000000
--- a/datahub-web-react/src/app/settings/posts/PostItemMenu.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import { DeleteOutlined, EditOutlined } from '@ant-design/icons';
-import { Dropdown, Modal, message } from 'antd';
-import React from 'react';
-
-import { MenuIcon } from '@app/entity/shared/EntityDropdown/EntityDropdown';
-import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent';
-import handleGraphQLError from '@app/shared/handleGraphQLError';
-
-import { useDeletePostMutation } from '@graphql/post.generated';
-
-type Props = {
-    urn: string;
-    title: string;
-    onDelete?: () => void;
-    onEdit?: () => void;
-};
-
-export default function PostItemMenu({ title, urn, onDelete, onEdit }: Props) {
-    const [deletePostMutation] = useDeletePostMutation();
-
-    const deletePost = () => {
-        deletePostMutation({
-            variables: {
-                urn,
-            },
-        })
-            .then(({ errors }) => {
-                if (!errors) {
-                    message.success('Deleted Post!');
-                    onDelete?.();
-                }
-            })
-            .catch((error) => {
-                handleGraphQLError({
-                    error,
-                    defaultMessage: 'Failed to delete Post! An unexpected error occurred',
-                    permissionMessage: 'Unauthorized to delete Post. Please contact your DataHub administrator.',
-                });
-            });
-    };
-
-    const onConfirmDelete = () => {
-        Modal.confirm({
-            title: `Delete Post '${title}'`,
-            content: `Are you sure you want to remove this Post?`,
-            onOk() {
-                deletePost();
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    const items = [
-        {
-            key: 'delete',
-            label: (
-                <MenuItemStyle onClick={onConfirmDelete}>
-                    <DeleteOutlined /> &nbsp;Delete
-                </MenuItemStyle>
-            ),
-        },
-        {
-            key: 'edit',
-            label: (
-                <MenuItemStyle onClick={onEdit}>
-                    <EditOutlined /> &nbsp;Edit
-                </MenuItemStyle>
-            ),
-        },
-    ];
-
-    return (
-        <Dropdown trigger={['click']} menu={{ items }}>
-            <MenuIcon data-testid={`dropdown-menu-${title}`} fontSize={20} />
-        </Dropdown>
-    );
-}
diff --git a/datahub-web-react/src/app/settings/posts/PostsList.tsx b/datahub-web-react/src/app/settings/posts/PostsList.tsx
deleted file mode 100644
index b1505d5821873e..00000000000000
--- a/datahub-web-react/src/app/settings/posts/PostsList.tsx
+++ /dev/null
@@ -1,223 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Empty, Pagination, Typography } from 'antd';
-import * as QueryString from 'query-string';
-import { AlignType } from 'rc-table/lib/interface';
-import React, { useEffect, useState } from 'react';
-import { useLocation } from 'react-router';
-import styled from 'styled-components';
-
-import { StyledTable } from '@app/entity/shared/components/styled/StyledTable';
-import TabToolbar from '@app/entity/shared/components/styled/TabToolbar';
-import { SearchBar } from '@app/search/SearchBar';
-import CreatePostModal from '@app/settings/posts/CreatePostModal';
-import { PostColumn, PostEntry, PostListMenuColumn } from '@app/settings/posts/PostsListColumns';
-import { POST_TYPE_TO_DISPLAY_TEXT } from '@app/settings/posts/constants';
-import { addToListPostCache, removeFromListPostCache } from '@app/settings/posts/utils';
-import { Message } from '@app/shared/Message';
-import { scrollToTop } from '@app/shared/searchUtils';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { getHomePagePostsFilters } from '@app/utils/queryUtils';
-
-import { useListPostsQuery } from '@graphql/post.generated';
-
-const PostsContainer = styled.div`
-    display: flex;
-    flex-direction: column;
-    overflow: auto;
-`;
-
-export const PostsPaginationContainer = styled.div`
-    display: flex;
-    justify-content: center;
-    padding: 12px;
-    padding-left: 16px;
-    border-bottom: 1px solid;
-    border-color: ${(props) => props.theme.styles['border-color-base']};
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-`;
-
-const PaginationInfo = styled(Typography.Text)`
-    padding: 0px;
-`;
-
-const DEFAULT_PAGE_SIZE = 10;
-
-export const PostList = () => {
-    const entityRegistry = useEntityRegistry();
-    const location = useLocation();
-    const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
-    const paramsQuery = (params?.query as string) || undefined;
-    const [query, setQuery] = useState<undefined | string>(undefined);
-    useEffect(() => setQuery(paramsQuery), [paramsQuery]);
-
-    const [page, setPage] = useState(1);
-    const [isCreatingPost, setIsCreatingPost] = useState(false);
-    const [editData, setEditData] = useState<PostEntry | undefined>(undefined);
-
-    const pageSize = DEFAULT_PAGE_SIZE;
-    const start = (page - 1) * pageSize;
-
-    const { loading, error, data, client, refetch } = useListPostsQuery({
-        variables: {
-            input: {
-                start,
-                count: pageSize,
-                query,
-                orFilters: getHomePagePostsFilters(),
-            },
-        },
-        fetchPolicy: query && query.length > 0 ? 'no-cache' : 'cache-first',
-    });
-
-    const totalPosts = data?.listPosts?.total || 0;
-    const lastResultIndex = start + pageSize > totalPosts ? totalPosts : start + pageSize;
-    const posts = data?.listPosts?.posts || [];
-
-    const onChangePage = (newPage: number) => {
-        scrollToTop();
-        setPage(newPage);
-    };
-
-    const handleDelete = (urn: string) => {
-        removeFromListPostCache(client, urn, page, pageSize);
-        setTimeout(() => {
-            refetch?.();
-        }, 2000);
-    };
-
-    const handleEdit = (post: PostEntry) => {
-        setEditData(post);
-        setIsCreatingPost(true);
-    };
-
-    const handleClose = () => {
-        setEditData(undefined);
-        setIsCreatingPost(false);
-    };
-
-    const allColumns = [
-        {
-            title: 'Title',
-            dataIndex: '',
-            key: 'title',
-            sorter: (sourceA, sourceB) => {
-                return sourceA.title.localeCompare(sourceB.title);
-            },
-            render: (record: PostEntry) => PostColumn(record.title, 200),
-            width: '20%',
-        },
-        {
-            title: 'Description',
-            dataIndex: '',
-            key: 'description',
-            render: (record: PostEntry) => PostColumn(record.description || ''),
-        },
-        {
-            title: 'Type',
-            dataIndex: '',
-            key: 'type',
-            render: (record: PostEntry) => PostColumn(POST_TYPE_TO_DISPLAY_TEXT[record.contentType]),
-            style: { minWidth: 100 },
-            width: '10%',
-        },
-        {
-            title: '',
-            dataIndex: '',
-            width: '5%',
-            align: 'right' as AlignType,
-            key: 'menu',
-            render: PostListMenuColumn(handleDelete, handleEdit),
-        },
-    ];
-
-    const tableData = posts.map((post) => {
-        return {
-            urn: post.urn,
-            title: post.content.title,
-            description: post.content.description,
-            contentType: post.content.contentType,
-            link: post.content.link,
-            imageUrl: post.content.media?.location,
-        };
-    });
-
-    return (
-        <>
-            {!data && loading && <Message type="loading" content="Loading posts..." />}
-            {error && <Message type="error" content="Failed to load Posts! An unexpected error occurred." />}
-            <PostsContainer>
-                <TabToolbar>
-                    <Button data-testid="posts-create-post" type="text" onClick={() => setIsCreatingPost(true)}>
-                        <PlusOutlined /> New
-                    </Button>
-                    <SearchBar
-                        initialQuery={query || ''}
-                        placeholderText="Search..."
-                        suggestions={[]}
-                        style={{
-                            maxWidth: 220,
-                            padding: 0,
-                        }}
-                        inputStyle={{
-                            height: 32,
-                            fontSize: 12,
-                        }}
-                        onSearch={() => null}
-                        onQueryChange={(q) => setQuery(q && q.length > 0 ? q : undefined)}
-                        entityRegistry={entityRegistry}
-                        hideRecommendations
-                    />
-                </TabToolbar>
-                <StyledTable
-                    columns={allColumns}
-                    dataSource={tableData}
-                    rowKey="urn"
-                    pagination={false}
-                    locale={{ emptyText: <Empty description="No posts!" image={Empty.PRESENTED_IMAGE_SIMPLE} /> }}
-                />
-                {totalPosts > pageSize && (
-                    <PostsPaginationContainer>
-                        <PaginationInfo>
-                            <b>
-                                {lastResultIndex > 0 ? (page - 1) * pageSize + 1 : 0} - {lastResultIndex}
-                            </b>{' '}
-                            of <b>{totalPosts}</b>
-                        </PaginationInfo>
-                        <Pagination
-                            current={page}
-                            pageSize={pageSize}
-                            total={totalPosts}
-                            showLessItems
-                            onChange={onChangePage}
-                            showSizeChanger={false}
-                        />
-                        <span />
-                    </PostsPaginationContainer>
-                )}
-                {isCreatingPost && (
-                    <CreatePostModal
-                        editData={editData as PostEntry}
-                        onClose={handleClose}
-                        onEdit={() => setTimeout(() => refetch(), 2000)}
-                        onCreate={(urn, title, description) => {
-                            addToListPostCache(
-                                client,
-                                {
-                                    urn,
-                                    properties: {
-                                        title,
-                                        description: description || null,
-                                    },
-                                },
-                                pageSize,
-                            );
-                            setTimeout(() => refetch(), 2000);
-                        }}
-                    />
-                )}
-            </PostsContainer>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/settings/posts/PostsListColumns.tsx b/datahub-web-react/src/app/settings/posts/PostsListColumns.tsx
index d5ce06289da50f..a335344389ee5a 100644
--- a/datahub-web-react/src/app/settings/posts/PostsListColumns.tsx
+++ b/datahub-web-react/src/app/settings/posts/PostsListColumns.tsx
@@ -1,8 +1,4 @@
 import { Maybe } from 'graphql/jsutils/Maybe';
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import PostItemMenu from '@app/settings/posts/PostItemMenu';
 
 export interface PostEntry {
     urn: string;
@@ -12,22 +8,3 @@ export interface PostEntry {
     link?: string | null;
     imageUrl?: string;
 }
-
-const PostText = styled.div<{ minWidth?: number }>`
-    ${(props) => props.minWidth !== undefined && `min-width: ${props.minWidth}px;`}
-`;
-
-export function PostListMenuColumn(handleDelete: (urn: string) => void, handleEdit: (urn: PostEntry) => void) {
-    return (record: PostEntry) => (
-        <PostItemMenu
-            title={record.title}
-            urn={record.urn}
-            onDelete={() => handleDelete(record.urn)}
-            onEdit={() => handleEdit(record)}
-        />
-    );
-}
-
-export function PostColumn(text: string, minWidth?: number) {
-    return <PostText minWidth={minWidth}>{text}</PostText>;
-}
diff --git a/datahub-web-react/src/app/settings/posts/constants.ts b/datahub-web-react/src/app/settings/posts/constants.ts
index e99cc3239fc407..0d856f75f6c204 100644
--- a/datahub-web-react/src/app/settings/posts/constants.ts
+++ b/datahub-web-react/src/app/settings/posts/constants.ts
@@ -1,13 +1,5 @@
-import { PostContentType } from '@types';
 
-export const TITLE_FIELD_NAME = 'title';
-export const DESCRIPTION_FIELD_NAME = 'description';
 export const LINK_FIELD_NAME = 'link';
 export const LOCATION_FIELD_NAME = 'location';
 export const TYPE_FIELD_NAME = 'type';
 export const CREATE_POST_BUTTON_ID = 'createPostButton';
-
-export const POST_TYPE_TO_DISPLAY_TEXT = {
-    [PostContentType.Link]: 'Link',
-    [PostContentType.Text]: 'Announcement',
-};
diff --git a/datahub-web-react/src/app/settings/posts/utils.ts b/datahub-web-react/src/app/settings/posts/utils.ts
deleted file mode 100644
index b43e4b14f87ae6..00000000000000
--- a/datahub-web-react/src/app/settings/posts/utils.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { ListPostsDocument, ListPostsQuery } from '@graphql/post.generated';
-
-/**
- * Add an entry to the list posts cache.
- */
-export const addToListPostCache = (client, newPost, pageSize) => {
-    // Read the data from our cache for this query.
-    const currData: ListPostsQuery | null = client.readQuery({
-        query: ListPostsDocument,
-        variables: {
-            input: {
-                start: 0,
-                count: pageSize,
-            },
-        },
-    });
-
-    // Add our new post into the existing list.
-    const newPosts = [...(currData?.listPosts?.posts || [])];
-
-    // Write our data back to the cache.
-    client.writeQuery({
-        query: ListPostsDocument,
-        variables: {
-            input: {
-                start: 0,
-                count: pageSize,
-            },
-        },
-        data: {
-            listPosts: {
-                start: 0,
-                count: (currData?.listPosts?.count || 0) + 1,
-                total: (currData?.listPosts?.total || 0) + 1,
-                posts: newPosts,
-            },
-        },
-    });
-};
-
-/**
- * Remove an entry from the list posts cache.
- */
-export const removeFromListPostCache = (client, urn, page, pageSize) => {
-    // Read the data from our cache for this query.
-    const currData: ListPostsQuery | null = client.readQuery({
-        query: ListPostsDocument,
-        variables: {
-            input: {
-                start: (page - 1) * pageSize,
-                count: pageSize,
-            },
-        },
-    });
-
-    // Remove the post from the existing posts set.
-    const newPosts = [...(currData?.listPosts?.posts || []).filter((post) => post.urn !== urn)];
-
-    // Write our data back to the cache.
-    client.writeQuery({
-        query: ListPostsDocument,
-        variables: {
-            input: {
-                start: (page - 1) * pageSize,
-                count: pageSize,
-            },
-        },
-        data: {
-            listPosts: {
-                start: currData?.listPosts?.start || 0,
-                count: (currData?.listPosts?.count || 1) - 1,
-                total: (currData?.listPosts?.total || 1) - 1,
-                posts: newPosts,
-            },
-        },
-    });
-};
diff --git a/datahub-web-react/src/app/settings/utils.ts b/datahub-web-react/src/app/settings/utils.ts
deleted file mode 100644
index dd0d4763e8575a..00000000000000
--- a/datahub-web-react/src/app/settings/utils.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { AccessTokenDuration, AccessTokenType } from '@types';
-
-/** A type of DataHub Access Token. */
-export const ACCESS_TOKEN_TYPES = [{ text: 'Personal', type: AccessTokenType.Personal }];
-
-/** The duration for which an Access Token is valid. */
-export const ACCESS_TOKEN_DURATIONS = [
-    { text: '1 hour', duration: AccessTokenDuration.OneHour },
-    { text: '1 day', duration: AccessTokenDuration.OneDay },
-    { text: '1 month', duration: AccessTokenDuration.OneMonth },
-    { text: '3 months', duration: AccessTokenDuration.ThreeMonths },
-    { text: 'Never', duration: AccessTokenDuration.NoExpiry },
-];
-
-const addHours = (hour: number) => {
-    const result = new Date();
-    result.setHours(result.getHours() + hour);
-    return `The token will expire on ${result.toLocaleDateString()} at ${result.toLocaleTimeString()}.`;
-};
-
-const addDays = (days: number) => {
-    const result = new Date();
-    result.setDate(result.getDate() + days);
-    return `The token will expire on ${result.toLocaleDateString()} at ${result.toLocaleTimeString()}.`;
-};
-
-export const getTokenExpireDate = (duration: AccessTokenDuration) => {
-    switch (duration) {
-        case AccessTokenDuration.OneHour:
-            return addHours(1);
-        case AccessTokenDuration.OneDay:
-            return addDays(1);
-        case AccessTokenDuration.OneMonth:
-            return addDays(30);
-        case AccessTokenDuration.ThreeMonths:
-            return addDays(90);
-        case AccessTokenDuration.NoExpiry:
-            return 'This token will never expire.';
-        default:
-            return AccessTokenDuration.OneMonth;
-    }
-};
diff --git a/datahub-web-react/src/app/settingsV2/AccessTokens.tsx b/datahub-web-react/src/app/settingsV2/AccessTokens.tsx
index c68d0d8c1aa043..6e76c916e602d6 100644
--- a/datahub-web-react/src/app/settingsV2/AccessTokens.tsx
+++ b/datahub-web-react/src/app/settingsV2/AccessTokens.tsx
@@ -83,7 +83,7 @@ const SelectContainer = styled.div`
 
 const DEFAULT_PAGE_SIZE = 10;
 
-export enum StatusType {
+enum StatusType {
     ALL,
     EXPIRED,
 }
diff --git a/datahub-web-react/src/app/settingsV2/Preferences.tsx b/datahub-web-react/src/app/settingsV2/Preferences.tsx
index dc434075e837cf..69902efc1e5736 100644
--- a/datahub-web-react/src/app/settingsV2/Preferences.tsx
+++ b/datahub-web-react/src/app/settingsV2/Preferences.tsx
@@ -3,14 +3,10 @@ import { message } from 'antd';
 import React from 'react';
 import styled from 'styled-components';
 
-import analytics, { EventType } from '@app/analytics';
 import { useUserContext } from '@app/context/useUserContext';
 import { useAppConfig } from '@app/useAppConfig';
-import { useIsThemeV2, useIsThemeV2EnabledForUser, useIsThemeV2Toggleable } from '@app/useIsThemeV2';
 
 import { useUpdateApplicationsSettingsMutation } from '@graphql/app.generated';
-import { useUpdateUserSettingMutation } from '@graphql/me.generated';
-import { UserSetting } from '@types';
 
 const Page = styled.div`
     width: 100%;
@@ -70,22 +66,13 @@ const DescriptionText = styled.div`
 `;
 
 export const Preferences = () => {
-    // Current User Urn
-    const { user, refetchUser } = useUserContext();
-    const isThemeV2 = useIsThemeV2();
-    const [isThemeV2Toggleable] = useIsThemeV2Toggleable();
-    const [isThemeV2EnabledForUser] = useIsThemeV2EnabledForUser();
     const userContext = useUserContext();
     const appConfig = useAppConfig();
 
-    const showSimplifiedHomepage = !!user?.settings?.appearance?.showSimplifiedHomepage;
-
     const applicationsEnabled = appConfig.config?.visualConfig?.application?.showApplicationInNavigation ?? false;
 
-    const [updateUserSettingMutation] = useUpdateUserSettingMutation();
     const [updateApplicationsSettingsMutation] = useUpdateApplicationsSettingsMutation();
 
-    const showSimplifiedHomepageSetting = !isThemeV2;
     const canManageApplicationAppearance = userContext?.platformPrivileges?.manageFeatures;
 
     return (
@@ -96,77 +83,6 @@ export const Preferences = () => {
                         <PageTitle title="Appearance" subTitle="Manage your appearance settings." />
                     </HeaderContainer>
                 </TokensContainer>
-                {showSimplifiedHomepageSetting && (
-                    <StyledCard>
-                        <UserSettingRow>
-                            <TextContainer>
-                                <SettingText>Show simplified homepage </SettingText>
-                                <DescriptionText>
-                                    Limits entity browse cards on homepage to Domains, Charts, Datasets, Dashboards and
-                                    Glossary Terms
-                                </DescriptionText>
-                            </TextContainer>
-                            <Switch
-                                label=""
-                                checked={showSimplifiedHomepage}
-                                onChange={async () => {
-                                    await updateUserSettingMutation({
-                                        variables: {
-                                            input: {
-                                                name: UserSetting.ShowSimplifiedHomepage,
-                                                value: !showSimplifiedHomepage,
-                                            },
-                                        },
-                                    });
-                                    analytics.event({
-                                        type: showSimplifiedHomepage
-                                            ? EventType.ShowStandardHomepageEvent
-                                            : EventType.ShowSimplifiedHomepageEvent,
-                                    });
-                                    message.success({ content: 'Setting updated!', duration: 2 });
-                                    refetchUser?.();
-                                }}
-                            />
-                        </UserSettingRow>
-                    </StyledCard>
-                )}
-                {isThemeV2Toggleable && (
-                    <>
-                        <StyledCard>
-                            <UserSettingRow>
-                                <TextContainer>
-                                    <SettingText>Try New User Experience</SettingText>
-                                    <DescriptionText>
-                                        Enable an early preview of the new DataHub UX - a complete makeover for your app
-                                        with a sleek new design and advanced features.
-                                    </DescriptionText>
-                                </TextContainer>
-                                <Switch
-                                    label=""
-                                    checked={isThemeV2EnabledForUser}
-                                    onChange={async () => {
-                                        await updateUserSettingMutation({
-                                            variables: {
-                                                input: {
-                                                    name: UserSetting.ShowThemeV2,
-                                                    value: !isThemeV2EnabledForUser,
-                                                },
-                                            },
-                                        });
-                                        // clicking this button toggles, so event is whatever is opposite to what isThemeV2EnabledForUser currently is
-                                        analytics.event({
-                                            type: isThemeV2EnabledForUser
-                                                ? EventType.RevertV2ThemeEvent
-                                                : EventType.ShowV2ThemeEvent,
-                                        });
-                                        message.success({ content: 'Setting updated!', duration: 2 });
-                                        refetchUser?.();
-                                    }}
-                                />
-                            </UserSettingRow>
-                        </StyledCard>
-                    </>
-                )}
                 {canManageApplicationAppearance && (
                     <StyledCard>
                         <UserSettingRow>
@@ -195,7 +111,7 @@ export const Preferences = () => {
                         </UserSettingRow>
                     </StyledCard>
                 )}
-                {!showSimplifiedHomepageSetting && !isThemeV2Toggleable && !canManageApplicationAppearance && (
+                {!canManageApplicationAppearance && (
                     <div style={{ color: colors.gray[1700] }}>No appearance settings found.</div>
                 )}
             </SourceContainer>
diff --git a/datahub-web-react/src/app/settingsV2/SettingsPage.tsx b/datahub-web-react/src/app/settingsV2/SettingsPage.tsx
index d45ec45ef82905..81808d6d342ca1 100644
--- a/datahub-web-react/src/app/settingsV2/SettingsPage.tsx
+++ b/datahub-web-react/src/app/settingsV2/SettingsPage.tsx
@@ -20,7 +20,6 @@ import NavBarMenu from '@app/homeV2/layout/navBarRedesign/NavBarMenu';
 import { NavBarMenuItemTypes, NavBarMenuItems } from '@app/homeV2/layout/navBarRedesign/types';
 import { DEFAULT_PATH, PATHS } from '@app/settingsV2/settingsPaths';
 import { useAppConfig } from '@app/useAppConfig';
-import { useIsThemeV2 } from '@app/useIsThemeV2';
 import { useShowNavBarRedesign } from '@app/useShowNavBarRedesign';
 import { Button, colors } from '@src/alchemy-components';
 
@@ -86,7 +85,6 @@ export const SettingsPage = () => {
     const history = useHistory();
     const subscriptionsEnabled = false;
     const me = useUserContext();
-    const isThemeV2 = useIsThemeV2();
     const isShowNavBarRedesign = useShowNavBarRedesign();
     const { config } = useAppConfig();
 
@@ -246,7 +244,7 @@ export const SettingsPage = () => {
                         <NavBarTitle>Settings</NavBarTitle>
                         <NavBarSubTitle>Manage your settings</NavBarSubTitle>
                     </div>
-                    {isThemeV2 && !isShowNavBarRedesign && (
+                    {!isShowNavBarRedesign && (
                         <a href="/logOut">
                             <Button
                                 variant="outline"
diff --git a/datahub-web-react/src/app/settingsV2/personal/utils.tsx b/datahub-web-react/src/app/settingsV2/personal/utils.tsx
deleted file mode 100644
index 3a3f9ed39e0e48..00000000000000
--- a/datahub-web-react/src/app/settingsV2/personal/utils.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import styled from 'styled-components/macro';
-
-import EntityRegistry from '@app/entity/EntityRegistry';
-
-import { Entity, EntityType } from '@types';
-
-const StyledIcon = styled.img`
-    width: 28px;
-    height: 28px;
-`;
-
-export function getEntityNameAndLogo(entity: Entity, entityType: EntityType, entityRegistry: EntityRegistry) {
-    const genericProps = entityRegistry.getGenericEntityProperties(entityType, entity);
-    const platform = genericProps?.platform;
-    const logoUrl = platform?.properties?.logoUrl || '';
-    const label = entityRegistry.getDisplayName(EntityType.DataPlatform, platform);
-    const icon: JSX.Element | null = <StyledIcon alt="icon" src={logoUrl} />;
-
-    return { label, icon };
-}
diff --git a/datahub-web-react/src/app/settingsV2/posts/PostsList.tsx b/datahub-web-react/src/app/settingsV2/posts/PostsList.tsx
index 341fab80e174b6..fcea89db99efa3 100644
--- a/datahub-web-react/src/app/settingsV2/posts/PostsList.tsx
+++ b/datahub-web-react/src/app/settingsV2/posts/PostsList.tsx
@@ -26,7 +26,7 @@ const PostsContainer = styled.div`
     overflow: auto;
 `;
 
-export const PostsPaginationContainer = styled.div`
+const PostsPaginationContainer = styled.div`
     display: flex;
     justify-content: center;
     padding: 12px;
diff --git a/datahub-web-react/src/app/settingsV2/utils.ts b/datahub-web-react/src/app/settingsV2/utils.ts
index dd0d4763e8575a..b1c9ed2d99ab81 100644
--- a/datahub-web-react/src/app/settingsV2/utils.ts
+++ b/datahub-web-react/src/app/settingsV2/utils.ts
@@ -1,7 +1,4 @@
-import { AccessTokenDuration, AccessTokenType } from '@types';
-
-/** A type of DataHub Access Token. */
-export const ACCESS_TOKEN_TYPES = [{ text: 'Personal', type: AccessTokenType.Personal }];
+import { AccessTokenDuration } from '@types';
 
 /** The duration for which an Access Token is valid. */
 export const ACCESS_TOKEN_DURATIONS = [
diff --git a/datahub-web-react/src/app/shared/BrowserTabTitleContext.tsx b/datahub-web-react/src/app/shared/BrowserTabTitleContext.tsx
index abc6bddeed3bde..ee187c411e61f4 100644
--- a/datahub-web-react/src/app/shared/BrowserTabTitleContext.tsx
+++ b/datahub-web-react/src/app/shared/BrowserTabTitleContext.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode, createContext, useContext } from 'react';
+import React, { ReactNode, createContext } from 'react';
 
 interface BrowserTitleContextProps {
     title: string;
@@ -16,11 +16,3 @@ export const BrowserTitleProvider: React.FC<{ children: ReactNode }> = ({ childr
 
     return <BrowserTitleContext.Provider value={{ title, updateTitle }}>{children}</BrowserTitleContext.Provider>;
 };
-
-export const useBrowserTitle = () => {
-    const context = useContext(BrowserTitleContext);
-    if (!context) {
-        throw new Error('useBrowserTitle must be used within a BrowserTitleProvider');
-    }
-    return context;
-};
diff --git a/datahub-web-react/src/app/shared/LegacyEntityProfile.tsx b/datahub-web-react/src/app/shared/LegacyEntityProfile.tsx
deleted file mode 100644
index 74e13c3854ae15..00000000000000
--- a/datahub-web-react/src/app/shared/LegacyEntityProfile.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { TagOutlined } from '@ant-design/icons';
-import { Card, Col, Divider, Layout, Row, Typography } from 'antd';
-import { LayoutProps } from 'antd/lib/layout';
-import * as React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import CompactContext from '@app/shared/CompactContext';
-import { RoutedTabs } from '@app/shared/RoutedTabs';
-
-export interface EntityProfileProps {
-    title: string;
-    tags?: React.ReactNode;
-    tagCardHeader?: string;
-    header: React.ReactNode;
-    tabs?: Array<{
-        name: string;
-        path: string;
-        content: React.ReactNode;
-    }>;
-    titleLink?: string;
-    onTabChange?: (selectedTab: string) => void;
-}
-
-const TagsTitle = styled(Typography.Title)`
-    font-size: 18px;
-`;
-
-const TagCard = styled(Card)`
-    margin-top: 24px;
-    font-size: 18px;
-    min-width: 100%;
-    width: 100%;
-`;
-
-const TagIcon = styled(TagOutlined)`
-    padding-right: 6px;
-`;
-
-type LayoutPropsExtended = {
-    isCompact: boolean;
-};
-
-const LayoutContent = styled(({ isCompact: _, ...props }: LayoutProps & LayoutPropsExtended) => (
-    <Layout.Content {...props} />
-))`
-    padding: 0px ${(props) => (props.isCompact ? '0px' : '100px')};
-`;
-
-const LayoutDiv = styled(({ isCompact: _, ...props }: LayoutProps & LayoutPropsExtended) => (
-    <Layout.Content {...props} />
-))`
-    padding-right: ${(props) => (props.isCompact ? '0px' : '24px')};
-`;
-
-const defaultProps = {
-    tags: null,
-    tabs: [],
-    tagCardHeader: 'Tags',
-};
-
-/**
- * A default container view for presenting Entity details.
- */
-export const LegacyEntityProfile = ({
-    title,
-    tags,
-    header,
-    tabs,
-    titleLink,
-    onTabChange,
-    tagCardHeader,
-}: EntityProfileProps) => {
-    const isCompact = React.useContext(CompactContext);
-    const defaultTabPath = tabs && tabs?.length > 0 ? tabs[0].path : '';
-    /* eslint-disable spaced-comment */
-    return (
-        <LayoutContent isCompact={isCompact}>
-            <Row>
-                <Col md={isCompact ? 24 : 16} sm={24} xs={24}>
-                    <LayoutDiv isCompact={isCompact}>
-                        <Row style={{ padding: '20px 0px 10px 0px' }}>
-                            <Col span={24}>
-                                {titleLink ? (
-                                    <Link to={titleLink}>
-                                        <h1>{title}</h1>
-                                    </Link>
-                                ) : (
-                                    <h1>{title}</h1>
-                                )}
-                            </Col>
-                        </Row>
-                        {header}
-                    </LayoutDiv>
-                </Col>
-                {!!tags && (
-                    <Col md={isCompact ? 24 : 8} xs={24} sm={24}>
-                        <TagCard>
-                            <TagsTitle type="secondary" level={4}>
-                                <TagIcon /> {tagCardHeader}
-                            </TagsTitle>
-                            {tags}
-                        </TagCard>
-                    </Col>
-                )}
-            </Row>
-            {!isCompact && (
-                <>
-                    <Divider style={{ marginBottom: '0px' }} />
-                    <Row style={{ padding: '0px 0px 10px 0px' }}>
-                        <Col span={24}>
-                            <RoutedTabs defaultPath={defaultTabPath} tabs={tabs || []} onTabChange={onTabChange} />
-                        </Col>
-                    </Row>
-                </>
-            )}
-        </LayoutContent>
-    );
-};
-
-LegacyEntityProfile.defaultProps = defaultProps;
diff --git a/datahub-web-react/src/app/shared/LogoCountCard.tsx b/datahub-web-react/src/app/shared/LogoCountCard.tsx
deleted file mode 100644
index bb4b4f1d0d7d6a..00000000000000
--- a/datahub-web-react/src/app/shared/LogoCountCard.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Image, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { HomePageButton } from '@app/shared/components';
-import { formatNumber } from '@app/shared/formatNumber';
-
-const PlatformLogo = styled(Image)`
-    max-height: 32px;
-    height: 32px;
-    width: auto;
-    object-fit: contain;
-    background-color: transparent;
-`;
-
-const CountText = styled(Typography.Text)`
-    font-size: 18px;
-    color: ${ANTD_GRAY[8]};
-`;
-
-const LogoContainer = styled.div``;
-
-const TitleContainer = styled.div``;
-
-const Title = styled(Typography.Title)`
-    word-break: break-word;
-`;
-
-type Props = {
-    logoUrl?: string;
-    logoComponent?: React.ReactNode;
-    name: string;
-    count?: number;
-    onClick?: () => void;
-};
-
-export const LogoCountCard = ({ logoUrl, logoComponent, name, count, onClick }: Props) => {
-    return (
-        <HomePageButton type="link" onClick={onClick}>
-            <LogoContainer>
-                {(logoUrl && <PlatformLogo preview={false} src={logoUrl} alt={name} />) || logoComponent}
-            </LogoContainer>
-            <TitleContainer>
-                <Title
-                    ellipsis={{
-                        rows: 4,
-                    }}
-                    level={5}
-                >
-                    {name}
-                </Title>
-            </TitleContainer>
-            {count !== undefined && <CountText>{formatNumber(count)}</CountText>}
-        </HomePageButton>
-    );
-};
diff --git a/datahub-web-react/src/app/shared/ManageAccount.tsx b/datahub-web-react/src/app/shared/ManageAccount.tsx
deleted file mode 100644
index f8b8ef539958f3..00000000000000
--- a/datahub-web-react/src/app/shared/ManageAccount.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-import { CaretDownOutlined } from '@ant-design/icons';
-import { Dropdown } from 'antd';
-import Cookies from 'js-cookie';
-import React from 'react';
-import styled, { useTheme } from 'styled-components';
-
-import analytics, { EventType } from '@app/analytics';
-import { isLoggedInVar } from '@app/auth/checkAuthStatus';
-import { useUserContext } from '@app/context/useUserContext';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { MenuItemStyle } from '@app/entity/view/menu/item/styledComponent';
-import CustomAvatar from '@app/shared/avatar/CustomAvatar';
-import { useAppConfig } from '@app/useAppConfig';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-import { GlobalCfg } from '@src/conf';
-import { resolveRuntimePath } from '@utils/runtimeBasePath';
-
-import { EntityType } from '@types';
-
-const DownArrow = styled(CaretDownOutlined)`
-    vertical-align: -1px;
-    font-size: 10px;
-    color: ${ANTD_GRAY[7]};
-`;
-
-const DropdownWrapper = styled.div`
-    align-items: center;
-    cursor: pointer;
-    display: flex;
-`;
-
-interface Props {
-    urn: string;
-    pictureLink?: string;
-    name?: string;
-}
-
-const defaultProps = {
-    pictureLink: undefined,
-};
-
-export const ManageAccount = ({ urn: _urn, pictureLink: _pictureLink, name }: Props) => {
-    const entityRegistry = useEntityRegistry();
-    const themeConfig = useTheme();
-    const { config } = useAppConfig();
-    const userContext = useUserContext();
-    const handleLogout = () => {
-        analytics.event({ type: EventType.LogOutEvent });
-        isLoggedInVar(false);
-        Cookies.remove(GlobalCfg.CLIENT_AUTH_COOKIE);
-        userContext.updateLocalState({ selectedViewUrn: undefined });
-    };
-    const version = config?.appVersion;
-
-    const themeConfigItems = themeConfig.content.menu.items.map((value) => {
-        return {
-            key: value.label,
-            label: (
-                <MenuItemStyle key={value.label}>
-                    <a
-                        href={value.path || ''}
-                        target={value.shouldOpenInNewTab ? '_blank' : ''}
-                        rel="noopener noreferrer"
-                        tabIndex={0}
-                    >
-                        {value.label}
-                    </a>
-                </MenuItemStyle>
-            ),
-        };
-    });
-
-    const divider = {
-        key: 'divider',
-        type: 'divider',
-    };
-
-    const items = [
-        version
-            ? {
-                  key: 'version',
-                  label: (
-                      <MenuItemStyle key="version" disabled style={{ color: '#8C8C8C' }}>
-                          {version}
-                      </MenuItemStyle>
-                  ),
-              }
-            : null,
-        divider,
-        {
-            key: 'profile',
-            label: (
-                <MenuItemStyle key="profile">
-                    <a
-                        href={resolveRuntimePath(`/${entityRegistry.getPathName(EntityType.CorpUser)}/${_urn}`)}
-                        rel="noopener noreferrer"
-                        tabIndex={0}
-                    >
-                        Your Profile
-                    </a>
-                </MenuItemStyle>
-            ),
-        },
-        ...themeConfigItems,
-        {
-            key: 'graphiQLLink',
-            label: (
-                <MenuItemStyle key="graphiQLLink">
-                    <a href={resolveRuntimePath('/api/graphiql')}>GraphiQL</a>
-                </MenuItemStyle>
-            ),
-        },
-        {
-            key: 'openapiLink',
-            label: (
-                <MenuItemStyle key="openapiLink">
-                    <a href={resolveRuntimePath('/openapi/swagger-ui/index.html')}>OpenAPI</a>
-                </MenuItemStyle>
-            ),
-        },
-        divider,
-        {
-            key: 'logout',
-            label: (
-                <MenuItemStyle danger key="logout" tabIndex={0}>
-                    <a href={resolveRuntimePath('/logOut')} onClick={handleLogout} data-testid="log-out-menu-item">
-                        Sign Out
-                    </a>
-                </MenuItemStyle>
-            ),
-        },
-    ];
-
-    return (
-        <Dropdown menu={{ items }} trigger={['click']}>
-            <DropdownWrapper data-testid="manage-account-menu">
-                <CustomAvatar photoUrl={_pictureLink} style={{ marginRight: 4 }} name={name} />
-                <DownArrow />
-            </DropdownWrapper>
-        </Dropdown>
-    );
-};
-
-ManageAccount.defaultProps = defaultProps;
diff --git a/datahub-web-react/src/app/shared/Message.tsx b/datahub-web-react/src/app/shared/Message.tsx
index 5373a19b198f4d..35d15ca3d99e10 100644
--- a/datahub-web-react/src/app/shared/Message.tsx
+++ b/datahub-web-react/src/app/shared/Message.tsx
@@ -2,7 +2,7 @@ import { message } from 'antd';
 import React, { ReactNode, useEffect, useMemo } from 'react';
 
 type MessageType = 'loading' | 'info' | 'error' | 'warning' | 'success';
-export type MessageProps = {
+type MessageProps = {
     type: MessageType;
     content: ReactNode;
     style?: React.CSSProperties;
diff --git a/datahub-web-react/src/app/shared/ShowMoreSection.tsx b/datahub-web-react/src/app/shared/ShowMoreSection.tsx
index f427be206d757b..ec2d138fd7b6ab 100644
--- a/datahub-web-react/src/app/shared/ShowMoreSection.tsx
+++ b/datahub-web-react/src/app/shared/ShowMoreSection.tsx
@@ -4,7 +4,7 @@ import styled from 'styled-components';
 import { ANTD_GRAY } from '@app/entity/shared/constants';
 import colors from '@src/alchemy-components/theme/foundations/colors';
 
-export const ShowMoreButton = styled.div`
+const ShowMoreButton = styled.div`
     padding: 4px;
     color: ${colors.gray[1700]};
     text-align: left;
diff --git a/datahub-web-react/src/app/shared/TagLabel.tsx b/datahub-web-react/src/app/shared/TagLabel.tsx
index 93ba6c7cb48c70..e43ff53b299836 100644
--- a/datahub-web-react/src/app/shared/TagLabel.tsx
+++ b/datahub-web-react/src/app/shared/TagLabel.tsx
@@ -12,7 +12,7 @@ const generateColor = new ColorHash({
     saturation: 0.9,
 });
 
-export const StyledDiv = styled.div<{ $color: any; $colorHash?: string }>`
+const StyledDiv = styled.div<{ $color: any; $colorHash?: string }>`
     ${(props) =>
         props.$colorHash &&
         css`
diff --git a/datahub-web-react/src/app/shared/TagStyleEntity.tsx b/datahub-web-react/src/app/shared/TagStyleEntity.tsx
index efe1d484bd54aa..baf3add260682c 100644
--- a/datahub-web-react/src/app/shared/TagStyleEntity.tsx
+++ b/datahub-web-react/src/app/shared/TagStyleEntity.tsx
@@ -93,7 +93,7 @@ const DescriptionLabel = styled(Typography.Text)`
     }
 `;
 
-export const EmptyValue = styled.div`
+const EmptyValue = styled.div`
     &:after {
         content: 'None';
         color: #b7b7b7;
diff --git a/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx b/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx
deleted file mode 100644
index 0cd6e308a32874..00000000000000
--- a/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx
+++ /dev/null
@@ -1,206 +0,0 @@
-import {
-    ApiOutlined,
-    BarChartOutlined,
-    BookOutlined,
-    DownOutlined,
-    GlobalOutlined,
-    SettingOutlined,
-    SolutionOutlined,
-    UnorderedListOutlined,
-} from '@ant-design/icons';
-import { Button, Dropdown, Tooltip } from 'antd';
-import * as React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components/macro';
-
-import { useUserContext } from '@app/context/useUserContext';
-import DomainIcon from '@app/domain/DomainIcon';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { HOME_PAGE_INGESTION_ID } from '@app/onboarding/config/HomePageOnboardingConfig';
-import { useToggleEducationStepIdsAllowList } from '@app/onboarding/useToggleEducationStepIdsAllowList';
-import { useAppConfig, useBusinessAttributesFlag } from '@app/useAppConfig';
-import { PageRoutes } from '@conf/Global';
-
-const LinkWrapper = styled.span`
-    margin-right: 0px;
-`;
-
-const LinksWrapper = styled.div<{ areLinksHidden?: boolean }>`
-    opacity: 1;
-    white-space: nowrap;
-    transition: opacity 0.5s;
-
-    ${(props) =>
-        props.areLinksHidden &&
-        `
-        opacity: 0;
-        width: 0;
-    `}
-`;
-
-const NavTitleContainer = styled.span`
-    display: flex;
-    align-items: center;
-    justify-content: left;
-    padding: 2px;
-`;
-
-const NavSubItemTitleContainer = styled(NavTitleContainer)`
-    line-height: 20px;
-`;
-
-const NavTitleText = styled.span`
-    margin-left: 6px;
-    font-weight: bold;
-`;
-
-const NavTitleDescription = styled.div`
-    font-size: 12px;
-    font-weight: normal;
-    color: ${ANTD_GRAY[7]};
-`;
-
-interface Props {
-    areLinksHidden?: boolean;
-}
-
-export function HeaderLinks(props: Props) {
-    const { areLinksHidden } = props;
-    const me = useUserContext();
-    const { config } = useAppConfig();
-
-    const businessAttributesFlag = useBusinessAttributesFlag();
-
-    const isAnalyticsEnabled = config?.analyticsConfig?.enabled;
-    const isIngestionEnabled = config?.managedIngestionConfig?.enabled;
-
-    const showAnalytics = (isAnalyticsEnabled && me && me?.platformPrivileges?.viewAnalytics) || false;
-    const showSettings = true;
-    const showIngestion =
-        isIngestionEnabled && me && (me.platformPrivileges?.manageIngestion || me.platformPrivileges?.manageSecrets);
-    const showStructuredProperties =
-        config?.featureFlags?.showManageStructuredProperties &&
-        (me.platformPrivileges?.manageStructuredProperties || me.platformPrivileges?.viewStructuredPropertiesPage);
-
-    useToggleEducationStepIdsAllowList(!!showIngestion, HOME_PAGE_INGESTION_ID);
-
-    const items = [
-        {
-            key: 0,
-            label: (
-                <Link to="/glossary">
-                    <NavTitleContainer>
-                        <BookOutlined style={{ fontSize: '14px', fontWeight: 'bold' }} />
-                        <NavTitleText>Glossary</NavTitleText>
-                    </NavTitleContainer>
-                    <NavTitleDescription>View and modify your data dictionary</NavTitleDescription>
-                </Link>
-            ),
-        },
-        {
-            key: 1,
-            label: (
-                <Link to="/domains">
-                    <NavTitleContainer>
-                        <DomainIcon
-                            style={{
-                                fontSize: 14,
-                                fontWeight: 'bold',
-                            }}
-                        />
-                        <NavTitleText>Domains</NavTitleText>
-                    </NavTitleContainer>
-                    <NavTitleDescription>Manage related groups of data assets</NavTitleDescription>
-                </Link>
-            ),
-        },
-        ...(businessAttributesFlag
-            ? [
-                  {
-                      key: 2,
-                      label: (
-                          <Link to="/business-attribute">
-                              <NavTitleContainer>
-                                  <GlobalOutlined
-                                      style={{
-                                          fontSize: 14,
-                                          fontWeight: 'bold',
-                                      }}
-                                  />
-                                  <NavTitleText>Business Attribute</NavTitleText>
-                              </NavTitleContainer>
-                              <NavTitleDescription>Universal field for data consistency</NavTitleDescription>
-                          </Link>
-                      ),
-                  },
-              ]
-            : []),
-        ...(showStructuredProperties
-            ? [
-                  {
-                      key: 5,
-                      label: (
-                          <Link to={PageRoutes.STRUCTURED_PROPERTIES}>
-                              <NavSubItemTitleContainer>
-                                  <UnorderedListOutlined style={{ fontSize: '14px', fontWeight: 'bold' }} />
-                                  <NavTitleText>Structured Properties</NavTitleText>
-                              </NavSubItemTitleContainer>
-                              <NavTitleDescription>Manage custom properties for your data assets</NavTitleDescription>
-                          </Link>
-                      ),
-                  },
-              ]
-            : []),
-    ];
-
-    return (
-        <LinksWrapper areLinksHidden={areLinksHidden}>
-            {showAnalytics && (
-                <LinkWrapper>
-                    <Link to="/analytics">
-                        <Button type="text">
-                            <Tooltip title="View DataHub usage analytics">
-                                <NavTitleContainer>
-                                    <BarChartOutlined />
-                                    <NavTitleText>Analytics</NavTitleText>
-                                </NavTitleContainer>
-                            </Tooltip>
-                        </Button>
-                    </Link>
-                </LinkWrapper>
-            )}
-            <Dropdown trigger={['click']} menu={{ items }}>
-                <LinkWrapper>
-                    <Button type="text">
-                        <SolutionOutlined /> Govern <DownOutlined style={{ fontSize: '6px' }} />
-                    </Button>
-                </LinkWrapper>
-            </Dropdown>
-            {showIngestion && (
-                <LinkWrapper>
-                    <Link to="/ingestion">
-                        <Button id={HOME_PAGE_INGESTION_ID} type="text">
-                            <Tooltip title="Connect DataHub to your organization's data sources">
-                                <NavTitleContainer>
-                                    <ApiOutlined />
-                                    <NavTitleText>Ingestion</NavTitleText>
-                                </NavTitleContainer>
-                            </Tooltip>
-                        </Button>
-                    </Link>
-                </LinkWrapper>
-            )}
-            {showSettings && (
-                <LinkWrapper style={{ marginRight: 12 }}>
-                    <Link to="/settings">
-                        <Button type="text">
-                            <Tooltip title="Manage your DataHub settings">
-                                <SettingOutlined />
-                            </Tooltip>
-                        </Button>
-                    </Link>
-                </LinkWrapper>
-            )}
-        </LinksWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx b/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx
deleted file mode 100644
index f6c49af7746fb4..00000000000000
--- a/datahub-web-react/src/app/shared/businessAttribute/AddBusinessAttributeModal.tsx
+++ /dev/null
@@ -1,382 +0,0 @@
-import { GlobalOutlined } from '@ant-design/icons';
-import { Button, Tag as CustomTag, Modal, Select, message } from 'antd';
-import React, { useRef, useState } from 'react';
-import styled from 'styled-components';
-
-import AttributeBrowser from '@app/businessAttribute/AttributeBrowser';
-import { handleBatchError } from '@app/entity/shared/utils';
-import ClickOutside from '@app/shared/ClickOutside';
-import { ENTER_KEY_CODE } from '@app/shared/constants';
-import { useGetRecommendations } from '@app/shared/recommendation';
-import { useEnterKeyListener } from '@app/shared/useEnterKeyListener';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useListBusinessAttributesQuery } from '@graphql/businessAttribute.generated';
-import { useAddBusinessAttributeMutation, useRemoveBusinessAttributeMutation } from '@graphql/mutations.generated';
-import { useGetSearchResultsLazyQuery } from '@graphql/search.generated';
-import { Entity, EntityType, ResourceRefInput } from '@types';
-
-export enum OperationType {
-    ADD,
-    REMOVE,
-}
-
-const AttributeSelect = styled(Select)`
-    width: 480px;
-`;
-
-const AttributeName = styled.span`
-    margin-left: 5px;
-`;
-
-const StyleTag = styled(CustomTag)`
-    margin: 2px;
-    display: flex;
-    justify-content: start;
-    align-items: center;
-    white-space: nowrap;
-    opacity: 1;
-    color: #434343;
-    line-height: 16px;
-    white-space: normal;
-    word-break: break-all;
-`;
-
-export const BrowserWrapper = styled.div<{ isHidden: boolean; width?: string; maxHeight?: number }>`
-    background-color: white;
-    border-radius: 5px;
-    box-shadow:
-        0 3px 6px -4px rgb(0 0 0 / 12%),
-        0 6px 16px 0 rgb(0 0 0 / 8%),
-        0 9px 28px 8px rgb(0 0 0 / 5%);
-    max-height: ${(props) => (props.maxHeight ? props.maxHeight : '380')}px;
-    overflow: auto;
-    position: absolute;
-    transition: opacity 0.2s;
-    width: ${(props) => (props.width ? props.width : '480px')};
-    z-index: 1051;
-    ${(props) =>
-        props.isHidden &&
-        `
-        opacity: 0;
-        height: 0;
-    `}
-`;
-
-type EditAttributeModalProps = {
-    open: boolean;
-    onCloseModal: () => void;
-    resources: ResourceRefInput[];
-    type?: EntityType;
-    operationType?: OperationType;
-    onOkOverride?: (result: string) => void;
-};
-
-export default function EditBusinessAttributeModal({
-    open,
-    type = EntityType.BusinessAttribute,
-    operationType = OperationType.ADD,
-    onCloseModal,
-    onOkOverride,
-    resources,
-}: EditAttributeModalProps) {
-    const entityRegistry = useEntityRegistry();
-    const [inputValue, setInputValue] = useState('');
-    const [addBusinessAttributeMutation] = useAddBusinessAttributeMutation();
-    const [removeBusinessAttributeMutation] = useRemoveBusinessAttributeMutation();
-    const [isFocusedOnInput, setIsFocusedOnInput] = useState(false);
-    const inputEl = useRef(null);
-    const [urn, setUrn] = useState<string>('');
-    const [disableAction, setDisableAction] = useState(false);
-    const { recommendedData } = useGetRecommendations([EntityType.BusinessAttribute]);
-    const [selectedAttribute, setSelectedAttribute] = useState<any>('');
-    const [attributeSearch, { data: attributeSearchData }] = useGetSearchResultsLazyQuery();
-    const attributeSearchResults =
-        attributeSearchData?.search?.searchResults?.map((searchResult) => searchResult.entity) || [];
-    const { data: attributeData } = useListBusinessAttributesQuery({
-        variables: {
-            start: 0,
-            count: 10,
-            query: '',
-        },
-    });
-
-    const displayedAttributes =
-        attributeData?.listBusinessAttributes?.businessAttributes?.map((defaultValue) => ({
-            urn: defaultValue.urn,
-            component: (
-                <div>
-                    <GlobalOutlined />
-                    <AttributeName>{defaultValue?.properties?.name}</AttributeName>
-                </div>
-            ),
-        })) || [];
-
-    const handleSearch = (text: string) => {
-        if (text.length > 0) {
-            attributeSearch({
-                variables: {
-                    input: {
-                        type,
-                        query: text,
-                        start: 0,
-                        count: 10,
-                    },
-                },
-            });
-        }
-    };
-
-    const renderSearchResult = (entity: Entity) => {
-        const displayName = entityRegistry.getDisplayName(entity.type, entity);
-        return (
-            <Select.Option
-                data-testid="business-attribute-option"
-                value={entity.urn}
-                key={entity.urn}
-                name={displayName}
-            >
-                <div>
-                    <GlobalOutlined />
-                    <AttributeName>{displayName}</AttributeName>
-                </div>
-            </Select.Option>
-        );
-    };
-
-    const attributeResult = !inputValue || inputValue.length === 0 ? recommendedData : attributeSearchResults;
-    const attributeSearchOptions = attributeResult?.map((result) => {
-        return renderSearchResult(result);
-    });
-
-    const attributeRender = (props) => {
-        // eslint-disable-next-line react/prop-types
-        const { closable, onClose, value } = props;
-        const onPreventMouseDown = (event) => {
-            event.preventDefault();
-            event.stopPropagation();
-        };
-        /* eslint-disable-next-line react/prop-types */
-        const selectedItem = selectedAttribute
-            ? selectedAttribute?.props?.component
-            : displayedAttributes.find((attribute) => attribute.urn === value)?.component;
-        return (
-            <StyleTag onMouseDown={onPreventMouseDown} closable={closable} onClose={onClose}>
-                {selectedItem}
-            </StyleTag>
-        );
-    };
-
-    // Handle the Enter press
-    useEnterKeyListener({
-        querySelectorToExecuteClick: '#addAttributeButton',
-    });
-
-    // When business attribute search result is selected, add the urn
-    const onSelectValue = (selectedUrn: string) => {
-        const selectedSearchOption = attributeSearchOptions?.find((option) => option.props.value === selectedUrn);
-        setUrn(selectedUrn);
-        if (selectedAttribute?.selectedUrn !== selectedUrn) {
-            setSelectedAttribute({
-                selectedUrn,
-                component: (
-                    <div>
-                        <GlobalOutlined />
-                        <AttributeName>{selectedSearchOption?.props?.name}</AttributeName>
-                    </div>
-                ),
-            });
-        }
-        if (inputEl && inputEl.current) {
-            (inputEl.current as any).blur();
-        }
-    };
-
-    // When a Tag or term search result is deselected, remove the urn from the Owners
-    const onDeselectValue = (selectedUrn: string) => {
-        setUrn(urn === selectedUrn ? '' : urn);
-        setInputValue('');
-        setIsFocusedOnInput(true);
-        setSelectedAttribute('');
-    };
-
-    const addBusinessAttribute = () => {
-        addBusinessAttributeMutation({
-            variables: {
-                input: {
-                    businessAttributeUrn: urn,
-                    resourceUrn: resources,
-                },
-            },
-        })
-            .then(({ errors }) => {
-                if (!errors) {
-                    message.success({
-                        content: `Added Business Attribute!`,
-                        duration: 2,
-                    });
-                }
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error({ content: `Failed to add: \n ${e.message || ''}`, duration: 3 });
-            })
-            .finally(() => {
-                setDisableAction(false);
-                onCloseModal();
-                setUrn('');
-            });
-    };
-
-    const removeBusinessAttribute = () => {
-        removeBusinessAttributeMutation({
-            variables: {
-                input: {
-                    businessAttributeUrn: urn,
-                    resourceUrn: [
-                        {
-                            resourceUrn: resources[0].resourceUrn,
-                            subResource: resources[0].subResource,
-                            subResourceType: resources[0].subResourceType,
-                        },
-                    ],
-                },
-            },
-        })
-            .then(({ errors }) => {
-                if (!errors) {
-                    message.success({
-                        content: `Removed Business Attribute!`,
-                        duration: 2,
-                    });
-                }
-            })
-            .catch((e) => {
-                message.destroy();
-                message.error(
-                    handleBatchError(urn, e, { content: `Failed to remove: \n ${e.message || ''}`, duration: 3 }),
-                );
-            })
-            .finally(() => {
-                setDisableAction(false);
-                onCloseModal();
-                setUrn('');
-            });
-    };
-
-    const editBusinessAttribute = () => {
-        if (operationType === OperationType.ADD) {
-            addBusinessAttribute();
-        } else {
-            removeBusinessAttribute();
-        }
-    };
-
-    const onOk = () => {
-        if (onOkOverride) {
-            onOkOverride(urn);
-            return;
-        }
-
-        if (!resources) {
-            onCloseModal();
-            return;
-        }
-        setDisableAction(true);
-        editBusinessAttribute();
-    };
-
-    function selectAttributeFromBrowser(selectedUrn: string, displayName: string) {
-        setIsFocusedOnInput(false);
-        setUrn(selectedUrn);
-        setSelectedAttribute({
-            selectedUrn,
-            component: (
-                <div>
-                    <GlobalOutlined />
-                    <AttributeName>{displayName}</AttributeName>
-                </div>
-            ),
-        });
-    }
-
-    function clearInput() {
-        setInputValue('');
-        setTimeout(() => setIsFocusedOnInput(true), 0); // call after click outside
-    }
-
-    function handleBlur() {
-        setInputValue('');
-    }
-
-    function handleKeyDown(event) {
-        if (event.keyCode === ENTER_KEY_CODE) {
-            (inputEl.current as any).blur();
-        }
-    }
-
-    const isShowingAttributeBrowser = !inputValue && type === EntityType.BusinessAttribute && isFocusedOnInput;
-
-    return (
-        <Modal
-            title={`${operationType === OperationType.ADD ? 'Add' : 'Remove'} ${entityRegistry.getEntityName(type)}s`}
-            open={open}
-            onCancel={onCloseModal}
-            footer={
-                <>
-                    <Button onClick={onCloseModal} type="text">
-                        Cancel
-                    </Button>
-                    <Button
-                        id="addAttributeButton"
-                        data-testid="add-attribute-from-modal-btn"
-                        onClick={onOk}
-                        disabled={urn.length === 0 || disableAction}
-                    >
-                        Done
-                    </Button>
-                </>
-            }
-        >
-            <ClickOutside onClickOutside={() => setIsFocusedOnInput(false)}>
-                <AttributeSelect
-                    data-testid="business-attribute-modal-input"
-                    placeholder={`Search for ${entityRegistry.getEntityName(type)?.toLowerCase()}...`}
-                    autoFocus
-                    defaultOpen
-                    mode="multiple"
-                    ref={inputEl}
-                    filterOption={false}
-                    showSearch
-                    defaultActiveFirstOption={false}
-                    onSelect={(asset: any) => {
-                        onSelectValue(asset);
-                    }}
-                    onDeselect={(asset: any) => onDeselectValue(asset)}
-                    onSearch={(value: string) => {
-                        // eslint-disable-next-line react/prop-types
-                        handleSearch(value.trim());
-                        // eslint-disable-next-line react/prop-types
-                        setInputValue(value.trim());
-                    }}
-                    tagRender={attributeRender}
-                    value={urn || undefined}
-                    onClear={clearInput}
-                    onFocus={() => setIsFocusedOnInput(true)}
-                    onBlur={handleBlur}
-                    onInputKeyDown={handleKeyDown}
-                    dropdownStyle={isShowingAttributeBrowser ? { display: 'none', color: 'RED' } : {}}
-                >
-                    {attributeSearchOptions}
-                </AttributeSelect>
-                <BrowserWrapper isHidden={!isShowingAttributeBrowser}>
-                    <AttributeBrowser
-                        isSelecting
-                        selectAttribute={selectAttributeFromBrowser}
-                        attributeData={attributeData}
-                    />
-                </BrowserWrapper>
-            </ClickOutside>
-        </Modal>
-    );
-}
diff --git a/datahub-web-react/src/app/shared/businessAttribute/AttributeContent.tsx b/datahub-web-react/src/app/shared/businessAttribute/AttributeContent.tsx
deleted file mode 100644
index e2d1fd7c27acfe..00000000000000
--- a/datahub-web-react/src/app/shared/businessAttribute/AttributeContent.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { GlobalOutlined } from '@ant-design/icons';
-import { Modal, Tag, message } from 'antd';
-import React from 'react';
-import Highlight from 'react-highlighter';
-import styled from 'styled-components';
-
-import { useHasMatchedFieldByUrn } from '@app/search/context/SearchResultContext';
-import { MatchedFieldName } from '@app/search/matches/constants';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useRemoveBusinessAttributeMutation } from '@graphql/mutations.generated';
-import { BusinessAttributeAssociation, EntityType } from '@types';
-
-const highlightMatchStyle = { background: '#ffe58f', padding: '0' };
-
-const StyledAttribute = styled(Tag)<{ fontSize?: number; highlightAttribute?: boolean }>`
-    &&& {
-        ${(props) =>
-            props.highlightAttribute &&
-            `background: ${props.theme.styles['highlight-color']};
-            border: 1px solid ${props.theme.styles['highlight-border-color']};
-        `}
-    }
-    ${(props) => props.fontSize && `font-size: ${props.fontSize}px;`}
-`;
-
-interface Props {
-    businessAttribute: BusinessAttributeAssociation | undefined;
-    entityUrn?: string;
-    canRemove?: boolean;
-    readOnly?: boolean;
-    highlightText?: string;
-    fontSize?: number;
-    onOpenModal?: () => void;
-    refetch?: () => Promise<any>;
-}
-
-export default function AttributeContent({
-    businessAttribute,
-    canRemove,
-    readOnly,
-    highlightText,
-    fontSize,
-    onOpenModal,
-    entityUrn,
-    refetch,
-}: Props) {
-    const entityRegistry = useEntityRegistry();
-    const [removeBusinessAttributeMutation] = useRemoveBusinessAttributeMutation();
-    const highlightAttribute = useHasMatchedFieldByUrn(
-        businessAttribute?.businessAttribute?.urn || '',
-        'businessAttributes' as MatchedFieldName,
-    );
-
-    const removeAttribute = (attributeToRemove: BusinessAttributeAssociation) => {
-        onOpenModal?.();
-        const AttributeName =
-            attributeToRemove &&
-            entityRegistry.getDisplayName(
-                attributeToRemove.businessAttribute.type,
-                attributeToRemove.businessAttribute,
-            );
-        Modal.confirm({
-            title: `Do you want to remove ${AttributeName} attribute?`,
-            content: `Are you sure you want to remove the ${AttributeName} attribute?`,
-            onOk() {
-                if (attributeToRemove.associatedUrn || entityUrn) {
-                    removeBusinessAttributeMutation({
-                        variables: {
-                            input: {
-                                businessAttributeUrn: attributeToRemove.businessAttribute.urn,
-                                resourceUrn: [
-                                    {
-                                        resourceUrn: attributeToRemove.associatedUrn || entityUrn || '',
-                                        subResource: null,
-                                        subResourceType: null,
-                                    },
-                                ],
-                            },
-                        },
-                    })
-                        .then(({ errors }) => {
-                            if (!errors) {
-                                message.success({ content: 'Removed Business Attribute!', duration: 2 });
-                            }
-                        })
-                        .then(refetch)
-                        .catch((e) => {
-                            message.destroy();
-                            message.error({
-                                content: `Failed to remove business attribute: \n ${e.message || ''}`,
-                                duration: 3,
-                            });
-                        });
-                }
-            },
-            onCancel() {},
-            okText: 'Yes',
-            maskClosable: true,
-            closable: true,
-        });
-    };
-
-    return (
-        <StyledAttribute
-            style={{ cursor: 'pointer', whiteSpace: 'normal' }}
-            closable={canRemove && !readOnly}
-            onClose={(e) => {
-                e.preventDefault();
-                removeAttribute(businessAttribute as BusinessAttributeAssociation);
-            }}
-            fontSize={fontSize}
-            highlightAttribute={highlightAttribute}
-        >
-            <GlobalOutlined style={{ marginRight: '4px' }} />
-            <Highlight style={{ marginLeft: 0 }} matchStyle={highlightMatchStyle} search={highlightText}>
-                {entityRegistry.getDisplayName(EntityType.BusinessAttribute, businessAttribute?.businessAttribute)}
-            </Highlight>
-        </StyledAttribute>
-    );
-}
diff --git a/datahub-web-react/src/app/shared/businessAttribute/BusinessAttributeGroup.tsx b/datahub-web-react/src/app/shared/businessAttribute/BusinessAttributeGroup.tsx
deleted file mode 100644
index 2069d291373153..00000000000000
--- a/datahub-web-react/src/app/shared/businessAttribute/BusinessAttributeGroup.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Typography } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { EMPTY_MESSAGES } from '@app/entity/shared/constants';
-import EditBusinessAttributeModal from '@app/shared/businessAttribute/AddBusinessAttributeModal';
-import StyledAttribute from '@app/shared/businessAttribute/StyledAttribute';
-
-import { BusinessAttributeAssociation, EntityType } from '@types';
-
-type Props = {
-    businessAttribute?: BusinessAttributeAssociation;
-    canRemove?: boolean;
-    canAddAttribute?: boolean;
-    showEmptyMessage?: boolean;
-    buttonProps?: Record<string, unknown>;
-    onOpenModal?: () => void;
-    maxShow?: number;
-    entityUrn?: string;
-    entityType?: EntityType;
-    entitySubresource?: string;
-    highlightText?: string;
-    fontSize?: number;
-    refetch?: () => Promise<any>;
-    readOnly?: boolean;
-};
-
-const NoElementButton = styled(Button)`
-    :not(:last-child) {
-        margin-right: 8px;
-    }
-`;
-
-export default function BusinessAttributeGroup({
-    businessAttribute,
-    canAddAttribute,
-    showEmptyMessage,
-    buttonProps,
-    onOpenModal,
-    entityUrn,
-    entityType,
-    entitySubresource,
-    refetch,
-    readOnly,
-    canRemove,
-    highlightText,
-    fontSize,
-}: Props) {
-    const [showAddModal, setShowAddModal] = useState(false);
-    const [addModalType, setAddModalType] = useState(EntityType.BusinessAttribute);
-    const businessAttributeEmpty = !businessAttribute?.associatedUrn?.length;
-    return (
-        <>
-            {!businessAttributeEmpty && businessAttribute !== undefined && (
-                <StyledAttribute
-                    businessAttribute={businessAttribute}
-                    entityUrn={entityUrn}
-                    entitySubresource={entitySubresource}
-                    canRemove={canRemove}
-                    readOnly={readOnly}
-                    highlightText={highlightText}
-                    onOpenModal={onOpenModal}
-                    refetch={refetch}
-                    fontSize={fontSize}
-                />
-            )}
-            {showEmptyMessage && canAddAttribute && businessAttributeEmpty && (
-                <Typography.Paragraph type="secondary">
-                    {EMPTY_MESSAGES.businessAttributes.title}. {EMPTY_MESSAGES.businessAttributes.description}
-                </Typography.Paragraph>
-            )}
-            {canAddAttribute && !readOnly && businessAttributeEmpty && (
-                <NoElementButton
-                    type={showEmptyMessage && businessAttributeEmpty ? 'default' : 'text'}
-                    onClick={() => {
-                        setAddModalType(EntityType.BusinessAttribute);
-                        setShowAddModal(true);
-                    }}
-                    {...buttonProps}
-                >
-                    <PlusOutlined />
-                    <span>Add Attribute</span>
-                </NoElementButton>
-            )}
-            {showAddModal && !!entityUrn && !!entityType && (
-                <EditBusinessAttributeModal
-                    type={addModalType}
-                    open
-                    onCloseModal={() => {
-                        onOpenModal?.();
-                        setShowAddModal(false);
-                        refetch?.();
-                    }}
-                    resources={[
-                        {
-                            resourceUrn: entityUrn,
-                            subResource: null,
-                            subResourceType: null,
-                        },
-                    ]}
-                />
-            )}
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/shared/businessAttribute/StyledAttribute.tsx b/datahub-web-react/src/app/shared/businessAttribute/StyledAttribute.tsx
deleted file mode 100644
index f253ce9d4999eb..00000000000000
--- a/datahub-web-react/src/app/shared/businessAttribute/StyledAttribute.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip';
-import AttributeContent from '@app/shared/businessAttribute/AttributeContent';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { BusinessAttributeAssociation, EntityType } from '@types';
-
-const AttributeLink = styled(Link)`
-    display: inline-block;
-    margin-bottom: 8px;
-`;
-
-const AttributeWrapper = styled.span`
-    display: inline-block;
-    margin-bottom: 8px;
-`;
-
-interface Props {
-    businessAttribute: BusinessAttributeAssociation;
-    entityUrn?: string;
-    entitySubresource?: string;
-    canRemove?: boolean;
-    readOnly?: boolean;
-    highlightText?: string;
-    fontSize?: number;
-    onOpenModal?: () => void;
-    refetch?: () => Promise<any>;
-}
-
-export default function StyledAttribute(props: Props) {
-    const { businessAttribute, readOnly } = props;
-    const entityRegistry = useEntityRegistry();
-
-    if (readOnly) {
-        return (
-            <HoverEntityTooltip entity={businessAttribute?.businessAttribute}>
-                <AttributeWrapper>
-                    <AttributeContent {...props} />
-                </AttributeWrapper>
-            </HoverEntityTooltip>
-        );
-    }
-
-    return (
-        <HoverEntityTooltip entity={businessAttribute?.businessAttribute}>
-            <AttributeLink
-                to={entityRegistry.getEntityUrl(
-                    EntityType.BusinessAttribute,
-                    businessAttribute?.businessAttribute?.urn,
-                )}
-                key={businessAttribute?.businessAttribute?.urn}
-            >
-                <AttributeContent {...props} />
-            </AttributeLink>
-        </HoverEntityTooltip>
-    );
-}
diff --git a/datahub-web-react/src/app/shared/components.tsx b/datahub-web-react/src/app/shared/components.tsx
index e67aed9e4dc95f..e8da2438717631 100644
--- a/datahub-web-react/src/app/shared/components.tsx
+++ b/datahub-web-react/src/app/shared/components.tsx
@@ -1,27 +1,6 @@
 import { Button } from 'antd';
 import styled from 'styled-components';
 
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-export const HomePageButton = styled(Button)`
-    margin-right: 12px;
-    margin-left: 12px;
-    margin-bottom: 12px;
-    width: 160px;
-    height: 140px;
-    display: flex;
-    justify-content: center;
-    border-radius: 4px;
-    align-items: center;
-    flex-direction: column;
-    border: 1px solid ${ANTD_GRAY[4]};
-    box-shadow: ${(props) => props.theme.styles['box-shadow']};
-    &&:hover {
-        box-shadow: ${(props) => props.theme.styles['box-shadow-hover']};
-    }
-    white-space: unset;
-`;
-
 export const BaseButton = styled(Button)`
     &&& {
         display: flex;
diff --git a/datahub-web-react/src/app/shared/constants.ts b/datahub-web-react/src/app/shared/constants.ts
index d0d8718db5e134..d7a4ce3e8f4893 100644
--- a/datahub-web-react/src/app/shared/constants.ts
+++ b/datahub-web-react/src/app/shared/constants.ts
@@ -12,7 +12,6 @@ export enum ErrorCodes {
     BadRequest = 400,
     Unauthorized = 401,
     Forbidden = 403,
-    NotFound = 404,
     ServerError = 500,
 }
 
diff --git a/datahub-web-react/src/app/shared/entitySearch/routingUtils/useUserParams.ts b/datahub-web-react/src/app/shared/entitySearch/routingUtils/useUserParams.ts
deleted file mode 100644
index 41c849ee10d36c..00000000000000
--- a/datahub-web-react/src/app/shared/entitySearch/routingUtils/useUserParams.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useMemo } from 'react';
-import { useLocation, useParams } from 'react-router';
-
-type UserPageParams = {
-    urn: string;
-};
-
-const SUBVIEW_PATH_INDEX = 3;
-const ITEM_PATH_INDEX = 4;
-
-export default function useUserParams(): { subview?: string; item?: string; urn: string } {
-    const location = useLocation();
-    const { urn } = useParams<UserPageParams>();
-    return useMemo(() => {
-        const parts = location.pathname.split('/');
-        const subview = parts[SUBVIEW_PATH_INDEX];
-
-        return {
-            urn,
-            subview,
-            item: parts[ITEM_PATH_INDEX],
-        };
-    }, [location.pathname, urn]);
-}
diff --git a/datahub-web-react/src/app/shared/health/healthUtils.tsx b/datahub-web-react/src/app/shared/health/healthUtils.tsx
index dbe79a049f39cc..2151f6e037697d 100644
--- a/datahub-web-react/src/app/shared/health/healthUtils.tsx
+++ b/datahub-web-react/src/app/shared/health/healthUtils.tsx
@@ -1,17 +1,13 @@
 import {
     CheckCircleOutlined,
-    CheckOutlined,
-    CloseOutlined,
     ExclamationCircleOutlined,
     ExclamationCircleTwoTone,
-    WarningFilled,
-    WarningOutlined,
 } from '@ant-design/icons';
 import { colors } from '@components';
 import React from 'react';
 import styled from 'styled-components';
 
-import { FAILURE_COLOR_HEX, SUCCESS_COLOR_HEX } from '@app/entity/shared/tabs/Incident/incidentUtils';
+import { SUCCESS_COLOR_HEX } from '@app/entity/shared/tabs/Incident/incidentUtils';
 import { GenericEntityProperties } from '@src/app/entity/shared/types';
 
 import { Health, HealthStatus, HealthStatusType } from '@types';
@@ -88,68 +84,6 @@ export const getHealthSummaryMessage = (healths: Health[]) => {
     return unhealthy ? 'This asset may be unhealthy' : 'This asset is healthy';
 };
 
-export const getHealthColor = (status: HealthStatus) => {
-    switch (status) {
-        case HealthStatus.Pass: {
-            return 'green';
-        }
-        case HealthStatus.Fail: {
-            return 'red';
-        }
-        case HealthStatus.Warn: {
-            return 'yellow';
-        }
-        default:
-            throw new Error(`Unrecognized Health Status ${status} provided`);
-    }
-};
-
-export const getAssertionsHealthIcon = (status: HealthStatus, fontSize: number) => {
-    switch (status) {
-        case HealthStatus.Pass: {
-            return <CheckOutlined style={{ color: getHealthColor(status), fontSize }} />;
-        }
-        case HealthStatus.Fail: {
-            return <CloseOutlined style={{ color: getHealthColor(status), fontSize }} />;
-        }
-        case HealthStatus.Warn: {
-            return <WarningOutlined style={{ color: getHealthColor(status), fontSize }} />;
-        }
-        default:
-            throw new Error(`Unrecognized Health Status ${status} provided`);
-    }
-};
-
-export const getIncidentsHealthIcon = (status: HealthStatus, fontSize: number) => {
-    switch (status) {
-        case HealthStatus.Pass: {
-            // No "success" logo.
-            return null;
-        }
-        case HealthStatus.Fail: {
-            return <WarningFilled style={{ color: FAILURE_COLOR_HEX, fontSize }} />;
-        }
-        case HealthStatus.Warn: {
-            return <WarningFilled style={{ color: FAILURE_COLOR_HEX, fontSize }} />;
-        }
-        default:
-            throw new Error(`Unrecognized Health Status ${status} provided`);
-    }
-};
-
-export const getHealthIcon = (type: HealthStatusType, status: HealthStatus, fontSize: number) => {
-    switch (type) {
-        case HealthStatusType.Assertions: {
-            return getAssertionsHealthIcon(status, fontSize);
-        }
-        case HealthStatusType.Incidents: {
-            return getIncidentsHealthIcon(status, fontSize);
-        }
-        default:
-            throw new Error(`Unrecognized Health Status Type ${type} provided`);
-    }
-};
-
 export const getHealthRedirectPath = (type: HealthStatusType) => {
     switch (type) {
         case HealthStatusType.Assertions: {
diff --git a/datahub-web-react/src/app/shared/numberUtil.ts b/datahub-web-react/src/app/shared/numberUtil.ts
index 82280c75b47f8b..94beb88dbf2a43 100644
--- a/datahub-web-react/src/app/shared/numberUtil.ts
+++ b/datahub-web-react/src/app/shared/numberUtil.ts
@@ -2,21 +2,3 @@ export function parseMaybeStringAsFloatOrDefault<T>(str: any, fallback?: T): num
     const parsedValue = typeof str === 'string' ? parseFloat(str) : str;
     return typeof parsedValue === 'number' && !Number.isNaN(parsedValue) ? parsedValue : fallback;
 }
-
-export function parseJsonArrayOrDefault<T>(str: any, fallback: T[] = []): T[] | undefined {
-    // Check if the input is a string and try to parse it.
-    if (typeof str === 'string') {
-        try {
-            const parsedValue = JSON.parse(str);
-            // Check if the parsed value is an array before returning.
-            if (Array.isArray(parsedValue)) {
-                return parsedValue;
-            }
-        } catch (e) {
-            // If parsing throws, log the error (optional) and proceed to return fallback.
-            console.error('Failed to parse JSON:', e);
-        }
-    }
-    // Return fallback if the above conditions fail.
-    return fallback;
-}
diff --git a/datahub-web-react/src/app/shared/product/update/hooks.ts b/datahub-web-react/src/app/shared/product/update/hooks.ts
index 4537e25b10fe40..c520511175a614 100644
--- a/datahub-web-react/src/app/shared/product/update/hooks.ts
+++ b/datahub-web-react/src/app/shared/product/update/hooks.ts
@@ -37,7 +37,7 @@ export function useGetLatestProductAnnouncementData() {
     return data.latestProductUpdate;
 }
 
-export type ProductAnnouncementResult = {
+type ProductAnnouncementResult = {
     visible: boolean;
     refetch: () => void;
 };
diff --git a/datahub-web-react/src/app/shared/share/ShareButton.tsx b/datahub-web-react/src/app/shared/share/ShareButton.tsx
deleted file mode 100644
index d6e6c1460f1f67..00000000000000
--- a/datahub-web-react/src/app/shared/share/ShareButton.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { ShareAltOutlined } from '@ant-design/icons';
-import { Button, Dropdown } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import useShareButtonMenu from '@app/shared/share/useShareButtonMenu';
-
-import { EntityType } from '@types';
-
-interface ShareButtonProps {
-    urn: string;
-    entityType: EntityType;
-    subType?: string | null;
-    name?: string | null;
-}
-
-const StyledButton = styled(Button)`
-    padding-left: 10px;
-    padding-right: 10px;
-`;
-
-const StyledShareIcon = styled(ShareAltOutlined)`
-    font-size: 14px;
-`;
-
-export default function ShareButton({ urn, entityType, subType, name }: ShareButtonProps) {
-    const items = useShareButtonMenu({ urn, entityType, subType, name });
-
-    return (
-        <Dropdown trigger={['click']} menu={items}>
-            <StyledButton type="primary">
-                <StyledShareIcon />
-                Share
-            </StyledButton>
-        </Dropdown>
-    );
-}
diff --git a/datahub-web-react/src/app/shared/share/items/CopyLinkMenuItem.tsx b/datahub-web-react/src/app/shared/share/items/CopyLinkMenuItem.tsx
deleted file mode 100644
index 6b7663162c6f4e..00000000000000
--- a/datahub-web-react/src/app/shared/share/items/CopyLinkMenuItem.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { CheckOutlined, LinkOutlined } from '@ant-design/icons';
-import { Tooltip } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components/macro';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-const StyledMenuItem = styled.div`
-    && {
-        color: ${ANTD_GRAY[8]};
-    }
-`;
-
-const TextSpan = styled.span`
-    padding-left: 12px;
-`;
-
-const StyledLinkOutlined = styled(LinkOutlined)`
-    font-size: 14px;
-`;
-
-export default function CopyLinkMenuItem() {
-    /**
-     * Whether button has been clicked
-     */
-    const [isClicked, setIsClicked] = useState(false);
-
-    return (
-        <StyledMenuItem
-            onClick={() => {
-                navigator.clipboard.writeText(window.location.href);
-                setIsClicked(true);
-            }}
-        >
-            <Tooltip title="Copy a shareable link to this entity.">
-                {isClicked ? <CheckOutlined /> : <StyledLinkOutlined />}
-                <TextSpan>
-                    <b>Copy Link</b>
-                </TextSpan>
-            </Tooltip>
-        </StyledMenuItem>
-    );
-}
diff --git a/datahub-web-react/src/app/shared/share/items/CopyUrnMenuItem.tsx b/datahub-web-react/src/app/shared/share/items/CopyUrnMenuItem.tsx
deleted file mode 100644
index 27ba51a47e7246..00000000000000
--- a/datahub-web-react/src/app/shared/share/items/CopyUrnMenuItem.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { CheckOutlined, CopyOutlined } from '@ant-design/icons';
-import { Tooltip } from 'antd';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-interface CopyUrnMenuItemProps {
-    urn: string;
-    type: string;
-}
-
-const StyledMenuItem = styled.div`
-    && {
-        color: ${ANTD_GRAY[8]};
-    }
-`;
-
-const TextSpan = styled.span`
-    padding-left: 12px;
-`;
-
-export default function CopyUrnMenuItem({ urn, type }: CopyUrnMenuItemProps) {
-    /**
-     * Whether button has been clicked
-     */
-    const [isClicked, setIsClicked] = useState(false);
-
-    return (
-        <StyledMenuItem
-            onClick={() => {
-                navigator.clipboard.writeText(urn);
-                setIsClicked(true);
-            }}
-        >
-            <Tooltip title={`Copy the URN for this ${type}. An URN uniquely identifies an entity on DataHub.`}>
-                {isClicked ? <CheckOutlined /> : <CopyOutlined />}
-                <TextSpan>
-                    <b>Copy URN</b>
-                </TextSpan>
-            </Tooltip>
-        </StyledMenuItem>
-    );
-}
diff --git a/datahub-web-react/src/app/shared/share/items/EmailMenuItem.tsx b/datahub-web-react/src/app/shared/share/items/EmailMenuItem.tsx
deleted file mode 100644
index 12cd6eb13ebeee..00000000000000
--- a/datahub-web-react/src/app/shared/share/items/EmailMenuItem.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { CheckOutlined, MailOutlined } from '@ant-design/icons';
-import { Tooltip } from 'antd';
-import qs from 'query-string';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-
-interface EmailMenuItemProps {
-    urn: string;
-    name: string;
-    type: string;
-}
-
-const StyledMenuItem = styled.div`
-    && {
-        color: ${ANTD_GRAY[8]};
-    }
-`;
-
-const TextSpan = styled.span`
-    padding-left: 12px;
-`;
-
-export default function EmailMenuItem({ urn, name, type }: EmailMenuItemProps) {
-    /**
-     * Whether button has been clicked
-     */
-    const [isClicked, setIsClicked] = useState(false);
-    const linkText = window.location.href;
-
-    const link = qs.stringifyUrl({
-        url: 'mailto:',
-        query: {
-            subject: `${name} | ${type}`,
-            body: `Check out this ${type} on DataHub: ${linkText}. Urn: ${urn}`,
-        },
-    });
-
-    return (
-        <StyledMenuItem
-            onClick={() => {
-                setIsClicked(true);
-            }}
-        >
-            <Tooltip title={`Share this ${type} via email`}>
-                {isClicked ? <CheckOutlined /> : <MailOutlined />}
-                <TextSpan>
-                    <a href={link} target="_blank" rel="noreferrer" style={{ color: 'inherit' }}>
-                        <b>Email</b>
-                    </a>
-                </TextSpan>
-            </Tooltip>
-        </StyledMenuItem>
-    );
-}
diff --git a/datahub-web-react/src/app/shared/share/useShareButtonMenu.tsx b/datahub-web-react/src/app/shared/share/useShareButtonMenu.tsx
deleted file mode 100644
index 9f1ee4f66f06ce..00000000000000
--- a/datahub-web-react/src/app/shared/share/useShareButtonMenu.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { MenuProps } from 'antd';
-import React from 'react';
-
-import CopyLinkMenuItem from '@app/shared/share/items/CopyLinkMenuItem';
-import CopyUrnMenuItem from '@app/shared/share/items/CopyUrnMenuItem';
-import EmailMenuItem from '@app/shared/share/items/EmailMenuItem';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { EntityType } from '@types';
-
-interface ShareButtonMenuProps {
-    urn: string;
-    entityType: EntityType;
-    subType?: string | null;
-    name?: string | null;
-}
-
-export default function useShareButtonMenu({ urn, entityType, subType, name }: ShareButtonMenuProps): MenuProps {
-    const entityRegistry = useEntityRegistry();
-    const displayName = name || urn;
-    const displayType = subType || entityRegistry.getEntityName(entityType) || entityType;
-
-    const items = [
-        navigator.clipboard && {
-            key: 0,
-            label: <CopyLinkMenuItem key="0" />,
-        },
-        navigator.clipboard && {
-            key: 1,
-            label: <CopyUrnMenuItem key="1" urn={urn} type={displayType} />,
-        },
-        {
-            key: 2,
-            label: <EmailMenuItem key="2" urn={urn} name={displayName} type={displayType} />,
-        },
-    ];
-
-    return { items };
-}
diff --git a/datahub-web-react/src/app/shared/share/v2/styledComponents.tsx b/datahub-web-react/src/app/shared/share/v2/styledComponents.tsx
index 49fb6122c4e1b6..95c57b52b6900f 100644
--- a/datahub-web-react/src/app/shared/share/v2/styledComponents.tsx
+++ b/datahub-web-react/src/app/shared/share/v2/styledComponents.tsx
@@ -1,8 +1,6 @@
-import { Button, Checkbox, Form, Menu, Modal, Typography } from 'antd';
+import { Menu } from 'antd';
 import styled from 'styled-components';
 
-import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-
 export const StyledMenuItem = styled(Menu.Item)`
     min-width: 120px;
     background-color: #fff !important;
@@ -25,123 +23,3 @@ export const StyledMenu = styled(Menu)`
     gap: 5px;
     border-right: none;
 `;
-
-export const StyledCheckbox = styled(Checkbox)<{ $color?: string }>`
-    .ant-checkbox-inner,
-    .ant-checkbox-input {
-        border-radius: 2px;
-        width: 18px !important;
-        height: 18px !important;
-    }
-
-    .ant-checkbox-checked .ant-checkbox-inner {
-        background-color: ${(props) => props.$color};
-        border-color: ${(props) => props.$color} !important;
-    }
-
-    .ant-checkbox-checked::after {
-        border-radius: 2px;
-        border-color: ${(props) => props.$color} !important;
-    }
-`;
-
-export const StyledButton = styled(Button)<{ $type?: string; $color?: string; $hoverColor?: string }>`
-    && {
-        font-size: 14px;
-        border-radius: 6px;
-        height: auto;
-        width: max-content;
-        display: flex;
-        align-items: center;
-        gap: 5px;
-        box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.05);
-        border-color: ${(props) => props.$color};
-        color: ${(props) => (props.$type === 'filled' ? 'white' : props.$color)};
-        background-color: ${(props) => (props.$type === 'filled' ? props.$color : 'transparent')};
-
-        :hover {
-            border-color: ${(props) => (props.$hoverColor ? props.$hoverColor : props.$color)};
-            background-color: ${(props) => (props.$hoverColor ? props.$hoverColor : props.$color)};
-            color: ${(props) => !(props.$type === 'filled') && 'white'};
-        }
-    }
-`;
-
-export const StyledModal = styled(Modal)`
-    font-family: Mulish;
-    width: 580px !important;
-    max-width: 680px;
-
-    &&& .ant-modal-content {
-        box-shadow:
-            0px 4px 4px 0px rgba(0, 0, 0, 0.25),
-            0px 4px 8px 3px rgba(0, 0, 0, 0.15);
-        border-radius: 12px;
-    }
-
-    .ant-modal-header {
-        border-bottom: 0;
-        padding-top: 24px;
-        border-radius: 12px !important;
-    }
-
-    .ant-modal-footer {
-        border-top: 0;
-    }
-
-    .ant-modal-body {
-        padding: 12px 24px;
-    }
-
-    .ant-modal-close-x {
-        color: ${(props) => props.theme.styles['primary-color']};
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        padding-right: 9px;
-        padding-top: 20px;
-
-        :hover {
-            stroke: ${(props) => props.theme.styles['primary-color']};
-        }
-    }
-`;
-
-export const ModalTitle = styled.span`
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    font-size: 22px;
-    font-weight: 700;
-    color: ${REDESIGN_COLORS.TEXT_HEADING_SUB_LINK};
-`;
-
-export const StyledFormItem = styled(Form.Item)`
-    margin-bottom: 8px;
-
-    .ant-input {
-        font-size: 14px;
-        font-weight: 500;
-        border-radius: 8px;
-        color: ${REDESIGN_COLORS.FOUNDATION_BLUE_5};
-
-        &:hover,
-        &:focus,
-        &:active {
-            border-color: ${(props) => props.theme.styles['primary-color']};
-        }
-
-        &:focus,
-        &:active {
-            color: ${(props) => props.theme.styles['primary-color']};
-            box-shadow: 0px 0px 4px 0px rgba(83, 63, 209, 0.5);
-        }
-    }
-`;
-
-export const FormItemTitle = styled(Typography.Text)`
-    margin-bottom: 8px;
-    font-size: 14px;
-    font-weight: 500;
-    color: ${REDESIGN_COLORS.TEXT_HEADING};
-`;
diff --git a/datahub-web-react/src/app/shared/sidebar/EmptySectionText.tsx b/datahub-web-react/src/app/shared/sidebar/EmptySectionText.tsx
deleted file mode 100644
index 232d4a8b5cc7eb..00000000000000
--- a/datahub-web-react/src/app/shared/sidebar/EmptySectionText.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-const EmptyContentMessage = styled(Typography.Text)`
-    font-size: 12px;
-    font-weight: 400;
-    color: #56668e;
-    opacity: 0.5;
-`;
-
-type Props = {
-    message: string;
-};
-
-const EmptySectionText = ({ message }: Props) => {
-    return <EmptyContentMessage type="secondary">{message}.</EmptyContentMessage>;
-};
-
-export default EmptySectionText;
diff --git a/datahub-web-react/src/app/shared/sidebar/components.tsx b/datahub-web-react/src/app/shared/sidebar/components.tsx
index 5dff07a2dc9f44..a75416f5f33554 100644
--- a/datahub-web-react/src/app/shared/sidebar/components.tsx
+++ b/datahub-web-react/src/app/shared/sidebar/components.tsx
@@ -1,19 +1,9 @@
-import { countries } from 'country-data-list';
+
 import { CaretRight } from 'phosphor-react';
 import React from 'react';
-import styled from 'styled-components';
 
 import { RotatingButton } from '@app/shared/components';
 
-export const SidebarWrapper = styled.div<{ width: number }>`
-    max-height: 100%;
-    width: ${(props) => props.width}px;
-    min-width: ${(props) => props.width}px;
-    display: ${(props) => (props.width ? 'block' : 'none')};
-    display: flex;
-    flex-direction: column;
-`;
-
 export function RotatingTriangle({
     isOpen,
     onClick,
@@ -35,21 +25,3 @@ export function RotatingTriangle({
         />
     );
 }
-
-export function getCountryName(countryCode: string) {
-    let countryName;
-    const findCountryName = (code) => {
-        try {
-            countryName = countries[code].name;
-        } catch (error) {
-            countryName = null;
-        }
-    };
-
-    if (countryCode === '' || countryCode === undefined || countryCode == null) {
-        return null;
-    }
-
-    findCountryName(countryCode);
-    return countryName;
-}
diff --git a/datahub-web-react/src/app/shared/tags/DataProductLink.tsx b/datahub-web-react/src/app/shared/tags/DataProductLink.tsx
deleted file mode 100644
index 666d4ba7b45923..00000000000000
--- a/datahub-web-react/src/app/shared/tags/DataProductLink.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import { Tag } from 'antd';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { IconStyleType } from '@app/entity/Entity';
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { HoverEntityTooltip } from '@app/recommendations/renderer/component/HoverEntityTooltip';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { DataProduct, EntityType } from '@types';
-
-const DomainLinkContainer = styled(Link)`
-    display: inline-block;
-    margin-bottom: 8px;
-`;
-
-const DomainWrapper = styled.span`
-    display: inline-block;
-    margin-bottom: 8px;
-`;
-
-const StyledTag = styled(Tag)<{ fontSize?: number }>`
-    ${(props) => props.fontSize && `font-size: ${props.fontSize}px;`}
-`;
-
-interface ContentProps {
-    dataProduct: DataProduct;
-    name?: string;
-    closable?: boolean;
-    onClose?: (e: any) => void;
-    tagStyle?: any | undefined;
-    fontSize?: number;
-}
-
-function DataProductContent({ dataProduct, name, closable, onClose, tagStyle, fontSize }: ContentProps) {
-    const entityRegistry = useEntityRegistry();
-
-    const displayName = name || entityRegistry.getDisplayName(EntityType.DataProduct, dataProduct);
-
-    return (
-        <StyledTag style={tagStyle} closable={closable} onClose={onClose} fontSize={fontSize}>
-            <span style={{ paddingRight: '4px' }}>
-                {entityRegistry.getIcon(EntityType.DataProduct, fontSize || 10, IconStyleType.ACCENT, ANTD_GRAY[9])}
-            </span>
-            {displayName}
-        </StyledTag>
-    );
-}
-
-export type Props = {
-    dataProduct: DataProduct;
-    name?: string;
-    closable?: boolean;
-    onClose?: (e: any) => void;
-    tagStyle?: any | undefined;
-    readOnly?: boolean;
-    fontSize?: number;
-};
-
-export const DataProductLink = ({
-    dataProduct,
-    name,
-    closable,
-    onClose,
-    tagStyle,
-    readOnly,
-    fontSize,
-}: Props): JSX.Element => {
-    const entityRegistry = useEntityRegistry();
-    const urn = dataProduct?.urn;
-
-    if (readOnly) {
-        return (
-            <HoverEntityTooltip entity={dataProduct}>
-                <DomainWrapper>
-                    <DataProductContent
-                        dataProduct={dataProduct}
-                        name={name}
-                        closable={closable}
-                        onClose={onClose}
-                        tagStyle={tagStyle}
-                        fontSize={fontSize}
-                    />
-                </DomainWrapper>
-            </HoverEntityTooltip>
-        );
-    }
-
-    return (
-        <HoverEntityTooltip entity={dataProduct}>
-            <DomainLinkContainer to={entityRegistry.getEntityUrl(EntityType.DataProduct, urn)}>
-                <DataProductContent
-                    dataProduct={dataProduct}
-                    name={name}
-                    closable={closable}
-                    onClose={onClose}
-                    tagStyle={tagStyle}
-                    fontSize={fontSize}
-                />
-            </DomainLinkContainer>
-        </HoverEntityTooltip>
-    );
-};
diff --git a/datahub-web-react/src/app/shared/tags/DomainLink.tsx b/datahub-web-react/src/app/shared/tags/DomainLink.tsx
index 0180e3887bbf78..65a93e50ee3bbb 100644
--- a/datahub-web-react/src/app/shared/tags/DomainLink.tsx
+++ b/datahub-web-react/src/app/shared/tags/DomainLink.tsx
@@ -53,7 +53,7 @@ function DomainContent({ domain, name, closable, onClose, tagStyle, fontSize }:
     );
 }
 
-export type Props = {
+type Props = {
     domain: Domain;
     name?: string;
     closable?: boolean;
diff --git a/datahub-web-react/src/app/shared/tags/utils/convertTagsForUpdate.ts b/datahub-web-react/src/app/shared/tags/utils/convertTagsForUpdate.ts
deleted file mode 100644
index 2c293331498192..00000000000000
--- a/datahub-web-react/src/app/shared/tags/utils/convertTagsForUpdate.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { TagAssociation, TagAssociationUpdate } from '@types';
-
-export function convertTagsForUpdate(tags: TagAssociation[]): TagAssociationUpdate[] {
-    return tags.map((tag) => ({
-        tag: { urn: tag.tag.urn, name: tag.tag.name, description: tag.tag.description },
-    }));
-}
diff --git a/datahub-web-react/src/app/shared/time/timeUtils.tsx b/datahub-web-react/src/app/shared/time/timeUtils.tsx
index 4e7e2176da7b05..bde9020d0b9398 100644
--- a/datahub-web-react/src/app/shared/time/timeUtils.tsx
+++ b/datahub-web-react/src/app/shared/time/timeUtils.tsx
@@ -6,7 +6,7 @@ import { DateInterval } from '@types';
 
 dayjs.extend(relativeTime);
 
-export const INTERVAL_TO_SECONDS = {
+const INTERVAL_TO_SECONDS = {
     [DateInterval.Second]: 1,
     [DateInterval.Minute]: 60,
     [DateInterval.Hour]: 3600,
@@ -16,7 +16,7 @@ export const INTERVAL_TO_SECONDS = {
     [DateInterval.Year]: 31536000,
 };
 
-export const INTERVAL_TO_MS = {
+const INTERVAL_TO_MS = {
     [DateInterval.Second]: 1000,
     [DateInterval.Minute]: 60000,
     [DateInterval.Hour]: 3600000,
@@ -26,7 +26,7 @@ export const INTERVAL_TO_MS = {
     [DateInterval.Year]: 31536000000,
 };
 
-export const INTERVAL_TO_MOMENT_INTERVAL: { [key: string]: moment.DurationInputArg2 } = {
+const INTERVAL_TO_MOMENT_INTERVAL: { [key: string]: moment.DurationInputArg2 } = {
     [DateInterval.Second]: 'seconds',
     [DateInterval.Minute]: 'minutes',
     [DateInterval.Hour]: 'hours',
@@ -41,9 +41,9 @@ export type TimeWindowSize = {
     count: number;
 };
 
-export type TimeWindowSizeMs = number;
+type TimeWindowSizeMs = number;
 
-export type TimeWindow = {
+type TimeWindow = {
     startTime: number;
     endTime: number;
 };
@@ -55,7 +55,7 @@ export type TimeWindow = {
  * @param interval a human-readable time interval
  * @param count the number of time intervals composing the window
  */
-export const getTimeWindowSizeMs = (windowSize: TimeWindowSize): TimeWindowSizeMs => {
+const getTimeWindowSizeMs = (windowSize: TimeWindowSize): TimeWindowSizeMs => {
     return INTERVAL_TO_SECONDS[windowSize.interval] * 1000 * windowSize.count;
 };
 
@@ -117,19 +117,6 @@ export const toLocalDateTimeString = (timeMs: number) => {
     });
 };
 
-export const toUTCDateTimeString = (timeMs: number) => {
-    const date = new Date(timeMs);
-    return date.toLocaleString([], {
-        year: 'numeric',
-        month: 'numeric',
-        day: 'numeric',
-        hour: '2-digit',
-        minute: '2-digit',
-        timeZone: 'UTC',
-        timeZoneName: 'short',
-    });
-};
-
 export const getLocaleTimezone = () => {
     return Intl.DateTimeFormat().resolvedOptions().timeZone;
 };
diff --git a/datahub-web-react/src/app/shared/userSearchUtils.ts b/datahub-web-react/src/app/shared/userSearchUtils.ts
index 37cafa6db67848..d783b4addecff3 100644
--- a/datahub-web-react/src/app/shared/userSearchUtils.ts
+++ b/datahub-web-react/src/app/shared/userSearchUtils.ts
@@ -1,7 +1,6 @@
 import {
     AndFilterInput,
     AutoCompleteInput,
-    AutoCompleteMultipleInput,
     EntityType,
     FilterOperator,
     SearchAcrossEntitiesInput,
@@ -13,7 +12,7 @@ import {
  *
  * @returns Array of AndFilterInput for server-side user filtering
  */
-export const getUserFilters = (): AndFilterInput[] => [
+const getUserFilters = (): AndFilterInput[] => [
     {
         // Include users with active status = true
         and: [{ field: 'active', values: ['true'] }],
@@ -80,23 +79,3 @@ export const addUserFiltersToAutoCompleteInput = (
     }
     return input;
 };
-
-/**
- * Adds filtering on active=true or displayName to AutoCompleteMultipleInput when CorpUser is included in types.
- *
- * @param input - The autocomplete input object to modify
- * @param entityTypes - Array of entity types being searched
- * @returns The modified input object with user filters applied if CorpUser is included
- */
-export const addUserFiltersToAutoCompleteMultipleInput = (
-    input: AutoCompleteMultipleInput,
-    entityTypes: EntityType[],
-): AutoCompleteMultipleInput => {
-    if (entityTypes.includes(EntityType.CorpUser)) {
-        return {
-            ...input,
-            orFilters: getUserFilters(),
-        };
-    }
-    return input;
-};
diff --git a/datahub-web-react/src/app/sharedV2/PageBanner.tsx b/datahub-web-react/src/app/sharedV2/PageBanner.tsx
deleted file mode 100644
index 89d19e30bd3a82..00000000000000
--- a/datahub-web-react/src/app/sharedV2/PageBanner.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Button, colors } from '@components';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-import { FontColorOptions } from '@components/theme/config';
-
-const BannerWrapper = styled.div<{ $backgroundColor: string }>`
-    padding: 16px;
-    font-size: 14px;
-    font-weight: 500;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    background-color: ${({ $backgroundColor }) => $backgroundColor};
-`;
-
-const IconTextWrapper = styled.div`
-    display: flex;
-    gap: 16px;
-    align-items: center;
-`;
-
-const StyledButton = styled(Button)`
-    padding: 0;
-`;
-
-interface Props {
-    content: React.ReactNode;
-    localStorageKey: string;
-    icon?: React.ReactNode;
-    backgroundColor?: string;
-    exitColor?: FontColorOptions;
-}
-
-export default function PageBanner({
-    content,
-    localStorageKey,
-    icon,
-    backgroundColor = colors.red[0],
-    exitColor = 'red',
-}: Props) {
-    const [isBannerHidden, setIsBannerHidden] = useState(!!localStorage.getItem(localStorageKey));
-
-    function handleClose() {
-        localStorage.setItem(localStorageKey, 'true');
-        setIsBannerHidden(true);
-    }
-
-    if (isBannerHidden) return null;
-
-    return (
-        <BannerWrapper $backgroundColor={backgroundColor}>
-            <IconTextWrapper>
-                {icon}
-                {content}
-            </IconTextWrapper>
-            <StyledButton
-                icon={{ icon: 'X', color: exitColor, source: 'phosphor', size: '2xl' }}
-                variant="link"
-                onClick={handleClose}
-            />
-        </BannerWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/sharedV2/cards/filterFromHex.ts b/datahub-web-react/src/app/sharedV2/cards/filterFromHex.ts
deleted file mode 100644
index 53172d0619b7fb..00000000000000
--- a/datahub-web-react/src/app/sharedV2/cards/filterFromHex.ts
+++ /dev/null
@@ -1,313 +0,0 @@
-// eslint-disable-next-line max-classes-per-file
-import { hexToRgb } from '@app/sharedV2/colors/colorUtils';
-
-// Taken from https://stackoverflow.com/questions/42966641/how-to-transform-black-into-any-given-color-using-only-css-filters/43960991#43960991
-export default function getFilterFromHex(hex): string {
-    const [r, g, b] = hexToRgb(hex);
-    const color = new Color(r, g, b);
-    const solver = new Solver(color);
-    return solver.solve().filter;
-}
-
-class Color {
-    r: number;
-
-    g: number;
-
-    b: number;
-
-    constructor(r, g, b) {
-        this.r = this.clamp(r);
-        this.g = this.clamp(g);
-        this.b = this.clamp(b);
-    }
-
-    toString() {
-        return `rgb(${Math.round(this.r)}, ${Math.round(this.g)}, ${Math.round(this.b)})`;
-    }
-
-    set(r, g, b) {
-        this.r = this.clamp(r);
-        this.g = this.clamp(g);
-        this.b = this.clamp(b);
-    }
-
-    hueRotate(angle = 0) {
-        // eslint-disable-next-line no-param-reassign
-        angle = (angle / 180) * Math.PI;
-        const sin = Math.sin(angle);
-        const cos = Math.cos(angle);
-
-        this.multiply([
-            0.213 + cos * 0.787 - sin * 0.213,
-            0.715 - cos * 0.715 - sin * 0.715,
-            0.072 - cos * 0.072 + sin * 0.928,
-            0.213 - cos * 0.213 + sin * 0.143,
-            0.715 + cos * 0.285 + sin * 0.14,
-            0.072 - cos * 0.072 - sin * 0.283,
-            0.213 - cos * 0.213 - sin * 0.787,
-            0.715 - cos * 0.715 + sin * 0.715,
-            0.072 + cos * 0.928 + sin * 0.072,
-        ]);
-    }
-
-    grayscale(value = 1) {
-        this.multiply([
-            0.2126 + 0.7874 * (1 - value),
-            0.7152 - 0.7152 * (1 - value),
-            0.0722 - 0.0722 * (1 - value),
-            0.2126 - 0.2126 * (1 - value),
-            0.7152 + 0.2848 * (1 - value),
-            0.0722 - 0.0722 * (1 - value),
-            0.2126 - 0.2126 * (1 - value),
-            0.7152 - 0.7152 * (1 - value),
-            0.0722 + 0.9278 * (1 - value),
-        ]);
-    }
-
-    sepia(value = 1) {
-        this.multiply([
-            0.393 + 0.607 * (1 - value),
-            0.769 - 0.769 * (1 - value),
-            0.189 - 0.189 * (1 - value),
-            0.349 - 0.349 * (1 - value),
-            0.686 + 0.314 * (1 - value),
-            0.168 - 0.168 * (1 - value),
-            0.272 - 0.272 * (1 - value),
-            0.534 - 0.534 * (1 - value),
-            0.131 + 0.869 * (1 - value),
-        ]);
-    }
-
-    saturate(value = 1) {
-        this.multiply([
-            0.213 + 0.787 * value,
-            0.715 - 0.715 * value,
-            0.072 - 0.072 * value,
-            0.213 - 0.213 * value,
-            0.715 + 0.285 * value,
-            0.072 - 0.072 * value,
-            0.213 - 0.213 * value,
-            0.715 - 0.715 * value,
-            0.072 + 0.928 * value,
-        ]);
-    }
-
-    multiply(matrix) {
-        const newR = this.clamp(this.r * matrix[0] + this.g * matrix[1] + this.b * matrix[2]);
-        const newG = this.clamp(this.r * matrix[3] + this.g * matrix[4] + this.b * matrix[5]);
-        const newB = this.clamp(this.r * matrix[6] + this.g * matrix[7] + this.b * matrix[8]);
-        this.r = newR;
-        this.g = newG;
-        this.b = newB;
-    }
-
-    brightness(value = 1) {
-        this.linear(value);
-    }
-
-    contrast(value = 1) {
-        this.linear(value, -(0.5 * value) + 0.5);
-    }
-
-    linear(slope = 1, intercept = 0) {
-        this.r = this.clamp(this.r * slope + intercept * 255);
-        this.g = this.clamp(this.g * slope + intercept * 255);
-        this.b = this.clamp(this.b * slope + intercept * 255);
-    }
-
-    invert(value = 1) {
-        this.r = this.clamp((value + (this.r / 255) * (1 - 2 * value)) * 255);
-        this.g = this.clamp((value + (this.g / 255) * (1 - 2 * value)) * 255);
-        this.b = this.clamp((value + (this.b / 255) * (1 - 2 * value)) * 255);
-    }
-
-    hsl() {
-        // Code taken from https://stackoverflow.com/a/9493060/2688027, licensed under CC BY-SA.
-        const r = this.r / 255;
-        const g = this.g / 255;
-        const b = this.b / 255;
-        const max = Math.max(r, g, b);
-        const min = Math.min(r, g, b);
-        let h = (max + min) / 2;
-        let s = (max + min) / 2;
-        const l = (max + min) / 2;
-
-        if (max === min) {
-            // eslint-disable-next-line no-multi-assign
-            h = s = 0;
-        } else {
-            const d = max - min;
-            s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
-            switch (max) {
-                case r:
-                    h = (g - b) / d + (g < b ? 6 : 0);
-                    break;
-                case g:
-                    h = (b - r) / d + 2;
-                    break;
-                case b:
-                    h = (r - g) / d + 4;
-                    break;
-                default:
-                    break;
-            }
-            h /= 6;
-        }
-
-        return {
-            h: h * 100,
-            s: s * 100,
-            l: l * 100,
-        };
-    }
-
-    clamp(value) {
-        if (value > 255) {
-            return 255;
-        }
-        if (value < 0) {
-            return 0;
-        }
-        return value;
-    }
-}
-
-class Solver {
-    target: Color;
-
-    targetHSL: { h: number; s: number; l: number };
-
-    reusedColor: Color;
-
-    constructor(target) {
-        this.target = target;
-        this.targetHSL = target.hsl();
-        this.reusedColor = new Color(0, 0, 0); // Object pool
-    }
-
-    solve() {
-        const result = this.solveNarrow(this.solveWide());
-        return {
-            values: result.values,
-            loss: result.loss,
-            filter: this.css(result.values),
-        };
-    }
-
-    solveWide() {
-        const A = 5;
-        const c = 15;
-        const a = [60, 180, 18000, 600, 1.2, 1.2];
-
-        let best = { loss: Infinity };
-        for (let i = 0; best.loss > 25 && i < 3; i++) {
-            const initial = [50, 20, 3750, 50, 100, 100];
-            const result = this.spsa(A, a, c, initial, 1000);
-            if (result.loss < best.loss) {
-                best = result;
-            }
-        }
-        return best;
-    }
-
-    solveNarrow(wide) {
-        const A = wide.loss;
-        const c = 2;
-        const A1 = A + 1;
-        const a = [0.25 * A1, 0.25 * A1, A1, 0.25 * A1, 0.2 * A1, 0.2 * A1];
-        return this.spsa(A, a, c, wide.values, 500);
-    }
-
-    spsa(A, a, c, values, iters) {
-        const alpha = 1;
-        const gamma = 0.16666666666666666;
-
-        let best = null;
-        let bestLoss = Infinity;
-        const deltas = new Array(6);
-        const highArgs = new Array(6);
-        const lowArgs = new Array(6);
-
-        for (let k = 0; k < iters; k++) {
-            const ck = c / (k + 1) ** gamma;
-            for (let i = 0; i < 6; i++) {
-                deltas[i] = Math.random() > 0.5 ? 1 : -1;
-                highArgs[i] = values[i] + ck * deltas[i];
-                lowArgs[i] = values[i] - ck * deltas[i];
-            }
-
-            const lossDiff = this.loss(highArgs) - this.loss(lowArgs);
-            for (let i = 0; i < 6; i++) {
-                const g = (lossDiff / (2 * ck)) * deltas[i];
-                const ak = a[i] / (A + k + 1) ** alpha;
-                // eslint-disable-next-line no-param-reassign
-                values[i] = fix(values[i] - ak * g, i);
-            }
-
-            const loss = this.loss(values);
-            if (loss < bestLoss) {
-                best = values.slice(0);
-                bestLoss = loss;
-            }
-        }
-        return { values: best, loss: bestLoss };
-
-        function fix(value, idx) {
-            let max = 100;
-            if (idx === 2 /* saturate */) {
-                max = 7500;
-            } else if (idx === 4 /* brightness */ || idx === 5 /* contrast */) {
-                max = 200;
-            }
-
-            if (idx === 3 /* hue-rotate */) {
-                if (value > max) {
-                    return value % max;
-                }
-                if (value < 0) {
-                    return max + (value % max);
-                }
-            } else if (value < 0) {
-                return 0;
-            } else if (value > max) {
-                return max;
-            }
-            return value;
-        }
-    }
-
-    loss(filters) {
-        // Argument is array of percentages.
-        const color = this.reusedColor;
-        color.set(0, 0, 0);
-
-        color.invert(filters[0] / 100);
-        color.sepia(filters[1] / 100);
-        color.saturate(filters[2] / 100);
-        color.hueRotate(filters[3] * 3.6);
-        color.brightness(filters[4] / 100);
-        color.contrast(filters[5] / 100);
-
-        const colorHSL = color.hsl();
-        return (
-            Math.abs(color.r - this.target.r) +
-            Math.abs(color.g - this.target.g) +
-            Math.abs(color.b - this.target.b) +
-            Math.abs(colorHSL.h - this.targetHSL.h) +
-            Math.abs(colorHSL.s - this.targetHSL.s) +
-            Math.abs(colorHSL.l - this.targetHSL.l)
-        );
-    }
-
-    css(filters) {
-        function fmt(idx, multiplier = 1) {
-            return Math.round(filters[idx] * multiplier);
-        }
-
-        return `brightness(0) saturate(100%) invert(${fmt(0)}%) sepia(${fmt(1)}%) saturate(${fmt(2)}%) hue-rotate(${fmt(
-            3,
-            3.6,
-        )}deg) brightness(${fmt(4)}%) contrast(${fmt(5)}%);`;
-    }
-}
diff --git a/datahub-web-react/src/app/sharedV2/filters/Filter.tsx b/datahub-web-react/src/app/sharedV2/filters/Filter.tsx
deleted file mode 100644
index 4b9a517fb9403b..00000000000000
--- a/datahub-web-react/src/app/sharedV2/filters/Filter.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import { Button } from 'antd';
-import { CaretDown } from 'phosphor-react';
-import React from 'react';
-import styled, { CSSProperties } from 'styled-components';
-
-import { Pill } from '@src/alchemy-components';
-import { IconWrapper } from '@src/app/searchV2/filters/SearchFilterView';
-import { FilterPredicate } from '@src/app/searchV2/filters/types';
-import useFilterDropdown from '@src/app/searchV2/filters/useSearchFilterDropdown';
-import { getFilterDropdownIcon, useFilterDisplayName } from '@src/app/searchV2/filters/utils';
-import ValueSelector from '@src/app/searchV2/filters/value/ValueSelector';
-import { formatNumber } from '@src/app/shared/formatNumber';
-import { EntityType, FacetFilterInput, FacetMetadata } from '@src/types.generated';
-
-export type FilterLabels = {
-    [key: string]: {
-        displayName: string;
-        icon?: React.ReactElement;
-    };
-};
-
-interface Props {
-    filter: FacetMetadata;
-    activeFilters: FacetFilterInput[];
-    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
-    filterPredicates: FilterPredicate[];
-    labelStyle?: CSSProperties;
-    customFilterLabels?: FilterLabels;
-    aggregationsEntityTypes?: Array<EntityType>;
-    shouldApplyView?: boolean;
-}
-
-export const FilterLabel = styled(Button)<{ $isActive: boolean }>`
-    display: flex;
-    align-items: center;
-    padding: 8px;
-    height: 36px;
-    border-radius: 8px;
-    background-color: white;
-    color: #6b7280;
-    font-size: 14px;
-    font-weight: 500;
-    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-    cursor: pointer;
-    transition: all 0.2s ease;
-    gap: 8px;
-    margin: 0 4px;
-    border: 1px solid #ebecf0;
-
-    &:hover,
-    &:focus {
-        color: inherit;
-        border-color: #ebecf0;
-        box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
-    }
-
-    ${(props) =>
-        props.$isActive &&
-        `
-    color: #374066;
-    font-weight: 600;
-  `}
-`;
-
-export default function Filter({
-    filter,
-    filterPredicates,
-    activeFilters,
-    onChangeFilters,
-    labelStyle,
-    customFilterLabels,
-    aggregationsEntityTypes,
-    shouldApplyView,
-}: Props) {
-    const { finalAggregations, updateFilters, numActiveFilters } = useFilterDropdown({
-        filter,
-        activeFilters,
-        onChangeFilters,
-        aggregationsEntityTypes,
-        shouldApplyView,
-    });
-
-    const currentFilterPredicate = filterPredicates?.find((obj) => obj.field.field === filter.field) as FilterPredicate;
-
-    // TODO: Have config for the value labels as well
-    const labelConfig = customFilterLabels?.[filter.field];
-
-    const filterIcon = labelConfig ? labelConfig.icon : getFilterDropdownIcon(filter.field);
-    const entityFilterName = useFilterDisplayName(filter, currentFilterPredicate?.field?.displayName);
-    const displayName = labelConfig ? labelConfig.displayName : entityFilterName;
-
-    return (
-        <ValueSelector
-            field={currentFilterPredicate?.field}
-            values={currentFilterPredicate?.values}
-            defaultOptions={finalAggregations}
-            onChangeValues={updateFilters}
-            aggregationsEntityTypes={aggregationsEntityTypes}
-        >
-            <FilterLabel
-                $isActive={!!numActiveFilters}
-                style={labelStyle}
-                data-testid={`filter-dropdown-${displayName?.replace(/\s/g, '-')}`}
-            >
-                {filterIcon && <IconWrapper>{filterIcon}</IconWrapper>}
-                {displayName} {!!numActiveFilters && <Pill size="xs" label={formatNumber(numActiveFilters)} />}
-                <CaretDown style={{ fontSize: '14px', height: '14px' }} />
-            </FilterLabel>
-        </ValueSelector>
-    );
-}
diff --git a/datahub-web-react/src/app/sharedV2/filters/FilterSection.tsx b/datahub-web-react/src/app/sharedV2/filters/FilterSection.tsx
deleted file mode 100644
index 9bd7aac82da4dd..00000000000000
--- a/datahub-web-react/src/app/sharedV2/filters/FilterSection.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import Filter, { FilterLabels } from '@app/sharedV2/filters/Filter';
-import FiltersLoadingSection from '@src/app/searchV2/filters/SearchFiltersLoadingSection';
-import { FilterPredicate } from '@src/app/searchV2/filters/types';
-import { convertToAvailableFilterPredictes } from '@src/app/searchV2/filters/utils';
-import { EntityType, FacetFilterInput, FacetMetadata } from '@src/types.generated';
-
-const Section = styled.div<{ removePadding?: boolean }>`
-    margin-bottom: 10px;
-    position: relative;
-    height: 40px;
-    display: flex;
-`;
-
-interface Props {
-    name: string;
-    loading: boolean;
-    availableFilters: FacetMetadata[];
-    activeFilters: FacetFilterInput[];
-    onChangeFilters: (newFilters: FacetFilterInput[]) => void;
-    aggregationsEntityTypes?: Array<EntityType>;
-    customFilterLabels?: FilterLabels;
-    noOfLoadingSkeletons?: number;
-    shouldApplyView?: boolean;
-}
-
-export default function FilterSection({
-    name,
-    loading,
-    availableFilters,
-    activeFilters,
-    onChangeFilters,
-    aggregationsEntityTypes,
-    customFilterLabels,
-    noOfLoadingSkeletons,
-    shouldApplyView,
-}: Props) {
-    const [finalAvailableFilters, setFinalAvailableFilters] = useState(availableFilters);
-
-    useEffect(() => {
-        if (!loading && finalAvailableFilters !== availableFilters) {
-            setFinalAvailableFilters(availableFilters);
-        }
-    }, [availableFilters, loading, finalAvailableFilters]);
-
-    const filterPredicates: FilterPredicate[] = convertToAvailableFilterPredictes(
-        activeFilters,
-        finalAvailableFilters || [],
-    );
-
-    return (
-        <Section id={`${name}-filters-section`} data-testid={`${name}-filters-section`}>
-            {loading && !finalAvailableFilters?.length && (
-                <FiltersLoadingSection noOfLoadingSkeletons={noOfLoadingSkeletons} />
-            )}
-            {finalAvailableFilters?.map((filter) => (
-                <Filter
-                    key={filter.field}
-                    filter={filter}
-                    activeFilters={activeFilters}
-                    onChangeFilters={onChangeFilters}
-                    filterPredicates={filterPredicates}
-                    customFilterLabels={customFilterLabels}
-                    aggregationsEntityTypes={aggregationsEntityTypes}
-                    shouldApplyView={shouldApplyView}
-                />
-            ))}
-        </Section>
-    );
-}
diff --git a/datahub-web-react/src/app/sharedV2/filters/navigateWithFilters.ts b/datahub-web-react/src/app/sharedV2/filters/navigateWithFilters.ts
deleted file mode 100644
index d13f8be078e713..00000000000000
--- a/datahub-web-react/src/app/sharedV2/filters/navigateWithFilters.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import * as QueryString from 'query-string';
-
-import filtersToQueryStringParams from '@app/searchV2/utils/filtersToQueryStringParams';
-import { FacetFilterInput } from '@src/types.generated';
-
-export const navigateWithFilters = ({
-    filters,
-    history,
-    location,
-}: {
-    filters?: Array<FacetFilterInput>;
-    history: any;
-    location: any;
-}) => {
-    const search = QueryString.stringify(
-        {
-            ...filtersToQueryStringParams(filters || []),
-        },
-        { arrayFormat: 'comma' },
-    );
-
-    history.replace({
-        pathname: location.pathname, // Keep the current pathname
-        search,
-    });
-};
diff --git a/datahub-web-react/src/app/sharedV2/icons/CompactFieldIcon.tsx b/datahub-web-react/src/app/sharedV2/icons/CompactFieldIcon.tsx
index 2b0af76c0553f2..5745f3230d227c 100644
--- a/datahub-web-react/src/app/sharedV2/icons/CompactFieldIcon.tsx
+++ b/datahub-web-react/src/app/sharedV2/icons/CompactFieldIcon.tsx
@@ -12,7 +12,7 @@ import React from 'react';
 
 import { SchemaFieldDataType } from '@types';
 
-export default function CompactFieldIcon(type?: SchemaFieldDataType): JSX.Element | null {
+function CompactFieldIcon(type?: SchemaFieldDataType): JSX.Element | null {
     if (type === SchemaFieldDataType.Number) {
         return <NumberOutlined />;
     }
diff --git a/datahub-web-react/src/app/sharedV2/icons/ImageColoredBackground.tsx b/datahub-web-react/src/app/sharedV2/icons/ImageColoredBackground.tsx
deleted file mode 100644
index 7715b62c056b41..00000000000000
--- a/datahub-web-react/src/app/sharedV2/icons/ImageColoredBackground.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import ColorThief from 'colorthief';
-import React, { useCallback } from 'react';
-import styled from 'styled-components';
-
-import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-
-const Wrapper = styled.div<{ background?: string }>`
-    align-items: center;
-    background-color: ${({ background }) => background || 'transparent'};
-    display: flex;
-    justify-content: center;
-`;
-
-interface Props {
-    children?: JSX.Element;
-    className?: string;
-}
-
-export default function ImageColoredBackground({ children, className }: Props): JSX.Element {
-    const [background, setBackground] = React.useState<string | undefined>(undefined);
-
-    const ref = useCallback(
-        (node: HTMLDivElement) => {
-            if (node === null) {
-                return;
-            }
-            const image = node.getElementsByTagName('img')[0];
-            if (image) {
-                const colorThief = new ColorThief();
-                try {
-                    const [r, g, b] = colorThief.getColor(image, 25);
-                    setBackground(`rgb(${r}, ${g}, ${b}, .1)`);
-                } catch (_e) {
-                    image.onload = () => {
-                        if (background !== undefined) {
-                            return;
-                        }
-                        const [r, g, b] = colorThief.getColor(image, 25);
-                        setBackground(`rgb(${r}, ${g}, ${b}, .1)`);
-                        image.crossOrigin = 'anonymous';
-                    };
-                    image.onerror = () => {
-                        image.removeAttribute('crossOrigin');
-                        setBackground(REDESIGN_COLORS.BACKGROUND_GREY);
-                    };
-                }
-            }
-            const svg = node.getElementsByTagName('svg')[0];
-            if (svg) {
-                const color = window.getComputedStyle(svg).getPropertyValue('color');
-                const [, r, g, b] = color.match(/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/) || [0, 0, 0];
-                setBackground(`rgb(${r}, ${g}, ${b}, .1)`);
-            }
-        },
-        [background],
-    );
-
-    return (
-        <Wrapper ref={ref} background={background} className={className}>
-            {children}
-        </Wrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/sharedV2/icons/InfoTooltip.tsx b/datahub-web-react/src/app/sharedV2/icons/InfoTooltip.tsx
deleted file mode 100644
index 9630c7b15ae906..00000000000000
--- a/datahub-web-react/src/app/sharedV2/icons/InfoTooltip.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { InfoCircleFilled, InfoCircleOutlined } from '@ant-design/icons';
-import { Tooltip } from '@components';
-import React, { useState } from 'react';
-import styled from 'styled-components';
-
-const InfoWrapper = styled.div`
-    color: ${(props) => props.theme.styles['primary-color']};
-`;
-
-interface Props {
-    content: React.ReactNode;
-    className?: string;
-}
-
-export default function InfoTooltip({ content, className }: Props) {
-    const [showTooltip, setShowTooltip] = useState(false);
-
-    return (
-        <InfoWrapper className={className}>
-            <Tooltip
-                placement="top"
-                title={content}
-                trigger="hover"
-                open={showTooltip}
-                onOpenChange={setShowTooltip}
-                showArrow={false}
-            >
-                {showTooltip ? <InfoCircleFilled /> : <InfoCircleOutlined />}
-            </Tooltip>
-        </InfoWrapper>
-    );
-}
diff --git a/datahub-web-react/src/app/sharedV2/modals/ConfirmationModal.tsx b/datahub-web-react/src/app/sharedV2/modals/ConfirmationModal.tsx
index d0cee7e7091fc2..0aa8cfc1da9248 100644
--- a/datahub-web-react/src/app/sharedV2/modals/ConfirmationModal.tsx
+++ b/datahub-web-react/src/app/sharedV2/modals/ConfirmationModal.tsx
@@ -9,7 +9,7 @@ const ButtonsContainer = styled.div`
     justify-content: end;
 `;
 
-export const StyledModal = styled(Modal)`
+const StyledModal = styled(Modal)`
     font-family: ${typography.fonts.body};
 
     &&& .ant-modal-content {
diff --git a/datahub-web-react/src/app/sharedV2/propagation/DocumentationPropagationDetails.tsx b/datahub-web-react/src/app/sharedV2/propagation/DocumentationPropagationDetails.tsx
deleted file mode 100644
index e95ce73ebd3478..00000000000000
--- a/datahub-web-react/src/app/sharedV2/propagation/DocumentationPropagationDetails.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import { Popover } from '@components';
-import React from 'react';
-import styled from 'styled-components';
-
-import PropagationEntityLink from '@app/sharedV2/propagation/PropagationEntityLink';
-import { PropagateThunderbolt, PropagateThunderboltFilled } from '@app/sharedV2/propagation/PropagationIcon';
-import { usePropagationDetails } from '@app/sharedV2/propagation/utils';
-
-import { StringMapEntry } from '@types';
-
-const PopoverWrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-`;
-
-const PopoverTitle = styled.div`
-    font-weight: bold;
-    font-size: 14px;
-    padding: 6px 0px;
-    color: #eeecfa;
-`;
-
-const PopoverDescription = styled.div`
-    max-width: 340px;
-    font-size: 14px;
-    color: #eeecfa;
-    display: inline;
-    padding: 0px 0px 8px 0px;
-`;
-
-const PopoverAttributes = styled.div`
-    display: flex;
-`;
-
-const PopoverAttribute = styled.div`
-    margin-right: 12px;
-    margin-bottom: 4px;
-`;
-
-const PopoverAttributeTitle = styled.div`
-    font-size: 14px;
-    color: #eeecfa;
-    font-weight: bold;
-    margin: 8px 0px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-`;
-
-const PopoverDocumentation = styled.a`
-    margin-top: 12px;
-`;
-
-interface Props {
-    sourceDetail?: StringMapEntry[] | null;
-}
-
-export default function DocumentationPropagationDetails({ sourceDetail }: Props) {
-    const {
-        isPropagated,
-        origin: { entity: originEntity },
-        via: { entity: viaEntity },
-    } = usePropagationDetails(sourceDetail);
-
-    if (!sourceDetail || !isPropagated) return null;
-
-    const popoverContent =
-        originEntity || viaEntity ? (
-            <PopoverWrapper>
-                <PopoverDescription>
-                    This description was automatically propagated from an upstream column.{' '}
-                    <PopoverDocumentation
-                        href="https://docs.datahub.com/docs/automation/docs-propagation"
-                        target="_blank"
-                        rel="noopener noreferrer"
-                    >
-                        Learn more
-                    </PopoverDocumentation>
-                </PopoverDescription>
-                <PopoverAttributes>
-                    {originEntity && originEntity.urn !== viaEntity?.urn && (
-                        <PopoverAttribute>
-                            <PopoverAttributeTitle>Origin</PopoverAttributeTitle>
-                            <PropagationEntityLink entity={originEntity} />
-                        </PopoverAttribute>
-                    )}
-                    {viaEntity && (
-                        <PopoverAttribute>
-                            <PopoverAttributeTitle>Via</PopoverAttributeTitle>
-                            <PropagationEntityLink entity={viaEntity} />
-                        </PopoverAttribute>
-                    )}
-                </PopoverAttributes>
-            </PopoverWrapper>
-        ) : undefined;
-
-    return (
-        <Popover
-            overlayInnerStyle={{ backgroundColor: '#272D48' }}
-            showArrow={false}
-            title={
-                <PopoverTitle>
-                    <PropagateThunderboltFilled />
-                    Propagated Description
-                </PopoverTitle>
-            }
-            content={popoverContent}
-        >
-            <PropagateThunderbolt data-testid="docPropagationIndicator" />
-        </Popover>
-    );
-}
diff --git a/datahub-web-react/src/app/sharedV2/propagation/LabelPropagationDetails.tsx b/datahub-web-react/src/app/sharedV2/propagation/LabelPropagationDetails.tsx
deleted file mode 100644
index 865e3df4593dfc..00000000000000
--- a/datahub-web-react/src/app/sharedV2/propagation/LabelPropagationDetails.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { Popover } from '@components';
-import React from 'react';
-import styled from 'styled-components';
-
-import PropagationEntityLink from '@app/sharedV2/propagation/PropagationEntityLink';
-import { PropagateThunderbolt, PropagateThunderboltFilled } from '@app/sharedV2/propagation/PropagationIcon';
-import { PropagationRelationshipType } from '@app/sharedV2/propagation/utils';
-import { PropagationContext, usePropagationContextEntities } from '@app/sharedV2/tags/usePropagationContextEntities';
-import { EntityType } from '@src/types.generated';
-
-const PopoverWrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-`;
-
-const PopoverTitle = styled.div`
-    font-weight: bold;
-    font-size: 14px;
-    padding: 6px 0px;
-    color: #eeecfa;
-`;
-
-const PopoverDescription = styled.div`
-    max-width: 340px;
-    font-size: 14px;
-    color: #eeecfa;
-    display: inline;
-    padding: 0px 0px 8px 0px;
-`;
-
-const PopoverAttributes = styled.div`
-    display: flex;
-`;
-
-const PopoverAttribute = styled.div`
-    margin-right: 12px;
-    margin-bottom: 4px;
-`;
-
-const PopoverAttributeTitle = styled.div`
-    font-size: 14px;
-    color: #eeecfa;
-    font-weight: bold;
-    margin: 8px 0px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-`;
-
-interface Props {
-    entityType: EntityType;
-    context?: string | null;
-}
-
-export default function LabelPropagationDetails({ entityType, context }: Props) {
-    const contextObj = context ? (JSON.parse(context) as PropagationContext) : null;
-    const isPropagated = contextObj?.propagated;
-    const { originEntity } = usePropagationContextEntities(contextObj);
-    const isSiblingsRelationship = contextObj?.relationship === PropagationRelationshipType.SIBLINGS;
-
-    if (!isPropagated || !originEntity || (EntityType.GlossaryTerm !== entityType && entityType !== EntityType.Tag))
-        return null;
-
-    const popoverContent = originEntity ? (
-        <PopoverWrapper>
-            <PopoverDescription>
-                This {EntityType.GlossaryTerm === entityType ? 'Glossary Term' : 'Tag'} was automatically propagated
-                from {isSiblingsRelationship ? 'a sibling' : 'an upstream'}.{' '}
-            </PopoverDescription>
-            <PopoverAttributes>
-                {originEntity && (
-                    <PopoverAttribute>
-                        <PopoverAttributeTitle>Origin</PopoverAttributeTitle>
-                        <PropagationEntityLink entity={originEntity} />
-                    </PopoverAttribute>
-                )}
-            </PopoverAttributes>
-        </PopoverWrapper>
-    ) : undefined;
-
-    return (
-        <Popover
-            overlayInnerStyle={{ backgroundColor: '#272D48' }}
-            showArrow={false}
-            title={
-                <PopoverTitle>
-                    <PropagateThunderboltFilled fontSize={16} />
-                    Propagated {EntityType.GlossaryTerm === entityType ? 'Glossary Term' : 'Tag'}
-                </PopoverTitle>
-            }
-            content={popoverContent}
-        >
-            <PropagateThunderbolt fontSize={14} data-testid="glossaryTermPropagationIndicator" />
-        </Popover>
-    );
-}
diff --git a/datahub-web-react/src/app/sharedV2/propagation/PropagationEntityLink.tsx b/datahub-web-react/src/app/sharedV2/propagation/PropagationEntityLink.tsx
deleted file mode 100644
index 2f5401bf23d208..00000000000000
--- a/datahub-web-react/src/app/sharedV2/propagation/PropagationEntityLink.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { GenericEntityProperties } from '@app/entity/shared/types';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { Entity, EntityType, SchemaFieldEntity } from '@types';
-
-const PreviewImage = styled.img<{ size: number }>`
-    height: ${(props) => props.size}px;
-    width: ${(props) => props.size}px;
-    min-width: ${(props) => props.size}px;
-    object-fit: contain;
-    background-color: transparent;
-    margin: 0px 4px 0px 0px;
-`;
-
-const StyledLink = styled(Link)`
-    margin-right: 4px;
-    display: flex;
-    align-items: center;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-`;
-
-interface Props {
-    entity: Entity;
-}
-
-export default function PropagationEntityLink({ entity }: Props) {
-    const entityRegistry = useEntityRegistry();
-
-    const isSchemaField = entity.type === EntityType.SchemaField;
-    const baseEntity = isSchemaField ? (entity as SchemaFieldEntity).parent : entity;
-
-    const logoUrl = (baseEntity as GenericEntityProperties)?.platform?.properties?.logoUrl || '';
-    let entityUrl = entityRegistry.getEntityUrl(baseEntity.type, baseEntity.urn);
-    let entityDisplayName = entityRegistry.getDisplayName(baseEntity.type, baseEntity);
-
-    if (isSchemaField) {
-        entityUrl = `${entityUrl}/${encodeURIComponent('Columns')}?schemaFilter=${encodeURIComponent(
-            (entity as SchemaFieldEntity).fieldPath,
-        )}`;
-        const schemaFieldName = entityRegistry.getDisplayName(entity.type, entity);
-        entityDisplayName = `${entityDisplayName}.${schemaFieldName}`;
-    }
-
-    return (
-        <>
-            <StyledLink to={entityUrl}>
-                <PreviewImage src={logoUrl} alt="test" size={14} />
-                {entityDisplayName}
-            </StyledLink>
-        </>
-    );
-}
diff --git a/datahub-web-react/src/app/sharedV2/propagation/PropagationIcon.tsx b/datahub-web-react/src/app/sharedV2/propagation/PropagationIcon.tsx
deleted file mode 100644
index 27eba42447688d..00000000000000
--- a/datahub-web-react/src/app/sharedV2/propagation/PropagationIcon.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ThunderboltFilled } from '@ant-design/icons';
-import styled from 'styled-components';
-
-import { REDESIGN_COLORS } from '@app/entityV2/shared/constants';
-
-export const PropagateThunderbolt = styled(ThunderboltFilled)<{ fontSize?: number }>`
-    && {
-        color: #a7c7fa;
-    }
-    font-size: ${(props) => props.fontSize || 16}px;
-    &:hover {
-        color: ${REDESIGN_COLORS.BLUE};
-    }
-    margin-right: 4px;
-`;
-
-export const PropagateThunderboltFilled = styled(ThunderboltFilled)<{ fontSize?: number }>`
-    && {
-        color: ${REDESIGN_COLORS.BLUE};
-    }
-    font-size: ${(props) => props.fontSize || 16}px;
-    margin-right: 4px;
-`;
diff --git a/datahub-web-react/src/app/sharedV2/propagation/utils.ts b/datahub-web-react/src/app/sharedV2/propagation/utils.ts
deleted file mode 100644
index c38da908491e12..00000000000000
--- a/datahub-web-react/src/app/sharedV2/propagation/utils.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { useGetEntities } from '@app/sharedV2/useGetEntities';
-
-import { StringMapEntry } from '@types';
-
-export enum PropagationRelationshipType {
-    LINEAGE = 'lineage',
-    HIERARCHY = 'hierarchy',
-    SIBLINGS = 'siblings',
-}
-
-export function usePropagationDetails(sourceDetail?: StringMapEntry[] | null) {
-    const isPropagated = !!sourceDetail?.find((mapEntry) => mapEntry.key === 'propagated' && mapEntry.value === 'true');
-    const originEntityUrn = sourceDetail?.find((mapEntry) => mapEntry.key === 'origin')?.value || '';
-    const viaEntityUrn = sourceDetail?.find((mapEntry) => mapEntry.key === 'via')?.value || '';
-
-    const { entities } = useGetEntities([originEntityUrn, viaEntityUrn]);
-    const originEntity = entities.find((e) => e.urn === originEntityUrn);
-    const viaEntity = entities.find((e) => e.urn === viaEntityUrn);
-
-    return {
-        isPropagated,
-        origin: {
-            urn: originEntityUrn,
-            entity: originEntity,
-        },
-        via: {
-            urn: viaEntityUrn,
-            entity: viaEntity,
-        },
-    };
-}
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/constants.ts b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/constants.ts
index 50d8a2a610ad75..8ff62406d7fe7e 100644
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/constants.ts
+++ b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/constants.ts
@@ -7,11 +7,6 @@
  */
 export const STRUCTURED_PROPERTY_REFERENCE_PLACEHOLDER_ID = '__structuredPropertyRef';
 
-/**
- * Regex used to match a property that references a specific structured property
- */
-export const STRUCTURED_PROPERTY_REFERENCE_REGEX = /^structuredProperties\.(urn:li:structuredProperty:.+)$/;
-
 /**
  * This is a placeholder ID that is used in the Property Select experience to switch into the "Ownership Type"
  * builder experience.
@@ -20,8 +15,3 @@ export const STRUCTURED_PROPERTY_REFERENCE_REGEX = /^structuredProperties\.(urn:
  * allows you to select a specific structured property as the target for metadata test evaluation.
  */
 export const OWNERSHIP_TYPE_REFERENCE_PLACEHOLDER_ID = '__ownershipTypeRef';
-
-/**
- * Regex used to match a property that references a specific ownership type
- */
-export const OWNERSHIP_TYPE_REFERENCE_REGEX = /^ownership\.ownerTypes\.(urn:li:ownershipType:.+)$/;
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/input/EntitySearchInput.tsx b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/input/EntitySearchInput.tsx
deleted file mode 100644
index a7142bb83b2340..00000000000000
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/input/EntitySearchInput.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { Tooltip } from '@components';
-import { Select, Tag } from 'antd';
-import React from 'react';
-
-import { EntitySearchInputResult } from '@app/sharedV2/queryBuilder/builder/property/input/EntitySearchInputResult';
-import { SelectInputMode } from '@app/sharedV2/queryBuilder/builder/property/types/values';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-import { useGetSearchResultsForMultipleLazyQuery } from '@graphql/search.generated';
-import { EntityType } from '@types';
-
-type Props = {
-    selectedUrns: string[];
-    entityTypes: EntityType[];
-    placeholder?: string;
-    mode?: SelectInputMode.MULTIPLE | SelectInputMode.SINGLE;
-    style?: any;
-    onChangeSelectedUrns: (newUrns: string[]) => void;
-};
-
-export const EntitySearchInput = ({
-    selectedUrns,
-    entityTypes,
-    placeholder,
-    style,
-    mode,
-    onChangeSelectedUrns,
-}: Props) => {
-    const entityRegistry = useEntityRegistry();
-    const [searchResources, { data: resourcesSearchData }] = useGetSearchResultsForMultipleLazyQuery();
-    const searchResults = resourcesSearchData?.searchAcrossEntities?.searchResults || [];
-
-    const urnToSearchResultEntity = new Map();
-    searchResults.forEach((result) => {
-        urnToSearchResultEntity[result.entity.urn] = {
-            urn: result.entity.urn,
-            type: result.entity.type,
-            displayName: entityRegistry.getDisplayName(result.entity.type, result.entity),
-        };
-    });
-
-    const onSelect = (newUrn) => {
-        if (mode === SelectInputMode.SINGLE) {
-            onChangeSelectedUrns([newUrn]);
-        } else {
-            const newUrns = [...selectedUrns, newUrn];
-            onChangeSelectedUrns(newUrns);
-        }
-    };
-
-    const onDeselect = (urn) => {
-        if (mode === SelectInputMode.SINGLE) {
-            onChangeSelectedUrns([]);
-        } else {
-            onChangeSelectedUrns(selectedUrns.filter((u) => u !== urn));
-        }
-    };
-
-    const onSearch = (text: string) => {
-        searchResources({
-            variables: {
-                input: {
-                    types: entityTypes,
-                    query: text,
-                    start: 0,
-                    count: 10,
-                },
-            },
-        });
-    };
-
-    return (
-        <Select
-            value={selectedUrns}
-            mode="multiple"
-            style={style}
-            filterOption={false}
-            placeholder={placeholder || 'Search for entities...'}
-            onSelect={onSelect}
-            onDeselect={onDeselect}
-            onSearch={onSearch}
-            tagRender={(tagProps) => {
-                const displayName = tagProps.value as string; // TODO: Support display name resolution.
-                return (
-                    <Tag closable={tagProps.closable} onClose={tagProps.onClose}>
-                        <Tooltip title={displayName}>{displayName}</Tooltip>
-                    </Tag>
-                );
-            }}
-        >
-            {searchResults?.map((result) => (
-                <Select.Option value={result.entity.urn}>
-                    <EntitySearchInputResult entity={result.entity} />
-                </Select.Option>
-            ))}
-        </Select>
-    );
-};
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/input/EntitySearchInputResult.tsx b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/input/EntitySearchInputResult.tsx
deleted file mode 100644
index 51993b20879146..00000000000000
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/input/EntitySearchInputResult.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-
-import { IconStyleType } from '@app/entity/Entity';
-import { useEntityRegistry } from '@app/useEntityRegistry';
-
-type Props = {
-    entity: any;
-};
-
-const Container = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-    padding: 12px;
-`;
-
-const IconContainer = styled.div`
-    margin-right: 8px;
-`;
-
-export const EntitySearchInputResult = ({ entity }: Props) => {
-    const entityRegistry = useEntityRegistry();
-    return (
-        <Container>
-            <IconContainer>{entityRegistry.getIcon(entity.type, 12, IconStyleType.ACCENT)}</IconContainer>
-            {entityRegistry.getDisplayName(entity.type, entity)}
-        </Container>
-    );
-};
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/input/SelectInput.tsx b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/input/SelectInput.tsx
deleted file mode 100644
index f353cb325eb4e1..00000000000000
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/input/SelectInput.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Select, Tag } from 'antd';
-import React from 'react';
-
-import { SelectOption } from '@app/sharedV2/queryBuilder/builder/property/types/values';
-
-type Props = {
-    options: SelectOption[];
-    selected?: string[];
-    mode?: 'multiple' | 'tags';
-    placeholder?: string;
-    style?: any;
-    tagStyle?: React.CSSProperties;
-    optionStyle?: React.CSSProperties;
-    onChangeSelected: (newSelectedIds: string[] | undefined) => void;
-};
-
-export const SelectInput = ({
-    options,
-    selected,
-    mode,
-    placeholder,
-    style,
-    tagStyle,
-    optionStyle,
-    onChangeSelected,
-}: Props) => {
-    const onSelect = (id) => {
-        const newSelected = [...(selected || []), id];
-        onChangeSelected(newSelected);
-    };
-
-    const onDeselect = (id) => {
-        if (Array.isArray(selected)) {
-            onChangeSelected(selected.filter((item) => item !== id));
-        } else {
-            onChangeSelected(undefined);
-        }
-    };
-
-    return (
-        <Select
-            style={style}
-            value={selected}
-            mode={mode}
-            placeholder={placeholder || 'Select values...'}
-            onSelect={onSelect}
-            onDeselect={onDeselect}
-            tagRender={(tagProps) => (
-                <Tag closable={tagProps.closable} onClose={tagProps.onClose} style={tagStyle}>
-                    {tagProps.label}
-                </Tag>
-            )}
-        >
-            {options.map((option) => (
-                <Select.Option value={option.id} style={optionStyle}>
-                    <span> {option.displayName}</span>
-                </Select.Option>
-            ))}
-        </Select>
-    );
-};
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/input/TimeSelectInput.tsx b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/input/TimeSelectInput.tsx
deleted file mode 100644
index 5c3f01a5bfdb37..00000000000000
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/input/TimeSelectInput.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { DatePicker } from 'antd';
-import moment from 'moment';
-import React from 'react';
-
-type Props = {
-    selected?: string[];
-    placeholder?: string;
-    style?: any;
-    onChangeSelected: (newSelectedIds: string[] | undefined) => void;
-};
-
-// Simply extracts and returns the first time if it is a time, null otherwise.
-export const getValue = (selected) => {
-    if (selected && selected?.length) {
-        const firstItem: number = +selected[0];
-        if (!Number.isNaN(firstItem)) {
-            // It's a number!
-            return moment(firstItem);
-        }
-    }
-    return undefined;
-};
-
-export const TimeSelectInput = ({ selected, placeholder, style, onChangeSelected }: Props) => {
-    const onSelect = (time) => {
-        const timeInMillisSinceEpoch = time.valueOf();
-        const newSelected = [timeInMillisSinceEpoch];
-        onChangeSelected(newSelected);
-    };
-
-    return (
-        <DatePicker
-            style={style}
-            value={getValue(selected)}
-            placeholder={placeholder || 'Select time (local)...'}
-            onSelect={onSelect}
-            showTime
-        />
-    );
-};
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/OperatorSelect.tsx b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/OperatorSelect.tsx
deleted file mode 100644
index 8c4b49d1cf5711..00000000000000
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/OperatorSelect.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Tooltip } from '@components';
-import { Select, Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { Operator } from '@app/sharedV2/queryBuilder/builder/property/types/operators';
-
-const StyledSelect = styled(Select)`
-    max-width: 160px;
-    margin-right: 12px;
-`;
-
-type Props = {
-    selectedOperator?: string;
-    operators: Operator[];
-    onChangeOperator: (newOperatorId: string) => void;
-};
-
-/**
- * A single node in a menu tree. This node can have children corresponding
- * to properties that should appear nested inside of it.
- */
-export const OperatorSelect = ({ selectedOperator, operators, onChangeOperator }: Props) => {
-    return (
-        <StyledSelect
-            defaultActiveFirstOption={false}
-            placeholder="Select an operator..."
-            onSelect={(newVal) => onChangeOperator(newVal as string)}
-            value={selectedOperator?.toLowerCase()}
-        >
-            {operators?.map((operator) => {
-                return (
-                    <Select.Option value={operator.id.toLowerCase()} key={operator.id.toLowerCase()}>
-                        <Tooltip title={operator.description} placement="right">
-                            <Typography.Text>{operator.displayName}</Typography.Text>
-                        </Tooltip>
-                    </Select.Option>
-                );
-            })}
-        </StyledSelect>
-    );
-};
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/PropertyTreeNodeLabel.tsx b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/PropertyTreeNodeLabel.tsx
deleted file mode 100644
index f504c1b720e7ae..00000000000000
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/PropertyTreeNodeLabel.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { CaretRightFilled } from '@ant-design/icons';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { Property } from '@app/sharedV2/queryBuilder/builder/property/types/properties';
-
-const StyledCaret = styled(CaretRightFilled)`
-    padding: 4px;
-    color: ${ANTD_GRAY[5]};
-    font-size: 12px;
-`;
-
-const ValueTypeLabel = styled(Typography.Text)`
-    margin-left: 8px;
-`;
-
-type Props = {
-    property: Property;
-    parents: Property[];
-    valueType?: string;
-};
-
-/**
- * A label displayed for a Property tree Node.
- *
- * This is shown in the select when a node is chosen.
- */
-export const PropertyTreeNodeLabel = ({ property, parents, valueType }: Props) => {
-    return (
-        <>
-            {parents.map((parentProp) => (
-                <Typography.Text key={parentProp.id}>
-                    {parentProp.displayName}
-                    <StyledCaret />
-                </Typography.Text>
-            ))}
-            <Typography.Text>{property.displayName}</Typography.Text>
-            <ValueTypeLabel type="secondary">{valueType}</ValueTypeLabel>
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/PropertyTreeNodeTitle.tsx b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/PropertyTreeNodeTitle.tsx
deleted file mode 100644
index 74ca60b90cb121..00000000000000
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/PropertyTreeNodeTitle.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Tooltip } from '@components';
-import { Typography } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { Property } from '@app/sharedV2/queryBuilder/builder/property/types/properties';
-
-const TitleWrapper = styled.div`
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-`;
-
-const ValueTypeText = styled(Typography.Text)`
-    margin-left: 8px;
-`;
-
-type Props = {
-    property: Property;
-    selectable?: boolean;
-    valueType?: string;
-};
-
-/**
- * A title displayed for a Property tree Node.
- *
- * This is shown in the select dropdown item list.
- */
-export const PropertyTreeNodeTitle = ({ property, selectable = true, valueType }: Props) => {
-    return (
-        <Tooltip title={property.description} placement="right">
-            <TitleWrapper>
-                <div>
-                    <Tooltip title={property.displayName}>
-                        <Typography.Text type={!selectable ? 'secondary' : undefined}>
-                            {property.displayName}
-                        </Typography.Text>
-                    </Tooltip>
-                    <ValueTypeText type="secondary">{valueType}</ValueTypeText>
-                </div>
-            </TitleWrapper>
-        </Tooltip>
-    );
-};
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/PropertyTreeSelect.tsx b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/PropertyTreeSelect.tsx
deleted file mode 100644
index 5ed38ade9333df..00000000000000
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/PropertyTreeSelect.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import { TreeSelect, Typography } from 'antd';
-import { TreeNode } from 'antd/lib/tree-select';
-import React from 'react';
-import styled from 'styled-components';
-
-import { PropertyTreeNodeLabel } from '@app/sharedV2/queryBuilder/builder/property/select/PropertyTreeNodeLabel';
-import { PropertyTreeNodeTitle } from '@app/sharedV2/queryBuilder/builder/property/select/PropertyTreeNodeTitle';
-import { Property } from '@app/sharedV2/queryBuilder/builder/property/types/properties';
-import { VALUE_TYPE_ID_TO_DETAILS } from '@app/sharedV2/queryBuilder/builder/property/types/values';
-
-const CUSTOM_ID = 'custom';
-
-const StyledTreeSelect = styled(TreeSelect)`
-    max-width: 400px;
-    min-width: 240px;
-    margin-right: 8px;
-`;
-
-type Props = {
-    selectedProperty?: string;
-    properties: Property[];
-    onChangeProperty: (newPropertyId: string) => void;
-};
-
-/**
- * A dropdown select for well-supported, typed properties.
- */
-export const PropertyTreeSelect = ({ selectedProperty, properties, onChangeProperty }: Props) => {
-    /**
-     * Render a single node in the property tree select
-     */
-    const renderNode = (property, parents) => {
-        const valueTypeDetails = property.valueType && VALUE_TYPE_ID_TO_DETAILS.get(property.valueType);
-        const valueTypeDisplayName = valueTypeDetails && valueTypeDetails.displayName;
-        const selectable = !!property.valueType; // If a prop has a value type, we can select it.
-
-        return (
-            <TreeNode
-                selectable={selectable}
-                label={<PropertyTreeNodeLabel property={property} parents={parents} valueType={valueTypeDisplayName} />}
-                value={property.id}
-                title={
-                    <PropertyTreeNodeTitle
-                        property={property}
-                        selectable={!!selectable}
-                        valueType={valueTypeDisplayName}
-                    />
-                }
-                key={property.id}
-            >
-                {property.children?.map((child) => renderNode(child, [...parents, property]))}
-            </TreeNode>
-        );
-    };
-
-    return (
-        <StyledTreeSelect
-            autoFocus
-            treeNodeLabelProp="label"
-            placeholder="Select a property..."
-            onSelect={(newVal) => onChangeProperty(newVal as string)}
-            value={selectedProperty}
-            treeDefaultExpandAll
-            treeExpandAction="click"
-        >
-            {properties.map((property) => {
-                return renderNode(property, []);
-            })}
-            <TreeNode
-                key={CUSTOM_ID}
-                label={<Typography.Text>Custom</Typography.Text>}
-                value={CUSTOM_ID}
-                title={<Typography.Text>Custom</Typography.Text>}
-            />
-        </StyledTreeSelect>
-    );
-};
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/ValueSelect.tsx b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/ValueSelect.tsx
deleted file mode 100644
index 237f3c884d1691..00000000000000
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/ValueSelect.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { Select } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { EntitySearchInput } from '@app/entityV2/shared/EntitySearchInput/EntitySearchInput';
-import { SelectInput } from '@app/sharedV2/queryBuilder/builder/property/input/SelectInput';
-import { TimeSelectInput } from '@app/sharedV2/queryBuilder/builder/property/input/TimeSelectInput';
-import { SelectParams, ValueInputType, ValueOptions } from '@app/sharedV2/queryBuilder/builder/property/types/values';
-
-const StyledSelect = styled(Select)`
-    & {
-        min-width: 240px;
-        margin-right: 12px;
-    }
-`;
-
-const SelectInputStyle = {
-    minWidth: 240,
-    marginRight: 12,
-};
-
-const EntitySearchInputStyle = {
-    minWidth: 240,
-};
-
-type Props = {
-    selectedValues?: string[];
-    options: ValueOptions;
-    onChangeValues: (newValues: string[]) => void;
-};
-
-/**
- * A single node in a menu tree. This node can have children corresponding
- * to properties that should appear nested inside of it.
- */
-export const ValueSelect = ({ selectedValues, options, onChangeValues }: Props) => {
-    return (
-        <>
-            {options.inputType === ValueInputType.TEXT && (
-                <StyledSelect
-                    value={selectedValues}
-                    onChange={(e) => onChangeValues(e as string[])}
-                    mode="tags"
-                    placeholder="Type a case-insensitive value..."
-                />
-            )}
-            {options.inputType === ValueInputType.ENTITY_SEARCH && (
-                <EntitySearchInput
-                    selectedUrns={selectedValues || []}
-                    onChangeSelectedUrns={(newSelected) => onChangeValues(newSelected)}
-                    entityTypes={(options.options as any)?.entityTypes || []}
-                    mode={(options.options as any)?.mode || 'single'}
-                    style={EntitySearchInputStyle}
-                />
-            )}
-            {options.inputType === ValueInputType.SELECT && (
-                <SelectInput
-                    selected={selectedValues}
-                    onChangeSelected={(selected) => onChangeValues(selected as string[])}
-                    placeholder="Select a value..."
-                    options={(options.options as SelectParams)?.options}
-                    mode={(options.options as any)?.mode || 'single'}
-                    style={SelectInputStyle}
-                />
-            )}
-            {options.inputType === ValueInputType.TIME_SELECT && (
-                <TimeSelectInput
-                    selected={selectedValues}
-                    onChangeSelected={(selected) => onChangeValues(selected as string[])}
-                    placeholder="Select a time (local)..."
-                    style={SelectInputStyle}
-                />
-            )}
-        </>
-    );
-};
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/structured/StructuredPropertySelect.tsx b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/structured/StructuredPropertySelect.tsx
deleted file mode 100644
index 82d06f801da0aa..00000000000000
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/structured/StructuredPropertySelect.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { Select } from 'antd';
-import React, { useEffect } from 'react';
-
-import { StructuredPropertySelectResult } from '@app/sharedV2/queryBuilder/builder/property/select/structured/StructuredPropertySelectResult';
-import { createPropertyUrnMap } from '@app/sharedV2/queryBuilder/builder/property/select/structured/utils';
-
-import { useSearchStructuredPropertiesLazyQuery } from '@graphql/structuredProperties.generated';
-import { EntityType, StructuredPropertyEntity } from '@types';
-
-type Props = {
-    selectedProperty?: StructuredPropertyEntity; // The selected property
-    entityTypes?: EntityType[]; // The set of entity types for the structured property.
-    onSelect: (property: StructuredPropertyEntity) => void;
-    onClear: () => void;
-};
-
-/**
- * Select a structured property from a dropdown. Allow search values.
- */
-export const StructuredPropertySelect = ({ selectedProperty, entityTypes, onSelect, onClear }: Props) => {
-    console.log(entityTypes);
-
-    const [searchProperties, { data: propertiesSearchData }] = useSearchStructuredPropertiesLazyQuery();
-    const searchResults = propertiesSearchData?.searchAcrossEntities?.searchResults || [];
-    const properties = searchResults.map((result) => result.entity) as StructuredPropertyEntity[];
-
-    // Local of property urn to property object.
-    const urnToProperty = createPropertyUrnMap(properties);
-
-    const onSearch = (text: string) => {
-        searchProperties({
-            variables: {
-                query: text,
-                start: 0,
-                count: 10,
-            },
-        });
-    };
-
-    useEffect(() => {
-        searchProperties({
-            variables: {
-                query: '*',
-                start: 0,
-                count: 20,
-            },
-        });
-    }, [searchProperties]);
-
-    return (
-        <Select
-            autoFocus
-            allowClear
-            autoClearSearchValue={false}
-            showSearch={!selectedProperty?.urn}
-            maxTagCount={1}
-            style={{ width: 240, marginRight: 8 }}
-            dropdownMatchSelectWidth={400}
-            value={(selectedProperty?.urn && [selectedProperty?.urn]) || []}
-            filterOption={false}
-            placeholder="Search for structured properties..."
-            onSelect={(propertyUrn) => {
-                onSelect(urnToProperty.get(propertyUrn));
-            }}
-            onSearch={onSearch}
-            onClear={onClear}
-            showArrow={false}
-        >
-            {properties?.map((property) => (
-                <Select.Option value={property.urn}>
-                    <StructuredPropertySelectResult property={property} />
-                </Select.Option>
-            ))}
-        </Select>
-    );
-};
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/structured/StructuredPropertySelectResult.tsx b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/structured/StructuredPropertySelectResult.tsx
deleted file mode 100644
index 584833aa027d1a..00000000000000
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/structured/StructuredPropertySelectResult.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Tooltip } from '@components';
-import { Divider } from 'antd';
-import React from 'react';
-import styled from 'styled-components';
-
-import { ANTD_GRAY } from '@app/entity/shared/constants';
-import { getPropertyDisplayName } from '@app/sharedV2/queryBuilder/builder/property/select/structured/utils';
-
-import { StructuredPropertyEntity } from '@types';
-
-const Container = styled.div`
-    display: flex;
-    justify-content: left;
-    align-items: center;
-`;
-
-const Type = styled.div`
-    color: ${ANTD_GRAY[8]};
-`;
-
-type Props = {
-    property: StructuredPropertyEntity; // The selected property
-};
-
-/**
- * Result when searching for a structured property.
- */
-export const StructuredPropertySelectResult = ({ property }: Props) => {
-    const displayName = getPropertyDisplayName(property);
-    const stdType = property.definition?.valueType?.info?.displayName;
-    return (
-        <Tooltip title={displayName}>
-            <Container>
-                {displayName}
-                <Divider type="vertical" />
-                <Type>{stdType}</Type>
-            </Container>
-        </Tooltip>
-    );
-};
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/structured/utils.ts b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/structured/utils.ts
deleted file mode 100644
index cef67ff0585ef6..00000000000000
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/select/structured/utils.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { StructuredPropertyEntity } from '@types';
-
-export const getPropertyDisplayName = (property: StructuredPropertyEntity) => {
-    return property.definition?.displayName || property.definition?.qualifiedName || property.urn;
-};
-
-export const createPropertyUrnMap = (properties: StructuredPropertyEntity[]) => {
-    const results = new Map();
-    properties.forEach((property) => {
-        results.set(property.urn, property);
-    });
-    return results;
-};
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/action.ts b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/action.ts
deleted file mode 100644
index 09494685701684..00000000000000
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/action.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { SelectInputMode, ValueTypeId } from '@app/sharedV2/queryBuilder/builder/property/types/values';
-
-import { EntityType } from '@types';
-
-/**
- * An action to be taken on failure or success of a passing test
- */
-export enum ActionId {
-    ADD_TAGS = 'add_tags',
-    REMOVE_TAGS = 'remove_tags',
-    ADD_OWNERS = 'add_owners',
-    REMOVE_OWNERS = 'remove_owners',
-    ADD_GLOSSARY_TERMS = 'add_glossary_terms',
-    REMOVE_GLOSSARY_TERMS = 'remove_glossary_terms',
-    SET_DOMAIN = 'set_domain',
-    UNSET_DOMAIN = 'unset_domain',
-    DEPRECATE = 'deprecate',
-    UN_DEPRECATE = 'un_deprecate',
-}
-
-export type ActionType = {
-    id: ActionId;
-    displayName: string;
-    description: string;
-    valueType?: ValueTypeId;
-    valueOptions?: any;
-    additionalParams?: Record<string, any>;
-};
-
-/**
- * A list of well-supported action types.
- */
-export const ACTION_TYPES: ActionType[] = [
-    {
-        id: ActionId.ADD_TAGS,
-        displayName: 'Add Tags',
-        description: 'Add specific tags to an asset.',
-        valueType: ValueTypeId.URN_LIST,
-        valueOptions: {
-            entityTypes: [EntityType.Tag],
-            mode: SelectInputMode.MULTIPLE,
-        },
-    },
-    {
-        id: ActionId.REMOVE_TAGS,
-        displayName: 'Remove Tags',
-        description: 'Remove specific tags from an asset.',
-        valueType: ValueTypeId.URN_LIST,
-        valueOptions: {
-            entityTypes: [EntityType.Tag],
-            mode: SelectInputMode.MULTIPLE,
-        },
-    },
-    {
-        id: ActionId.ADD_GLOSSARY_TERMS,
-        displayName: 'Add Glossary Terms',
-        description: 'Add specific glossary terms to an asset.',
-        valueType: ValueTypeId.URN_LIST,
-        valueOptions: {
-            entityTypes: [EntityType.GlossaryTerm],
-            mode: SelectInputMode.MULTIPLE,
-        },
-    },
-    {
-        id: ActionId.REMOVE_GLOSSARY_TERMS,
-        displayName: 'Remove Glossary Terms',
-        description: 'Remove specific glossary terms from an asset.',
-        valueType: ValueTypeId.URN_LIST,
-        valueOptions: {
-            entityTypes: [EntityType.GlossaryTerm],
-            mode: SelectInputMode.MULTIPLE,
-        },
-    },
-    {
-        id: ActionId.ADD_OWNERS,
-        displayName: 'Add Owners',
-        description: 'Add specific owners to an asset.',
-        valueType: ValueTypeId.URN_LIST,
-        valueOptions: {
-            entityTypes: [EntityType.CorpUser, EntityType.CorpGroup],
-            mode: SelectInputMode.MULTIPLE,
-        },
-        additionalParams: {
-            ownerType: 'TECHNICAL_OWNER',
-        },
-    },
-    {
-        id: ActionId.REMOVE_OWNERS,
-        displayName: 'Remove Owners',
-        description: 'Remove specific owners from an asset.',
-        valueType: ValueTypeId.URN_LIST,
-        valueOptions: {
-            entityTypes: [EntityType.CorpUser, EntityType.CorpGroup],
-            mode: SelectInputMode.MULTIPLE,
-        },
-    },
-    {
-        id: ActionId.SET_DOMAIN,
-        displayName: 'Set Domain',
-        description: 'Set specific Domain for an asset.',
-        valueType: ValueTypeId.URN_LIST,
-        valueOptions: {
-            entityTypes: [EntityType.Domain],
-            mode: SelectInputMode.SINGLE,
-        },
-    },
-    {
-        id: ActionId.UNSET_DOMAIN,
-        displayName: 'Remove Domain',
-        description: 'Remove Domain for an asset.',
-        valueType: ValueTypeId.URN_LIST,
-        valueOptions: {
-            entityTypes: [EntityType.Domain],
-            mode: SelectInputMode.SINGLE,
-        },
-    },
-    {
-        id: ActionId.DEPRECATE,
-        displayName: 'Deprecate Asset',
-        description: 'Mark asset as Deprecated.',
-        valueType: ValueTypeId.NO_VALUE,
-        valueOptions: {
-            mode: SelectInputMode.NONE,
-        },
-    },
-    {
-        id: ActionId.UN_DEPRECATE,
-        displayName: 'Un-Deprecate Asset',
-        description: 'Un-mark asset as Deprecated.',
-        valueType: ValueTypeId.NO_VALUE,
-        valueOptions: {
-            mode: SelectInputMode.NONE,
-        },
-    },
-];
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/operators.ts b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/operators.ts
index 13fc019048f9f6..864007e0db10d4 100644
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/operators.ts
+++ b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/operators.ts
@@ -65,7 +65,7 @@ export type Operator = {
 /**
  * A list of well-supported operators.
  */
-export const OPERATORS: Operator[] = [
+const OPERATORS: Operator[] = [
     {
         id: OperatorId.EQUAL_TO,
         displayName: 'Equals',
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/properties.ts b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/properties.ts
index 90bd2f9d3d6de3..ebb083e4f59388 100644
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/properties.ts
+++ b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/properties.ts
@@ -35,7 +35,7 @@ export type Property = {
  *          "If an asset has > 10 downstreams, then mark it as Heavy node"
  *          "Must have an owner of type Technical Owner"
  */
-export const commonProps: Property[] = [
+const commonProps: Property[] = [
     {
         id: 'urn',
         displayName: 'Urn',
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/values.ts b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/values.ts
index ee81c7579a5be2..e8f2c4750d7903 100644
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/values.ts
+++ b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/types/values.ts
@@ -64,20 +64,11 @@ export enum ValueTypeId {
     SCHEMA_FIELD_LIST = 'SCHEMA_FIELD_LIST',
 }
 
-/**
- * A single well-supported operator.
- */
-export type Value = {
-    id: ValueTypeId;
-    displayName: string;
-    operators: OperatorId[];
-};
-
 /**
  * A list of value types and their corresponding details,
  * including their display names and the operators that they support
  */
-export const valueTypes = [
+const valueTypes = [
     {
         id: ValueTypeId.BOOLEAN,
         displayName: 'Boolean',
@@ -183,11 +174,9 @@ export enum ValueInputType {
     /**
      * No input type
      */
-    NONE,
-}
+    }
 
 export enum SelectInputMode {
-    NONE = 'none',
     SINGLE = 'single',
     MULTIPLE = 'multiple',
 }
@@ -201,7 +190,7 @@ export type SelectParams = {
     options: SelectOption[];
 };
 
-export type EntitySearchParams = {
+type EntitySearchParams = {
     entityTypes: EntityType[];
 };
 
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/utils.ts b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/utils.ts
index 9b94dd1e4f82a0..c68161a127a1e0 100644
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/utils.ts
+++ b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/property/utils.ts
@@ -1,13 +1,7 @@
-import {
-    OWNERSHIP_TYPE_REFERENCE_PLACEHOLDER_ID,
-    OWNERSHIP_TYPE_REFERENCE_REGEX,
-    STRUCTURED_PROPERTY_REFERENCE_PLACEHOLDER_ID,
-    STRUCTURED_PROPERTY_REFERENCE_REGEX,
-} from '@app/sharedV2/queryBuilder/builder/property/constants';
+
 import {
     OPERATOR_ID_TO_DETAILS,
     Operator,
-    OperatorId,
     isUnaryOperator,
 } from '@app/sharedV2/queryBuilder/builder/property/types/operators';
 import { Property, entityProperties } from '@app/sharedV2/queryBuilder/builder/property/types/properties';
@@ -19,7 +13,7 @@ import {
 } from '@app/sharedV2/queryBuilder/builder/property/types/values';
 import { PropertyPredicate } from '@app/sharedV2/queryBuilder/builder/types';
 
-import { EntityType, PropertyCardinality, StdDataType, StructuredPropertyEntity } from '@types';
+import { EntityType } from '@types';
 
 /**
  * Returns true if a well-supported Property supports searchable
@@ -47,7 +41,7 @@ const isTimeProperty = (property: Property): boolean => {
 /**
  * Returns a list of properties supported fora given entity type.
  */
-export const getPropertiesForEntityType = (type: EntityType): Property[] => {
+const getPropertiesForEntityType = (type: EntityType): Property[] => {
     const maybeProperties = entityProperties.filter((entry) => entry.type === type);
     return maybeProperties.length > 0 ? maybeProperties[0].properties : [];
 };
@@ -75,26 +69,6 @@ export const getPropertiesForEntityTypes = (types: EntityType[]): Property[] =>
     return propertySets.length > 0 ? propertySets.reduce(intersectPropertySets) : [];
 };
 
-/**
- * Retrieves a specific Property from a list of properties given the
- * property's unique id, or undefined if one cannot be found.
- */
-export const getPropertyById = (propertyId: string, properties: Property[]): Property | undefined => {
-    // eslint-disable-next-line
-    for (const prop of properties) {
-        if (prop.id === propertyId) {
-            return prop;
-        }
-        if (prop?.children) {
-            const foundProp = getPropertyById(propertyId, prop?.children);
-            if (foundProp) {
-                return foundProp;
-            }
-        }
-    }
-    return undefined;
-};
-
 /**
  * Returns the set of operators that are supported
  * for a given well-supported property.
@@ -144,237 +118,3 @@ export const getValueOptions = (property: Property, predicate: PropertyPredicate
         options: property.valueOptions,
     };
 };
-
-/**
- * Attempts to determine whether the property id should be treated as a "structured property id",
- * which implies that the editor experience we show will be handled slightly differently than the default.
- *
- * There are 2 cases where we will consider the property to be related to structured properties:
- *
- * 1. The property id is equivalent to the "placeholder" property id used by the normal Property Select.
- * This implies that the user has just selected "Structured Property" from the list of possible entity properties,
- * but has not yet selected a specific property (which is required to complete the test).
- *
- * 2. The property id is a reference to a specific structured property, having the form "structuredProperties.urn:li:structuredProperty:xyz".
- * This implies that a property has already been chosen for testing by the user.
- *
- * @param propertyId the property id that may refer to the structured property concept.
- */
-export const isStructuredPropertyId = (propertyId: string) => {
-    return (
-        propertyId === STRUCTURED_PROPERTY_REFERENCE_PLACEHOLDER_ID ||
-        STRUCTURED_PROPERTY_REFERENCE_REGEX.test(propertyId)
-    );
-};
-
-/**
- * Attempts to determine whether the property id should be treated as a "ownership type id",
- * which implies that the editor experience we show will be handled slightly differently than the default.
- *
- * There are 2 cases where we will consider the property to be related to ownership types:
- *
- * 1. The property id is equivalent to the "placeholder" property id used by the normal Property Select.
- * This implies that the user has just selected "Ownership Type" from the list of possible entity properties,
- * but has not yet selected a specific type (which is required to complete the test).
- *
- * 2. The property id is a reference to a specific ownership type, having the form "ownership.ownerTypes.urn:li:ownershipType:xyz".
- * This implies that a property has already been chosen for testing by the user.
- *
- * @param propertyId the property id that may refer to the structured property concept.
- */
-export const isOwnershipTypeId = (propertyId: string) => {
-    return propertyId === OWNERSHIP_TYPE_REFERENCE_PLACEHOLDER_ID || OWNERSHIP_TYPE_REFERENCE_REGEX.test(propertyId);
-};
-
-/**
- * Attempts to extract the URN of a structured property to reference using the property id.
- * Does this by extracting a regex group if there is a match:
- *
- * structuredProperties.urn:li:structuredProperty:xyz
- *
- * @param propertyId the property id that may contain reference to a specific structured property.
- * Returns undefined if a structured property urn cannot be found (meaning one is not yet selected).
- */
-export const extractStructuredPropertyReferenceUrn = (propertyId: string) => {
-    const match = propertyId.match(STRUCTURED_PROPERTY_REFERENCE_REGEX);
-    return match ? match[1] : undefined;
-};
-
-/**
- * Attempts to extract the URN of a ownership type to reference using the property id.
- * Does this by extracting a regex group if there is a match:
- *
- * ownership.ownerTypes.urn:li:ownershipType:xyz
- *
- * @param propertyId the property id that may contain reference to a specific ownership type.
- * Returns undefined if a ownership type urn cannot be found (meaning one is not yet selected).
- */
-export const extractOwnershipTypeReferenceUrn = (propertyId: string) => {
-    const match = propertyId.match(OWNERSHIP_TYPE_REFERENCE_REGEX);
-    return match ? match[1] : undefined;
-};
-
-/**
- * Returns a set of valid operator options given a structured property definition.
- * This is achieved by considering the valueType of the property.
- */
-export const getStructuredPropertiesOperatorOptions = (property: StructuredPropertyEntity) => {
-    const valueType = property.definition?.valueType;
-    const stdValueType = valueType.info?.type;
-    const cardinality = property.definition?.cardinality;
-    const allowedValues = property.definition?.allowedValues;
-    switch (stdValueType) {
-        case StdDataType.String: {
-            if (allowedValues) {
-                return [OPERATOR_ID_TO_DETAILS.get(OperatorId.EXISTS), OPERATOR_ID_TO_DETAILS.get(OperatorId.EQUAL_TO)];
-            }
-            return [
-                OPERATOR_ID_TO_DETAILS.get(OperatorId.EXISTS),
-                OPERATOR_ID_TO_DETAILS.get(OperatorId.EQUAL_TO),
-                OPERATOR_ID_TO_DETAILS.get(OperatorId.REGEX_MATCH),
-                OPERATOR_ID_TO_DETAILS.get(OperatorId.CONTAINS_STR),
-                OPERATOR_ID_TO_DETAILS.get(OperatorId.STARTS_WITH),
-            ];
-        }
-        case StdDataType.Number:
-            if (allowedValues) {
-                return [OPERATOR_ID_TO_DETAILS.get(OperatorId.EXISTS), OPERATOR_ID_TO_DETAILS.get(OperatorId.EQUAL_TO)];
-            }
-            return [
-                OPERATOR_ID_TO_DETAILS.get(OperatorId.EXISTS),
-                OPERATOR_ID_TO_DETAILS.get(OperatorId.GREATER_THAN),
-                OPERATOR_ID_TO_DETAILS.get(OperatorId.LESS_THAN),
-                OPERATOR_ID_TO_DETAILS.get(OperatorId.EQUAL_TO),
-            ];
-        case StdDataType.Urn:
-        case StdDataType.Other:
-        default: {
-            const baseTypes = [
-                OPERATOR_ID_TO_DETAILS.get(OperatorId.EXISTS),
-                OPERATOR_ID_TO_DETAILS.get(OperatorId.EQUAL_TO),
-            ];
-            return cardinality === PropertyCardinality.Multiple
-                ? [...baseTypes, OPERATOR_ID_TO_DETAILS.get(OperatorId.CONTAINS_ANY)]
-                : baseTypes;
-        }
-    }
-};
-
-/**
- * Returns a set of valid operator options given a ownership type definition.
- */
-export const getOwnershipTypeOperatorOptions = () => {
-    return [
-        OPERATOR_ID_TO_DETAILS.get(OperatorId.EXISTS),
-        OPERATOR_ID_TO_DETAILS.get(OperatorId.EQUAL_TO),
-        OPERATOR_ID_TO_DETAILS.get(OperatorId.REGEX_MATCH),
-        OPERATOR_ID_TO_DETAILS.get(OperatorId.CONTAINS_STR),
-        OPERATOR_ID_TO_DETAILS.get(OperatorId.STARTS_WITH),
-    ];
-};
-
-/**
- * Returns a set of valid operator options given a structured property definition.
- * This is achieved by considering the valueType and the allowedValues of the property.
- */
-export const getStructuredPropertyValueOptions = (property: StructuredPropertyEntity) => {
-    const valueType = property.definition?.valueType;
-    const stdValueType = valueType.info?.type;
-    const allowedValues = property.definition?.allowedValues;
-    const allowedEntityTypes = property.definition?.typeQualifier?.allowedTypes;
-    switch (stdValueType) {
-        case StdDataType.String: {
-            if (allowedValues) {
-                return {
-                    inputType: ValueInputType.SELECT,
-                    options: {
-                        options:
-                            allowedValues
-                                .filter((value) => (value.value as any).stringValue)
-                                .map((value) => {
-                                    const actualValue = (value.value as any).stringValue;
-                                    return {
-                                        id: actualValue,
-                                        displayName: actualValue,
-                                    };
-                                }) || [],
-                    },
-                };
-            }
-            return {
-                inputType: ValueInputType.TEXT,
-                options: undefined,
-            };
-        }
-        case StdDataType.Number: {
-            if (allowedValues) {
-                return {
-                    inputType: ValueInputType.SELECT, // Should become numeric
-                    options: {
-                        options: allowedValues
-                            .filter((value) => (value.value as any).numberValue)
-                            .map((value) => {
-                                const actualValue = (value.value as any).numberValue;
-                                return {
-                                    id: actualValue,
-                                    displayName: actualValue,
-                                };
-                            }),
-                    },
-                };
-            }
-            return {
-                inputType: ValueInputType.TEXT,
-                options: undefined,
-            };
-        }
-        case StdDataType.Urn: {
-            // Note: Currently we do not support limiting URN types using allowed values
-            // on the frontend side.
-            return {
-                inputType: ValueInputType.ENTITY_SEARCH,
-                options:
-                    (allowedEntityTypes && {
-                        entityTypes: allowedEntityTypes.map((type) => type.info?.type),
-                    }) ||
-                    undefined,
-            };
-        }
-        case StdDataType.Other:
-        default:
-            if (allowedValues) {
-                return {
-                    inputType: ValueInputType.SELECT,
-                    options: {
-                        options: allowedValues
-                            .filter((value) => (value.value as any).numberValue || (value.value as any).stringValue)
-                            .map((value) => {
-                                const actualValue =
-                                    (value.value as any).stringValue || (value.value as any).numberValue;
-                                return {
-                                    id: actualValue,
-                                    displayName: actualValue,
-                                };
-                            }),
-                    },
-                };
-            }
-            return {
-                inputType: ValueInputType.TEXT,
-                options: undefined,
-            };
-    }
-};
-
-/**
- * Returns a set of valid operator options given a ownership type definition.
- */
-export const getOwnershipTypeValueOptions = (predicate: PropertyPredicate): ValueOptions | undefined => {
-    if (!predicate.operator || isUnaryOperator(predicate.operator)) {
-        return undefined;
-    }
-    return {
-        inputType: ValueInputType.TEXT,
-        options: undefined,
-    };
-};
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/utils.ts b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/utils.ts
index 5bda13e0af65d7..da85a18861b080 100644
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/builder/utils.ts
+++ b/datahub-web-react/src/app/sharedV2/queryBuilder/builder/utils.ts
@@ -4,13 +4,6 @@ import { AndFilterInput, FilterOperator } from '@src/types.generated';
 
 const LOGICAL_OPERATORS = new Set(Object.values(LogicalOperatorType));
 
-/**
- * Retrieves the display name for a specific Logical Operator Type.
- */
-export const getOperatorDisplayName = (operator: LogicalOperatorType) => {
-    return operator.toLocaleUpperCase();
-};
-
 /**
  * Returns true if the predicate is a logical predicate, as opposed
  * to a property predicate.
diff --git a/datahub-web-react/src/app/sharedV2/queryBuilder/styledComponents.ts b/datahub-web-react/src/app/sharedV2/queryBuilder/styledComponents.ts
index 63bbd9ee38dfe9..4804f8ce771fca 100644
--- a/datahub-web-react/src/app/sharedV2/queryBuilder/styledComponents.ts
+++ b/datahub-web-react/src/app/sharedV2/queryBuilder/styledComponents.ts
@@ -1,4 +1,4 @@
-import { Collapse, Select } from 'antd';
+import { Collapse } from 'antd';
 import styled from 'styled-components/macro';
 
 import { Button, colors } from '@src/alchemy-components';
@@ -109,9 +109,3 @@ export const CardIcons = styled.div`
         }
     }
 `;
-
-export const StyledSelect = styled(Select)`
-    min-width: 200px;
-    display: flex;
-    align-items: center;
-`;
diff --git a/datahub-web-react/src/app/sharedV2/reloadableContext/utils.ts b/datahub-web-react/src/app/sharedV2/reloadableContext/utils.ts
index 3125067828ce8b..939db8259d53ca 100644
--- a/datahub-web-react/src/app/sharedV2/reloadableContext/utils.ts
+++ b/datahub-web-react/src/app/sharedV2/reloadableContext/utils.ts
@@ -1,7 +1,7 @@
 import { ReloadableKeyTypeNamespace } from '@app/sharedV2/reloadableContext/types';
 
 export const KEY_SEPARATOR = '|';
-export const NAMESPACE_SEPARATOR = '>';
+const NAMESPACE_SEPARATOR = '>';
 
 export const getReloadableKey = (keyType: string, entryId?: string) => `${keyType}${KEY_SEPARATOR}${entryId ?? ''}`;
 
diff --git a/datahub-web-react/src/app/sharedV2/sidebar/useSidebarWidth.ts b/datahub-web-react/src/app/sharedV2/sidebar/useSidebarWidth.ts
index 29e66f8a3da91a..f57f1206e19f52 100644
--- a/datahub-web-react/src/app/sharedV2/sidebar/useSidebarWidth.ts
+++ b/datahub-web-react/src/app/sharedV2/sidebar/useSidebarWidth.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from 'react';
 
-export function useWindowResize(callback: () => void): void {
+function useWindowResize(callback: () => void): void {
     useEffect(() => {
         window.addEventListener('resize', callback);
 
diff --git a/datahub-web-react/src/app/sharedV2/tags/DataProductLink.tsx b/datahub-web-react/src/app/sharedV2/tags/DataProductLink.tsx
index 5c11279f4ae9b5..40854eca99494a 100644
--- a/datahub-web-react/src/app/sharedV2/tags/DataProductLink.tsx
+++ b/datahub-web-react/src/app/sharedV2/tags/DataProductLink.tsx
@@ -76,7 +76,7 @@ function DataProductContent({ dataProduct, name, closable, onClose, tagStyle, fo
     );
 }
 
-export type Props = {
+type Props = {
     dataProduct: DataProductEntity;
     name?: string;
     closable?: boolean;
diff --git a/datahub-web-react/src/app/sharedV2/tags/DomainLink.tsx b/datahub-web-react/src/app/sharedV2/tags/DomainLink.tsx
index 971948dbbc6c3d..78d0b3e15b0d1f 100644
--- a/datahub-web-react/src/app/sharedV2/tags/DomainLink.tsx
+++ b/datahub-web-react/src/app/sharedV2/tags/DomainLink.tsx
@@ -53,7 +53,7 @@ interface DomainContentProps {
     iconSize?: number;
 }
 
-export function DomainContent({ domain, name, closable, onClose, tagStyle, fontSize, iconSize }: DomainContentProps) {
+function DomainContent({ domain, name, closable, onClose, tagStyle, fontSize, iconSize }: DomainContentProps) {
     const entityRegistry = useEntityRegistry();
     const displayName = name || entityRegistry.getDisplayName(EntityType.Domain, domain);
 
@@ -70,7 +70,7 @@ export function DomainContent({ domain, name, closable, onClose, tagStyle, fontS
     );
 }
 
-export type Props = {
+type Props = {
     domain: DomainEntity;
     name?: string;
     closable?: boolean;
diff --git a/datahub-web-react/src/app/sharedV2/tags/term/TermContent.tsx b/datahub-web-react/src/app/sharedV2/tags/term/TermContent.tsx
index 362198d30a3043..caab4b2de325b9 100644
--- a/datahub-web-react/src/app/sharedV2/tags/term/TermContent.tsx
+++ b/datahub-web-react/src/app/sharedV2/tags/term/TermContent.tsx
@@ -97,7 +97,7 @@ const CloseIconStyle = styled(CloseIcon)`
     color: white;
 `;
 
-export const TermRibbon = styled.span<{ color: string; opacity?: number }>`
+const TermRibbon = styled.span<{ color: string; opacity?: number }>`
     position: absolute;
     left: -20px;
     top: 4px;
diff --git a/datahub-web-react/src/app/sharedV2/toastMessageUtils.ts b/datahub-web-react/src/app/sharedV2/toastMessageUtils.ts
index b714d668e05fc2..0f38f606b536d9 100644
--- a/datahub-web-react/src/app/sharedV2/toastMessageUtils.ts
+++ b/datahub-web-react/src/app/sharedV2/toastMessageUtils.ts
@@ -2,10 +2,8 @@ import { message } from 'antd';
 import { ReactNode } from 'react';
 
 export enum ToastType {
-    INFO = 'info',
     ERROR = 'error',
     SUCCESS = 'success',
-    WARNING = 'warning',
     LOADING = 'loading',
 }
 
diff --git a/datahub-web-react/src/app/tags/CreateNewTagModal/TagDetailsSection.tsx b/datahub-web-react/src/app/tags/CreateNewTagModal/TagDetailsSection.tsx
index 7221a6c0f82490..9e332435e2182e 100644
--- a/datahub-web-react/src/app/tags/CreateNewTagModal/TagDetailsSection.tsx
+++ b/datahub-web-react/src/app/tags/CreateNewTagModal/TagDetailsSection.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import styled from 'styled-components';
 
 // Tag details section props
-export interface TagDetailsProps {
+interface TagDetailsProps {
     tagName: string;
     setTagName: React.Dispatch<React.SetStateAction<string>>;
     tagDescription: string;
diff --git a/datahub-web-react/src/app/tags/CreateNewTagModal/types.ts b/datahub-web-react/src/app/tags/CreateNewTagModal/types.ts
deleted file mode 100644
index d8ff0bb9b75347..00000000000000
--- a/datahub-web-react/src/app/tags/CreateNewTagModal/types.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Common styled components
-export const FormSection = {
-    marginBottom: '16px',
-};
-
-// Create tag result interface
-export interface CreateTagResult {
-    tagUrn: string;
-    success: boolean;
-    error?: Error;
-}
diff --git a/datahub-web-react/src/app/useBuildEntityRegistry.ts b/datahub-web-react/src/app/useBuildEntityRegistry.ts
index 1c9449cbd555b8..429577ae758b65 100644
--- a/datahub-web-react/src/app/useBuildEntityRegistry.ts
+++ b/datahub-web-react/src/app/useBuildEntityRegistry.ts
@@ -1,12 +1,9 @@
 import { useMemo } from 'react';
 
-import buildEntityRegistry from '@app/buildEntityRegistry';
 import buildEntityRegistryV2 from '@app/buildEntityRegistryV2';
-import { useIsThemeV2 } from '@app/useIsThemeV2';
 
 export default function useBuildEntityRegistry() {
-    const isThemeV2Enabled = useIsThemeV2();
     return useMemo(() => {
-        return isThemeV2Enabled ? buildEntityRegistryV2() : buildEntityRegistry();
-    }, [isThemeV2Enabled]);
+        return buildEntityRegistryV2();
+    }, []);
 }
diff --git a/datahub-web-react/src/app/useGetAuthenticatedUser.tsx b/datahub-web-react/src/app/useGetAuthenticatedUser.tsx
index 78c713beb4ee82..351c93307fdd20 100644
--- a/datahub-web-react/src/app/useGetAuthenticatedUser.tsx
+++ b/datahub-web-react/src/app/useGetAuthenticatedUser.tsx
@@ -15,14 +15,3 @@ export function useGetAuthenticatedUser(skip?: boolean) {
     }
     return data?.me;
 }
-
-/**
- * Fetch an urn corresponding to the authenticated user.
- */
-export function useGetAuthenticatedUserUrn() {
-    const userUrn = Cookies.get(CLIENT_AUTH_COOKIE);
-    if (!userUrn) {
-        throw new Error('Could not find logged in user.');
-    }
-    return userUrn;
-}
diff --git a/datahub-web-react/src/app/useIsThemeV2.tsx b/datahub-web-react/src/app/useIsThemeV2.tsx
index 1696a9f546e40b..623c3f2024011e 100644
--- a/datahub-web-react/src/app/useIsThemeV2.tsx
+++ b/datahub-web-react/src/app/useIsThemeV2.tsx
@@ -11,7 +11,7 @@ import { useAppConfig } from '@app/useAppConfig';
  * 2. If theme v2 is enabled and toggleable, the user has not set a preference, and v2 is the default theme.
  * 3. If theme v2 is enabled not toggleable, and v2 is the default theme.
  */
-export function useIsThemeV2() {
+function useIsThemeV2() {
     const appConfig = useAppConfig();
     const { themeV2Enabled, themeV2Default, themeV2Toggleable } = appConfig.config.featureFlags;
     const [isThemeV2EnabledForUser, isUserLoaded] = useIsThemeV2EnabledForUser();
@@ -24,21 +24,10 @@ export function useIsThemeV2() {
     return loadThemeV2FromLocalStorage();
 }
 
-/**
- * Returns [isThemeV2Toggleable, isAppConfigLoaded]: whether the V2 theme can be toggled by users.
- */
-export function useIsThemeV2Toggleable() {
-    const appConfig = useAppConfig();
-    return [
-        appConfig.config.featureFlags.themeV2Enabled && appConfig.config.featureFlags.themeV2Toggleable,
-        appConfig.loaded,
-    ];
-}
-
 /**
  * Returns [isThemeV2EnabledForUser, isUserLoaded]: whether the V2 theme is turned on for the user.
  */
-export function useIsThemeV2EnabledForUser(): [boolean, boolean] {
+function useIsThemeV2EnabledForUser(): [boolean, boolean] {
     const appConfig = useAppConfig();
     const { user } = useUserContext();
     return [
diff --git a/datahub-web-react/src/app/useSetAppTheme.tsx b/datahub-web-react/src/app/useSetAppTheme.tsx
index 4eeabcac882050..79595e1904b9e9 100644
--- a/datahub-web-react/src/app/useSetAppTheme.tsx
+++ b/datahub-web-react/src/app/useSetAppTheme.tsx
@@ -1,7 +1,6 @@
 import { useEffect } from 'react';
 
 import { useAppConfig } from '@app/useAppConfig';
-import { useIsThemeV2 } from '@app/useIsThemeV2';
 import themes from '@conf/theme/themes';
 import { useCustomTheme } from '@src/customThemeContext';
 
@@ -20,7 +19,6 @@ export function useCustomThemeId(): string | null {
 }
 
 export function useSetAppTheme() {
-    const isThemeV2 = useIsThemeV2();
     const { updateTheme } = useCustomTheme();
     const customThemeId = useCustomThemeId();
 
@@ -44,9 +42,9 @@ export function useSetAppTheme() {
         } else if (customThemeId && themes[customThemeId]) {
             updateTheme(themes[customThemeId]);
         } else {
-            updateTheme(isThemeV2 ? themes.themeV2 : themes.themeV1);
+            updateTheme(themes.themeV2);
         }
-    }, [customThemeId, isThemeV2, updateTheme]);
+    }, [customThemeId, updateTheme]);
 }
 
 function setThemeIdLocalStorage(customThemeId: string | null) {
diff --git a/datahub-web-react/src/app/useShowNavBarRedesign.tsx b/datahub-web-react/src/app/useShowNavBarRedesign.tsx
index db33c2c2d34c00..93ba794288b459 100644
--- a/datahub-web-react/src/app/useShowNavBarRedesign.tsx
+++ b/datahub-web-react/src/app/useShowNavBarRedesign.tsx
@@ -1,17 +1,15 @@
 import { useEffect } from 'react';
 
 import { useAppConfig } from '@app/useAppConfig';
-import { useIsThemeV2 } from '@app/useIsThemeV2';
 
 export function useShowNavBarRedesign() {
     const appConfig = useAppConfig();
-    const isThemeV2Enabled = useIsThemeV2();
 
     if (!appConfig.loaded) {
         return loadFromLocalStorage();
     }
 
-    return appConfig.config.featureFlags.showNavBarRedesign && isThemeV2Enabled;
+    return appConfig.config.featureFlags.showNavBarRedesign;
 }
 
 export function useSetNavBarRedesignEnabled() {
diff --git a/datahub-web-react/src/conf/Global.ts b/datahub-web-react/src/conf/Global.ts
index 8eabfebbe64738..50bf78f2b35e87 100644
--- a/datahub-web-react/src/conf/Global.ts
+++ b/datahub-web-react/src/conf/Global.ts
@@ -14,7 +14,6 @@ export enum PageRoutes {
     SEARCH = '/search',
     BROWSE = '/browse',
     BROWSE_RESULTS = '/browse/:type',
-    DATASETS = '/datasets',
     ANALYTICS = '/analytics',
     POLICIES = '/policies',
     SETTINGS_POLICIES = '/settings/policies',
@@ -29,7 +28,6 @@ export enum PageRoutes {
     SETTINGS_VIEWS = '/settings/views',
     EMBED = '/embed',
     EMBED_LOOKUP = '/embed/lookup/:url',
-    SETTINGS_POSTS = '/settings/posts',
     BUSINESS_ATTRIBUTE = '/business-attribute',
     INTRODUCE = '/introduce',
     // Temporary route to view all data products
diff --git a/datahub-web-react/src/graphql-mock/fixtures/browseChart/index.ts b/datahub-web-react/src/graphql-mock/fixtures/browseChart/index.ts
deleted file mode 100644
index 5d0c9bf499e554..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/browseChart/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { BrowsePathResolver } from '@graphql-mock/fixtures/browsePathHelper';
-import { chartBrowsePaths, filterChartByPath } from '@graphql-mock/fixtures/searchResult/chartSearchResult';
-import { EntityType } from '@types';
-
-const browsePathResolver = new BrowsePathResolver({
-    entityType: EntityType.Chart,
-    paths: chartBrowsePaths,
-    filterEntityHandler: filterChartByPath,
-});
-
-export default {
-    ...browsePathResolver.getBrowse(),
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/browseDashboard/index.ts b/datahub-web-react/src/graphql-mock/fixtures/browseDashboard/index.ts
deleted file mode 100644
index 76c1f436ad6ff9..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/browseDashboard/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { BrowsePathResolver } from '@graphql-mock/fixtures/browsePathHelper';
-import { dashboardBrowsePaths, filterDashboardByPath } from '@graphql-mock/fixtures/searchResult/dashboardSearchResult';
-import { EntityType } from '@types';
-
-const browsePathResolver = new BrowsePathResolver({
-    entityType: EntityType.Dashboard,
-    paths: dashboardBrowsePaths,
-    filterEntityHandler: filterDashboardByPath,
-});
-
-export default {
-    ...browsePathResolver.getBrowse(),
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/browseDataFlow/index.ts b/datahub-web-react/src/graphql-mock/fixtures/browseDataFlow/index.ts
deleted file mode 100644
index 8a827f74e37f93..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/browseDataFlow/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { BrowsePathResolver } from '@graphql-mock/fixtures/browsePathHelper';
-import { dataFlowBrowsePaths, filterDataFlowByPath } from '@graphql-mock/fixtures/searchResult/dataFlowSearchResult';
-import { EntityType } from '@types';
-
-const browsePathResolver = new BrowsePathResolver({
-    entityType: EntityType.DataFlow,
-    paths: dataFlowBrowsePaths,
-    filterEntityHandler: filterDataFlowByPath,
-});
-
-export default {
-    ...browsePathResolver.getBrowse(),
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/browseDataset/index.ts b/datahub-web-react/src/graphql-mock/fixtures/browseDataset/index.ts
deleted file mode 100644
index f674fdb31a2f51..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/browseDataset/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { BrowsePathResolver } from '@graphql-mock/fixtures/browsePathHelper';
-import { datasetBrowsePaths, filterDatasetByPath } from '@graphql-mock/fixtures/searchResult/datasetSearchResult';
-import { EntityType } from '@types';
-
-const browsePathResolver = new BrowsePathResolver({
-    entityType: EntityType.Dataset,
-    paths: datasetBrowsePaths,
-    filterEntityHandler: filterDatasetByPath,
-});
-
-export default {
-    ...browsePathResolver.getBrowse(),
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/browsePathHelper.ts b/datahub-web-react/src/graphql-mock/fixtures/browsePathHelper.ts
deleted file mode 100644
index 38536c9a607057..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/browsePathHelper.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-import { toLowerCaseEntityType, toTitleCase } from '@graphql-mock/helper';
-import { EntityBrowseFn, EntityBrowsePath, GetBrowseResults, StringNumber } from '@graphql-mock/types';
-import { BrowseInput, BrowseResultGroup, BrowseResults, Entity, EntityType, SearchResult } from '@types';
-
-type ToFlatPathsArg = {
-    flatPaths: StringNumber[][];
-    paths: EntityBrowsePath[];
-    parentPaths: string[];
-};
-
-export const toFlatPaths = ({ flatPaths, paths, parentPaths }: ToFlatPathsArg) => {
-    paths.forEach(({ name, paths: childPaths, count = 0 }) => {
-        if (childPaths.length) {
-            parentPaths.push(name);
-            toFlatPaths({ flatPaths, parentPaths, paths: childPaths });
-        } else {
-            flatPaths.push([...parentPaths, name, count]);
-        }
-    });
-    parentPaths.pop();
-};
-
-type FilterEntityByPathArg = {
-    term: string;
-    searchResults: SearchResult[];
-};
-
-export const filterEntityByPath = ({ term, searchResults }: FilterEntityByPathArg): Entity[] => {
-    return searchResults
-        .filter((r) => {
-            const regex = new RegExp(term);
-            return regex.test(r.entity.urn);
-        })
-        .map((r) => r.entity);
-};
-
-export class BrowsePathResolver {
-    private readonly browse: Record<string, EntityBrowseFn>;
-
-    private readonly paths: EntityBrowsePath[];
-
-    private readonly filterEntityHandler: (path: string[]) => Entity[];
-
-    private readonly baseBrowseResult: GetBrowseResults = {
-        data: {
-            browse: {
-                entities: [],
-                groups: [],
-                start: 0,
-                count: 0,
-                total: 0,
-                metadata: {
-                    path: [],
-                    totalNumEntities: 0,
-                    __typename: 'BrowseResultMetadata',
-                },
-                __typename: 'BrowseResults',
-            },
-        },
-    };
-
-    constructor({
-        entityType,
-        paths,
-        filterEntityHandler,
-    }: {
-        entityType: EntityType;
-        paths: EntityBrowsePath[];
-        filterEntityHandler(path: string[]): Entity[];
-    }) {
-        this.browse = {};
-        this.paths = paths;
-        this.filterEntityHandler = filterEntityHandler;
-        const browsePathKey = `${toLowerCaseEntityType(entityType)}Browse`;
-        const groups = this.paths.map<BrowseResultGroup>(({ name, paths: rootPaths, count = 0 }) => ({
-            name,
-            count: rootPaths.length ? rootPaths.reduce(this.sumTotalEntityByPaths, 0) : count,
-            __typename: 'BrowseResultGroup',
-        }));
-        this.initBrowsePathResolver({ browsePathKey, groups });
-        this.initBrowsePathResolverForPaths({ prefixPathKey: browsePathKey, paths });
-    }
-
-    public getBrowse() {
-        return this.browse;
-    }
-
-    private initBrowsePathResolver({ browsePathKey, groups }: { browsePathKey: string; groups: BrowseResultGroup[] }) {
-        if (!this.browse.hasOwnProperty(browsePathKey)) {
-            const dataBrowse: BrowseResults = JSON.parse(JSON.stringify(this.baseBrowseResult.data.browse));
-
-            Object.assign(this.browse, {
-                [browsePathKey]: ({ start, count, path }: BrowseInput): GetBrowseResults => {
-                    const startValue = start as number;
-                    const countValue = count as number;
-                    const paths = path as string[];
-                    const entities = groups.length ? [] : this.filterEntityHandler(paths);
-                    const chunkEntities = entities.slice(startValue, startValue + countValue);
-
-                    return {
-                        data: {
-                            browse: {
-                                ...dataBrowse,
-                                entities: chunkEntities,
-                                groups,
-                                start: startValue,
-                                count: chunkEntities.length,
-                                total: entities.length,
-                                metadata: {
-                                    ...dataBrowse.metadata,
-                                    path: paths,
-                                    totalNumEntities: groups.reduce(this.sumTotalEntityByGroups, 0),
-                                },
-                            },
-                        },
-                    };
-                },
-            });
-        }
-    }
-
-    private initBrowsePathResolverForPaths({
-        prefixPathKey,
-        paths,
-    }: {
-        prefixPathKey: string;
-        paths: EntityBrowsePath[];
-    }) {
-        paths.forEach(({ name, paths: childPaths }) => {
-            const browsePathKey = `${prefixPathKey}${toTitleCase(name)}`;
-
-            if (childPaths.length) {
-                const groups = childPaths.map<BrowseResultGroup>(
-                    ({ name: childName, paths: child2Paths, count = 0 }) => ({
-                        name: childName,
-                        count: child2Paths.length ? child2Paths.reduce(this.sumTotalEntityByPaths, 0) : count,
-                        __typename: 'BrowseResultGroup',
-                    }),
-                );
-
-                this.initBrowsePathResolver({ browsePathKey, groups });
-                this.initBrowsePathResolverForPaths({ prefixPathKey: browsePathKey, paths: childPaths });
-            } else {
-                this.initBrowsePathResolver({ browsePathKey, groups: [] });
-            }
-        });
-    }
-
-    private sumTotalEntityByGroups = (out: number, { count = 0 }: BrowseResultGroup): number => {
-        return out + count;
-    };
-
-    private sumTotalEntityByPaths = (out: number, { paths, count = 0 }: EntityBrowsePath): number => {
-        if (paths.length) {
-            return paths.reduce(this.sumTotalEntityByPaths, out);
-        }
-        return out + count;
-    };
-}
diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/chartEntity.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/chartEntity.ts
deleted file mode 100644
index d5144f1615e098..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/entity/chartEntity.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import * as faker from 'faker';
-
-import { findUserByUsername } from '@graphql-mock/fixtures/searchResult/userSearchResult';
-// import { generatePlatform } from 'generateDataPlatform';
-import { Chart, ChartType, DataPlatform, EntityType, OwnershipType, PlatformType } from '@types';
-
-import bigqueryLogo from '@images/bigquerylogo.png';
-import kafkaLogo from '@images/kafkalogo.png';
-import s3Logo from '@images/s3.png';
-import snowflakeLogo from '@images/snowflakelogo.png';
-
-export const platformLogo = {
-    kafka: kafkaLogo,
-    s3: s3Logo,
-    snowflake: snowflakeLogo,
-    bigquery: bigqueryLogo,
-};
-
-export const generatePlatform = ({ platform, urn }): DataPlatform => {
-    return {
-        urn,
-        type: EntityType.Dataset,
-        name: platform,
-        properties: {
-            type: PlatformType.Others,
-            datasetNameDelimiter: '',
-            logoUrl: platformLogo[platform],
-            __typename: 'DataPlatformProperties',
-        },
-        __typename: 'DataPlatform',
-    };
-};
-
-export const chartEntity = (tool): Chart => {
-    const name = `${faker.company.bsNoun()}_${faker.company.bsNoun()}_${faker.company.bsNoun()}`;
-    const description = `${faker.commerce.productDescription()}`;
-    const datahubUser = findUserByUsername('datahub');
-    const platform = 'snowflake';
-    const platformURN = `urn:li:dataPlatform:snowflake`;
-    const dataPlatform = generatePlatform({ platform, urn: platformURN });
-
-    return {
-        urn: `urn:li:chart:(${tool},${name})`,
-        type: EntityType.Chart,
-        tool,
-        chartId: '2',
-        info: {
-            name,
-            description,
-            externalUrl: 'https://superset.demo.datahub.com/superset/explore/?form_data=%7B%22slice_id%22%3A%202%7D',
-            type: ChartType.Pie,
-            access: null,
-            lastModified: { time: 1619137330, __typename: 'AuditStamp' },
-            created: { time: 1619137330, __typename: 'AuditStamp' },
-            __typename: 'ChartInfo',
-        },
-        editableProperties: null,
-        ownership: {
-            owners: [
-                {
-                    owner: datahubUser,
-                    type: OwnershipType.Stakeholder,
-                    __typename: 'Owner',
-                    associatedUrn: `urn:li:chart:(${tool},${name})`,
-                },
-            ],
-            lastModified: { time: 1619717962718, __typename: 'AuditStamp' },
-            __typename: 'Ownership',
-        },
-        globalTags: null,
-        platform: dataPlatform,
-        __typename: 'Chart',
-    };
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/dashboardEntity.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/dashboardEntity.ts
deleted file mode 100644
index 00b79b048e4605..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/entity/dashboardEntity.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import * as faker from 'faker';
-
-import { findUserByUsername } from '@graphql-mock/fixtures/searchResult/userSearchResult';
-import { generateTag } from '@graphql-mock/fixtures/tag';
-import { Dashboard, DataPlatform, EntityType, Ownership, OwnershipType, PlatformType } from '@types';
-
-import bigqueryLogo from '@images/bigquerylogo.png';
-// import { generatePlatform } from 'generateDataPlatform';
-import kafkaLogo from '@images/kafkalogo.png';
-import s3Logo from '@images/s3.png';
-import snowflakeLogo from '@images/snowflakelogo.png';
-
-export const platformLogo = {
-    kafka: kafkaLogo,
-    s3: s3Logo,
-    snowflake: snowflakeLogo,
-    bigquery: bigqueryLogo,
-};
-
-export const generatePlatform = ({ platform, urn }): DataPlatform => {
-    return {
-        urn,
-        type: EntityType.Dataset,
-        name: platform,
-        properties: {
-            type: PlatformType.Others,
-            datasetNameDelimiter: '',
-            logoUrl: platformLogo[platform],
-            __typename: 'DataPlatformProperties',
-        },
-        __typename: 'DataPlatform',
-    };
-};
-
-export const dashboardEntity = (tool): Dashboard => {
-    const name = `${faker.company.bsNoun()}`;
-    const description = `${faker.commerce.productDescription()}`;
-    const datahubUser = findUserByUsername('datahub');
-    const kafkaUser = findUserByUsername('kafka');
-    const lookerUser = findUserByUsername('looker');
-    const datahubOwnership: Ownership = {
-        owners: [
-            {
-                owner: datahubUser,
-                type: OwnershipType.Stakeholder,
-                __typename: 'Owner',
-                associatedUrn: `urn:li:dashboard:(${tool},${name})`,
-            },
-        ],
-        lastModified: { time: 1619993818664, __typename: 'AuditStamp' },
-        __typename: 'Ownership',
-    };
-    const kafkaOwnership: Ownership = {
-        owners: [
-            {
-                owner: kafkaUser,
-                type: OwnershipType.Stakeholder,
-                __typename: 'Owner',
-                associatedUrn: `urn:li:dashboard:(${tool},${name})`,
-            },
-        ],
-        lastModified: { time: 1619993818664, __typename: 'AuditStamp' },
-        __typename: 'Ownership',
-    };
-    const platform = 's3';
-    const platformURN = `urn:li:dataPlatform:s3`;
-    const dataPlatform = generatePlatform({ platform, urn: platformURN });
-
-    return {
-        urn: `urn:li:dashboard:(${tool},${name})`,
-        type: EntityType.Dashboard,
-        tool,
-        dashboardId: '3',
-        editableProperties: null,
-        info: {
-            name,
-            description,
-            externalUrl: null,
-            access: null,
-            charts: [],
-            lastModified: { time: 1619160920, __typename: 'AuditStamp' },
-            created: { time: 1619160920, __typename: 'AuditStamp' },
-            __typename: 'DashboardInfo',
-        },
-        ownership: {
-            owners: [
-                {
-                    owner: datahubUser,
-                    type: OwnershipType.Stakeholder,
-                    associatedUrn: `urn:li:dashboard:(${tool},${name})`,
-                    __typename: 'Owner',
-                },
-                {
-                    owner: kafkaUser,
-                    type: OwnershipType.Developer,
-                    associatedUrn: `urn:li:dashboard:(${tool},${name})`,
-                    __typename: 'Owner',
-                },
-                {
-                    owner: lookerUser,
-                    type: OwnershipType.Developer,
-                    associatedUrn: `urn:li:dashboard:(${tool},${name})`,
-                    __typename: 'Owner',
-                },
-            ],
-            lastModified: { time: 1619993818664, __typename: 'AuditStamp' },
-            __typename: 'Ownership',
-        },
-        globalTags: {
-            tags: [
-                {
-                    tag: generateTag(datahubOwnership),
-                    associatedUrn: `urn:li:dashboard:(${tool},${name})`,
-                    __typename: 'TagAssociation',
-                },
-                {
-                    tag: generateTag(kafkaOwnership),
-                    associatedUrn: `urn:li:dashboard:(${tool},${name})`,
-                    __typename: 'TagAssociation',
-                },
-            ],
-            __typename: 'GlobalTags',
-        },
-        platform: dataPlatform,
-        __typename: 'Dashboard',
-        subTypes: null,
-    };
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/dataFlowEntity.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/dataFlowEntity.ts
deleted file mode 100644
index e5a7a4443b0fed..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/entity/dataFlowEntity.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import * as faker from 'faker';
-
-import { findUserByUsername } from '@graphql-mock/fixtures/searchResult/userSearchResult';
-import { DataFlow, DataPlatform, EntityType, OwnershipType, PlatformType } from '@types';
-
-import bigqueryLogo from '@images/bigquerylogo.png';
-// import { generatePlatform } from 'generateDataPlatform';
-import kafkaLogo from '@images/kafkalogo.png';
-import s3Logo from '@images/s3.png';
-import snowflakeLogo from '@images/snowflakelogo.png';
-
-export type DataFlowEntityArg = {
-    orchestrator: string;
-    cluster: string;
-};
-
-export const platformLogo = {
-    kafka: kafkaLogo,
-    s3: s3Logo,
-    snowflake: snowflakeLogo,
-    bigquery: bigqueryLogo,
-};
-
-export const generatePlatform = ({ platform, urn }): DataPlatform => {
-    return {
-        urn,
-        type: EntityType.Dataset,
-        name: platform,
-        properties: {
-            type: PlatformType.Others,
-            datasetNameDelimiter: '',
-            logoUrl: platformLogo[platform],
-            __typename: 'DataPlatformProperties',
-        },
-        __typename: 'DataPlatform',
-    };
-};
-
-export const dataFlowEntity = ({ orchestrator, cluster }: DataFlowEntityArg): DataFlow => {
-    const flowId = `${faker.company.bsNoun()}_${faker.company.bsNoun()}`;
-    const description = `${faker.commerce.productDescription()}`;
-    const datahubUser = findUserByUsername('datahub');
-    const platform = 'kafka';
-    const platformURN = `urn:li:dataPlatform:kafka`;
-    const dataPlatform = generatePlatform({ platform, urn: platformURN });
-
-    return {
-        urn: `urn:li:dataFlow:(${orchestrator},${flowId},${cluster})`,
-        type: EntityType.DataFlow,
-        orchestrator,
-        flowId,
-        cluster,
-        info: {
-            name: flowId,
-            description,
-            project: null,
-            __typename: 'DataFlowInfo',
-        },
-        editableProperties: null,
-        ownership: {
-            owners: [
-                {
-                    owner: datahubUser,
-                    type: OwnershipType.Stakeholder,
-                    associatedUrn: `urn:li:dataFlow:(${orchestrator},${flowId},${cluster})`,
-                    __typename: 'Owner',
-                },
-            ],
-            lastModified: { time: 1620224528712, __typename: 'AuditStamp' },
-            __typename: 'Ownership',
-        },
-        globalTags: { tags: [], __typename: 'GlobalTags' },
-        dataJobs: null,
-        platform: dataPlatform,
-        __typename: 'DataFlow',
-    };
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/dataJobEntity.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/dataJobEntity.ts
deleted file mode 100644
index 8c6b11a58fc188..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/entity/dataJobEntity.ts
+++ /dev/null
@@ -1,215 +0,0 @@
-import * as faker from 'faker';
-
-import { findUserByUsername } from '@graphql-mock/fixtures/searchResult/userSearchResult';
-import { DataJob, DataPlatform, EntityType, OwnershipType, PlatformType } from '@types';
-
-import bigqueryLogo from '@images/bigquerylogo.png';
-import kafkaLogo from '@images/kafkalogo.png';
-import s3Logo from '@images/s3.png';
-import snowflakeLogo from '@images/snowflakelogo.png';
-
-export const platformLogo = {
-    kafka: kafkaLogo,
-    s3: s3Logo,
-    snowflake: snowflakeLogo,
-    bigquery: bigqueryLogo,
-};
-
-export const generatePlatform = ({ platform, urn }): DataPlatform => {
-    return {
-        urn,
-        type: EntityType.Dataset,
-        name: platform,
-        properties: {
-            type: PlatformType.Others,
-            datasetNameDelimiter: '',
-            logoUrl: platformLogo[platform],
-            __typename: 'DataPlatformProperties',
-        },
-        __typename: 'DataPlatform',
-    };
-};
-
-export const dataJobEntity = (): DataJob => {
-    const orchestrator = 'airflow';
-    const flowId = `datajob_${faker.company.bsNoun()}_${faker.company.bsNoun()}`;
-    const cluster = 'prod';
-    const dataFlowURN = `(urn:li:dataFlow:(${orchestrator},${flowId},${cluster})`;
-    const description = faker.commerce.productDescription();
-    const jobId = `load_all_${faker.company.bsNoun()}_${faker.company.bsNoun()}`;
-    const kafkaUser = findUserByUsername('kafka');
-    const platform = 'kafka';
-    const platformURN = `urn:li:dataPlatform:kafka`;
-    const dataPlatform = generatePlatform({ platform, urn: platformURN });
-
-    return {
-        urn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-        type: EntityType.DataJob,
-        dataFlow: {
-            urn: dataFlowURN,
-            type: EntityType.DataFlow,
-            orchestrator,
-            flowId,
-            cluster,
-            info: {
-                name: flowId,
-                description,
-                project: null,
-                externalUrl: 'https://airflow.demo.datahub.com/tree?dag_id=datahub_analytics_refresh',
-                customProperties: [
-                    {
-                        key: 'end_date',
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        value: 'None',
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: 'orientation',
-                        value: "'LR'",
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: 'max_active_runs',
-                        value: '16',
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: 'is_paused_upon_creation',
-                        value: 'None',
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: 'timezone',
-                        value: "'UTC'",
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: 'params',
-                        value: '{}',
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: 'fileloc',
-                        value: "'/opt/airflow/dags/repo/airflow/dags/datahub_analytics_refresh.py'",
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: 'default_args',
-                        value: "{<Encoding.VAR: '__var'>: {'owner': 'harshal', 'depends_on_past': False, 'email': ['harshal@acryl.io'], 'email_on_failure': False, 'execution_timeout': {<Encoding.VAR: '__var'>: 300.0, <Encoding.TYPE: '__type'>: <DagAttributeTypes.TIMEDELTA: 'timedelta'>}}, <Encoding.TYPE: '__type'>: <DagAttributeTypes.DICT: 'dict'>}",
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: 'tags',
-                        value: 'None',
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: '_access_control',
-                        value: 'None',
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: 'doc_md',
-                        value: 'None',
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: 'dagrun_timeout',
-                        value: 'None',
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: '_dag_id',
-                        value: "'datahub_analytics_refresh'",
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: 'catchup',
-                        value: 'False',
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: 'schedule_interval',
-                        value: "{<Encoding.VAR: '__var'>: 86400.0, <Encoding.TYPE: '__type'>: <DagAttributeTypes.TIMEDELTA: 'timedelta'>}",
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: '_default_view',
-                        value: 'None',
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: '_description',
-                        value: "'Refresh snowflake tables for analytics purposes'",
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: '_concurrency',
-                        value: '16',
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: 'tasks',
-                        value: "[{'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': []}, 'ui_color': '#f0ede4', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'run_data_task', '_inlets': {'auto': False, 'task_ids': [], 'datasets': []}, 'template_fields': ['bash_command', 'env'], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['split_s3_task'], '_task_type': 'BashOperator', '_task_module': 'airflow.operators.bash_operator', 'bash_command': \"echo 'This is where we might run the backup job'\"}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.all_entities', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.user_basic_info', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.user_extra_info', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataset_ownerships', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataset_properties', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataset_schemas', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataset_schema_extras', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataset_tags', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataset_lineages', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataset_statuses', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.tag_ownerships', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.tag_properties', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataflow_ownerships', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataflow_info', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataflow_tags', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.datajob_ownerships', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.datajob_info', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.datajob_lineages', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.datajob_tags', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.chart_info', env='PROD')\", \"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dashboard_info', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'split_s3_task', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahub-demo-backup.demo.aspects', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['load_all_entities_to_snowflake', 'load_tag_ownerships_to_snowflake', 'load_dataset_tags_to_snowflake', 'load_dataset_properties_to_snowflake', 'load_dataset_schema_extras_to_snowflake', 'load_dataset_schemas_to_snowflake', 'load_datajob_lineages_to_snowflake', 'load_dataflow_ownerships_to_snowflake', 'load_dashboard_info_to_snowflake', 'load_datajob_tags_to_snowflake', 'load_dataset_statuses_to_snowflake', 'load_chart_info_to_snowflake', 'load_user_basic_info_to_snowflake', 'load_user_extra_info_to_snowflake', 'load_datajob_info_to_snowflake', 'load_dataset_lineages_to_snowflake', 'load_dataset_ownerships_to_snowflake', 'load_datajob_ownerships_to_snowflake', 'load_tag_properties_to_snowflake', 'load_dataflow_info_to_snowflake', 'load_dataflow_tags_to_snowflake'], '_task_type': 'S3FileToDirectoryTransform', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': []}, 'ui_color': '#e8f7e4', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'wait_for_load_finish', '_inlets': {'auto': False, 'task_ids': [], 'datasets': []}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['update_generated_latest_dataset_owners', 'update_generated_latest_dataset_info', 'update_generated_dataset_platforms'], '_task_type': 'DummyOperator', '_task_module': 'airflow.operators.dummy_operator'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.all_entities', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_all_entities_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.all_entities', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.user_basic_info', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_user_basic_info_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.user_basic_info', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.user_extra_info', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_user_extra_info_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.user_extra_info', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.dataset_ownerships', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_dataset_ownerships_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataset_ownerships', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.dataset_properties', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_dataset_properties_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataset_properties', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.dataset_schemas', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_dataset_schemas_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataset_schemas', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.dataset_schema_extras', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_dataset_schema_extras_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataset_schema_extras', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.dataset_tags', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_dataset_tags_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataset_tags', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.dataset_lineages', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_dataset_lineages_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataset_lineages', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.dataset_statuses', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_dataset_statuses_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataset_statuses', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.tag_ownerships', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_tag_ownerships_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.tag_ownerships', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.tag_properties', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_tag_properties_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.tag_properties', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.dataflow_ownerships', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_dataflow_ownerships_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataflow_ownerships', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.dataflow_info', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_dataflow_info_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataflow_info', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.dataflow_tags', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_dataflow_tags_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dataflow_tags', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.datajob_ownerships', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_datajob_ownerships_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.datajob_ownerships', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.datajob_info', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_datajob_info_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.datajob_info', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.datajob_lineages', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_datajob_lineages_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.datajob_lineages', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.datajob_tags', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_datajob_tags_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.datajob_tags', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.chart_info', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_chart_info_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.chart_info', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.dashboard_info', env='PROD')\"]}, 'ui_color': '#fff', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'load_dashboard_info_to_snowflake', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='s3', name='datahubproject-demo-pipelines.entity_aspect_splits.dashboard_info', env='PROD')\"]}, 'template_fields': [], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['wait_for_load_finish'], '_task_type': 'LoadS3IntoSnowflakeOperator', '_task_module': 'unusual_prefix_436311363ce00ecbd709f747db697044ba2913d4_datahub_analytics_refresh'}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.generated_dataset_platforms', env='PROD')\"]}, 'ui_color': '#ededed', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'update_generated_dataset_platforms', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.all_entities', env='PROD')\"]}, 'template_fields': ['sql'], 'email': ['harshal@acryl.io'], '_downstream_task_ids': ['update_generated_latest_dataset_owners', 'update_generated_latest_dataset_info'], '_task_type': 'SnowflakeOperator', '_task_module': 'airflow.providers.snowflake.operators.snowflake', 'sql': \"\\nCREATE OR REPLACE TABLE generated_dataset_platforms AS (\\n    SELECT urn, split(split(urn, ',')[0], ':')[6]::string as platform\\n    FROM all_entities\\n    WHERE all_entities.entity = 'dataset'\\n);\\n        \"}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.generated_latest_dataset_owners', env='PROD')\"]}, 'ui_color': '#ededed', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'update_generated_latest_dataset_owners', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.all_entities', env='PROD')\", \"Dataset(platform='snowflake', name='demo_pipeline.public.dataset_ownerships', env='PROD')\", \"Dataset(platform='snowflake', name='demo_pipeline.public.generated_dataset_platforms', env='PROD')\"]}, 'template_fields': ['sql'], 'email': ['harshal@acryl.io'], '_downstream_task_ids': [], '_task_type': 'SnowflakeOperator', '_task_module': 'airflow.providers.snowflake.operators.snowflake', 'sql': \"\\nCREATE OR REPLACE TABLE generated_latest_dataset_owners AS (\\n    WITH latest_dataset_owners AS (SELECT * FROM dataset_ownerships WHERE version = 0)\\n    SELECT all_entities.urn, generated_dataset_platforms.platform, metadata:owners as owners, ARRAY_SIZE(COALESCE(metadata:owners, array_construct())) as owner_count\\n    FROM all_entities\\n    LEFT JOIN latest_dataset_owners ON all_entities.urn = latest_dataset_owners.urn\\n    LEFT JOIN generated_dataset_platforms ON all_entities.urn = generated_dataset_platforms.urn\\n    WHERE all_entities.entity = 'dataset'\\n);\\n        \"}, {'execution_timeout': 300.0, 'ui_fgcolor': '#000', '_outlets': {'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.generated_latest_dataset_info', env='PROD')\"]}, 'ui_color': '#ededed', 'email_on_failure': False, 'owner': 'harshal', 'task_id': 'update_generated_latest_dataset_info', '_inlets': {'auto': False, 'task_ids': [], 'datasets': [\"Dataset(platform='snowflake', name='demo_pipeline.public.all_entities', env='PROD')\", \"Dataset(platform='snowflake', name='demo_pipeline.public.dataset_properties', env='PROD')\", \"Dataset(platform='snowflake', name='demo_pipeline.public.dataset_tags', env='PROD')\", \"Dataset(platform='snowflake', name='demo_pipeline.public.dataset_lineages', env='PROD')\", \"Dataset(platform='snowflake', name='demo_pipeline.public.generated_dataset_platforms', env='PROD')\"]}, 'template_fields': ['sql'], 'email': ['harshal@acryl.io'], '_downstream_task_ids': [], '_task_type': 'SnowflakeOperator', '_task_module': 'airflow.providers.snowflake.operators.snowflake', 'sql': \"\\nCREATE OR REPLACE TABLE generated_latest_dataset_info AS (\\n    WITH\\n        latest_dataset_info AS (SELECT * FROM dataset_properties WHERE version = 0),\\n        latest_dataset_tags AS (SELECT * FROM dataset_tags WHERE version = 0),\\n        latest_dataset_lineages AS (SELECT * FROM dataset_lineages WHERE version = 0)\\n    SELECT\\n        all_entities.urn,\\n        generated_dataset_platforms.platform,\\n        latest_dataset_info.metadata:description::string as description,\\n        COALESCE(IS_NULL_VALUE(latest_dataset_info.metadata:description), TRUE) as is_missing_docs,\\n        latest_dataset_info.metadata:customProperties as properties,\\n        ARRAY_CAT(COALESCE(latest_dataset_tags.metadata:tags, array_construct()), COALESCE(latest_dataset_info.metadata:tags, array_construct())) as tags,\\n        latest_dataset_lineages.metadata:upstreams as upstreams,\\n        COALESCE(ARRAY_SIZE(latest_dataset_lineages.metadata:upstreams), 0) as upstream_count,\\n        COALESCE(ARRAY_SIZE(latest_dataset_lineages.metadata:upstreams), 0) > 0 as has_upstreams\\n    FROM all_entities\\n    LEFT JOIN latest_dataset_info ON all_entities.urn = latest_dataset_info.urn\\n    LEFT JOIN latest_dataset_tags ON all_entities.urn = latest_dataset_tags.urn\\n    LEFT JOIN latest_dataset_lineages ON all_entities.urn = latest_dataset_lineages.urn\\n    LEFT JOIN generated_dataset_platforms ON all_entities.urn = generated_dataset_platforms.urn\\n    WHERE all_entities.entity = 'dataset'\\n);\\n        \"}]",
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                    {
-                        key: 'start_date',
-                        value: '1619913600.0',
-                        associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                        __typename: 'CustomPropertiesEntry',
-                    },
-                ],
-                __typename: 'DataFlowInfo',
-            },
-            editableProperties: null,
-            ownership: {
-                owners: [],
-                lastModified: { time: 1620224528712, __typename: 'AuditStamp' },
-                __typename: 'Ownership',
-            },
-            platform: dataPlatform,
-            __typename: 'DataFlow',
-        },
-        jobId,
-        ownership: {
-            owners: [
-                {
-                    owner: kafkaUser,
-                    type: OwnershipType.Developer,
-                    __typename: 'Owner',
-                    associatedUrn: `urn:li:dataJob:${dataFlowURN},${jobId})`,
-                },
-            ],
-            lastModified: { time: 1620079975489, __typename: 'AuditStamp' },
-            __typename: 'Ownership',
-        },
-        inputOutput: {
-            inputDatasets: [],
-            outputDatasets: [],
-            __typename: 'DataJobInputOutput',
-        },
-        editableProperties: null,
-        info: { name: jobId, description: null, __typename: 'DataJobInfo' },
-        globalTags: { tags: [], __typename: 'GlobalTags' },
-        __typename: 'DataJob',
-    };
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/datasetEntity.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/datasetEntity.ts
deleted file mode 100644
index d24bb42dbbc1eb..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/entity/datasetEntity.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import * as faker from 'faker';
-
-import { findUserByUsername } from '@graphql-mock/fixtures/searchResult/userSearchResult';
-import { DataPlatform, Dataset, EntityType, FabricType, OwnershipType, PlatformType } from '@types';
-
-import bigqueryLogo from '@images/bigquerylogo.png';
-// import { generatePlatform } from 'generateDataPlatform';
-import kafkaLogo from '@images/kafkalogo.png';
-import s3Logo from '@images/s3.png';
-import snowflakeLogo from '@images/snowflakelogo.png';
-
-export const platformLogo = {
-    kafka: kafkaLogo,
-    s3: s3Logo,
-    snowflake: snowflakeLogo,
-    bigquery: bigqueryLogo,
-};
-
-export const generatePlatform = ({ platform, urn }): DataPlatform => {
-    return {
-        urn,
-        type: EntityType.Dataset,
-        name: platform,
-        properties: {
-            type: PlatformType.Others,
-            datasetNameDelimiter: '',
-            logoUrl: platformLogo[platform],
-            __typename: 'DataPlatformProperties',
-        },
-        __typename: 'DataPlatform',
-    };
-};
-
-export type DatasetEntityArg = {
-    platform: string;
-    origin: FabricType;
-    path: string;
-};
-
-export const datasetEntity = ({ platform, origin, path }: DatasetEntityArg): Dataset => {
-    const name = `${path}.${faker.company.bsNoun()}_${faker.company.bsNoun()}`;
-    const description = `${faker.commerce.productDescription()}`;
-    const datahubUser = findUserByUsername('datahub');
-    const platformURN = `urn:li:dataPlatform:${platform}`;
-
-    return {
-        urn: `urn:li:dataset:(${platformURN},${name},${origin.toUpperCase()})`,
-        type: EntityType.Dataset,
-        name,
-        origin,
-        description,
-        uri: null,
-        platform: generatePlatform({ platform, urn: platformURN }),
-        platformNativeType: null,
-        properties: null,
-        editableProperties: null,
-        editableSchemaMetadata: null,
-        deprecation: null,
-        ownership: {
-            owners: [
-                {
-                    owner: datahubUser,
-                    type: OwnershipType.Dataowner,
-                    associatedUrn: `urn:li:dataset:(${platformURN},${name},${origin.toUpperCase()})`,
-                    __typename: 'Owner',
-                },
-            ],
-            lastModified: {
-                time: 1616107219521,
-                __typename: 'AuditStamp',
-            },
-            __typename: 'Ownership',
-        },
-        globalTags: {
-            tags: [],
-            __typename: 'GlobalTags',
-        },
-        institutionalMemory: null,
-        usageStats: null,
-        glossaryTerms: null,
-        schemaMetadata: null,
-        __typename: 'Dataset',
-        subTypes: null,
-        health: [],
-    };
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/generateDataPlatform.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/generateDataPlatform.ts
deleted file mode 100644
index b3b39fbc392408..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/entity/generateDataPlatform.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { DataPlatform, EntityType, PlatformType } from '@types';
-
-import bigqueryLogo from '@images/bigquerylogo.png';
-import kafkaLogo from '@images/kafkalogo.png';
-import s3Logo from '@images/s3.png';
-import snowflakeLogo from '@images/snowflakelogo.png';
-
-export const platformLogo = {
-    kafka: kafkaLogo,
-    s3: s3Logo,
-    snowflake: snowflakeLogo,
-    bigquery: bigqueryLogo,
-};
-
-export const generatePlatform = ({ platform, urn }): DataPlatform => {
-    return {
-        urn,
-        type: EntityType.Dataset,
-        name: platform,
-        properties: {
-            type: PlatformType.Others,
-            datasetNameDelimiter: '',
-            logoUrl: platformLogo[platform],
-            __typename: 'DataPlatformProperties',
-        },
-        __typename: 'DataPlatform',
-    };
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/entity/userEntity.ts b/datahub-web-react/src/graphql-mock/fixtures/entity/userEntity.ts
deleted file mode 100644
index 4f04dba60599d0..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/entity/userEntity.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import * as faker from 'faker';
-
-import { CorpUser, EntityType } from '@types';
-
-export type UserEntityArg = {
-    username: string;
-};
-
-export const userEntity = (option?: UserEntityArg): CorpUser => {
-    const username = option?.username || `${faker.internet.userName()}`;
-    const title = `${faker.name.title()}`;
-    const firstName = `${faker.name.firstName()}`;
-    const lastName = `${faker.name.lastName()}`;
-    const email = `${faker.internet.email()}`;
-
-    return {
-        urn: `urn:li:corpuser:${username}`,
-        type: EntityType.CorpUser,
-        username,
-        info: {
-            active: true,
-            displayName: `${firstName} ${lastName}`,
-            title,
-            email,
-            firstName,
-            lastName,
-            fullName: `${firstName} ${lastName}`,
-            __typename: 'CorpUserInfo',
-        },
-        editableInfo: {
-            aboutMe: `about ${username}`,
-            teams: [faker.company.companyName(), faker.company.companyName()],
-            skills: [faker.company.catchPhrase(), faker.company.catchPhrase()],
-            pictureLink: null,
-            __typename: 'CorpUserEditableInfo',
-        },
-        __typename: 'CorpUser',
-    };
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/index.ts b/datahub-web-react/src/graphql-mock/fixtures/index.ts
deleted file mode 100644
index d776447fe97565..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './searchResult';
-export { default as datasetBrowseResult } from './browseDataset';
-export { default as dashboardBrowseResult } from './browseDashboard';
-export { default as chartBrowseResult } from './browseChart';
-export { default as dataflowBrowseResult } from './browseDataFlow';
diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/chartSearchResult.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/chartSearchResult.ts
deleted file mode 100644
index bd3d75a885f337..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/chartSearchResult.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { filterEntityByPath } from '@graphql-mock/fixtures/browsePathHelper';
-import { chartEntity } from '@graphql-mock/fixtures/entity/chartEntity';
-import { generateData } from '@graphql-mock/fixtures/searchResult/dataGenerator';
-import { EntityBrowsePath } from '@graphql-mock/types';
-import { Chart, SearchResult, SearchResults } from '@types';
-
-const searchResult = (tool: string) => (): SearchResult => {
-    return {
-        entity: chartEntity(tool),
-        matchedFields: [],
-        __typename: 'SearchResult',
-    };
-};
-
-export const chartBrowsePaths: EntityBrowsePath[] = [{ name: 'superset', paths: [], count: 6 }];
-
-const generateSearchResults = (): SearchResult[] => {
-    return chartBrowsePaths.flatMap(({ name, count = 0 }) => {
-        return generateData<SearchResult>({ generator: searchResult(name), count });
-    });
-};
-
-const searchResults = generateSearchResults();
-
-export const chartSearchResult: SearchResults = {
-    start: 0,
-    count: 0,
-    total: 0,
-    searchResults,
-    facets: [
-        { field: 'access', displayName: 'access', aggregations: [], __typename: 'FacetMetadata' },
-        {
-            field: 'type',
-            displayName: 'type',
-            aggregations: [
-                { value: 'TABLE', count: 1, __typename: 'AggregationMetadata' },
-                { value: 'BAR', count: 3, __typename: 'AggregationMetadata' },
-                { value: 'PIE', count: 1, __typename: 'AggregationMetadata' },
-                { value: 'LINE', count: 1, __typename: 'AggregationMetadata' },
-            ],
-            __typename: 'FacetMetadata',
-        },
-        {
-            field: 'tool',
-            displayName: 'tool',
-            aggregations: [{ value: 'superset', count: 6, __typename: 'AggregationMetadata' }],
-            __typename: 'FacetMetadata',
-        },
-        { field: 'queryType', displayName: 'queryType', aggregations: [], __typename: 'FacetMetadata' },
-    ],
-    __typename: 'SearchResults',
-};
-
-export const filterChartByTool = (tool: string): Chart[] => {
-    return searchResults
-        .filter((r) => {
-            return (r.entity as Chart).tool === tool;
-        })
-        .map((r) => r.entity as Chart);
-};
-
-export const findChartByURN = (urn: string): Chart => {
-    return searchResults.find((r) => {
-        return (r.entity as Chart).urn === urn;
-    })?.entity as Chart;
-};
-
-export const filterChartByPath = (path: string[]): Chart[] => {
-    return filterEntityByPath({ term: path.slice(-2).join('.'), searchResults }) as Chart[];
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dashboardSearchResult.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/dashboardSearchResult.ts
deleted file mode 100644
index 1c504d0964e6ba..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dashboardSearchResult.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { filterEntityByPath } from '@graphql-mock/fixtures/browsePathHelper';
-import { dashboardEntity } from '@graphql-mock/fixtures/entity/dashboardEntity';
-import { generateData } from '@graphql-mock/fixtures/searchResult/dataGenerator';
-import { EntityBrowsePath } from '@graphql-mock/types';
-import { Dashboard, SearchResult, SearchResults } from '@types';
-
-const searchResult = (tool: string) => (): SearchResult => {
-    return {
-        entity: dashboardEntity(tool),
-        matchedFields: [],
-        __typename: 'SearchResult',
-    };
-};
-
-export const dashboardBrowsePaths: EntityBrowsePath[] = [{ name: 'superset', paths: [], count: 3 }];
-
-const generateSearchResults = (): SearchResult[] => {
-    return dashboardBrowsePaths.flatMap(({ name, count = 0 }) => {
-        return generateData<SearchResult>({ generator: searchResult(name), count });
-    });
-};
-
-const searchResults = generateSearchResults();
-
-export const dashboardSearchResult: SearchResults = {
-    start: 0,
-    count: 0,
-    total: 0,
-    searchResults,
-    facets: [
-        {
-            field: 'tool',
-            displayName: 'tool',
-            aggregations: [{ value: 'superset', count: 1, __typename: 'AggregationMetadata' }],
-            __typename: 'FacetMetadata',
-        },
-        {
-            field: 'access',
-            displayName: 'access',
-            aggregations: [],
-            __typename: 'FacetMetadata',
-        },
-    ],
-    __typename: 'SearchResults',
-};
-
-export const filterDashboardByTool = (tool: string): Dashboard[] => {
-    return searchResults
-        .filter((r) => {
-            return (r.entity as Dashboard).tool === tool;
-        })
-        .map((r) => r.entity as Dashboard);
-};
-
-export const findDashboardByURN = (urn: string): Dashboard => {
-    return searchResults.find((r) => {
-        return (r.entity as Dashboard).urn === urn;
-    })?.entity as Dashboard;
-};
-
-export const filterDashboardByPath = (path: string[]): Dashboard[] => {
-    return filterEntityByPath({ term: path.slice(-2).join('.'), searchResults }) as Dashboard[];
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataFlowSearchResult.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataFlowSearchResult.ts
deleted file mode 100644
index 867868f2eead66..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataFlowSearchResult.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { filterEntityByPath } from '@graphql-mock/fixtures/browsePathHelper';
-import { DataFlowEntityArg, dataFlowEntity } from '@graphql-mock/fixtures/entity/dataFlowEntity';
-import { generateData } from '@graphql-mock/fixtures/searchResult/dataGenerator';
-import { EntityBrowsePath } from '@graphql-mock/types';
-import { DataFlow, SearchResult, SearchResults } from '@types';
-
-type SearchResultArg = DataFlowEntityArg;
-
-const searchResult =
-    ({ orchestrator, cluster }: SearchResultArg) =>
-    (): SearchResult => {
-        return {
-            entity: dataFlowEntity({ orchestrator, cluster }),
-            matchedFields: [],
-            __typename: 'SearchResult',
-        };
-    };
-
-export const dataFlowBrowsePaths: EntityBrowsePath[] = [
-    {
-        name: 'airflow',
-        paths: [
-            {
-                name: 'prod',
-                paths: [],
-                count: 4,
-            },
-            {
-                name: 'dev',
-                paths: [],
-                count: 1,
-            },
-        ],
-    },
-];
-
-const generateSearchResults = (): SearchResult[] => {
-    return dataFlowBrowsePaths.flatMap(({ name: orchestrator, paths }) => {
-        return paths.flatMap(({ name: cluster, count = 0 }) => {
-            return generateData<SearchResult>({ generator: searchResult({ orchestrator, cluster }), count });
-        });
-    });
-};
-
-const searchResults = generateSearchResults();
-
-export const dataFlowSearchResult: SearchResults = {
-    start: 0,
-    count: 0,
-    total: 0,
-    searchResults,
-    facets: [],
-    __typename: 'SearchResults',
-};
-
-export const filterDataFlowByOrchestrator = (orchestrator: string): DataFlow[] => {
-    return searchResults
-        .filter((r) => {
-            return (r.entity as DataFlow).orchestrator === orchestrator;
-        })
-        .map((r) => r.entity as DataFlow);
-};
-
-export const findDataFlowByURN = (urn: string): DataFlow => {
-    return searchResults.find((r) => {
-        return (r.entity as DataFlow).urn === urn;
-    })?.entity as DataFlow;
-};
-
-export const filterDataFlowByPath = (path: string[]): DataFlow[] => {
-    return filterEntityByPath({ term: path.slice(-2).join(',[\\s\\S]+,'), searchResults }) as DataFlow[];
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataGenerator.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataGenerator.ts
deleted file mode 100644
index 2d818edd60a251..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataGenerator.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { AnyRecord } from '@graphql-mock/types';
-
-type GenerateDataArg<T = AnyRecord> = {
-    generator(): T;
-    count: number;
-};
-
-export const times = (count: number) => {
-    return Array.from(new Array(count));
-};
-
-export const generateData = <T = AnyRecord>({ generator, count }: GenerateDataArg<T>): T[] => {
-    return times(count).map(() => {
-        return generator();
-    });
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataJobSearchResult.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataJobSearchResult.ts
deleted file mode 100644
index 26b03c030ac2fa..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/dataJobSearchResult.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { dataJobEntity } from '@graphql-mock/fixtures/entity/dataJobEntity';
-import { generateData } from '@graphql-mock/fixtures/searchResult/dataGenerator';
-import { DataJob, SearchResult, SearchResults } from '@types';
-
-const searchResult = (): SearchResult => {
-    return {
-        entity: dataJobEntity(),
-        matchedFields: [],
-        __typename: 'SearchResult',
-    };
-};
-
-const generateSearchResults = (): SearchResult[] => {
-    return generateData<SearchResult>({ generator: searchResult, count: 2 });
-};
-
-const searchResults = generateSearchResults();
-
-export const dataJobSearchResult: SearchResults = {
-    start: 0,
-    count: 0,
-    total: 0,
-    searchResults,
-    facets: [],
-    __typename: 'SearchResults',
-};
-
-export const findDataJobByURN = (urn: string): DataJob => {
-    return searchResults.find((r) => {
-        return (r.entity as DataJob).urn === urn;
-    })?.entity as DataJob;
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/datasetSearchResult.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/datasetSearchResult.ts
deleted file mode 100644
index bd3c25abb17562..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/datasetSearchResult.ts
+++ /dev/null
@@ -1,282 +0,0 @@
-import { filterEntityByPath, toFlatPaths } from '@graphql-mock/fixtures/browsePathHelper';
-import { DatasetEntityArg, datasetEntity } from '@graphql-mock/fixtures/entity/datasetEntity';
-import { generateData } from '@graphql-mock/fixtures/searchResult/dataGenerator';
-import { EntityBrowsePath, StringNumber } from '@graphql-mock/types';
-import { Dataset, FabricType, SearchResult, SearchResults } from '@types';
-
-type SearchResultArg = DatasetEntityArg;
-
-const searchResult =
-    ({ platform, origin, path }: SearchResultArg) =>
-    (): SearchResult => {
-        return {
-            entity: datasetEntity({ platform, origin, path }),
-            matchedFields: [],
-            __typename: 'SearchResult',
-        };
-    };
-
-export const datasetBrowsePaths: EntityBrowsePath[] = [
-    {
-        name: FabricType.Prod.toLowerCase(),
-        paths: [
-            {
-                name: 'kafka',
-                paths: [
-                    {
-                        name: 'australia',
-                        paths: [
-                            {
-                                name: 'queensland',
-                                paths: [
-                                    {
-                                        name: 'brisbane',
-                                        paths: [
-                                            {
-                                                name: 'queensland-brisbane-sunnybank-vaccine-test',
-                                                paths: [
-                                                    {
-                                                        name: 'topic-queensland-brisbane-sunnybank-vaccine-test-jan',
-                                                        paths: [],
-                                                        count: 2,
-                                                    },
-                                                    {
-                                                        name: 'topic-queensland-brisbane-sunnybank-vaccine-test-feb',
-                                                        paths: [],
-                                                        count: 1,
-                                                    },
-                                                ],
-                                            },
-                                            {
-                                                name: 'topic-queensland-brisbane-carindale-vaccine-test-jan',
-                                                paths: [],
-                                                count: 2,
-                                            },
-                                        ],
-                                    },
-                                    {
-                                        name: 'topic-queensland-sunshine-coast-vaccine-test-feb',
-                                        paths: [],
-                                        count: 1,
-                                    },
-                                ],
-                            },
-                            {
-                                name: 'victoria',
-                                paths: [
-                                    {
-                                        name: 'topic-victoria-vaccine-test-mar',
-                                        paths: [],
-                                        count: 2,
-                                    },
-                                ],
-                            },
-                        ],
-                    },
-                    {
-                        name: 'topic-papua-new-guinea-digital-transformation',
-                        paths: [],
-                        count: 3,
-                    },
-                ],
-            },
-            {
-                name: 's3',
-                paths: [
-                    {
-                        name: 'datahub-demo-backup',
-                        paths: [
-                            {
-                                name: 'demo',
-                                paths: [],
-                                count: 3,
-                            },
-                        ],
-                    },
-                    {
-                        name: 'datahubproject-demo-pipelines',
-                        paths: [
-                            {
-                                name: 'entity_aspect_splits',
-                                paths: [],
-                                count: 21,
-                            },
-                        ],
-                    },
-                ],
-            },
-            {
-                name: 'snowflake',
-                paths: [
-                    {
-                        name: 'mydb',
-                        paths: [
-                            {
-                                name: 'schema',
-                                paths: [],
-                                count: 3,
-                            },
-                        ],
-                    },
-                    {
-                        name: 'demo_pipeline',
-                        paths: [
-                            {
-                                name: 'public',
-                                paths: [],
-                                count: 2,
-                            },
-                        ],
-                    },
-                ],
-            },
-            {
-                name: 'bigquery',
-                paths: [
-                    {
-                        name: 'bigquery-pubic-data',
-                        paths: [
-                            {
-                                name: 'covid19-ecdc',
-                                paths: [],
-                                count: 1,
-                            },
-                            {
-                                name: 'covid19-open-data',
-                                paths: [],
-                                count: 24,
-                            },
-                        ],
-                    },
-                ],
-            },
-        ],
-    },
-    {
-        name: FabricType.Dev.toLowerCase(),
-        paths: [
-            {
-                name: 'kafka',
-                paths: [
-                    {
-                        name: 'topic-mysql-customer-schema',
-                        paths: [],
-                        count: 1,
-                    },
-                    {
-                        name: 'rnd',
-                        paths: [
-                            {
-                                name: 'topic-mysql-marketing-ml-schema',
-                                paths: [],
-                                count: 3,
-                            },
-                            {
-                                name: 'topic-mysql-sales-ml-schema',
-                                paths: [],
-                                count: 2,
-                            },
-                        ],
-                    },
-                ],
-            },
-        ],
-    },
-];
-
-const generateSearchResults = (): SearchResult[] => {
-    return datasetBrowsePaths.flatMap(({ name: origin, paths }) => {
-        return paths.flatMap(({ name: platform, paths: childPaths }) => {
-            const flatPaths: StringNumber[][] = [];
-            const parentPaths: string[] = [];
-
-            toFlatPaths({ flatPaths, paths: childPaths, parentPaths });
-
-            return flatPaths.flatMap((fp) => {
-                const count = fp.pop() as number;
-                const path = fp.join('.');
-                return generateData<SearchResult>({
-                    generator: searchResult({ platform, origin: origin.toUpperCase() as FabricType, path }),
-                    count,
-                });
-            });
-        });
-    });
-};
-
-const searchResults = generateSearchResults();
-
-export const datasetSearchResult: SearchResults = {
-    start: 0,
-    count: 0,
-    total: 0,
-    searchResults,
-    facets: [
-        {
-            field: 'platform',
-            displayName: 'platform',
-            aggregations: [
-                {
-                    value: 's3',
-                    count: 22,
-                    __typename: 'AggregationMetadata',
-                },
-                {
-                    value: 'snowflake',
-                    count: 69,
-                    __typename: 'AggregationMetadata',
-                },
-                {
-                    value: 'bigquery',
-                    count: 104,
-                    __typename: 'AggregationMetadata',
-                },
-                {
-                    value: 'kafka',
-                    count: 7,
-                    __typename: 'AggregationMetadata',
-                },
-            ],
-            __typename: 'FacetMetadata',
-        },
-        {
-            field: 'origin',
-            displayName: 'origin',
-            aggregations: [
-                {
-                    value: 'prod',
-                    count: 202,
-                    __typename: 'AggregationMetadata',
-                },
-            ],
-            __typename: 'FacetMetadata',
-        },
-    ],
-    __typename: 'SearchResults',
-};
-
-export const filterDatasetByPlatform = (platform: string): Dataset[] => {
-    return searchResults
-        .filter((r) => {
-            return (r.entity as Dataset).platform.name === platform;
-        })
-        .map((r) => r.entity as Dataset);
-};
-
-export const filterDatasetByName = (name: string): Dataset[] => {
-    return searchResults
-        .filter((r) => {
-            return (r.entity as Dataset).name.indexOf(name) >= 0;
-        })
-        .map((r) => r.entity as Dataset);
-};
-
-export const findDatasetByURN = (urn: string): Dataset => {
-    return searchResults.find((r) => {
-        return (r.entity as Dataset).urn === urn;
-    })?.entity as Dataset;
-};
-
-export const filterDatasetByPath = (path: string[]): Dataset[] => {
-    return filterEntityByPath({ term: path.slice(-2).join('.'), searchResults }) as Dataset[];
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/index.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/index.ts
deleted file mode 100644
index 481dc4cfc46a10..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export { datasetSearchResult } from './datasetSearchResult';
-export { dashboardSearchResult } from './dashboardSearchResult';
-export { dataFlowSearchResult } from './dataFlowSearchResult';
-export { dataJobSearchResult } from './dataJobSearchResult';
-export { chartSearchResult } from './chartSearchResult';
-export { userSearchResult } from './userSearchResult';
diff --git a/datahub-web-react/src/graphql-mock/fixtures/searchResult/userSearchResult.ts b/datahub-web-react/src/graphql-mock/fixtures/searchResult/userSearchResult.ts
deleted file mode 100644
index 1ed752ee84fab3..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/searchResult/userSearchResult.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/* eslint-disable prefer-object-spread */
-import { UserEntityArg, userEntity } from '@graphql-mock/fixtures/entity/userEntity';
-import { generateData } from '@graphql-mock/fixtures/searchResult/dataGenerator';
-import { CorpUser, SearchResult, SearchResults } from '@types';
-
-// login with one of these usernames
-const usernames = ['kafka', 'looker', 'datahub'];
-
-type SearchResultArg = UserEntityArg;
-
-const searchResult = (option?: SearchResultArg) => (): SearchResult => {
-    return {
-        entity: userEntity(option),
-        matchedFields: [],
-        __typename: 'SearchResult',
-    };
-};
-
-const generateSearchResults = (): SearchResult[] => {
-    const loginUsers = usernames.map((username) => {
-        return searchResult({ username })();
-    });
-
-    return [...loginUsers, ...generateData<SearchResult>({ generator: searchResult(), count: 25 })];
-};
-
-const searchResults = generateSearchResults();
-
-export const userSearchResult: SearchResults = {
-    start: 0,
-    count: 0,
-    total: 0,
-    searchResults,
-    facets: [],
-    __typename: 'SearchResults',
-};
-
-export const findUserByUsername = (username: string): CorpUser => {
-    const result = searchResults.find((r) => {
-        return (r.entity as CorpUser).username === username;
-    });
-
-    return Object.assign({}, result?.entity as CorpUser);
-};
-
-export const getUsers = (): CorpUser[] => {
-    return searchResults.map((r) => Object.assign({}, r.entity as CorpUser));
-};
-
-export const findUserByURN = (urn: string | null): CorpUser => {
-    return searchResults.find((r) => {
-        return (r.entity as CorpUser).urn === urn;
-    })?.entity as CorpUser;
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/tag.ts b/datahub-web-react/src/graphql-mock/fixtures/tag.ts
deleted file mode 100644
index adde2f10438a09..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/tag.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import * as faker from 'faker';
-
-import { findUserByURN } from '@graphql-mock/fixtures/searchResult/userSearchResult';
-import { getActor } from '@graphql-mock/helper';
-import { EntityType, Ownership, OwnershipType, Tag, TagUpdateInput } from '@types';
-
-export const tagDb: Tag[] = [];
-
-export const generateTag = (ownership?: Ownership): Tag => {
-    const name = `${faker.company.bsNoun()}`;
-    const description = `${faker.commerce.productDescription()}`;
-    const tag: Tag = {
-        urn: `urn:li:tag:${name}`,
-        name,
-        description,
-        type: EntityType.Tag,
-        ownership,
-        __typename: 'Tag',
-    };
-
-    tagDb.push(tag);
-
-    return tag;
-};
-
-export const createTag = ({ name, urn, description }: TagUpdateInput): Tag => {
-    const user = findUserByURN(getActor());
-    const tag: Tag = {
-        urn,
-        name,
-        description,
-        type: EntityType.Tag,
-        ownership: {
-            owners: [
-                {
-                    owner: user,
-                    type: OwnershipType.Dataowner,
-                    associatedUrn: urn,
-                    __typename: 'Owner',
-                },
-            ],
-            lastModified: { time: Date.now(), __typename: 'AuditStamp' },
-            __typename: 'Ownership',
-        },
-        __typename: 'Tag',
-    };
-
-    tagDb.push(tag);
-
-    return tag;
-};
diff --git a/datahub-web-react/src/graphql-mock/fixtures/user.ts b/datahub-web-react/src/graphql-mock/fixtures/user.ts
deleted file mode 100644
index 4d6a00f4d6bf85..00000000000000
--- a/datahub-web-react/src/graphql-mock/fixtures/user.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { getUsers } from '@graphql-mock/fixtures/searchResult/userSearchResult';
-
-const createCorpUserSchema = ({ server, user }) => {
-    const { info, editableInfo } = user;
-
-    // eslint-disable-next-line no-param-reassign
-    delete user.info;
-    // eslint-disable-next-line no-param-reassign
-    delete user.editableInfo;
-
-    const userSchema = server.create('CorpUser', user);
-    userSchema.createInfo(info);
-    userSchema.createEditableInfo(editableInfo);
-};
-
-export const createLoginUsers = (server) => {
-    const users = getUsers();
-    users.forEach((user) => {
-        createCorpUserSchema({ server, user });
-    });
-};
diff --git a/datahub-web-react/src/graphql-mock/helper.ts b/datahub-web-react/src/graphql-mock/helper.ts
index 3e6d5f3296757b..f0e0570d00b56e 100644
--- a/datahub-web-react/src/graphql-mock/helper.ts
+++ b/datahub-web-react/src/graphql-mock/helper.ts
@@ -1,17 +1,4 @@
-import { EntityType } from '@types';
 
-/**
- * Common helpers
- */
-
-export const getActor = (): string | null => {
-    const cookie = new URLSearchParams(document.cookie.replaceAll('; ', '&'));
-    return cookie.get('actor');
-};
-
-export const toLowerCaseEntityType = (type: EntityType): string => {
-    return type.toLowerCase().replace(/[_]/g, '');
-};
 
 export const toTitleCase = (str: string): string => {
     // eslint-disable-next-line no-useless-escape
diff --git a/datahub-web-react/src/graphql-mock/mutationHelper.ts b/datahub-web-react/src/graphql-mock/mutationHelper.ts
deleted file mode 100644
index 30cd4daa07814c..00000000000000
--- a/datahub-web-react/src/graphql-mock/mutationHelper.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import { findUserByURN } from '@graphql-mock/fixtures/searchResult/userSearchResult';
-import { tagDb } from '@graphql-mock/fixtures/tag';
-import { getActor } from '@graphql-mock/helper';
-import {
-    Chart,
-    Dashboard,
-    DataFlow,
-    DataJob,
-    Dataset,
-    Entity,
-    EntityType,
-    GlobalTags,
-    GlobalTagsUpdate,
-    InstitutionalMemory,
-    InstitutionalMemoryMetadata,
-    InstitutionalMemoryUpdate,
-    Owner,
-    OwnerUpdate,
-    TagAssociation,
-} from '@types';
-
-type UpdateEntityOwnersArg = {
-    entity?: Entity;
-    owners?: OwnerUpdate[];
-};
-
-export const updateEntityOwners = ({ entity, owners }: UpdateEntityOwnersArg) => {
-    const updateOwners = owners
-        ?.map((o) => {
-            const user = findUserByURN(o.owner);
-            return user
-                ? {
-                      owner: user,
-                      type: o.type,
-                      __typename: 'Owner',
-                  }
-                : null;
-        })
-        .filter(Boolean) as Owner[];
-
-    const dataEntity = entity as Dataset | Chart | Dashboard | DataFlow | DataJob;
-    if (dataEntity?.ownership?.owners) {
-        // eslint-disable-next-line no-param-reassign
-        dataEntity.ownership.owners = updateOwners;
-    }
-};
-
-type UpdateEntityTagArg = {
-    entity?: Entity;
-    globalTags: GlobalTagsUpdate;
-};
-
-export const updateEntityTag = ({ entity, globalTags }: UpdateEntityTagArg) => {
-    const tagAssociations = globalTags.tags
-        ?.map((t) => {
-            const tag = tagDb.find((ti) => {
-                return ti.urn === t.tag.urn;
-            });
-
-            return tag
-                ? {
-                      tag,
-                      __typename: 'TagAssociation',
-                  }
-                : null;
-        })
-        .filter(Boolean) as TagAssociation[];
-    const baseTags: TagAssociation[] = [];
-    const baseGlobalTags: GlobalTags = {
-        __typename: 'GlobalTags',
-        tags: baseTags,
-    };
-    const dataEntity = entity as Dataset | Chart | Dashboard | DataFlow | DataJob;
-
-    dataEntity.globalTags = dataEntity.globalTags || baseGlobalTags;
-    if (dataEntity.globalTags.tags) {
-        dataEntity.globalTags.tags = tagAssociations;
-    }
-};
-
-type UpdateEntityLinkArg = {
-    entity: Dataset;
-    institutionalMemory: InstitutionalMemoryUpdate;
-};
-
-export const updateEntityLink = ({ entity, institutionalMemory }: UpdateEntityLinkArg) => {
-    const dataEntity = entity;
-    const baseElements: InstitutionalMemoryMetadata[] = [];
-    const baseInstitutionalMemory: InstitutionalMemory = {
-        elements: baseElements,
-        __typename: 'InstitutionalMemory',
-    };
-
-    dataEntity.institutionalMemory = dataEntity.institutionalMemory || baseInstitutionalMemory;
-    dataEntity.institutionalMemory.elements = institutionalMemory.elements.map((e) => {
-        const link: InstitutionalMemoryMetadata = {
-            __typename: 'InstitutionalMemoryMetadata',
-            url: e.url,
-            description: e.description as string,
-            label: e.description as string,
-            author: { urn: e.author, username: '', type: EntityType.CorpUser },
-            actor: { urn: e.author, username: '', type: EntityType.CorpUser },
-            created: { time: Date.now(), actor: getActor(), __typename: 'AuditStamp' },
-            associatedUrn: dataEntity.urn,
-        };
-        return link;
-    });
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/getAutoCompleteAllResultsResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getAutoCompleteAllResultsResolver.ts
deleted file mode 100644
index 79736cee3f62ca..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/getAutoCompleteAllResultsResolver.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-import * as fixtures from '@graphql-mock/fixtures';
-import { tagDb } from '@graphql-mock/fixtures/tag';
-import {
-    AutoCompleteInput,
-    AutoCompleteMultipleResults,
-    AutoCompleteResultForEntity,
-    Chart,
-    CorpUser,
-    Dashboard,
-    DataFlow,
-    DataJob,
-    Dataset,
-    EntityType,
-    Maybe,
-} from '@types';
-
-type GetAutoCompleteAllResults = {
-    data: {
-        autoCompleteForAll: AutoCompleteMultipleResults;
-    };
-};
-
-const findSuggestions = ({ query, type }: AutoCompleteInput): AutoCompleteResultForEntity[] => {
-    const q = query.toLowerCase().trim();
-
-    if (type === EntityType.Tag) {
-        const results = q
-            ? tagDb.filter((t) => {
-                  return t.name.indexOf(q) >= 0;
-              })
-            : [];
-        return [
-            {
-                type: EntityType.Tag,
-                suggestions: results.map((r) => {
-                    return r.name;
-                }),
-                entities: results.map((r) => {
-                    return r;
-                }),
-                __typename: 'AutoCompleteResultForEntity',
-            },
-        ];
-    }
-
-    const filterSearchResults = (): AutoCompleteResultForEntity[] => {
-        const datasetResults = fixtures.datasetSearchResult.searchResults.filter((r) => {
-            return ((r.entity as Dataset).name?.toLowerCase()?.indexOf(q) ?? -1) >= 0;
-        });
-        const datasetQueryResults: Maybe<AutoCompleteResultForEntity> = datasetResults.length
-            ? {
-                  type: EntityType.Dataset,
-                  suggestions: datasetResults.map((r) => {
-                      return (r.entity as Dataset).name;
-                  }),
-                  entities: [],
-                  __typename: 'AutoCompleteResultForEntity',
-              }
-            : null;
-
-        const dashboardResults = fixtures.dashboardSearchResult.searchResults.filter((r) => {
-            return ((r.entity as Dashboard).info?.name?.toLowerCase()?.indexOf(q) ?? -1) >= 0;
-        });
-        const dashboardQueryResults: Maybe<AutoCompleteResultForEntity> = dashboardResults.length
-            ? {
-                  type: EntityType.Dashboard,
-                  suggestions: dashboardResults.map((r) => {
-                      return (r.entity as Dashboard).info?.name || '';
-                  }),
-                  entities: dashboardResults.map((r) => {
-                      return r.entity;
-                  }),
-                  __typename: 'AutoCompleteResultForEntity',
-              }
-            : null;
-
-        const chartResults = fixtures.chartSearchResult.searchResults.filter((r) => {
-            return ((r.entity as Chart).info?.name?.toLowerCase()?.indexOf(q) ?? -1) >= 0;
-        });
-        const chartQueryResults: Maybe<AutoCompleteResultForEntity> = chartResults.length
-            ? {
-                  type: EntityType.Chart,
-                  suggestions: chartResults.map((r) => {
-                      return (r.entity as Chart).info?.name || '';
-                  }),
-                  entities: chartResults.map((r) => {
-                      return r.entity;
-                  }),
-                  __typename: 'AutoCompleteResultForEntity',
-              }
-            : null;
-
-        const dataFlowResults = fixtures.dataFlowSearchResult.searchResults.filter((r) => {
-            return ((r.entity as DataFlow).info?.name?.toLowerCase()?.indexOf(q) ?? -1) >= 0;
-        });
-        const dataFlowQueryResults: Maybe<AutoCompleteResultForEntity> = dataFlowResults.length
-            ? {
-                  type: EntityType.DataFlow,
-                  suggestions: dataFlowResults.map((r) => {
-                      return (r.entity as DataFlow).info?.name || '';
-                  }),
-                  entities: dataFlowResults.map((r) => {
-                      return r.entity;
-                  }),
-                  __typename: 'AutoCompleteResultForEntity',
-              }
-            : null;
-
-        const dataJobResults = fixtures.dataJobSearchResult.searchResults.filter((r) => {
-            return ((r.entity as DataJob).info?.name?.toLowerCase()?.indexOf(q) ?? -1) >= 0;
-        });
-        const dataJobQueryResults: Maybe<AutoCompleteResultForEntity> = dataJobResults.length
-            ? {
-                  type: EntityType.DataJob,
-                  suggestions: dataJobResults.map((r) => {
-                      return (r.entity as DataJob).info?.name || '';
-                  }),
-                  entities: dataJobResults.map((r) => {
-                      return r.entity;
-                  }),
-                  __typename: 'AutoCompleteResultForEntity',
-              }
-            : null;
-
-        const userResults = fixtures.userSearchResult.searchResults.filter((r) => {
-            return ((r.entity as CorpUser).info?.fullName?.toLowerCase()?.indexOf(q) ?? -1) >= 0;
-        });
-        const userQueryResults: Maybe<AutoCompleteResultForEntity> = userResults.length
-            ? {
-                  type: EntityType.CorpUser,
-                  suggestions: userResults.map((r) => {
-                      return (r.entity as CorpUser).info?.fullName || '';
-                  }),
-                  entities: userResults.map((r) => {
-                      return r.entity;
-                  }),
-                  __typename: 'AutoCompleteResultForEntity',
-              }
-            : null;
-
-        return [
-            datasetQueryResults,
-            dashboardQueryResults,
-            chartQueryResults,
-            dataFlowQueryResults,
-            dataJobQueryResults,
-            userQueryResults,
-        ].filter(Boolean) as AutoCompleteResultForEntity[];
-    };
-
-    return q ? filterSearchResults() : [];
-};
-
-export const getAutoCompleteAllResultsResolver = {
-    getAutoCompleteAllResults({ variables: { input } }): GetAutoCompleteAllResults {
-        const { query }: AutoCompleteInput = input;
-        const suggestions = findSuggestions(input);
-
-        return {
-            data: {
-                autoCompleteForAll: {
-                    query,
-                    suggestions: suggestions.filter((s, i) => {
-                        return suggestions.indexOf(s) === i;
-                    }),
-                    __typename: 'AutoCompleteMultipleResults',
-                },
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/getAutoCompleteResultsResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getAutoCompleteResultsResolver.ts
deleted file mode 100644
index a97a0014c350d3..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/getAutoCompleteResultsResolver.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import * as fixtures from '@graphql-mock/fixtures';
-import { tagDb } from '@graphql-mock/fixtures/tag';
-import {
-    AutoCompleteInput,
-    AutoCompleteResults,
-    Chart,
-    CorpUser,
-    Dashboard,
-    DataFlow,
-    DataJob,
-    Dataset,
-    EntityType,
-} from '@types';
-
-type GetAutoCompleteResults = {
-    data: {
-        autoComplete: AutoCompleteResults;
-    };
-};
-
-const findSuggestions = ({ query, type, field }: AutoCompleteInput): string[] => {
-    const q = query.toLowerCase().trim();
-
-    if (type === EntityType.Tag) {
-        const results = q
-            ? tagDb.filter((t) => {
-                  return t.name.indexOf(q) >= 0;
-              })
-            : [];
-        return results.map((r) => {
-            return r.name;
-        });
-    }
-
-    const filterSearchResults = () => {
-        if (field === 'ldap') {
-            return fixtures.userSearchResult.searchResults.filter((r) => {
-                return ((r.entity as CorpUser).username?.indexOf(q) ?? -1) >= 0;
-            });
-        }
-        return [
-            ...fixtures.datasetSearchResult.searchResults.filter((r) => {
-                return ((r.entity as Dataset).name?.indexOf(q) ?? -1) >= 0;
-            }),
-            ...fixtures.dashboardSearchResult.searchResults.filter((r) => {
-                return ((r.entity as Dashboard).info?.name?.indexOf(q) ?? -1) >= 0;
-            }),
-            ...fixtures.chartSearchResult.searchResults.filter((r) => {
-                return ((r.entity as Chart).info?.name?.indexOf(q) ?? -1) >= 0;
-            }),
-            ...fixtures.dataFlowSearchResult.searchResults.filter((r) => {
-                return ((r.entity as DataFlow).info?.name?.indexOf(q) ?? -1) >= 0;
-            }),
-            ...fixtures.dataJobSearchResult.searchResults.filter((r) => {
-                return ((r.entity as DataJob).info?.name?.indexOf(q) ?? -1) >= 0;
-            }),
-            ...fixtures.userSearchResult.searchResults.filter((r) => {
-                return ((r.entity as CorpUser).info?.fullName?.toLowerCase()?.indexOf(q) ?? -1) >= 0;
-            }),
-        ];
-    };
-
-    const results = q ? filterSearchResults() : [];
-
-    return results
-        .map((r) => {
-            return field === 'ldap'
-                ? (r.entity as CorpUser)?.username
-                : (r.entity as Dataset)?.name ||
-                      (r.entity as Dashboard | Chart | DataFlow | DataJob)?.info?.name ||
-                      (r.entity as CorpUser)?.info?.fullName ||
-                      '';
-        })
-        .filter(Boolean);
-};
-
-export const getAutoCompleteResultsResolver = {
-    getAutoCompleteResults({ variables: { input } }): GetAutoCompleteResults {
-        const { query }: AutoCompleteInput = input;
-        const suggestions = findSuggestions(input);
-
-        return {
-            data: {
-                autoComplete: {
-                    query,
-                    suggestions: suggestions.filter((s, i) => {
-                        return suggestions.indexOf(s) === i;
-                    }),
-                    entities: [],
-                    __typename: 'AutoCompleteResults',
-                },
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/getBrowsePathsResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getBrowsePathsResolver.ts
deleted file mode 100644
index ad836a207b78fe..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/getBrowsePathsResolver.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { BrowsePath, BrowsePathsInput, EntityType } from '@types';
-
-const paths = {
-    [EntityType.Dataset](urn) {
-        const result = urn.replace('urn:li:dataset:(urn:li:dataPlatform:', '').replace(')', '').split(',');
-        return [result[result.length - 1].toLowerCase(), result[0], ...result[1].split('.')];
-    },
-    [EntityType.Dashboard](urn) {
-        return urn.replace('urn:li:dashboard:(', '').replace(')', '').split(',');
-    },
-    [EntityType.Chart](urn) {
-        return urn.replace('urn:li:chart:(', '').replace(')', '').split(',');
-    },
-    [EntityType.DataFlow](urn) {
-        const result = urn.replace('urn:li:dataFlow:(', '').replace(')', '').split(',');
-        return [result[0], result[result.length - 1].toLowerCase(), result[1]];
-    },
-    [EntityType.DataJob]() {
-        return [];
-    },
-};
-
-type GetBrowsePaths = {
-    data: {
-        browsePaths: BrowsePath[];
-    };
-};
-
-export const getBrowsePathsResolver = {
-    getBrowsePaths({ variables: { input } }): GetBrowsePaths {
-        const { urn, type }: BrowsePathsInput = input;
-
-        return {
-            data: {
-                browsePaths: [
-                    {
-                        path: paths[type](urn),
-                        __typename: 'BrowsePath',
-                    },
-                ],
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/getBrowseResultsResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getBrowseResultsResolver.ts
deleted file mode 100644
index f4856a36d91966..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/getBrowseResultsResolver.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import * as fixtures from '@graphql-mock/fixtures';
-import { toLowerCaseEntityType, toTitleCase } from '@graphql-mock/helper';
-import { EntityBrowseFn, GetBrowseResults } from '@graphql-mock/types';
-import { BrowseInput } from '@types';
-
-const toPathTitle = (paths: string[]): string => {
-    return paths?.map((p) => toTitleCase(p)).join('');
-};
-
-export const getBrowseResultsResolver = {
-    getBrowseResults({ variables: { input } }): GetBrowseResults {
-        const { type, path = [], start = 0, count = 0 }: BrowseInput = input;
-        const startValue = start as number;
-        const countValue = count as number;
-        const paths = path as string[];
-        const entityType = toLowerCaseEntityType(type);
-        const pathTitle = toPathTitle(paths);
-
-        const result: GetBrowseResults | EntityBrowseFn =
-            fixtures[`${entityType}BrowseResult`][`${entityType}Browse${pathTitle}`];
-
-        if (typeof result === 'function') {
-            return result({ start: startValue, count: countValue, path: paths });
-        }
-        return result;
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/getChartResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getChartResolver.ts
deleted file mode 100644
index 975d24f7533d1f..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/getChartResolver.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { findChartByURN } from '@graphql-mock/fixtures/searchResult/chartSearchResult';
-import { Chart } from '@types';
-
-type GetChart = {
-    data: {
-        chart: Chart;
-    };
-};
-
-export const getChartResolver = {
-    getChart({ variables: { urn } }): GetChart {
-        const chart = findChartByURN(urn) as Chart;
-        return {
-            data: {
-                chart: Object.assign(chart, {
-                    info: {
-                        ...chart.info,
-                        inputs: [],
-                        customProperties: [],
-                        lastRefreshed: null,
-                        created: {
-                            time: 1619160920,
-                            __typename: 'AuditStamp',
-                        },
-                    },
-                    query: null,
-                    downstreamLineage: {
-                        entities: [],
-                        __typename: 'DownstreamEntityRelationships',
-                    },
-                    upstreamLineage: {
-                        entities: [],
-                        __typename: 'UpstreamEntityRelationships',
-                    },
-                }),
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/getDashboardResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getDashboardResolver.ts
deleted file mode 100644
index 20a2cfe71e9106..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/getDashboardResolver.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { findDashboardByURN } from '@graphql-mock/fixtures/searchResult/dashboardSearchResult';
-import { Dashboard } from '@types';
-
-type GetDashboard = {
-    data: { dashboard: Dashboard };
-};
-
-export const getDashboardResolver = {
-    getDashboard({ variables: { urn } }): GetDashboard {
-        const dashboard = findDashboardByURN(urn) as Dashboard;
-        return {
-            data: {
-                dashboard: Object.assign(dashboard, {
-                    info: {
-                        ...dashboard.info,
-                        charts: [],
-                        customProperties: [],
-                        lastRefreshed: null,
-                        created: {
-                            time: 1619160920,
-                            __typename: 'AuditStamp',
-                        },
-                    },
-                    downstreamLineage: {
-                        entities: [],
-                        __typename: 'DownstreamEntityRelationships',
-                    },
-                    upstreamLineage: {
-                        entities: [],
-                        __typename: 'UpstreamEntityRelationships',
-                    },
-                }),
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/getDataFlowResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getDataFlowResolver.ts
deleted file mode 100644
index 32c10eb3177989..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/getDataFlowResolver.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { findDataFlowByURN } from '@graphql-mock/fixtures/searchResult/dataFlowSearchResult';
-import { DataFlow } from '@types';
-
-type GetDataFlow = {
-    data: { dataFlow: DataFlow };
-};
-
-export const getDataFlowResolver = {
-    getDataFlow({ variables: { urn } }): GetDataFlow {
-        const dataFlow = findDataFlowByURN(urn) as DataFlow;
-        return {
-            data: {
-                dataFlow: Object.assign(dataFlow, {
-                    info: {
-                        ...dataFlow.info,
-                        externalUrl: 'https://airflow.demo.datahub.com/tree?dag_id=datahub_analytics_refresh',
-                        inputs: [],
-                        customProperties: [],
-                    },
-                }),
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/getDataJobResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getDataJobResolver.ts
deleted file mode 100644
index b93a62d65f92ed..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/getDataJobResolver.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { findDataJobByURN } from '@graphql-mock/fixtures/searchResult/dataJobSearchResult';
-import { DataJob } from '@types';
-
-type GetJobFlow = {
-    data: { dataJob: DataJob };
-};
-
-export const getDataJobResolver = {
-    getDataJob({ variables: { urn } }): GetJobFlow {
-        const dataJob = findDataJobByURN(urn) as DataJob;
-        return {
-            data: {
-                dataJob: Object.assign(dataJob, {
-                    info: {
-                        ...dataJob.info,
-                        externalUrl: 'https://airflow.demo.datahub.com/tree?dag_id=datahub_analytics_refresh',
-                        inputs: [],
-                        customProperties: [],
-                    },
-                    downstreamLineage: {
-                        entities: [],
-                        __typename: 'DownstreamEntityRelationships',
-                    },
-                    upstreamLineage: {
-                        entities: [],
-                        __typename: 'UpstreamEntityRelationships',
-                    },
-                }),
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/getDatasetResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getDatasetResolver.ts
deleted file mode 100644
index ec4e0957ffafd4..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/getDatasetResolver.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { findDatasetByURN } from '@graphql-mock/fixtures/searchResult/datasetSearchResult';
-import { Dataset, InstitutionalMemory, InstitutionalMemoryMetadata } from '@types';
-
-type GetDataset = {
-    data: { dataset: Dataset };
-};
-
-export const getDatasetResolver = {
-    getDataset({ variables: { urn } }): GetDataset {
-        const dataset = findDatasetByURN(urn);
-
-        if (!dataset.institutionalMemory) {
-            const baseElements: InstitutionalMemoryMetadata[] = [];
-            const baseInstitutionalMemory: InstitutionalMemory = {
-                elements: baseElements,
-                __typename: 'InstitutionalMemory',
-            };
-            dataset.institutionalMemory = baseInstitutionalMemory;
-        }
-
-        return {
-            data: {
-                dataset: Object.assign(dataset, {
-                    schema: null,
-                    editableProperties: null,
-                    editableSchemaMetadata: null,
-                    deprecation: null,
-                    downstreamLineage: {
-                        entities: [],
-                        __typename: 'DownstreamEntityRelationships',
-                    },
-                    upstreamLineage: {
-                        entities: [],
-                        __typename: 'UpstreamEntityRelationships',
-                    },
-                    glossaryTerms: null,
-                    institutionalMemory: null,
-                    usageStats: null,
-                }),
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/getSearchResultsResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getSearchResultsResolver.ts
deleted file mode 100644
index 8093c5f3953273..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/getSearchResultsResolver.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import * as fixtures from '@graphql-mock/fixtures';
-import {
-    Chart,
-    CorpUser,
-    Dashboard,
-    DataFlow,
-    DataJob,
-    Dataset,
-    EntityType,
-    SearchInput,
-    SearchResult,
-    SearchResults,
-} from '@types';
-
-const entitySearchResults = {
-    [EntityType.Dataset]: fixtures.datasetSearchResult,
-    [EntityType.Dashboard]: fixtures.dashboardSearchResult,
-    [EntityType.Chart]: fixtures.chartSearchResult,
-    [EntityType.CorpUser]: fixtures.userSearchResult,
-    [EntityType.DataFlow]: fixtures.dataFlowSearchResult,
-    [EntityType.DataJob]: fixtures.dataJobSearchResult,
-};
-
-type FindByQueryArg = {
-    query: string;
-    searchResults: SearchResult[];
-    start: number;
-    count: number;
-};
-
-type QueryResult = {
-    results: SearchResult[];
-    total: number;
-};
-
-const findByQuery = ({ query, searchResults, start, count }: FindByQueryArg): QueryResult => {
-    if (query === '*') {
-        const results = searchResults.slice(start, start + count);
-
-        return { results, total: results.length };
-    }
-
-    if (query.indexOf('owners:') >= 0) {
-        const [, ownerQuery] = query.split(':');
-        const results = searchResults.filter((r) => {
-            return (r.entity as Dataset | Dashboard | Chart | DataFlow | DataJob).ownership?.owners?.filter((o) => {
-                return (o.owner as CorpUser).username === ownerQuery;
-            }).length;
-        });
-
-        return { results, total: results.length };
-    }
-
-    if (query.indexOf('tags:') >= 0) {
-        const [, tagQuery] = query.split(':');
-        const results = searchResults.filter((r) => {
-            return (r.entity as Dataset | Dashboard | Chart | DataFlow | DataJob).globalTags?.tags?.filter((t) => {
-                return t.tag.name === tagQuery;
-            }).length;
-        });
-
-        return { results, total: results.length };
-    }
-
-    const results = [
-        ...searchResults.filter((r) => {
-            return ((r.entity as Dataset).name?.indexOf(query) ?? -1) >= 0;
-        }),
-        ...searchResults.filter((r) => {
-            return ((r.entity as Dashboard | Chart | DataFlow | DataJob).info?.name?.indexOf(query) ?? -1) >= 0;
-        }),
-        ...searchResults.filter((r) => {
-            return ((r.entity as CorpUser).info?.fullName?.toLowerCase()?.indexOf(query) ?? -1) >= 0;
-        }),
-    ];
-
-    return { results, total: results.length };
-};
-
-type GetSearchResults = {
-    data: {
-        search: SearchResults;
-    };
-} | null;
-
-export const getSearchResultsResolver = {
-    getSearchResults({ variables: { input } }): GetSearchResults {
-        const { type, start = 0, count = 10, query }: SearchInput = input;
-        const startValue = start as number;
-        const countValue = count as number;
-        const entitySearchResult: SearchResults = entitySearchResults[type];
-        const { results, total } = findByQuery({
-            query: query.toLowerCase(),
-            searchResults: entitySearchResult.searchResults,
-            start: startValue,
-            count: countValue,
-        });
-
-        return entitySearchResult
-            ? {
-                  data: {
-                      search: {
-                          start: startValue,
-                          count: results.length,
-                          total,
-                          searchResults: results,
-                          facets: entitySearchResult.facets,
-                          __typename: entitySearchResult.__typename,
-                      },
-                  },
-              }
-            : null;
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/getTagResolver.ts b/datahub-web-react/src/graphql-mock/resolver/getTagResolver.ts
deleted file mode 100644
index 375872fe93e73d..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/getTagResolver.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { tagDb } from '@graphql-mock/fixtures/tag';
-import { Tag } from '@types';
-
-type GetTag = {
-    data: { tag: Tag | undefined };
-};
-
-export const getTagResolver = {
-    getTag({ variables: { urn } }): GetTag {
-        const tag = tagDb.find((t) => {
-            return t.urn === urn;
-        });
-
-        if (tag && !tag?.ownership) {
-            tag.ownership = null;
-        }
-
-        return {
-            data: {
-                tag,
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/index.ts b/datahub-web-react/src/graphql-mock/resolver/index.ts
deleted file mode 100644
index 8e631d73c24c41..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/index.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { getAutoCompleteAllResultsResolver } from '@graphql-mock/resolver/getAutoCompleteAllResultsResolver';
-import { getAutoCompleteResultsResolver } from '@graphql-mock/resolver/getAutoCompleteResultsResolver';
-import { getBrowsePathsResolver } from '@graphql-mock/resolver/getBrowsePathsResolver';
-import { getBrowseResultsResolver } from '@graphql-mock/resolver/getBrowseResultsResolver';
-import { getChartResolver } from '@graphql-mock/resolver/getChartResolver';
-import { getDashboardResolver } from '@graphql-mock/resolver/getDashboardResolver';
-import { getDataFlowResolver } from '@graphql-mock/resolver/getDataFlowResolver';
-import { getDataJobResolver } from '@graphql-mock/resolver/getDataJobResolver';
-import { getDatasetResolver } from '@graphql-mock/resolver/getDatasetResolver';
-import { getSearchResultsResolver } from '@graphql-mock/resolver/getSearchResultsResolver';
-import { getTagResolver } from '@graphql-mock/resolver/getTagResolver';
-import { isAnalyticsEnabledResolver } from '@graphql-mock/resolver/isAnalyticsEnabledResolver';
-import { updateChartResolver } from '@graphql-mock/resolver/updateChartResolver';
-import { updateDashboardResolver } from '@graphql-mock/resolver/updateDashboardResolver';
-import { updateDataFlowResolver } from '@graphql-mock/resolver/updateDataFlowResolver';
-import { updateDataJobResolver } from '@graphql-mock/resolver/updateDataJobResolver';
-import { updateDatasetResolver } from '@graphql-mock/resolver/updateDatasetResolver';
-import { updateTagResolver } from '@graphql-mock/resolver/updateTagResolver';
-
-const resolver = {
-    ...getSearchResultsResolver,
-    ...getBrowseResultsResolver,
-    ...getAutoCompleteAllResultsResolver,
-    ...getAutoCompleteResultsResolver,
-    ...getBrowsePathsResolver,
-    ...getDatasetResolver,
-    ...getDashboardResolver,
-    ...getChartResolver,
-    ...getDataFlowResolver,
-    ...getDataJobResolver,
-    ...getTagResolver,
-    ...isAnalyticsEnabledResolver,
-    ...updateDatasetResolver,
-    ...updateDashboardResolver,
-    ...updateChartResolver,
-    ...updateDataFlowResolver,
-    ...updateDataJobResolver,
-    ...updateTagResolver,
-};
-
-export const resolveRequest = (schema, request) => {
-    const { operationName, variables } = JSON.parse(request.requestBody);
-    return resolver[operationName] && resolver[operationName]({ schema, variables });
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/isAnalyticsEnabledResolver.ts b/datahub-web-react/src/graphql-mock/resolver/isAnalyticsEnabledResolver.ts
deleted file mode 100644
index cb229a64a18b8d..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/isAnalyticsEnabledResolver.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const isAnalyticsEnabledResolver = {
-    isAnalyticsEnabled(): boolean {
-        return false;
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/updateChartResolver.ts b/datahub-web-react/src/graphql-mock/resolver/updateChartResolver.ts
deleted file mode 100644
index b44d3baeb74e80..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/updateChartResolver.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { findChartByURN } from '@graphql-mock/fixtures/searchResult/chartSearchResult';
-import { updateEntityOwners, updateEntityTag } from '@graphql-mock/mutationHelper';
-import { Chart, ChartUpdateInput } from '@types';
-
-type UpdateChart = {
-    data: { updateChart: Chart };
-};
-
-export const updateChartResolver = {
-    updateChart({ variables: { urn, input } }): UpdateChart {
-        const { globalTags, ownership }: ChartUpdateInput = input;
-        const chart = findChartByURN(urn);
-
-        if (ownership) {
-            updateEntityOwners({ entity: chart, owners: ownership?.owners });
-        } else if (globalTags) {
-            updateEntityTag({ entity: chart, globalTags });
-        }
-
-        return {
-            data: {
-                updateChart: Object.assign(chart, {
-                    info: {
-                        ...chart.info,
-                        inputs: [],
-                        customProperties: [],
-                        lastRefreshed: null,
-                        created: {
-                            time: 1619160920,
-                            __typename: 'AuditStamp',
-                        },
-                    },
-                    query: null,
-                    downstreamLineage: {
-                        entities: [],
-                        __typename: 'DownstreamEntityRelationships',
-                    },
-                    upstreamLineage: {
-                        entities: [],
-                        __typename: 'UpstreamEntityRelationships',
-                    },
-                }),
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/updateDashboardResolver.ts b/datahub-web-react/src/graphql-mock/resolver/updateDashboardResolver.ts
deleted file mode 100644
index 68d1b3f47d08f5..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/updateDashboardResolver.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { findDashboardByURN } from '@graphql-mock/fixtures/searchResult/dashboardSearchResult';
-import { updateEntityOwners, updateEntityTag } from '@graphql-mock/mutationHelper';
-import { Dashboard, DashboardUpdateInput } from '@types';
-
-type UpdateDashboard = {
-    data: { updateDashboard: Dashboard };
-};
-
-export const updateDashboardResolver = {
-    updateDashboard({ variables: { urn, input } }): UpdateDashboard {
-        const { ownership, globalTags }: DashboardUpdateInput = input;
-        const dashboard = findDashboardByURN(urn);
-
-        if (ownership) {
-            updateEntityOwners({ entity: dashboard, owners: ownership?.owners });
-        } else if (globalTags) {
-            updateEntityTag({ entity: dashboard, globalTags });
-        }
-
-        return {
-            data: {
-                updateDashboard: Object.assign(dashboard, {
-                    info: {
-                        ...dashboard.info,
-                        charts: [],
-                        customProperties: [],
-                        lastRefreshed: null,
-                        created: {
-                            time: 1619160920,
-                            __typename: 'AuditStamp',
-                        },
-                    },
-                    downstreamLineage: {
-                        entities: [],
-                        __typename: 'DownstreamEntityRelationships',
-                    },
-                    upstreamLineage: {
-                        entities: [],
-                        __typename: 'UpstreamEntityRelationships',
-                    },
-                }),
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/updateDataFlowResolver.ts b/datahub-web-react/src/graphql-mock/resolver/updateDataFlowResolver.ts
deleted file mode 100644
index 89e836b7259561..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/updateDataFlowResolver.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { findDataFlowByURN } from '@graphql-mock/fixtures/searchResult/dataFlowSearchResult';
-import { updateEntityOwners, updateEntityTag } from '@graphql-mock/mutationHelper';
-import { DataFlow, DataFlowUpdateInput } from '@types';
-
-type UpdateDataFlow = {
-    data: { updateDataFlow: DataFlow };
-};
-
-export const updateDataFlowResolver = {
-    updateDataFlow({ variables: { urn, input } }): UpdateDataFlow {
-        const { globalTags, ownership }: DataFlowUpdateInput = input;
-        const dataFlow = findDataFlowByURN(urn);
-
-        if (ownership) {
-            updateEntityOwners({ entity: dataFlow, owners: ownership?.owners });
-        } else if (globalTags) {
-            updateEntityTag({ entity: dataFlow, globalTags });
-        }
-
-        return {
-            data: {
-                updateDataFlow: Object.assign(dataFlow, {
-                    info: {
-                        ...dataFlow.info,
-                        externalUrl: 'https://airflow.demo.datahub.com/tree?dag_id=datahub_analytics_refresh',
-                        inputs: [],
-                        customProperties: [],
-                    },
-                }),
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/updateDataJobResolver.ts b/datahub-web-react/src/graphql-mock/resolver/updateDataJobResolver.ts
deleted file mode 100644
index 28df1cd96d1d09..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/updateDataJobResolver.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { findDataJobByURN } from '@graphql-mock/fixtures/searchResult/dataJobSearchResult';
-import { updateEntityOwners, updateEntityTag } from '@graphql-mock/mutationHelper';
-import { DataJob, DataJobUpdateInput } from '@types';
-
-type UpdateDataJob = {
-    data: { updateDataJob: DataJob };
-};
-
-export const updateDataJobResolver = {
-    updateDataJob({ variables: { urn, input } }): UpdateDataJob {
-        const { ownership, globalTags }: DataJobUpdateInput = input;
-        const dataJob = findDataJobByURN(urn);
-
-        if (ownership) {
-            updateEntityOwners({ entity: dataJob, owners: ownership?.owners });
-        } else if (globalTags) {
-            updateEntityTag({ entity: dataJob, globalTags });
-        }
-
-        return {
-            data: {
-                updateDataJob: dataJob,
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/updateDatasetResolver.ts b/datahub-web-react/src/graphql-mock/resolver/updateDatasetResolver.ts
deleted file mode 100644
index 67700e59b5fbb1..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/updateDatasetResolver.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { findDatasetByURN } from '@graphql-mock/fixtures/searchResult/datasetSearchResult';
-import { updateEntityLink, updateEntityOwners, updateEntityTag } from '@graphql-mock/mutationHelper';
-import { Dataset, DatasetUpdateInput } from '@types';
-
-type UpdateDataset = {
-    data: { updateDataset: Dataset };
-};
-
-export const updateDatasetResolver = {
-    updateDataset({ variables: { urn, input } }): UpdateDataset {
-        const { ownership, globalTags, institutionalMemory }: DatasetUpdateInput = input;
-        const dataset = findDatasetByURN(urn);
-
-        if (ownership) {
-            updateEntityOwners({ entity: dataset, owners: ownership.owners });
-        } else if (globalTags) {
-            updateEntityTag({ entity: dataset, globalTags });
-        } else if (institutionalMemory) {
-            updateEntityLink({ entity: dataset, institutionalMemory });
-        }
-
-        return {
-            data: {
-                updateDataset: Object.assign(dataset, {
-                    schema: null,
-                    editableSchemaMetadata: null,
-                    deprecation: null,
-                    downstreamLineage: {
-                        entities: [],
-                        __typename: 'DownstreamEntityRelationships',
-                    },
-                    upstreamLineage: {
-                        entities: [],
-                        __typename: 'UpstreamEntityRelationships',
-                    },
-                }),
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/resolver/updateTagResolver.ts b/datahub-web-react/src/graphql-mock/resolver/updateTagResolver.ts
deleted file mode 100644
index 49b2136aca1057..00000000000000
--- a/datahub-web-react/src/graphql-mock/resolver/updateTagResolver.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { createTag } from '@graphql-mock/fixtures/tag';
-import { Tag } from '@types';
-
-type UpdateTag = {
-    data: { updateTag: Tag | undefined };
-};
-
-export const updateTagResolver = {
-    updateTag({ variables: { input } }): UpdateTag {
-        const tag: Tag = createTag(input);
-
-        return {
-            data: {
-                updateTag: tag,
-            },
-        };
-    },
-};
diff --git a/datahub-web-react/src/graphql-mock/schema.ts b/datahub-web-react/src/graphql-mock/schema.ts
deleted file mode 100644
index 058f714ac93df2..00000000000000
--- a/datahub-web-react/src/graphql-mock/schema.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { buildASTSchema } from 'graphql';
-import gql from 'graphql-tag';
-import { loader } from 'graphql.macro';
-
-const entitySchema = loader('../../../datahub-graphql-core/src/main/resources/entity.graphql');
-const searchSchema = loader('../../../datahub-graphql-core/src/main/resources/search.graphql');
-
-const graphQLSchemaAST = gql`
-    ${entitySchema}
-    ${searchSchema}
-`;
-
-export const graphQLSchema = buildASTSchema(graphQLSchemaAST);
diff --git a/datahub-web-react/src/graphql-mock/types.ts b/datahub-web-react/src/graphql-mock/types.ts
deleted file mode 100644
index 5486303daaba29..00000000000000
--- a/datahub-web-react/src/graphql-mock/types.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { BrowseResults } from '@types';
-
-export type DataSchema = {
-    id?: string | undefined;
-    attrs: AnyRecord;
-    modelName: string;
-    save(): void;
-    update<K extends never>(key: K, value: AnyRecord[K]): void;
-    update(changes: Partial<AnyRecord>): void;
-    destroy(): void;
-    reload(): void;
-};
-
-export type AnyRecord = Record<string, unknown>;
-
-export type EntityBrowsePath = {
-    name: string;
-    paths: EntityBrowsePath[];
-    count?: number;
-};
-
-export type StringNumber = string | number;
-
-export type GetBrowseResults = {
-    data: {
-        browse: BrowseResults;
-    };
-};
-
-type EntityBrowseFnArg = {
-    start: number;
-    count: number;
-    path: string[];
-};
-
-export type EntityBrowseFn = (arg: EntityBrowseFnArg) => GetBrowseResults;
diff --git a/datahub-web-react/src/providers/QuickFiltersContext.tsx b/datahub-web-react/src/providers/QuickFiltersContext.tsx
index 70c65716e0aaa7..b3a3e28e843439 100644
--- a/datahub-web-react/src/providers/QuickFiltersContext.tsx
+++ b/datahub-web-react/src/providers/QuickFiltersContext.tsx
@@ -20,4 +20,3 @@ export function useQuickFiltersContext() {
     return useContext(QuickFiltersContext);
 }
 
-export default QuickFiltersContext;
diff --git a/datahub-web-react/src/utils/test-utils/TestPageContainer.tsx b/datahub-web-react/src/utils/test-utils/TestPageContainer.tsx
index a32c415e75c680..98c7e6184eaab9 100644
--- a/datahub-web-react/src/utils/test-utils/TestPageContainer.tsx
+++ b/datahub-web-react/src/utils/test-utils/TestPageContainer.tsx
@@ -5,29 +5,29 @@ import { MemoryRouter } from 'react-router';
 import { ItalicExtension, UnderlineExtension } from 'remirror/extensions';
 
 import UserContextProvider from '@app/context/UserContextProvider';
-import EntityRegistry from '@app/entity/EntityRegistry';
-import { BusinessAttributeEntity } from '@app/entity/businessAttribute/BusinessAttributeEntity';
-import { ChartEntity } from '@app/entity/chart/ChartEntity';
-import { ContainerEntity } from '@app/entity/container/ContainerEntity';
-import { DashboardEntity } from '@app/entity/dashboard/DashboardEntity';
-import { DataFlowEntity } from '@app/entity/dataFlow/DataFlowEntity';
-import { DataJobEntity } from '@app/entity/dataJob/DataJobEntity';
-import { DataPlatformEntity } from '@app/entity/dataPlatform/DataPlatformEntity';
-import { DataPlatformInstanceEntity } from '@app/entity/dataPlatformInstance/DataPlatformInstanceEntity';
-import { DataProductEntity } from '@app/entity/dataProduct/DataProductEntity';
-import { DatasetEntity } from '@app/entity/dataset/DatasetEntity';
-import { DomainEntity } from '@app/entity/domain/DomainEntity';
-import GlossaryNodeEntity from '@app/entity/glossaryNode/GlossaryNodeEntity';
-import { GlossaryTermEntity } from '@app/entity/glossaryTerm/GlossaryTermEntity';
-import { GroupEntity } from '@app/entity/group/Group';
-import { MLFeatureTableEntity } from '@app/entity/mlFeatureTable/MLFeatureTableEntity';
-import { MLModelEntity } from '@app/entity/mlModel/MLModelEntity';
-import { MLModelGroupEntity } from '@app/entity/mlModelGroup/MLModelGroupEntity';
-import { QueryEntity } from '@app/entity/query/QueryEntity';
-import { SchemaFieldPropertiesEntity } from '@app/entity/schemaField/SchemaFieldPropertiesEntity';
-import { StructuredPropertyEntity } from '@app/entity/structuredProperty/StructuredPropertyEntity';
-import { TagEntity } from '@app/entity/tag/Tag';
-import { UserEntity } from '@app/entity/user/User';
+import EntityRegistry from '@app/entityV2/EntityRegistry';
+import { BusinessAttributeEntity } from '@app/entityV2/businessAttribute/BusinessAttributeEntity';
+import { ChartEntity } from '@app/entityV2/chart/ChartEntity';
+import { ContainerEntity } from '@app/entityV2/container/ContainerEntity';
+import { DashboardEntity } from '@app/entityV2/dashboard/DashboardEntity';
+import { DataFlowEntity } from '@app/entityV2/dataFlow/DataFlowEntity';
+import { DataJobEntity } from '@app/entityV2/dataJob/DataJobEntity';
+import { DataPlatformEntity } from '@app/entityV2/dataPlatform/DataPlatformEntity';
+import { DataPlatformInstanceEntity } from '@app/entityV2/dataPlatformInstance/DataPlatformInstanceEntity';
+import { DataProductEntity } from '@app/entityV2/dataProduct/DataProductEntity';
+import { DatasetEntity } from '@app/entityV2/dataset/DatasetEntity';
+import { DomainEntity } from '@app/entityV2/domain/DomainEntity';
+import GlossaryNodeEntity from '@app/entityV2/glossaryNode/GlossaryNodeEntity';
+import { GlossaryTermEntity } from '@app/entityV2/glossaryTerm/GlossaryTermEntity';
+import { GroupEntity } from '@app/entityV2/group/Group';
+import { MLFeatureTableEntity } from '@app/entityV2/mlFeatureTable/MLFeatureTableEntity';
+import { MLModelEntity } from '@app/entityV2/mlModel/MLModelEntity';
+import { MLModelGroupEntity } from '@app/entityV2/mlModelGroup/MLModelGroupEntity';
+import { QueryEntity } from '@app/entityV2/query/QueryEntity';
+import { SchemaFieldEntity } from '@app/entityV2/schemaField/SchemaFieldEntity';
+import { StructuredPropertyEntity } from '@app/entityV2/structuredProperty/StructuredPropertyEntity';
+import { TagEntity } from '@app/entityV2/tag/Tag';
+import { UserEntity } from '@app/entityV2/user/User';
 import { LineageExplorerContext } from '@app/lineage/utils/LineageExplorerContext';
 import { CLIENT_AUTH_COOKIE } from '@conf/Global';
 import AppConfigProvider from '@src/AppConfigProvider';
@@ -57,12 +57,11 @@ export function getTestEntityRegistry() {
     entityRegistry.register(new DataPlatformEntity());
     entityRegistry.register(new ContainerEntity());
     entityRegistry.register(new BusinessAttributeEntity());
-    entityRegistry.register(new SchemaFieldPropertiesEntity());
+    entityRegistry.register(new SchemaFieldEntity());
     entityRegistry.register(new DomainEntity());
     entityRegistry.register(new DataProductEntity());
     entityRegistry.register(new DataPlatformInstanceEntity());
     entityRegistry.register(new QueryEntity());
-    entityRegistry.register(new SchemaFieldPropertiesEntity());
     entityRegistry.register(new StructuredPropertyEntity());
     return entityRegistry;
 }
diff --git a/datahub-web-react/src/utils/test-utils/customRender.tsx b/datahub-web-react/src/utils/test-utils/customRender.tsx
index 4dcd99b26fb508..25e47b9d1dd434 100644
--- a/datahub-web-react/src/utils/test-utils/customRender.tsx
+++ b/datahub-web-react/src/utils/test-utils/customRender.tsx
@@ -3,7 +3,7 @@ import { RenderOptions, render } from '@testing-library/react';
 import React from 'react';
 
 // ApolloTestWrapper wraps children in MockedProvider with default settings
-export const ApolloTestWrapper: React.FC<Partial<MockedProviderProps> & { children: React.ReactNode }> = ({
+const ApolloTestWrapper: React.FC<Partial<MockedProviderProps> & { children: React.ReactNode }> = ({
     mocks = [],
     addTypename = false,
     children,