diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx
deleted file mode 100644
index c9ffef742bd3..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- *  Copyright 2023 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { Button } from 'antd';
-import classNames from 'classnames';
-import { useCallback, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Link } from 'react-router-dom';
-import ActivityFeedEditor from '../../../../components/ActivityFeed/ActivityFeedEditor/ActivityFeedEditor';
-import { ASSET_CARD_STYLES } from '../../../../constants/Feeds.constants';
-import { EntityType } from '../../../../enums/entity.enum';
-import { CardStyle } from '../../../../generated/entity/feed/thread';
-import {
-  AlertType,
-  EventSubscription,
-} from '../../../../generated/events/eventSubscription';
-import entityUtilClassBase from '../../../../utils/EntityUtilClassBase';
-import {
-  getEntityFQN,
-  getEntityType,
-  getFrontEndFormat,
-  MarkdownToHTMLConverter,
-} from '../../../../utils/FeedUtils';
-import RichTextEditorPreviewerV1 from '../../../common/RichTextEditor/RichTextEditorPreviewerV1';
-import ExploreSearchCard from '../../../ExploreV1/ExploreSearchCard/ExploreSearchCard';
-import DescriptionFeed from '../../ActivityFeedCardV2/FeedCardBody/DescriptionFeed/DescriptionFeed';
-import TagsFeed from '../../ActivityFeedCardV2/FeedCardBody/TagsFeed/TagsFeed';
-import './feed-card-body-v1.less';
-import { FeedCardBodyV1Props } from './FeedCardBodyV1.interface';
-
-const FeedCardBodyV1 = ({
-  isPost = false,
-  feed,
-  isEditPost,
-  className,
-  message,
-  onUpdate,
-  onEditCancel,
-}: FeedCardBodyV1Props) => {
-  const { t } = useTranslation();
-  const [postMessage, setPostMessage] = useState<string>(message);
-
-  const { entityFQN, entityType, cardStyle } = useMemo(() => {
-    return {
-      entityFQN: getEntityFQN(feed?.about ?? '') ?? '',
-      entityType: getEntityType(feed?.about ?? '') ?? '',
-      cardStyle: feed?.cardStyle ?? '',
-    };
-  }, [feed]);
-
-  const handleSave = useCallback(() => {
-    onUpdate?.(postMessage ?? '');
-  }, [onUpdate, postMessage]);
-
-  const getDefaultValue = (defaultMessage: string) => {
-    return MarkdownToHTMLConverter.makeHtml(getFrontEndFormat(defaultMessage));
-  };
-
-  const feedBodyStyleCardsRender = useMemo(() => {
-    if (!isPost && feed) {
-      if (cardStyle === CardStyle.Description) {
-        return <DescriptionFeed feed={feed} />;
-      }
-
-      if (cardStyle === CardStyle.Tags) {
-        return <TagsFeed feed={feed} />;
-      }
-
-      if (ASSET_CARD_STYLES.includes(cardStyle as CardStyle)) {
-        const entityInfo = feed?.feedInfo?.entitySpecificInfo?.entity;
-        const isExecutableTestSuite =
-          entityType === EntityType.TEST_SUITE && entityInfo.basic;
-        const isObservabilityAlert =
-          entityType === EntityType.EVENT_SUBSCRIPTION &&
-          (entityInfo as EventSubscription).alertType ===
-            AlertType.Observability;
-
-        const entityCard = (
-          <ExploreSearchCard
-            className="asset-info-card"
-            id={`tabledatacard${entityInfo.id}`}
-            showTags={false}
-            source={{ ...entityInfo, entityType }}
-          />
-        );
-
-        return cardStyle === CardStyle.EntityDeleted ? (
-          <div className="deleted-entity">{entityCard}</div>
-        ) : (
-          <Link
-            className="no-underline text-body text-hover-body"
-            to={entityUtilClassBase.getEntityLink(
-              entityType,
-              entityFQN,
-              '',
-              '',
-              isExecutableTestSuite,
-              isObservabilityAlert
-            )}>
-            {entityCard}
-          </Link>
-        );
-      }
-    }
-
-    return (
-      <RichTextEditorPreviewerV1
-        className="text-wrap"
-        markdown={getFrontEndFormat(message)}
-      />
-    );
-  }, [isPost, message, postMessage, cardStyle, feed, entityType, entityFQN]);
-
-  const feedBodyRender = useMemo(() => {
-    if (isEditPost) {
-      return (
-        <ActivityFeedEditor
-          focused
-          className="mb-8"
-          defaultValue={getDefaultValue(message)}
-          editAction={
-            <div className="d-flex justify-end gap-2 m-r-xss">
-              <Button
-                className="border border-primary text-primary rounded-4"
-                data-testid="cancel-button"
-                size="small"
-                onClick={onEditCancel}>
-                {t('label.cancel')}
-              </Button>
-              <Button
-                className="rounded-4"
-                data-testid="save-button"
-                disabled={!message.length}
-                size="small"
-                type="primary"
-                onClick={handleSave}>
-                {t('label.save')}
-              </Button>
-            </div>
-          }
-          editorClass="is_edit_post"
-          onSave={handleSave}
-          onTextChange={(message) => setPostMessage(message)}
-        />
-      );
-    }
-
-    return feedBodyStyleCardsRender;
-  }, [isEditPost, message, feedBodyStyleCardsRender]);
-
-  return (
-    <div
-      className={classNames('p-y-sm rounded-6', isEditPost ? '' : className)}>
-      <div className="feed-message">{feedBodyRender}</div>
-    </div>
-  );
-};
-
-export default FeedCardBodyV1;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/ActivityFeedCardV2.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/ActivityFeedCardV2.interface.ts
deleted file mode 100644
index 6a28dc036f1f..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/ActivityFeedCardV2.interface.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { Post, Thread } from '../../../generated/entity/feed/thread';
-
-export interface ActivityFeedCardV2Props {
-  post: Post;
-  feed: Thread;
-  className?: string;
-  isPost?: boolean;
-  isOpenInDrawer?: boolean;
-  showThread?: boolean;
-  isActive?: boolean;
-  componentsVisibility?: {
-    showThreadIcon?: boolean;
-    showRepliesContainer?: boolean;
-  };
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/ActivityFeedCardV2.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/ActivityFeedCardV2.tsx
deleted file mode 100644
index 15802e14f02d..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/ActivityFeedCardV2.tsx
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { Col, Row } from 'antd';
-import classNames from 'classnames';
-import { compare } from 'fast-json-patch';
-import { useMemo, useState } from 'react';
-import { EntityField } from '../../../constants/Feeds.constants';
-import { GeneratedBy } from '../../../generated/entity/feed/thread';
-import ProfilePicture from '../../common/ProfilePicture/ProfilePicture';
-import FeedCardBodyV1 from '../ActivityFeedCard/FeedCardBody/FeedCardBodyV1';
-import { useActivityFeedProvider } from '../ActivityFeedProvider/ActivityFeedProvider';
-import ActivityFeedActions from '../Shared/ActivityFeedActions';
-import './activity-feed-card-v2.less';
-import { ActivityFeedCardV2Props } from './ActivityFeedCardV2.interface';
-import FeedCardFooter from './FeedCardFooter/FeedCardFooter';
-import FeedCardHeaderV2 from './FeedCardHeader/FeedCardHeaderV2';
-
-const ActivityFeedCardV2 = ({
-  post,
-  feed,
-  className = '',
-  isPost = false,
-  isActive = false,
-  showThread = false,
-  isOpenInDrawer = false,
-  componentsVisibility = {
-    showThreadIcon: true,
-    showRepliesContainer: true,
-  },
-}: Readonly<ActivityFeedCardV2Props>) => {
-  const [isEditPost, setIsEditPost] = useState<boolean>(false);
-  const [showActions, setShowActions] = useState(false);
-  const { updateFeed } = useActivityFeedProvider();
-
-  const postLength = useMemo(
-    () => feed?.posts?.length ?? 0,
-    [feed?.posts?.length]
-  );
-
-  const onEditPost = () => {
-    setIsEditPost(!isEditPost);
-  };
-
-  const handleMouseEnter = () => {
-    setShowActions(true);
-  };
-
-  const handleMouseLeave = () => {
-    setShowActions(false);
-  };
-
-  const onUpdate = (message: string) => {
-    const updatedPost = { ...feed, message };
-    const patch = compare(feed, updatedPost);
-    updateFeed(feed.id, post.id, !isPost, patch);
-    setIsEditPost(!isEditPost);
-  };
-
-  return (
-    <div
-      className={classNames(
-        'feed-card-v2-container p-sm',
-        {
-          active: isActive,
-        },
-        className
-      )}>
-      <div
-        className={classNames('feed-card-v2-sidebar', {
-          'feed-card-v2-post-sidebar': isPost,
-        })}>
-        <ProfilePicture
-          avatarType="outlined"
-          name={post.from}
-          size={isPost ? 28 : 30}
-          width={isPost ? '28' : '30'}
-        />
-      </div>
-      <Row className="w-full" gutter={[0, 10]}>
-        <Col
-          className={classNames('feed-card-v2', {
-            'feed-reply-card-v2': isPost,
-            'drawer-feed-card-v2': isOpenInDrawer,
-          })}
-          span={24}
-          onMouseEnter={handleMouseEnter}
-          onMouseLeave={handleMouseLeave}>
-          <Row className="w-full">
-            <Col span={24}>
-              <FeedCardHeaderV2
-                about={!isPost ? feed.about : undefined}
-                cardStyle={feed.cardStyle}
-                createdBy={post.from}
-                feed={feed}
-                fieldName={feed.feedInfo?.fieldName as EntityField}
-                fieldOperation={feed.fieldOperation}
-                isEntityFeed={isPost}
-                timeStamp={post.postTs}
-              />
-            </Col>
-            <Col span={24}>
-              <FeedCardBodyV1
-                feed={feed}
-                isEditPost={isEditPost}
-                isPost={isPost}
-                message={post.message}
-                onEditCancel={() => setIsEditPost(false)}
-                onUpdate={onUpdate}
-              />
-            </Col>
-            <Col span={24}>
-              <FeedCardFooter
-                componentsVisibility={componentsVisibility}
-                feed={feed}
-                isPost={isPost}
-                post={post}
-              />
-            </Col>
-          </Row>
-          {showActions &&
-            (feed.generatedBy !== GeneratedBy.System || isPost) && (
-              <ActivityFeedActions
-                feed={feed}
-                isPost={isPost}
-                post={post}
-                onEditPost={onEditPost}
-              />
-            )}
-        </Col>
-        {showThread && postLength > 0 && (
-          <Col className="feed-replies" data-testid="feed-replies" span={24}>
-            {feed?.posts?.map((reply) => (
-              <ActivityFeedCardV2
-                isPost
-                componentsVisibility={componentsVisibility}
-                feed={feed}
-                isOpenInDrawer={isOpenInDrawer}
-                key={reply.id}
-                post={reply}
-              />
-            ))}
-          </Col>
-        )}
-      </Row>
-    </div>
-  );
-};
-
-export default ActivityFeedCardV2;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/FeedCardBody/CustomPropertyFeed/CustomPropertyFeed.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/FeedCardBody/CustomPropertyFeed/CustomPropertyFeed.component.tsx
deleted file mode 100644
index 88bb6ff0cb1d..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/FeedCardBody/CustomPropertyFeed/CustomPropertyFeed.component.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { useMemo } from 'react';
-import { getTextDiffCustomProperty } from '../../../../../utils/EntityVersionUtils';
-import RichTextEditorPreviewerV1 from '../../../../common/RichTextEditor/RichTextEditorPreviewerV1';
-import { CustomPropertyFeedProps } from './CustomPropertyFeed.interface';
-
-function CustomPropertyFeed({ feed }: Readonly<CustomPropertyFeedProps>) {
-  const message = useMemo(
-    () =>
-      getTextDiffCustomProperty(
-        feed.feedInfo?.fieldName ?? '',
-        feed.feedInfo?.entitySpecificInfo?.previousValue ?? '',
-        feed.feedInfo?.entitySpecificInfo?.updatedValue ?? ''
-      ),
-    [feed]
-  );
-
-  return (
-    <RichTextEditorPreviewerV1
-      className="text-wrap text-grey-muted"
-      markdown={message}
-    />
-  );
-}
-
-export default CustomPropertyFeed;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/FeedCardBody/CustomPropertyFeed/CustomPropertyFeed.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/FeedCardBody/CustomPropertyFeed/CustomPropertyFeed.interface.ts
deleted file mode 100644
index a9475e86df4a..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/FeedCardBody/CustomPropertyFeed/CustomPropertyFeed.interface.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import { Thread } from '../../../../../generated/entity/feed/thread';
-
-export interface CustomPropertyFeedProps {
-  feed: Thread;
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/FeedCardFooter/FeedCardFooter.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/FeedCardFooter/FeedCardFooter.tsx
deleted file mode 100644
index 3f9730de10c6..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCardV2/FeedCardFooter/FeedCardFooter.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { Avatar, Button, Col, Row, Space, Tooltip, Typography } from 'antd';
-import { min, noop, sortBy } from 'lodash';
-import { useCallback, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { ReactComponent as ThreadIcon } from '../../../../assets/svg/thread-icon.svg';
-import { ReactionOperation } from '../../../../enums/reactions.enum';
-import { ReactionType } from '../../../../generated/type/reaction';
-import {
-  formatDateTime,
-  getRelativeTime,
-} from '../../../../utils/date-time/DateTimeUtils';
-import ProfilePicture from '../../../common/ProfilePicture/ProfilePicture';
-import { useActivityFeedProvider } from '../../ActivityFeedProvider/ActivityFeedProvider';
-import Reactions from '../../Reactions/Reactions';
-import { FeedCardFooterProps } from './FeedCardFooter.interface';
-
-function FeedCardFooter({
-  feed,
-  post,
-  isPost = false,
-  componentsVisibility = {
-    showThreadIcon: true,
-    showRepliesContainer: true,
-  },
-}: Readonly<FeedCardFooterProps>) {
-  const { t } = useTranslation();
-  const { showDrawer, updateReactions, fetchUpdatedThread } =
-    useActivityFeedProvider();
-
-  // The number of posts in the thread
-  const postLength = useMemo(() => feed?.postsCount ?? 0, [feed?.postsCount]);
-
-  // The latest reply timestamp and the list of unique users who replied
-  const { latestReplyTimeStamp, repliedUniqueUsersList } = useMemo(() => {
-    const posts = sortBy(feed?.posts, 'postTs').reverse();
-    const latestReplyTimeStamp = posts[0]?.postTs;
-
-    const repliedUsers = [...new Set((feed?.posts ?? []).map((f) => f.from))];
-
-    const repliedUniqueUsersList = repliedUsers.slice(
-      0,
-      min([3, repliedUsers.length])
-    );
-
-    return { latestReplyTimeStamp, repliedUniqueUsersList };
-  }, [feed?.posts]);
-
-  const onReactionUpdate = useCallback(
-    async (reaction: ReactionType, operation: ReactionOperation) => {
-      if (!post) {
-        return;
-      }
-      await updateReactions(post, feed.id, !isPost, reaction, operation);
-      await fetchUpdatedThread(feed.id);
-    },
-    [updateReactions, post, feed.id, isPost, fetchUpdatedThread]
-  );
-
-  const showReplies = useCallback(() => {
-    showDrawer?.(feed);
-  }, [showDrawer, feed]);
-
-  return (
-    <Row>
-      <Col span={24}>
-        <Space className="p-xss" size={8}>
-          {componentsVisibility.showThreadIcon && postLength === 0 && (
-            <Button
-              className="flex-center p-0"
-              data-testid="thread-count"
-              icon={<ThreadIcon width={18} />}
-              shape="circle"
-              size="small"
-              type="text"
-              onClick={showReplies}
-            />
-          )}
-          <Reactions
-            reactions={post?.reactions ?? []}
-            onReactionSelect={onReactionUpdate ?? noop}
-          />
-        </Space>
-      </Col>
-      <Col span={24}>
-        {componentsVisibility.showRepliesContainer && postLength !== 0 && (
-          <Button
-            className="flex items-center gap-2 p-x-xss w-full rounded-8"
-            type="text"
-            onClick={componentsVisibility.showThreadIcon ? showReplies : noop}>
-            {postLength > 0 && (
-              <Avatar.Group>
-                {repliedUniqueUsersList.map((user) => (
-                  <ProfilePicture
-                    avatarType="outlined"
-                    key={user}
-                    name={user}
-                    size={20}
-                  />
-                ))}
-              </Avatar.Group>
-            )}
-            <Typography.Text
-              className="text-xs font-medium text-primary"
-              data-testid="reply-count">
-              {postLength <= 1
-                ? t('label.one-reply')
-                : t('label.number-reply-plural', {
-                    number: postLength,
-                  })}
-            </Typography.Text>
-            {latestReplyTimeStamp && (
-              <Tooltip
-                color="white"
-                overlayClassName="timestamp-tooltip"
-                title={formatDateTime(latestReplyTimeStamp)}>
-                <span
-                  className="feed-card-header-v2-timestamp"
-                  data-testid="timestamp">
-                  {getRelativeTime(latestReplyTimeStamp)}
-                </span>
-              </Tooltip>
-            )}
-          </Button>
-        )}
-      </Col>
-    </Row>
-  );
-}
-
-export default FeedCardFooter;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component.tsx
deleted file mode 100644
index bf3398b59719..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- *  Copyright 2023 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import { Typography } from 'antd';
-import { isEmpty } from 'lodash';
-import { ReactNode, useEffect, useMemo, useState } from 'react';
-import { ReactComponent as FeedEmptyIcon } from '../../../assets/svg/activity-feed-no-data-placeholder.svg';
-import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder';
-import { ERROR_PLACEHOLDER_TYPE, SIZE } from '../../../enums/common.enum';
-import { Thread } from '../../../generated/entity/feed/thread';
-import { getFeedListWithRelativeDays } from '../../../utils/FeedUtils';
-import Loader from '../../common/Loader/Loader';
-import FeedPanelBodyV1 from '../ActivityFeedPanel/FeedPanelBodyV1';
-
-interface ActivityFeedListV1Props {
-  feedList: Thread[];
-  isLoading: boolean;
-  showThread?: boolean;
-  onFeedClick?: (feed: Thread) => void;
-  activeFeedId?: string;
-  hidePopover: boolean;
-  isForFeedTab?: boolean;
-  emptyPlaceholderText: ReactNode;
-  componentsVisibility?: {
-    showThreadIcon?: boolean;
-    showRepliesContainer?: boolean;
-  };
-  selectedThread?: Thread;
-}
-
-const ActivityFeedListV1 = ({
-  feedList,
-  isLoading,
-  showThread = true,
-  componentsVisibility = {
-    showThreadIcon: true,
-    showRepliesContainer: true,
-  },
-  onFeedClick,
-  activeFeedId,
-  hidePopover = false,
-  isForFeedTab = false,
-  emptyPlaceholderText,
-  selectedThread,
-}: ActivityFeedListV1Props) => {
-  const [entityThread, setEntityThread] = useState<Thread[]>([]);
-
-  useEffect(() => {
-    const { updatedFeedList } = getFeedListWithRelativeDays(feedList);
-    setEntityThread(updatedFeedList);
-  }, [feedList]);
-
-  useEffect(() => {
-    if (onFeedClick) {
-      onFeedClick(
-        entityThread.find((feed) => feed.id === selectedThread?.id) ??
-          entityThread[0]
-      );
-    }
-  }, [entityThread, selectedThread, onFeedClick]);
-
-  const feeds = useMemo(
-    () =>
-      entityThread.map((feed) => (
-        <FeedPanelBodyV1
-          componentsVisibility={componentsVisibility}
-          feed={feed}
-          hidePopover={hidePopover}
-          isActive={activeFeedId === feed.id}
-          isForFeedTab={isForFeedTab}
-          key={feed.id}
-          showThread={showThread}
-          onFeedClick={onFeedClick}
-        />
-      )),
-    [
-      entityThread,
-      activeFeedId,
-      componentsVisibility,
-      hidePopover,
-      isForFeedTab,
-      showThread,
-    ]
-  );
-
-  if (isLoading) {
-    return <Loader />;
-  }
-
-  if (isEmpty(entityThread)) {
-    return (
-      <div
-        className="h-full p-x-md"
-        data-testid="no-data-placeholder-container"
-        id="feedData">
-        <ErrorPlaceHolder
-          icon={<FeedEmptyIcon height={SIZE.X_SMALL} width={SIZE.X_SMALL} />}
-          type={ERROR_PLACEHOLDER_TYPE.CUSTOM}>
-          <Typography.Paragraph
-            className="tw-max-w-md"
-            style={{ marginBottom: '0' }}>
-            {emptyPlaceholderText}
-          </Typography.Paragraph>
-        </ErrorPlaceHolder>
-      </div>
-    );
-  }
-
-  return (
-    <div className="feed-list-container p-md" id="feedData">
-      {feeds}
-    </div>
-  );
-};
-
-export default ActivityFeedListV1;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx
deleted file mode 100644
index 7b24e82e04da..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright 2022 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import Icon from '@ant-design/icons';
-import { Space, Tooltip, Typography } from 'antd';
-import { isEqual } from 'lodash';
-import { useTranslation } from 'react-i18next';
-import { ReactComponent as IconTaskClose } from '../../../assets/svg/complete.svg';
-import { ReactComponent as IconTaskOpen } from '../../../assets/svg/in-progress.svg';
-import { TEXT_BODY_COLOR } from '../../../constants/constants';
-import { ThreadTaskStatus } from '../../../generated/entity/feed/thread';
-import './task-badge.less';
-
-const TaskBadge = ({ status }: { status: ThreadTaskStatus }) => {
-  const { t } = useTranslation();
-  const isTaskOpen = isEqual(status, ThreadTaskStatus.Open);
-
-  const tooltipContent = isTaskOpen
-    ? `${t('label.status')}: ${t('label.open-lowercase')}`
-    : `${t('label.status')}: ${t('label.closed-lowercase')}`;
-
-  return (
-    <Tooltip align={{ targetOffset: [0, -15] }} title={tooltipContent}>
-      <Space align="center" className="task-badge" size={4}>
-        <Icon
-          alt="task-status"
-          component={isTaskOpen ? IconTaskOpen : IconTaskClose}
-          style={{ fontSize: '12px', color: TEXT_BODY_COLOR }}
-        />
-        <Typography.Text>{t('label.task')}</Typography.Text>
-      </Space>
-    </Tooltip>
-  );
-};
-
-export default TaskBadge;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertDetails/AlertDiagnosticInfo/AlertDiagnosticInfoTab.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertDetails/AlertDiagnosticInfo/AlertDiagnosticInfoTab.interface.ts
deleted file mode 100644
index b3285933037b..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertDetails/AlertDiagnosticInfo/AlertDiagnosticInfoTab.interface.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-export interface DiagnosticItem {
-  key: string;
-  value: string | number | boolean;
-  description: string;
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataMarketplace/MarketplaceNav/MarketplaceNav.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataMarketplace/MarketplaceNav/MarketplaceNav.component.tsx
deleted file mode 100644
index 3b87ee0c1827..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataMarketplace/MarketplaceNav/MarketplaceNav.component.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Copyright 2026 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { Dropdown } from '@openmetadata/ui-core-components';
-import { ChevronDown } from '@untitledui/icons';
-import { Key, useMemo } from 'react';
-import { Button as AriaButton } from 'react-aria-components';
-import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
-import { MARKETPLACE_NAV_ITEMS } from '../../../constants/MarketplaceNav.constants';
-
-const MarketplaceNav = () => {
-  const { t } = useTranslation();
-  const navigate = useNavigate();
-
-  const navItems = useMemo(
-    () =>
-      MARKETPLACE_NAV_ITEMS.map((item) => ({
-        id: item.redirect_url ?? item.children?.[0]?.redirect_url ?? item.key,
-        label: t(item.title),
-        icon: item.icon,
-      })),
-    [t]
-  );
-
-  const handleAction = (key: Key) => {
-    navigate(key.toString());
-  };
-
-  return (
-    <Dropdown.Root>
-      <AriaButton className="tw:flex tw:items-center tw:gap-1 tw:cursor-pointer tw:border-none tw:bg-transparent tw:p-0 tw:text-xl tw:font-semibold tw:text-brand-secondary tw:outline-none">
-        {t('label.data-marketplace')}
-        <ChevronDown className="tw:size-5 tw:font-semibold" />
-      </AriaButton>
-      <Dropdown.Popover>
-        <Dropdown.Menu onAction={handleAction}>
-          {navItems.map((item) => (
-            <Dropdown.Item
-              icon={item.icon}
-              id={item.id}
-              key={item.id}
-              label={item.label}
-            />
-          ))}
-        </Dropdown.Menu>
-      </Dropdown.Popover>
-    </Dropdown.Root>
-  );
-};
-
-export default MarketplaceNav;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataMarketplace/MarketplaceNavBar/MarketplaceNavBar.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataMarketplace/MarketplaceNavBar/MarketplaceNavBar.component.tsx
deleted file mode 100644
index 8d6c103601ca..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataMarketplace/MarketplaceNavBar/MarketplaceNavBar.component.tsx
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- *  Copyright 2026 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { Alert, Badge, Button, Dropdown, Tooltip } from 'antd';
-import { Header } from 'antd/lib/layout/layout';
-import { AxiosError } from 'axios';
-import { CookieStorage } from 'cookie-storage';
-import { startCase, upperCase } from 'lodash';
-import { MenuInfo } from 'rc-menu/lib/interface';
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
-import { ReactComponent as DropDownIcon } from '../../../assets/svg/drop-down.svg';
-import { ReactComponent as IconBell } from '../../../assets/svg/ic-alert-bell.svg';
-import { ReactComponent as Help } from '../../../assets/svg/ic-help.svg';
-import { ReactComponent as RefreshIcon } from '../../../assets/svg/ic-refresh.svg';
-import { ReactComponent as SidebarCollapsedIcon } from '../../../assets/svg/ic-sidebar-collapsed.svg';
-import { ReactComponent as SidebarExpandedIcon } from '../../../assets/svg/ic-sidebar-expanded.svg';
-import {
-  LAST_VERSION_FETCH_TIME_KEY,
-  NOTIFICATION_READ_TIMER,
-  ONE_HOUR_MS,
-  SOCKET_EVENTS,
-} from '../../../constants/constants';
-import { GlobalSettingsMenuCategory } from '../../../constants/GlobalSettings.constants';
-import { useAsyncDeleteProvider } from '../../../context/AsyncDeleteProvider/AsyncDeleteProvider';
-import { AsyncDeleteWebsocketResponse } from '../../../context/AsyncDeleteProvider/AsyncDeleteProvider.interface';
-import { useTourProvider } from '../../../context/TourProvider/TourProvider';
-import { useWebSocketConnector } from '../../../context/WebSocketProvider/WebSocketProvider';
-import { EntityTabs, EntityType } from '../../../enums/entity.enum';
-import { BackgroundJob, JobType } from '../../../generated/jobs/backgroundJob';
-import { useCurrentUserPreferences } from '../../../hooks/currentUserStore/useCurrentUserStore';
-import { useApplicationStore } from '../../../hooks/useApplicationStore';
-import useCustomLocation from '../../../hooks/useCustomLocation/useCustomLocation';
-import { getVersion } from '../../../rest/miscAPI';
-import applicationRoutesClass from '../../../utils/ApplicationRoutesClassBase';
-import brandClassBase from '../../../utils/BrandData/BrandClassBase';
-import {
-  hasNotificationPermission,
-  shouldRequestPermission,
-} from '../../../utils/BrowserNotificationUtils';
-import { getCustomPropertyEntityPathname } from '../../../utils/CustomProperty.utils';
-import entityUtilClassBase from '../../../utils/EntityUtilClassBase';
-import {
-  getEntityFQN,
-  getEntityType,
-  prepareFeedLink,
-} from '../../../utils/FeedUtils';
-import { languageSelectOptions } from '../../../utils/i18next/i18nextUtil';
-import i18n from '../../../utils/i18next/LocalUtil';
-import localUtilClassBase from '../../../utils/i18next/LocalUtilClassBase';
-import { getHelpDropdownItems } from '../../../utils/NavbarUtils';
-import { getSettingPath } from '../../../utils/RouterUtils';
-import { showErrorToast } from '../../../utils/ToastUtils';
-import { ActivityFeedTabs } from '../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.interface';
-import { useEntityExportModalProvider } from '../../Entity/EntityExportModalProvider/EntityExportModalProvider.component';
-import { CSVExportWebsocketResponse } from '../../Entity/EntityExportModalProvider/EntityExportModalProvider.interface';
-import '../../NavBar/nav-bar.less';
-import popupAlertsCardsClassBase from '../../NavBar/PopupAlertClassBase';
-import NotificationBox from '../../NotificationBox/NotificationBox.component';
-import { UserProfileIcon } from '../../Settings/Users/UserProfileIcon/UserProfileIcon.component';
-import MarketplaceNav from '../MarketplaceNav/MarketplaceNav.component';
-
-const cookieStorage = new CookieStorage();
-
-const MarketplaceNavBar = () => {
-  const { isTourOpen: isTourRoute } = useTourProvider();
-  const { onUpdateCSVExportJob } = useEntityExportModalProvider();
-  const { handleDeleteEntityWebsocketResponse } = useAsyncDeleteProvider();
-  const Logo = useMemo(() => brandClassBase.getMonogram().src, []);
-  const [showVersionMissMatchAlert, setShowVersionMissMatchAlert] =
-    useState(false);
-  const location = useCustomLocation();
-  const navigate = useNavigate();
-  const { t } = useTranslation();
-  const [hasTaskNotification, setHasTaskNotification] =
-    useState<boolean>(false);
-  const [hasMentionNotification, setHasMentionNotification] =
-    useState<boolean>(false);
-  const [activeTab, setActiveTab] = useState<string>('Task');
-  const { appVersion: version, setAppVersion } = useApplicationStore();
-  const {
-    preferences: { isSidebarCollapsed },
-    setPreference,
-  } = useCurrentUserPreferences();
-
-  const fetchOMVersion = async () => {
-    try {
-      const res = await getVersion();
-
-      const now = Date.now();
-      cookieStorage.setItem(LAST_VERSION_FETCH_TIME_KEY, String(now), {
-        expires: new Date(Date.now() + ONE_HOUR_MS),
-      });
-
-      setAppVersion(res.version.replace('-SNAPSHOT', ''));
-    } catch (err) {
-      showErrorToast(
-        err as AxiosError,
-        t('server.entity-fetch-error', {
-          entity: t('label.version'),
-        })
-      );
-    }
-  };
-
-  const renderAlertCards = useMemo(() => {
-    const cardList = popupAlertsCardsClassBase.alertsCards();
-
-    return cardList.map(({ key, component }) => {
-      const Component = component;
-
-      return <Component key={key} />;
-    });
-  }, []);
-
-  const { socket } = useWebSocketConnector();
-
-  const handleTaskNotificationRead = () => {
-    setHasTaskNotification(false);
-  };
-
-  const handleMentionsNotificationRead = () => {
-    setHasMentionNotification(false);
-  };
-
-  const handleBellClick = useCallback(
-    (visible: boolean) => {
-      if (visible) {
-        switch (activeTab) {
-          case 'Task':
-            hasTaskNotification &&
-              setTimeout(() => {
-                handleTaskNotificationRead();
-              }, NOTIFICATION_READ_TIMER);
-
-            break;
-
-          case 'Conversation':
-            hasMentionNotification &&
-              setTimeout(() => {
-                handleMentionsNotificationRead();
-              }, NOTIFICATION_READ_TIMER);
-
-            break;
-        }
-      }
-    },
-    [hasTaskNotification, hasMentionNotification, activeTab]
-  );
-
-  const handleActiveTab = (key: string) => {
-    setActiveTab(key);
-  };
-
-  const showBrowserNotification = (
-    about: string,
-    createdBy: string,
-    type: string,
-    backgroundJobData?: BackgroundJob
-  ) => {
-    if (!hasNotificationPermission()) {
-      return;
-    }
-
-    const entityType = getEntityType(about);
-    const entityFQN = getEntityFQN(about) ?? '';
-    let body;
-    let path: string;
-
-    switch (type) {
-      case 'Task':
-        body = t('message.user-assign-new-task', {
-          user: createdBy,
-        });
-
-        path = entityUtilClassBase.getEntityLink(
-          entityType as EntityType,
-          entityFQN,
-          EntityTabs.ACTIVITY_FEED,
-          ActivityFeedTabs.TASKS
-        );
-
-        break;
-      case 'Conversation':
-        body = t('message.user-mentioned-in-comment', {
-          user: createdBy,
-        });
-        path = prepareFeedLink(entityType as string, entityFQN as string);
-
-        break;
-
-      case 'BackgroundJob': {
-        if (!backgroundJobData) {
-          break;
-        }
-
-        const { jobArgs, status, jobType } = backgroundJobData;
-
-        if (jobType === JobType.CustomPropertyEnumCleanup) {
-          const enumCleanupArgs = jobArgs;
-          if (!enumCleanupArgs.entityType) {
-            showErrorToast(
-              {
-                isAxiosError: true,
-                message: 'Invalid job arguments: entityType is required',
-              } as AxiosError,
-              t('message.unexpected-error')
-            );
-
-            break;
-          }
-          body = t('message.custom-property-update', {
-            propertyName: jobArgs.propertyName,
-            entityName: jobArgs.entityType,
-            status: startCase(status.toLowerCase()),
-          });
-
-          path = getSettingPath(
-            GlobalSettingsMenuCategory.CUSTOM_PROPERTIES,
-            getCustomPropertyEntityPathname(enumCleanupArgs.entityType)
-          );
-        }
-
-        break;
-      }
-    }
-    const notification = new Notification('Notification From OpenMetadata', {
-      body: body,
-      icon: Logo,
-    });
-    notification.onclick = () => {
-      const isChrome = globalThis.navigator.userAgent.indexOf('Chrome');
-      if (isChrome > -1) {
-        globalThis.open(path);
-      } else {
-        navigate(path);
-      }
-    };
-  };
-
-  useEffect(() => {
-    if (shouldRequestPermission()) {
-      Notification.requestPermission();
-    }
-
-    const handleDocumentVisibilityChange = async () => {
-      if (
-        applicationRoutesClass.isProtectedRoute(location.pathname) &&
-        isTourRoute
-      ) {
-        return;
-      }
-
-      const lastFetchTime = cookieStorage.getItem(LAST_VERSION_FETCH_TIME_KEY);
-      const now = Date.now();
-
-      if (lastFetchTime) {
-        const timeSinceLastFetch = now - Number.parseInt(lastFetchTime);
-        if (timeSinceLastFetch < ONE_HOUR_MS) {
-          return;
-        }
-      }
-
-      const newVersion = await getVersion();
-      const cleanedVersion = newVersion.version?.replace('-SNAPSHOT', '');
-
-      cookieStorage.setItem(LAST_VERSION_FETCH_TIME_KEY, String(now), {
-        expires: new Date(Date.now() + ONE_HOUR_MS),
-      });
-
-      if (version && version !== cleanedVersion) {
-        setShowVersionMissMatchAlert(true);
-      }
-    };
-
-    addEventListener('focus', handleDocumentVisibilityChange);
-
-    return () => {
-      removeEventListener('focus', handleDocumentVisibilityChange);
-    };
-  }, [isTourRoute, version]);
-
-  useEffect(() => {
-    if (socket) {
-      socket.on(SOCKET_EVENTS.TASK_CHANNEL, (newActivity) => {
-        if (newActivity) {
-          const activity = JSON.parse(newActivity);
-          setHasTaskNotification(true);
-          showBrowserNotification(
-            activity.about,
-            activity.createdBy,
-            activity.type
-          );
-        }
-      });
-
-      socket.on(SOCKET_EVENTS.MENTION_CHANNEL, (newActivity) => {
-        if (newActivity) {
-          const activity = JSON.parse(newActivity);
-          setHasMentionNotification(true);
-          showBrowserNotification(
-            activity.about,
-            activity.createdBy,
-            activity.type
-          );
-        }
-      });
-
-      socket.on(SOCKET_EVENTS.CSV_EXPORT_CHANNEL, (exportResponse) => {
-        if (exportResponse) {
-          const exportResponseData = JSON.parse(
-            exportResponse
-          ) as CSVExportWebsocketResponse;
-
-          onUpdateCSVExportJob(exportResponseData);
-        }
-      });
-      socket.on(SOCKET_EVENTS.BACKGROUND_JOB_CHANNEL, (jobResponse) => {
-        if (jobResponse) {
-          const jobResponseData: BackgroundJob = JSON.parse(jobResponse);
-          showBrowserNotification(
-            '',
-            jobResponseData.createdBy,
-            'BackgroundJob',
-            jobResponseData
-          );
-        }
-      });
-
-      socket.on(SOCKET_EVENTS.DELETE_ENTITY_CHANNEL, (deleteResponse) => {
-        if (deleteResponse) {
-          const deleteResponseData = JSON.parse(
-            deleteResponse
-          ) as AsyncDeleteWebsocketResponse;
-          handleDeleteEntityWebsocketResponse(deleteResponseData);
-        }
-      });
-    }
-
-    return () => {
-      if (socket) {
-        socket.off(SOCKET_EVENTS.TASK_CHANNEL);
-        socket.off(SOCKET_EVENTS.MENTION_CHANNEL);
-        socket.off(SOCKET_EVENTS.CSV_EXPORT_CHANNEL);
-        socket.off(SOCKET_EVENTS.BACKGROUND_JOB_CHANNEL);
-        socket.off(SOCKET_EVENTS.DELETE_ENTITY_CHANNEL);
-      }
-    };
-  }, [socket, onUpdateCSVExportJob]);
-
-  useEffect(() => {
-    fetchOMVersion();
-  }, []);
-
-  const handleLanguageChange = useCallback(async ({ key }: MenuInfo) => {
-    await localUtilClassBase.loadLocales(key);
-    await i18n.changeLanguage(key);
-    navigate(0);
-  }, []);
-
-  const currentLanguage = i18n.language
-    ? upperCase(i18n.language.split('-')[0])
-    : '';
-
-  return (
-    <>
-      <Header
-        style={{
-          background: 'transparent',
-          marginBottom: 'calc(-1 * var(--ant-navbar-height))',
-          position: 'relative' as const,
-          zIndex: 10,
-        }}>
-        <div className="navbar-container">
-          <div className="flex-center gap-2">
-            <Tooltip
-              placement="right"
-              title={
-                isSidebarCollapsed ? t('label.expand') : t('label.collapse')
-              }>
-              <Button
-                className="w-6 h-6 p-0 flex-center"
-                data-testid="sidebar-toggle"
-                icon={
-                  isSidebarCollapsed ? (
-                    <SidebarCollapsedIcon height={20} width={20} />
-                  ) : (
-                    <SidebarExpandedIcon height={20} width={20} />
-                  )
-                }
-                size="middle"
-                type="text"
-                onClick={() =>
-                  setPreference({ isSidebarCollapsed: !isSidebarCollapsed })
-                }
-              />
-            </Tooltip>
-            <div className="tw:ml-10">
-              <MarketplaceNav />
-            </div>
-          </div>
-
-          <div className="flex-center gap-5 nav-bar-side-items">
-            <Dropdown
-              className="cursor-pointer"
-              menu={{
-                items: languageSelectOptions,
-                onClick: handleLanguageChange,
-              }}
-              placement="bottomRight"
-              trigger={['click']}>
-              <Button
-                className="flex-center gap-2 p-x-xs font-medium"
-                data-testid="language-selector-button"
-                type="text">
-                {currentLanguage} <DropDownIcon width={12} />
-              </Button>
-            </Dropdown>
-            <Dropdown
-              destroyPopupOnHide
-              className="cursor-pointer"
-              dropdownRender={() => (
-                <NotificationBox
-                  activeTab={activeTab}
-                  hasMentionNotification={hasMentionNotification}
-                  hasTaskNotification={hasTaskNotification}
-                  onMarkMentionsNotificationRead={
-                    handleMentionsNotificationRead
-                  }
-                  onMarkTaskNotificationRead={handleTaskNotificationRead}
-                  onTabChange={handleActiveTab}
-                />
-              )}
-              overlayStyle={{
-                width: '425px',
-                minHeight: '375px',
-              }}
-              placement="bottomRight"
-              trigger={['click']}
-              onOpenChange={handleBellClick}>
-              <Button
-                className="flex-center"
-                icon={
-                  <Badge
-                    dot={hasTaskNotification || hasMentionNotification}
-                    offset={[-3, 3]}>
-                    <IconBell data-testid="task-notifications" width={20} />
-                  </Badge>
-                }
-                title={t('label.notification-plural')}
-                type="text"
-              />
-            </Dropdown>
-            <Dropdown
-              menu={{
-                items: getHelpDropdownItems(version),
-              }}
-              overlayStyle={{ width: 175 }}
-              placement="bottomRight"
-              trigger={['click']}>
-              <Button
-                className="flex-center"
-                data-testid="help-icon"
-                icon={<Help width={20} />}
-                title={t('label.need-help')}
-                type="text"
-              />
-            </Dropdown>
-            <UserProfileIcon />
-          </div>
-        </div>
-      </Header>
-      {showVersionMissMatchAlert && (
-        <Alert
-          showIcon
-          action={
-            <Button
-              size="small"
-              type="link"
-              onClick={() => {
-                navigate(0);
-              }}>
-              {t('label.refresh')}
-            </Button>
-          }
-          className="refresh-alert slide-in-top"
-          description="For a seamless experience recommend you to refresh the page"
-          icon={<RefreshIcon />}
-          message="A new version is available"
-          type="info"
-        />
-      )}
-      {renderAlertCards}
-    </>
-  );
-};
-
-export default MarketplaceNavBar;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddSubDomainModal/AddSubDomainModal.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddSubDomainModal/AddSubDomainModal.component.tsx
deleted file mode 100644
index 6503e6daa2fd..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddSubDomainModal/AddSubDomainModal.component.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import { Button, Modal } from 'antd';
-import { useCallback } from 'react';
-import { useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
-import { CreateDomain } from '../../../generated/api/domains/createDomain';
-import AddDomainForm, {
-  DOMAIN_FORM_DEFAULTS,
-  transformDomainFormData,
-} from '../AddDomainForm/AddDomainForm.component';
-import { DomainFormValues } from '../AddDomainForm/AddDomainForm.interface';
-import { DomainFormType } from '../DomainPage.interface';
-import { AddSubDomainModalProps } from './AddSubDomainModal.interface';
-
-const AddSubDomainModal = ({
-  open,
-  onSubmit,
-  onCancel,
-}: AddSubDomainModalProps) => {
-  const { t } = useTranslation();
-  const form = useForm<DomainFormValues>({
-    defaultValues: DOMAIN_FORM_DEFAULTS,
-  });
-
-  const handleFormSubmit = useCallback(
-    async (data: DomainFormValues) => {
-      const payload = transformDomainFormData(
-        data,
-        DomainFormType.SUBDOMAIN
-      ) as CreateDomain;
-      await onSubmit(payload);
-      form.reset();
-    },
-    [form, onSubmit]
-  );
-
-  const handleSave = form.handleSubmit(handleFormSubmit);
-
-  return (
-    <Modal
-      centered
-      cancelText={t('label.cancel')}
-      className="add-subdomain-modal"
-      closable={false}
-      footer={[
-        <Button key="cancel-btn" type="link" onClick={onCancel}>
-          {t('label.cancel')}
-        </Button>,
-        <Button
-          data-testid="save-sub-domain"
-          key="save-btn"
-          type="primary"
-          onClick={handleSave}>
-          {t('label.save')}
-        </Button>,
-      ]}
-      maskClosable={false}
-      okText={t('label.submit')}
-      open={open}
-      styles={{
-        body: { padding: '48px' },
-      }}
-      title={t('label.add-entity', { entity: t('label.sub-domain') })}
-      width={670}
-      onCancel={onCancel}>
-      <AddDomainForm
-        isFormInDialog
-        form={form}
-        loading={false}
-        type={DomainFormType.SUBDOMAIN}
-        onCancel={onCancel}
-        onSubmit={handleFormSubmit}
-      />
-    </Modal>
-  );
-};
-
-export default AddSubDomainModal;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddSubDomainModal/AddSubDomainModal.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddSubDomainModal/AddSubDomainModal.interface.ts
deleted file mode 100644
index 40ac9f276999..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddSubDomainModal/AddSubDomainModal.interface.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import { CreateDomain } from '../../../generated/api/domains/createDomain';
-import { Domain } from '../../../generated/entity/domains/domain';
-
-export interface AddSubDomainModalProps {
-  open: boolean;
-  data?: Domain;
-  onCancel: () => void;
-  onSubmit: (data: CreateDomain) => Promise<void>;
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailPage/DomainDetailPage.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailPage/DomainDetailPage.interface.ts
deleted file mode 100644
index 93be83a37862..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailPage/DomainDetailPage.interface.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  Copyright 2023 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { Domain } from '../../../generated/entity/domains/domain';
-
-export interface DomainDetailPageProps {
-  domain?: Domain;
-  loading?: boolean;
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DriveService/File/FileColumnsTable/index.ts b/openmetadata-ui/src/main/resources/ui/src/components/DriveService/File/FileColumnsTable/index.ts
deleted file mode 100644
index 64b9d2edc2e7..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/DriveService/File/FileColumnsTable/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-export { default } from './FileColumnsTable';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/LineageControlButtons/LineageControlButtons.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/LineageControlButtons/LineageControlButtons.interface.ts
deleted file mode 100644
index 395ef9e44eaf..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/LineageControlButtons/LineageControlButtons.interface.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { EntityType } from '../../../../enums/entity.enum';
-
-export interface LineageControlButtonsProps {
-  deleted?: boolean;
-  hasEditAccess: boolean;
-  entityType?: EntityType;
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityList/EntityList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityList/EntityList.tsx
deleted file mode 100644
index f36fcf3165eb..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityList/EntityList.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *  Copyright 2022 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { Button, Col, Row, Typography } from 'antd';
-import { isEmpty } from 'lodash';
-import { FunctionComponent } from 'react';
-import { Link } from 'react-router-dom';
-import { EntityReference } from '../../../generated/entity/type';
-import entityUtilClassBase from '../../../utils/EntityUtilClassBase';
-import { getEntityName } from '../../../utils/EntityUtils';
-import searchClassBase from '../../../utils/SearchClassBase';
-import EntityListSkeleton from '../../common/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component';
-import './entity.less';
-
-interface AntdEntityListProp {
-  loading?: boolean;
-  entityList: Array<EntityReference>;
-  headerText?: string | JSX.Element;
-  headerTextLabel: string;
-  noDataPlaceholder: JSX.Element;
-  testIDText: string;
-}
-
-export const EntityListWithV1: FunctionComponent<AntdEntityListProp> = ({
-  entityList = [],
-  headerText,
-  headerTextLabel,
-  noDataPlaceholder,
-  testIDText,
-  loading,
-}: AntdEntityListProp) => {
-  return (
-    <EntityListSkeleton
-      dataLength={entityList.length !== 0 ? entityList.length : 5}
-      loading={Boolean(loading)}>
-      <>
-        <Row className="m-b-xs" justify="space-between">
-          <Col>
-            <Typography.Text className="text-lg font-semibold">
-              {headerTextLabel}
-            </Typography.Text>
-          </Col>
-          <Col>
-            <Typography.Text>{headerText}</Typography.Text>
-          </Col>
-        </Row>
-        {isEmpty(entityList) ? (
-          <div className="flex-center h-full">{noDataPlaceholder}</div>
-        ) : (
-          <div className="entity-list-body">
-            {entityList.map((item) => {
-              return (
-                <div
-                  className="right-panel-list-item flex items-center justify-between"
-                  data-testid={`${testIDText}-${item.name}`}
-                  key={item.id}>
-                  <div className="flex items-center">
-                    <Link
-                      className="font-medium"
-                      to={entityUtilClassBase.getEntityLink(
-                        item.type || '',
-                        item.fullyQualifiedName ?? ''
-                      )}>
-                      <Button
-                        className="entity-button flex-center p-0 m--ml-1"
-                        icon={
-                          <div className="entity-button-icon m-r-xs">
-                            {searchClassBase.getEntityIcon(item.type || '')}
-                          </div>
-                        }
-                        title={getEntityName(
-                          item as unknown as EntityReference
-                        )}
-                        type="text">
-                        <Typography.Text
-                          className="w-72 text-left text-xs"
-                          ellipsis={{ tooltip: true }}>
-                          {getEntityName(item as unknown as EntityReference)}
-                        </Typography.Text>
-                      </Button>
-                    </Link>
-                  </div>
-                </div>
-              );
-            })}
-          </div>
-        )}
-      </>
-    </EntityListSkeleton>
-  );
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TasktabIncidentManagerHeaderNew.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TasktabIncidentManagerHeaderNew.tsx
deleted file mode 100644
index c624c272b62f..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TasktabIncidentManagerHeaderNew.tsx
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- *  Copyright 2023 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import { Col, Row, Skeleton, Steps, Typography } from 'antd';
-import { last, toLower } from 'lodash';
-import { ReactNode, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { ReactComponent as AssigneesIcon } from '../../../../assets/svg/ic-assignees.svg';
-import { ReactComponent as FailureCommentIcon } from '../../../../assets/svg/ic-failure-comment.svg';
-import { ReactComponent as FailureReasonIcon } from '../../../../assets/svg/ic-failure-reason.svg';
-import { ReactComponent as SeverityIcon } from '../../../../assets/svg/ic-severity.svg';
-import { ReactComponent as UserIcon } from '../../../../assets/svg/ic-user-profile.svg';
-import { NO_DATA_PLACEHOLDER } from '../../../../constants/constants';
-import {
-  TEST_CASE_RESOLUTION_STATUS_LABELS,
-  TEST_CASE_STATUS,
-} from '../../../../constants/TestSuite.constant';
-import { Thread } from '../../../../generated/entity/feed/thread';
-import { TestCaseResolutionStatusTypes } from '../../../../generated/tests/testCaseResolutionStatus';
-import { formatDateTime } from '../../../../utils/date-time/DateTimeUtils';
-import { getEntityName } from '../../../../utils/EntityUtils';
-import { useActivityFeedProvider } from '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider';
-
-import { OwnerType } from '../../../../enums/user.enum';
-import { OwnerLabel } from '../../../common/OwnerLabel/OwnerLabel.component';
-import UserPopOverCard from '../../../common/PopOverCard/UserPopOverCard';
-import ProfilePicture from '../../../common/ProfilePicture/ProfilePicture';
-import RichTextEditorPreviewerV1 from '../../../common/RichTextEditor/RichTextEditorPreviewerV1';
-import Severity from '../../../DataQuality/IncidentManager/Severity/Severity.component';
-import './task-tab-incident-manager-header.style.less';
-
-const TaskTabIncidentManagerHeaderNew = ({ thread }: { thread: Thread }) => {
-  const { t } = useTranslation();
-  const { testCaseResolutionStatus, isTestCaseResolutionLoading } =
-    useActivityFeedProvider();
-  const testCaseResolutionStepper = useMemo(() => {
-    const updatedData = [...testCaseResolutionStatus];
-    const lastStatusType = last(
-      testCaseResolutionStatus
-    )?.testCaseResolutionStatusType;
-
-    if (lastStatusType && TEST_CASE_STATUS[lastStatusType]) {
-      updatedData.push(
-        ...TEST_CASE_STATUS[lastStatusType].map((type) => ({
-          testCaseResolutionStatusType: type,
-        }))
-      );
-    }
-
-    return updatedData.map((status) => {
-      let details: ReactNode = null;
-
-      switch (status.testCaseResolutionStatusType) {
-        case TestCaseResolutionStatusTypes.ACK:
-          details = status.updatedBy ? (
-            <Typography.Text className="text-grey-muted text-xss">
-              {`${t('label.by-entity', {
-                entity: getEntityName(status.updatedBy),
-              })} ${t('label.on-lowercase')} `}
-            </Typography.Text>
-          ) : null;
-
-          break;
-        case TestCaseResolutionStatusTypes.Assigned:
-          details = status.testCaseResolutionStatusDetails?.assignee ? (
-            <Typography.Text className="text-grey-muted text-xss">
-              {`${t('label.to-lowercase')} ${getEntityName(
-                status.testCaseResolutionStatusDetails?.assignee
-              )} ${t('label.on-lowercase')} `}
-            </Typography.Text>
-          ) : null;
-
-          break;
-        case TestCaseResolutionStatusTypes.Resolved:
-          details = status.testCaseResolutionStatusDetails?.resolvedBy ? (
-            <Typography.Text className="text-grey-muted text-xss">
-              {`${t('label.by-entity', {
-                entity: getEntityName(
-                  status.testCaseResolutionStatusDetails.resolvedBy
-                ),
-              })} ${t('label.on-lowercase')} `}
-            </Typography.Text>
-          ) : null;
-
-          break;
-
-        default:
-          break;
-      }
-
-      return {
-        className: toLower(status.testCaseResolutionStatusType),
-        title: (
-          <div className="incident-title">
-            <Typography.Paragraph className="m-b-0">
-              {
-                TEST_CASE_RESOLUTION_STATUS_LABELS[
-                  status.testCaseResolutionStatusType
-                ]
-              }
-            </Typography.Paragraph>
-            <Typography.Paragraph className="m-b-0 incident-details">
-              {details}
-              {status.updatedAt && (
-                <Typography.Text className="text-grey-muted text-xss">
-                  {formatDateTime(status.updatedAt)}
-                </Typography.Text>
-              )}
-            </Typography.Paragraph>
-          </div>
-        ),
-        key: status.testCaseResolutionStatusType,
-      };
-    });
-  }, [testCaseResolutionStatus, t]);
-
-  const latestTestCaseResolutionStatus = useMemo(
-    () => last(testCaseResolutionStatus),
-    [testCaseResolutionStatus]
-  );
-
-  const isResolved =
-    latestTestCaseResolutionStatus?.testCaseResolutionStatusType ===
-    TestCaseResolutionStatusTypes.Resolved;
-
-  return (
-    <Row data-testid="incident-manager-task-header-container" gutter={[8, 16]}>
-      <Row className="m-l-0" gutter={[16, 16]}>
-        <Col className="flex items-center gap-2 text-grey-muted" span={8}>
-          <UserIcon height={16} />
-          <Typography.Text className="incident-manager-details-label @grey-8">
-            {t('label.created-by')}
-          </Typography.Text>
-        </Col>
-        <Col className="flex items-center gap-2" span={16}>
-          <UserPopOverCard userName={thread.createdBy ?? ''}>
-            <div className="d-flex items-center">
-              <ProfilePicture name={thread.createdBy ?? ''} width="24" />
-            </div>
-          </UserPopOverCard>
-          <Typography.Text>{thread.createdBy}</Typography.Text>
-        </Col>
-        <Col className="flex items-center gap-2 text-grey-muted" span={8}>
-          <AssigneesIcon height={16} />
-          <Typography.Text className="incident-manager-details-label @grey-8">
-            {`${t('label.assignee-plural')} `}
-          </Typography.Text>
-        </Col>
-        <Col className="flex items-center gap-2" span={16}>
-          {thread?.task?.assignees?.length === 1 ? (
-            <div className="d-flex items-center gap-2">
-              <UserPopOverCard
-                type={thread?.task?.assignees[0]?.type as OwnerType}
-                userName={thread?.task?.assignees[0].name ?? ''}>
-                <div className="d-flex items-center">
-                  <ProfilePicture
-                    name={thread?.task?.assignees[0].name ?? ''}
-                    width="24"
-                  />
-                </div>
-              </UserPopOverCard>
-              <Typography.Text className="text-grey-body">
-                {getEntityName(thread?.task?.assignees[0])}
-              </Typography.Text>
-            </div>
-          ) : (
-            <OwnerLabel
-              isCompactView={false}
-              owners={thread?.task?.assignees}
-              showLabel={false}
-            />
-          )}
-        </Col>
-
-        <Col className="flex items-center gap-2 text-grey-muted" span={8}>
-          <SeverityIcon height={16} />
-          <Typography.Text className="incident-manager-details-label">
-            {' '}
-            {`${t('label.severity')} `}
-          </Typography.Text>
-        </Col>
-        <Col className="flex items-center gap-2" span={16}>
-          <Severity severity={latestTestCaseResolutionStatus?.severity} />
-        </Col>
-
-        {isResolved && (
-          <Col className="flex items-center gap-2 text-grey-muted" span={8}>
-            <FailureReasonIcon height={16} />
-            <Typography.Text className="incident-manager-details-label">{`${t(
-              'label.failure-reason'
-            )}: `}</Typography.Text>
-          </Col>
-        )}
-        {isResolved && (
-          <Col className="flex items-center gap-2" span={16}>
-            <Typography.Text className="text-sm incident-manager-text">
-              {latestTestCaseResolutionStatus?.testCaseResolutionStatusDetails
-                ?.testCaseFailureReason ?? NO_DATA_PLACEHOLDER}
-            </Typography.Text>
-          </Col>
-        )}
-        {isResolved && (
-          <Col className="flex items-center gap-2 text-grey-muted" span={8}>
-            <FailureCommentIcon height={16} />
-            <Typography.Text className="incident-manager-details-label">
-              {' '}
-              {`${t('label.failure-comment')} `}
-            </Typography.Text>
-          </Col>
-        )}
-        {isResolved && (
-          <Col className="flex items-center gap-2 " span={16}>
-            <RichTextEditorPreviewerV1
-              markdown={
-                latestTestCaseResolutionStatus?.testCaseResolutionStatusDetails
-                  ?.testCaseFailureComment ?? ''
-              }
-            />
-          </Col>
-        )}
-        <Col className="p-l-0" span={24}>
-          <div className="task-resolution-steps-container-new">
-            {isTestCaseResolutionLoading ? (
-              <Skeleton active />
-            ) : (
-              <Steps
-                className="task-resolution-steps w-full"
-                current={testCaseResolutionStatus.length}
-                data-testid="task-resolution-steps"
-                items={testCaseResolutionStepper}
-                labelPlacement="vertical"
-                size="small"
-              />
-            )}
-          </div>
-        </Col>
-      </Row>
-    </Row>
-  );
-};
-
-export default TaskTabIncidentManagerHeaderNew;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/mocks/SearchIndexSummary.mock.ts b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/mocks/SearchIndexSummary.mock.ts
deleted file mode 100644
index 2f9d3ad9ef59..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/mocks/SearchIndexSummary.mock.ts
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- *  Copyright 2023 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import {
-  DataType,
-  LabelType,
-  SearchIndex,
-  SearchServiceType,
-  State,
-  TagSource,
-} from '../../../../generated/entity/data/searchIndex';
-
-export const mockSearchIndexEntityDetails: SearchIndex = {
-  id: 'e157b054-e9d1-428b-97b6-12a36d6c1146',
-  name: 'table_search_index',
-  fullyQualifiedName: 'testES.table_search_index',
-  displayName: 'table_search_index_new',
-  version: 1.6,
-  updatedAt: 1694592004058,
-  updatedBy: 'ingestion-bot',
-  service: {
-    id: 'fb1bd626-d560-4a7f-8db1-aba7d2e6698b',
-    type: 'searchService',
-    name: 'testES',
-    fullyQualifiedName: 'testES',
-    description: '',
-    deleted: false,
-    href: 'http://localhost:8585/api/v1/services/storageServices/fb1bd626-d560-4a7f-8db1-aba7d2e6698b',
-  },
-  serviceType: SearchServiceType.ElasticSearch,
-  fields: [
-    {
-      name: 'column_suggest',
-      dataType: DataType.Completion,
-      fullyQualifiedName: 'testES.table_search_index.column_suggest',
-      tags: [],
-    },
-    {
-      name: 'columns',
-      dataType: DataType.Object,
-      fullyQualifiedName: 'testES.table_search_index.columns',
-      tags: [],
-      children: [
-        {
-          name: 'arrayDataType',
-          dataType: DataType.Text,
-          fullyQualifiedName: 'testES.table_search_index.columns.arrayDataType',
-          tags: [],
-        },
-        {
-          name: 'children',
-          dataType: DataType.Object,
-          fullyQualifiedName: 'testES.table_search_index.columns.children',
-          tags: [],
-          children: [
-            {
-              name: 'children',
-              dataType: DataType.Object,
-              fullyQualifiedName:
-                'testES.table_search_index.columns.children.children',
-              tags: [],
-              children: [
-                {
-                  name: 'dataLength',
-                  dataType: DataType.Unknown,
-                  fullyQualifiedName:
-                    'testES.table_search_index.columns.children.children.dataLength',
-                  tags: [],
-                },
-                {
-                  name: 'dataType',
-                  dataType: DataType.Text,
-                  fullyQualifiedName:
-                    'testES.table_search_index.columns.children.children.dataType',
-                  tags: [],
-                },
-              ],
-            },
-            {
-              name: 'constraint',
-              dataType: DataType.Text,
-              fullyQualifiedName:
-                'testES.table_search_index.columns.children.constraint',
-              tags: [],
-            },
-            {
-              name: 'dataLength',
-              dataType: DataType.Unknown,
-              fullyQualifiedName:
-                'testES.table_search_index.columns.children.dataLength',
-              tags: [],
-            },
-            {
-              name: 'dataType',
-              dataType: DataType.Text,
-              fullyQualifiedName:
-                'testES.table_search_index.columns.children.dataType',
-              tags: [],
-            },
-            {
-              name: 'dataTypeDisplay',
-              dataType: DataType.Text,
-              fullyQualifiedName:
-                'testES.table_search_index.columns.children.dataTypeDisplay',
-              tags: [],
-            },
-            {
-              name: 'description',
-              dataType: DataType.Text,
-              fullyQualifiedName:
-                'testES.table_search_index.columns.children.description',
-              tags: [],
-            },
-            {
-              name: 'fullyQualifiedName',
-              dataType: DataType.Text,
-              fullyQualifiedName:
-                'testES.table_search_index.columns.children.fullyQualifiedName',
-              tags: [],
-            },
-            {
-              name: 'name',
-              dataType: DataType.Text,
-              fullyQualifiedName:
-                'testES.table_search_index.columns.children.name',
-              tags: [],
-            },
-          ],
-        },
-        {
-          name: 'constraint',
-          dataType: DataType.Text,
-          fullyQualifiedName: 'testES.table_search_index.columns.constraint',
-          tags: [],
-        },
-        {
-          name: 'dataLength',
-          dataType: DataType.Unknown,
-          fullyQualifiedName: 'testES.table_search_index.columns.dataLength',
-          tags: [],
-        },
-        {
-          name: 'dataType',
-          dataType: DataType.Text,
-          fullyQualifiedName: 'testES.table_search_index.columns.dataType',
-          tags: [],
-        },
-        {
-          name: 'dataTypeDisplay',
-          dataType: DataType.Text,
-          fullyQualifiedName:
-            'testES.table_search_index.columns.dataTypeDisplay',
-          tags: [],
-        },
-        {
-          name: 'description',
-          dataType: DataType.Text,
-          fullyQualifiedName: 'testES.table_search_index.columns.description',
-          tags: [],
-        },
-        {
-          name: 'fullyQualifiedName',
-          dataType: DataType.Text,
-          fullyQualifiedName:
-            'testES.table_search_index.columns.fullyQualifiedName',
-          tags: [],
-        },
-        {
-          name: 'name',
-          dataType: DataType.Keyword,
-          fullyQualifiedName: 'testES.table_search_index.columns.name',
-          tags: [],
-        },
-        {
-          name: 'ordinalPosition',
-          dataType: DataType.Unknown,
-          fullyQualifiedName:
-            'testES.table_search_index.columns.ordinalPosition',
-          tags: [],
-        },
-      ],
-    },
-    {
-      name: 'dataProducts',
-      dataType: DataType.Keyword,
-      fullyQualifiedName: 'testES.table_search_index.dataProducts',
-      tags: [],
-    },
-    {
-      name: 'database',
-      dataType: DataType.Object,
-      fullyQualifiedName: 'testES.table_search_index.database',
-      tags: [],
-    },
-    {
-      name: 'name',
-      dataType: DataType.Text,
-      fullyQualifiedName: 'testES.table_search_index.name',
-      tags: [],
-    },
-  ],
-  searchIndexSettings: {
-    index: {
-      uuid: '3DqvLSVTRR2Cc8biJleHaA',
-      routing: {
-        allocation: {
-          include: {
-            _tier_preference: 'data_content',
-          },
-        },
-      },
-      version: {
-        created: '7160399',
-      },
-      analysis: {
-        filter: {
-          om_stemmer: {
-            name: 'english',
-            type: 'stemmer',
-          },
-        },
-        analyzer: {
-          om_ngram: {
-            filter: ['lowercase'],
-            max_gram: '2',
-            min_gram: '1',
-            tokenizer: 'ngram',
-          },
-          om_analyzer: {
-            filter: ['lowercase', 'om_stemmer'],
-            tokenizer: 'letter',
-          },
-        },
-        normalizer: {
-          lowercase_normalizer: {
-            type: 'custom',
-            filter: ['lowercase'],
-            char_filter: [],
-          },
-        },
-      },
-      creation_date: '1694572027496',
-      provided_name: 'table_search_index',
-      number_of_shards: '1',
-      number_of_replicas: '1',
-    },
-  },
-  followers: [],
-  tags: [
-    {
-      tagFQN: 'PersonalData.Personal',
-      description:
-        'Data that can be used to directly or indirectly identify a person.',
-      source: TagSource.Classification,
-      labelType: LabelType.Manual,
-      state: State.Confirmed,
-    },
-    {
-      tagFQN: 'PII.Sensitive',
-      description:
-        'PII which if lost, compromised, or disclosed without authorization, could result in substantial harm, embarrassment, inconvenience, or unfairness to an individual.',
-      source: TagSource.Classification,
-      labelType: LabelType.Manual,
-      state: State.Confirmed,
-    },
-  ],
-  href: 'http://localhost:8585/api/v1/searchIndexes/e157b054-e9d1-428b-97b6-12a36d6c1146',
-  changeDescription: {
-    fieldsAdded: [],
-    fieldsUpdated: [],
-    fieldsDeleted: [
-      {
-        name: 'fields.column_suggest.description',
-        oldValue: '',
-      },
-    ],
-    previousVersion: 1.5,
-  },
-  deleted: false,
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/WorkFlowTab/WorkFlowHistory.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/WorkFlowTab/WorkFlowHistory.interface.ts
deleted file mode 100644
index 77e11a047ae1..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/WorkFlowTab/WorkFlowHistory.interface.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-interface WorkflowStage {
-  name: string;
-  startedAt: number;
-  endedAt: number;
-  tasks: string[];
-  variables: Record<string, any>;
-}
-
-export interface WorkflowHistoryItem {
-  id: string;
-  workflowInstanceId: string;
-  workflowInstanceExecutionId: string;
-  workflowDefinitionId: string;
-  stage: WorkflowStage;
-  timestamp: number;
-  status: 'RUNNING' | 'COMPLETED' | 'FAILED' | 'PENDING' | 'CANCELLED';
-  exception?: string;
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/KnowledgeCenter/KnowledgePageOwners/KnowledgePageOwners.tsx b/openmetadata-ui/src/main/resources/ui/src/components/KnowledgeCenter/KnowledgePageOwners/KnowledgePageOwners.tsx
deleted file mode 100644
index 0499fb8544fa..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/KnowledgeCenter/KnowledgePageOwners/KnowledgePageOwners.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  Copyright 2026 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import { Button, Space, Tooltip, Typography } from 'antd';
-import classNames from 'classnames';
-import { FC } from 'react';
-import { useTranslation } from 'react-i18next';
-import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg';
-import { ReactComponent as PlusIcon } from '../../../assets/svg/plus-primary.svg';
-import TagButton from '../../../components/common/TagButton/TagButton.component';
-import { UserTeamSelectableList } from '../../../components/common/UserTeamSelectableList/UserTeamSelectableList.component';
-import { DE_ACTIVE_COLOR } from '../../../constants/constants';
-import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface';
-import { TabSpecificField } from '../../../enums/entity.enum';
-import { Glossary } from '../../../generated/entity/data/glossary';
-import { EntityReference } from '../../../generated/entity/data/page';
-import { KnowledgePage } from '../../../interface/knowledge-center.interface';
-import { getOwnerVersionLabel } from '../../../utils/EntityVersionUtils';
-
-interface KnowledgePageOwnersProps {
-  permissions: OperationPermission;
-  knowledgePage?: KnowledgePage;
-  onOwnerUpdate: (updatedOwners?: EntityReference[]) => Promise<void>;
-}
-
-const KnowledgePageOwners: FC<KnowledgePageOwnersProps> = ({
-  knowledgePage,
-  permissions,
-  onOwnerUpdate,
-}) => {
-  const { t } = useTranslation();
-  const hasOwners = knowledgePage?.owners && knowledgePage?.owners.length > 0;
-  const canEditOwners = permissions.EditOwners || permissions.EditAll;
-  const owners = knowledgePage?.owners ?? [];
-
-  return (
-    <Space direction="vertical" size={0}>
-      <div
-        className={classNames('d-flex items-center', {
-          'm-b-xss': hasOwners,
-        })}>
-        <Typography.Text className="right-panel-label">
-          {t('label.owner-plural')}
-        </Typography.Text>
-        {canEditOwners && (
-          <UserTeamSelectableList
-            hasPermission={canEditOwners}
-            listHeight={200}
-            multiple={{ user: true, team: false }}
-            owner={owners}
-            onUpdate={onOwnerUpdate}>
-            {hasOwners ? (
-              <Tooltip
-                title={t('label.edit-entity', {
-                  entity: t('label.owner-plural'),
-                })}>
-                <Button
-                  className="cursor-pointer flex-center m-l-sm"
-                  data-testid="edit-owner"
-                  icon={<EditIcon color={DE_ACTIVE_COLOR} width="14px" />}
-                  size="small"
-                  type="text"
-                />
-              </Tooltip>
-            ) : (
-              <TagButton
-                className="text-primary cursor-pointer m-l-sm"
-                dataTestId="add-owner"
-                icon={<PlusIcon height={16} name="plus" width={16} />}
-                label={t('label.add')}
-                tooltip=""
-              />
-            )}
-          </UserTeamSelectableList>
-        )}
-      </div>
-      {hasOwners && (
-        <Space className="m-r-xss" size={4}>
-          {getOwnerVersionLabel(
-            knowledgePage as unknown as Glossary,
-            false,
-            TabSpecificField.OWNERS,
-            canEditOwners
-          )}
-        </Space>
-      )}
-    </Space>
-  );
-};
-
-export default KnowledgePageOwners;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModel.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModel.interface.ts
deleted file mode 100644
index 913a232618d0..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModel.interface.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Copyright 2023 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface';
-import { Mlmodel } from '../../../generated/entity/data/mlmodel';
-
-export interface MlModelFeaturesListProp {
-  mlFeatures: Mlmodel['mlFeatures'];
-  permissions: OperationPermission;
-  handleFeaturesUpdate: (features: Mlmodel['mlFeatures']) => Promise<void>;
-  isDeleted?: boolean;
-  entityFqn: string;
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/VersionIndicatorIcon.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/VersionIndicatorIcon.component.tsx
deleted file mode 100644
index 881dc6f1d6bb..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/VersionIndicatorIcon.component.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Copyright 2022 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { VersionIndicatorInterface } from './VersionIndicatorIcon.interface';
-
-export const VersionIndicatorIcon = ({
-  fill,
-  style,
-}: VersionIndicatorInterface) => {
-  return (
-    <svg
-      className="anticon"
-      fill="none"
-      height="1em"
-      style={style}
-      viewBox="0 0 13 6"
-      width="1em"
-      xmlns="http://www.w3.org/2000/svg">
-      <path
-        clipRule="evenodd"
-        d="M7.878 3.002a1.876 1.876 0 11-3.751 0 1.876 1.876 0 013.751 0zm1.073.562a3.003 3.003 0 01-5.897 0H.563a.563.563 0 010-1.125h2.49a3.002 3.002 0 015.898 0h2.491a.563.563 0 010 1.125H8.951z"
-        fill={fill}
-        fillRule="evenodd"
-      />
-    </svg>
-  );
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/VersionIndicatorIcon.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Modals/VersionIndicatorIcon.interface.ts
deleted file mode 100644
index 72b86844336f..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/VersionIndicatorIcon.interface.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  Copyright 2022 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { CSSProperties } from 'react';
-
-export interface VersionIndicatorInterface {
-  fill: string;
-  style?: CSSProperties;
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/MyTaskWidget/MyTaskWidget.constants.ts b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/MyTaskWidget/MyTaskWidget.constants.ts
deleted file mode 100644
index d3a23ef5b59b..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/MyTaskWidget/MyTaskWidget.constants.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import { t } from '../../../../utils/i18next/LocalUtil';
-
-export const MY_TASK_SORT_BY_KEYS = {
-  LATEST: 'latest',
-  A_TO_Z: 'a-to-z',
-  Z_TO_A: 'z-to-a',
-};
-
-export const MY_TASK_SORT_BY_OPTIONS = [
-  {
-    key: MY_TASK_SORT_BY_KEYS.LATEST,
-    label: t('label.latest'),
-  },
-  {
-    key: MY_TASK_SORT_BY_KEYS.A_TO_Z,
-    label: t('label.a-to-z'),
-  },
-  {
-    key: MY_TASK_SORT_BY_KEYS.Z_TO_A,
-    label: t('label.z-to-a'),
-  },
-];
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV2/PageLayoutV2.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV2/PageLayoutV2.tsx
deleted file mode 100644
index ad79d6571d60..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV2/PageLayoutV2.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Copyright 2026 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import classNames from 'classnames';
-import { FC, ReactNode } from 'react';
-import DocumentTitle from '../common/DocumentTitle/DocumentTitle';
-
-interface PageLayoutV2Props {
-  children: ReactNode;
-  pageTitle: string;
-  className?: string;
-  mainContainerClassName?: string;
-}
-
-const PageLayoutV2: FC<PageLayoutV2Props> = ({
-  children,
-  pageTitle,
-  className,
-  mainContainerClassName,
-}) => {
-  return (
-    <>
-      <DocumentTitle title={pageTitle} />
-      <div
-        className={classNames('tw:flex tw:h-full tw:flex-col', className)}
-        data-testid="page-layout-v2">
-        <div
-          className={classNames(
-            'tw:flex-1 tw:overflow-y-auto',
-            mainContainerClassName
-          )}>
-          {children}
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default PageLayoutV2;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FilterConfiguration/FilterConfiguration.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FilterConfiguration/FilterConfiguration.tsx
deleted file mode 100644
index c8e327255ce3..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/SearchSettings/FilterConfiguration/FilterConfiguration.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import Icon from '@ant-design/icons';
-import {
-  Button,
-  Checkbox,
-  Col,
-  Divider,
-  Dropdown,
-  Row,
-  Typography,
-} from 'antd';
-import { startCase } from 'lodash';
-import { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { ReactComponent as CloseIcon } from '../../../assets/svg/close.svg';
-import { ReactComponent as FilterIcon } from '../../../assets/svg/filter-primary.svg';
-import { DATA_ASSET_DROPDOWN_ITEMS } from '../../../constants/AdvancedSearch.constants';
-import { EntityFields } from '../../../enums/AdvancedSearch.enum';
-import './filter-configuration.less';
-
-const FilterConfiguration = () => {
-  const { t } = useTranslation();
-  const [visible, setVisible] = useState(false);
-  const [checkedItems, setCheckedItems] = useState<string[]>([]);
-
-  const entityFields = useMemo(
-    () =>
-      Object.entries(EntityFields).map(([key, field]) => ({
-        fieldName: field,
-        label: startCase(key.toLowerCase()),
-      })),
-    []
-  );
-
-  const menuItems = useMemo(
-    () => ({
-      items: entityFields.map((field) => ({
-        key: field.fieldName,
-        label: (
-          <Checkbox
-            checked={checkedItems.includes(field.fieldName)}
-            onChange={() => handleCheckboxChange(field.fieldName)}>
-            {field.label}
-          </Checkbox>
-        ),
-      })),
-      className: 'menu-items',
-    }),
-    [entityFields, checkedItems]
-  );
-
-  const handleCheckboxChange = (fieldName: string) => {
-    setCheckedItems((prev) =>
-      prev.includes(fieldName)
-        ? prev.filter((item) => item !== fieldName)
-        : [...prev, fieldName]
-    );
-  };
-
-  return (
-    <Row className="filters-configuration-row p-y-md p-x-lg" gutter={[0, 16]}>
-      <Col span={24}>
-        <Typography.Title className="text-md font-semibold" level={5}>
-          {t('label.filters-configuration')}
-        </Typography.Title>
-      </Col>
-      <Col className="filter-configuration-container" span={24}>
-        <Dropdown
-          data-testid="add-filter-dropdown"
-          getPopupContainer={(triggerNode) => triggerNode.parentElement!}
-          menu={menuItems}
-          open={visible}
-          placement="bottomLeft"
-          trigger={['click']}
-          onOpenChange={(flag) => setVisible(flag)}>
-          <Button
-            className="flex items-center gap-2 p-md text-sm font-medium add-filters-btn"
-            icon={<FilterIcon />}>
-            {t('label.add-filter-plural')}
-          </Button>
-        </Dropdown>
-        <Divider className="h-auto self-stretch" type="vertical" />
-        {DATA_ASSET_DROPDOWN_ITEMS.map((value) => (
-          <div
-            className="bg-white flex items-center justify-center gap-3 p-y-xss p-x-sm filter-value"
-            key={value.key}>
-            {t(value.label)}
-            <Icon
-              className="text-grey-muted text-xss cursor-pointer"
-              component={CloseIcon}
-            />
-          </div>
-        ))}
-      </Col>
-    </Row>
-  );
-};
-
-export default FilterConfiguration;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOObjectFieldTemplate/SSOObjectFieldTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOObjectFieldTemplate/SSOObjectFieldTemplate.tsx
deleted file mode 100644
index b38928692b21..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/SettingsSso/SSOObjectFieldTemplate/SSOObjectFieldTemplate.tsx
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { PlusOutlined } from '@ant-design/icons';
-import {
-  ObjectFieldTemplatePropertyType,
-  ObjectFieldTemplateProps,
-} from '@rjsf/utils';
-import { Button, Space } from 'antd';
-import classNames from 'classnames';
-import { isEmpty, isUndefined } from 'lodash';
-import { createElement, Fragment, FunctionComponent } from 'react';
-import { ADVANCED_PROPERTIES } from '../../../constants/Services.constant';
-import serviceUtilClassBase from '../../../utils/ServiceUtilClassBase';
-import './sso-object-field-template.less';
-
-interface PropertyMap {
-  advancedProperties: ObjectFieldTemplatePropertyType[];
-  normalProperties: ObjectFieldTemplatePropertyType[];
-}
-
-interface FieldGroup {
-  title: string;
-  properties: ObjectFieldTemplatePropertyType[];
-  className?: string;
-}
-
-export const SSOObjectFieldTemplate: FunctionComponent<
-  ObjectFieldTemplateProps
-> = (props: ObjectFieldTemplateProps) => {
-  const { formContext, idSchema, title, onAddClick, schema, properties } =
-    props;
-
-  const { advancedProperties, normalProperties } = properties.reduce(
-    (propertyMap, currentProperty) => {
-      const isAdvancedProperty = ADVANCED_PROPERTIES.includes(
-        currentProperty.name
-      );
-
-      let advancedProperties = [...propertyMap.advancedProperties];
-      let normalProperties = [...propertyMap.normalProperties];
-
-      if (isAdvancedProperty) {
-        advancedProperties = [...advancedProperties, currentProperty];
-      } else {
-        normalProperties = [...normalProperties, currentProperty];
-      }
-
-      return { ...propertyMap, advancedProperties, normalProperties };
-    },
-    {
-      advancedProperties: [],
-      normalProperties: [],
-    } as PropertyMap
-  );
-
-  const {
-    properties: updatedNormalProperties,
-    additionalField: AdditionalField,
-    additionalFieldContent,
-  } = serviceUtilClassBase.getProperties(normalProperties);
-
-  // Define field groups for SSO forms
-  const getFieldGroups = (
-    properties: ObjectFieldTemplatePropertyType[]
-  ): FieldGroup[] => {
-    const groups: FieldGroup[] = [];
-
-    // Basic Configuration Group
-    const basicFields = properties.filter((prop) =>
-      ['clientType', 'clientId', 'callbackUrl'].includes(prop.name)
-    );
-    if (basicFields.length > 0) {
-      groups.push({
-        title: 'Basic Configuration',
-        properties: basicFields,
-        className: 'sso-field-group',
-      });
-    }
-
-    // Token & Security Group
-    const securityFields = properties.filter((prop) =>
-      [
-        'publicKeyUrls',
-        'tokenValidationAlgorithm',
-        'authority',
-        'secret',
-        'clientSecret',
-        'secretKey',
-      ].includes(prop.name)
-    );
-    if (securityFields.length > 0) {
-      groups.push({
-        title: 'Token & Security',
-        properties: securityFields,
-        className: 'sso-field-group',
-      });
-    }
-
-    // User Management Group
-    const userFields = properties.filter((prop) =>
-      [
-        'jwtPrincipalClaims',
-        'principalDomain',
-        'adminPrincipals',
-        'enableSelfSignup',
-      ].includes(prop.name)
-    );
-    if (userFields.length > 0) {
-      groups.push({
-        title: 'User Management',
-        properties: userFields,
-        className: 'sso-field-group',
-      });
-    }
-
-    // Any remaining fields go into "Other Configuration"
-    const groupedFieldNames = [
-      ...basicFields,
-      ...securityFields,
-      ...userFields,
-    ].map((p) => p.name);
-    const otherFields = properties.filter(
-      (prop) => !groupedFieldNames.includes(prop.name)
-    );
-    if (otherFields.length > 0) {
-      groups.push({
-        title: 'Other Configuration',
-        properties: otherFields,
-        className: 'sso-field-group',
-      });
-    }
-
-    return groups;
-  };
-
-  const fieldGroups = getFieldGroups(updatedNormalProperties);
-
-  const fieldElement = (
-    <Fragment>
-      <Space className="w-full justify-between header-title-wrapper">
-        <label
-          className={classNames('control-label', {
-            'font-medium text-base-color text-md': !schema.additionalProperties,
-          })}
-          id={`${idSchema.$id}__title`}>
-          {title}
-        </label>
-
-        {schema.additionalProperties && (
-          <Button
-            data-testid={`add-item-${title}`}
-            icon={<PlusOutlined style={{ color: 'white', fontSize: '12px' }} />}
-            id={`${idSchema.$id}`}
-            size="small"
-            type="primary"
-            onClick={() => {
-              onAddClick(schema)();
-            }}
-            onFocus={() => {
-              if (!isUndefined(formContext.handleFocus)) {
-                formContext.handleFocus(idSchema.$id);
-              }
-            }}
-          />
-        )}
-      </Space>
-
-      {AdditionalField &&
-        createElement(AdditionalField, {
-          data: additionalFieldContent,
-        })}
-
-      {/* Render field groups */}
-      {fieldGroups.map((group, groupIndex) => (
-        <div className={group.className} key={`group-${groupIndex}`}>
-          <div className="sso-field-group-title">{group.title}</div>
-          <div className="sso-field-group-content">
-            {group.properties.map((element, index) => (
-              <div
-                className={classNames('property-wrapper', {
-                  'additional-fields': schema.additionalProperties,
-                })}
-                key={`${element.content.key}-${index}`}>
-                {element.content}
-              </div>
-            ))}
-          </div>
-        </div>
-      ))}
-
-      {!isEmpty(advancedProperties) && (
-        <div className="sso-field-group">
-          <div className="sso-field-group-content">
-            {advancedProperties.map((element, index) => (
-              <div
-                className={classNames('property-wrapper', {
-                  'additional-fields': schema.additionalProperties,
-                })}
-                key={`${element.content.key}-${index}`}>
-                {element.content}
-              </div>
-            ))}
-          </div>
-        </div>
-      )}
-    </Fragment>
-  );
-
-  return fieldElement;
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskProvider/TaskProvider.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskProvider/TaskProvider.interface.ts
deleted file mode 100644
index 0c72fa4cd8dc..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskProvider/TaskProvider.interface.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import { Operation } from 'fast-json-patch';
-import { TestCaseResolutionStatus } from '../../../generated/tests/testCaseResolutionStatus';
-import { Paging } from '../../../generated/type/paging';
-import {
-  CreateTask,
-  ListTasksParams,
-  ResolveTask,
-  Task,
-  TaskEntityStatus,
-} from '../../../rest/tasksAPI';
-
-export interface TaskProviderProps {
-  children: React.ReactNode;
-}
-
-export interface TaskProviderContextType {
-  tasks: Task[];
-  selectedTask: Task | undefined;
-  loading: boolean;
-  isCommentsLoading: boolean;
-  isTestCaseResolutionLoading: boolean;
-  testCaseResolutionStatus: TestCaseResolutionStatus[];
-  paging: Paging;
-  // Task CRUD operations
-  fetchTasks: (params?: ListTasksParams) => Promise<void>;
-  fetchMyAssignedTasks: (status?: TaskEntityStatus) => Promise<void>;
-  fetchMyCreatedTasks: (status?: TaskEntityStatus) => Promise<void>;
-  fetchMyOwnedTasks: (status?: TaskEntityStatus) => Promise<void>;
-  fetchTaskById: (id: string) => Promise<Task | undefined>;
-  createNewTask: (task: CreateTask) => Promise<Task | undefined>;
-  updateTask: (id: string, patch: Operation[]) => Promise<Task | undefined>;
-  resolveTaskById: (id: string, data: ResolveTask) => Promise<Task | undefined>;
-  closeTaskById: (id: string, comment?: string) => Promise<Task | undefined>;
-  addComment: (taskId: string, message: string) => Promise<Task | undefined>;
-  editComment: (
-    taskId: string,
-    commentId: string,
-    message: string
-  ) => Promise<Task | undefined>;
-  deleteComment: (
-    taskId: string,
-    commentId: string
-  ) => Promise<Task | undefined>;
-  // Selection and state
-  setSelectedTask: (task: Task | undefined) => void;
-  refreshTask: (id: string) => Promise<void>;
-  updateTestCaseIncidentStatus: (status: TestCaseResolutionStatus[]) => void;
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskProvider/TaskProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskProvider/TaskProvider.tsx
deleted file mode 100644
index f425405896a4..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskProvider/TaskProvider.tsx
+++ /dev/null
@@ -1,534 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import { AxiosError } from 'axios';
-import { Operation } from 'fast-json-patch';
-import { orderBy } from 'lodash';
-import {
-  createContext,
-  ReactNode,
-  useCallback,
-  useContext,
-  useMemo,
-  useState,
-} from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  DEFAULT_DOMAIN_VALUE,
-  PAGE_SIZE_LARGE,
-} from '../../../constants/constants';
-import { TestCaseResolutionStatus } from '../../../generated/tests/testCaseResolutionStatus';
-import { Paging } from '../../../generated/type/paging';
-import { useApplicationStore } from '../../../hooks/useApplicationStore';
-import { useDomainStore } from '../../../hooks/useDomainStore';
-import { getListTestCaseIncidentByStateId } from '../../../rest/incidentManagerAPI';
-import {
-  addTaskComment,
-  closeTask,
-  createTask,
-  deleteTaskComment,
-  editTaskComment,
-  getTaskById,
-  listMyAssignedTasks,
-  listMyCreatedTasks,
-  listMyOwnedTasks,
-  listTasks,
-  ListTasksParams,
-  patchTask,
-  resolveTask,
-  ResolveTask,
-  Task,
-  TaskEntityStatus,
-} from '../../../rest/tasksAPI';
-import { isTaskPendingFurtherApproval } from '../../../utils/TasksUtils';
-import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils';
-
-interface TaskProviderProps {
-  children: ReactNode;
-}
-
-interface TaskProviderContextType {
-  tasks: Task[];
-  selectedTask: Task | undefined;
-  loading: boolean;
-  isCommentsLoading: boolean;
-  isTestCaseResolutionLoading: boolean;
-  testCaseResolutionStatus: TestCaseResolutionStatus[];
-  paging: Paging;
-  // Task CRUD operations
-  fetchTasks: (params?: ListTasksParams) => Promise<void>;
-  fetchMyAssignedTasks: (status?: TaskEntityStatus) => Promise<void>;
-  fetchMyCreatedTasks: (status?: TaskEntityStatus) => Promise<void>;
-  fetchMyOwnedTasks: (status?: TaskEntityStatus) => Promise<void>;
-  fetchTaskById: (id: string) => Promise<Task | undefined>;
-  createNewTask: (
-    task: Parameters<typeof createTask>[0]
-  ) => Promise<Task | undefined>;
-  updateTask: (id: string, patch: Operation[]) => Promise<Task | undefined>;
-  resolveTaskById: (id: string, data: ResolveTask) => Promise<Task | undefined>;
-  closeTaskById: (id: string, comment?: string) => Promise<Task | undefined>;
-  addComment: (taskId: string, message: string) => Promise<Task | undefined>;
-  editComment: (
-    taskId: string,
-    commentId: string,
-    message: string
-  ) => Promise<Task | undefined>;
-  deleteComment: (
-    taskId: string,
-    commentId: string
-  ) => Promise<Task | undefined>;
-  // Selection and state
-  setSelectedTask: (task: Task | undefined) => void;
-  refreshTask: (id: string) => Promise<void>;
-  updateTestCaseIncidentStatus: (status: TestCaseResolutionStatus[]) => void;
-}
-
-const TaskContext = createContext<TaskProviderContextType>(
-  {} as TaskProviderContextType
-);
-
-const TASK_FIELDS =
-  'assignees,reviewers,watchers,about,domains,comments,createdBy,payload,resolution';
-
-export const TaskProvider = ({ children }: TaskProviderProps) => {
-  const { t } = useTranslation();
-  const { currentUser } = useApplicationStore();
-  const activeDomain = useDomainStore((state) => state.activeDomain);
-  const domain =
-    activeDomain !== DEFAULT_DOMAIN_VALUE ? activeDomain : undefined;
-
-  const [tasks, setTasks] = useState<Task[]>([]);
-  const [selectedTask, setSelectedTask] = useState<Task | undefined>();
-  const [loading, setLoading] = useState(false);
-  const [isCommentsLoading] = useState(false);
-  const [isTestCaseResolutionLoading, setIsTestCaseResolutionLoading] =
-    useState(false);
-  const [testCaseResolutionStatus, setTestCaseResolutionStatus] = useState<
-    TestCaseResolutionStatus[]
-  >([]);
-  const [paging, setPaging] = useState<Paging>({} as Paging);
-
-  const fetchTestCaseResolution = useCallback(async (id: string) => {
-    setIsTestCaseResolutionLoading(true);
-    try {
-      const { data } = await getListTestCaseIncidentByStateId(id, {
-        limit: PAGE_SIZE_LARGE,
-      });
-      setTestCaseResolutionStatus(
-        orderBy(data, (item) => item.timestamp, ['asc'])
-      );
-    } catch {
-      setTestCaseResolutionStatus([]);
-    } finally {
-      setIsTestCaseResolutionLoading(false);
-    }
-  }, []);
-
-  const fetchTasks = useCallback(async (params?: ListTasksParams) => {
-    setLoading(true);
-    try {
-      const response = await listTasks({
-        fields: TASK_FIELDS,
-        ...params,
-      });
-      setTasks(response.data);
-      setPaging(response.paging);
-    } catch (err) {
-      showErrorToast(
-        err as AxiosError,
-        t('server.entity-fetch-error', { entity: t('label.task-plural') })
-      );
-    } finally {
-      setLoading(false);
-    }
-  }, []);
-
-  const fetchMyAssignedTasks = useCallback(
-    async (status?: TaskEntityStatus) => {
-      setLoading(true);
-      try {
-        const response = await listMyAssignedTasks({
-          fields: TASK_FIELDS,
-          status,
-          domain,
-        });
-        setTasks(response.data);
-        setPaging(response.paging);
-      } catch (err) {
-        showErrorToast(
-          err as AxiosError,
-          t('server.entity-fetch-error', { entity: t('label.task-plural') })
-        );
-      } finally {
-        setLoading(false);
-      }
-    },
-    [domain]
-  );
-
-  const fetchMyCreatedTasks = useCallback(
-    async (status?: TaskEntityStatus) => {
-      setLoading(true);
-      try {
-        const response = await listMyCreatedTasks({
-          fields: TASK_FIELDS,
-          status,
-          domain,
-        });
-        setTasks(response.data);
-        setPaging(response.paging);
-      } catch (err) {
-        showErrorToast(
-          err as AxiosError,
-          t('server.entity-fetch-error', { entity: t('label.task-plural') })
-        );
-      } finally {
-        setLoading(false);
-      }
-    },
-    [domain]
-  );
-
-  const fetchMyOwnedTasks = useCallback(
-    async (status?: TaskEntityStatus) => {
-      setLoading(true);
-      try {
-        const response = await listMyOwnedTasks({
-          fields: TASK_FIELDS,
-          status,
-          domain,
-        });
-        setTasks(response.data);
-        setPaging(response.paging);
-      } catch (err) {
-        showErrorToast(
-          err as AxiosError,
-          t('server.entity-fetch-error', { entity: t('label.task-plural') })
-        );
-      } finally {
-        setLoading(false);
-      }
-    },
-    [domain]
-  );
-
-  const fetchTaskById = useCallback(async (id: string) => {
-    try {
-      const response = await getTaskById(id, { fields: TASK_FIELDS });
-      const task = response.data;
-      setSelectedTask(task);
-
-      // Fetch test case resolution if applicable
-      if (
-        task.type === 'TestCaseResolution' &&
-        task.payload &&
-        typeof task.payload === 'object' &&
-        'testCaseResolutionStatusId' in task.payload
-      ) {
-        fetchTestCaseResolution(
-          task.payload.testCaseResolutionStatusId as string
-        );
-      }
-
-      return task;
-    } catch (err) {
-      showErrorToast(
-        err as AxiosError,
-        t('server.entity-fetch-error', { entity: t('label.task') })
-      );
-
-      return undefined;
-    }
-  }, []);
-
-  const createNewTask = useCallback(
-    async (taskData: Parameters<typeof createTask>[0]) => {
-      try {
-        const task = await createTask(taskData);
-        showSuccessToast(
-          t('server.create-entity-success', { entity: t('label.task') })
-        );
-
-        return task;
-      } catch (err) {
-        showErrorToast(
-          err as AxiosError,
-          t('server.create-entity-error', { entity: t('label.task') })
-        );
-
-        return undefined;
-      }
-    },
-    []
-  );
-
-  const updateTask = useCallback(
-    async (id: string, patch: Operation[]) => {
-      try {
-        const task = await patchTask(id, patch);
-
-        // Update in tasks list
-        setTasks((prev) => prev.map((t) => (t.id === id ? task : t)));
-
-        // Update selected task if it matches
-        if (selectedTask?.id === id) {
-          setSelectedTask(task);
-        }
-
-        return task;
-      } catch (err) {
-        showErrorToast(
-          err as AxiosError,
-          t('server.entity-updating-error', { entity: t('label.task') })
-        );
-
-        return undefined;
-      }
-    },
-    [selectedTask]
-  );
-
-  const resolveTaskById = useCallback(
-    async (id: string, data: ResolveTask) => {
-      try {
-        const task = await resolveTask(id, data);
-        showSuccessToast(
-          isTaskPendingFurtherApproval(task)
-            ? 'Vote recorded.'
-            : t('server.task-resolved-successfully')
-        );
-
-        // Update in tasks list
-        setTasks((prev) => prev.map((t) => (t.id === id ? task : t)));
-
-        // Update selected task if it matches
-        if (selectedTask?.id === id) {
-          setSelectedTask(task);
-        }
-
-        return task;
-      } catch (err) {
-        showErrorToast(err as AxiosError, t('server.unexpected-error'));
-
-        return undefined;
-      }
-    },
-    [selectedTask]
-  );
-
-  const closeTaskById = useCallback(
-    async (id: string, comment?: string) => {
-      try {
-        const task = await closeTask(id, comment);
-        showSuccessToast(t('server.task-closed-successfully'));
-
-        // Update in tasks list
-        setTasks((prev) => prev.map((t) => (t.id === id ? task : t)));
-
-        // Update selected task if it matches
-        if (selectedTask?.id === id) {
-          setSelectedTask(task);
-        }
-
-        return task;
-      } catch (err) {
-        showErrorToast(err as AxiosError, t('server.unexpected-error'));
-
-        return undefined;
-      }
-    },
-    [selectedTask]
-  );
-
-  const addComment = useCallback(
-    async (taskId: string, message: string) => {
-      if (!currentUser) {
-        return undefined;
-      }
-
-      try {
-        const task = await addTaskComment(taskId, message);
-
-        // Update in tasks list
-        setTasks((prev) => prev.map((t) => (t.id === taskId ? task : t)));
-
-        // Update selected task if it matches
-        if (selectedTask?.id === taskId) {
-          setSelectedTask(task);
-        }
-
-        return task;
-      } catch (err) {
-        showErrorToast(
-          err as AxiosError,
-          t('server.add-entity-error', { entity: t('label.comment') })
-        );
-
-        return undefined;
-      }
-    },
-    [currentUser, selectedTask]
-  );
-
-  const editComment = useCallback(
-    async (taskId: string, commentId: string, message: string) => {
-      if (!currentUser) {
-        return undefined;
-      }
-
-      try {
-        const task = await editTaskComment(taskId, commentId, message);
-
-        // Update in tasks list
-        setTasks((prev) => prev.map((t) => (t.id === taskId ? task : t)));
-
-        // Update selected task if it matches
-        if (selectedTask?.id === taskId) {
-          setSelectedTask(task);
-        }
-
-        showSuccessToast(
-          t('server.update-entity-success', { entity: t('label.comment') })
-        );
-
-        return task;
-      } catch (err) {
-        showErrorToast(
-          err as AxiosError,
-          t('server.entity-updating-error', { entity: t('label.comment') })
-        );
-
-        return undefined;
-      }
-    },
-    [currentUser, selectedTask]
-  );
-
-  const deleteComment = useCallback(
-    async (taskId: string, commentId: string) => {
-      if (!currentUser) {
-        return undefined;
-      }
-
-      try {
-        const task = await deleteTaskComment(taskId, commentId);
-
-        // Update in tasks list
-        setTasks((prev) => prev.map((t) => (t.id === taskId ? task : t)));
-
-        // Update selected task if it matches
-        if (selectedTask?.id === taskId) {
-          setSelectedTask(task);
-        }
-
-        showSuccessToast(
-          t('server.delete-entity-success', { entity: t('label.comment') })
-        );
-
-        return task;
-      } catch (err) {
-        showErrorToast(
-          err as AxiosError,
-          t('server.delete-entity-error', { entity: t('label.comment') })
-        );
-
-        return undefined;
-      }
-    },
-    [currentUser, selectedTask]
-  );
-
-  const refreshTask = useCallback(
-    async (id: string) => {
-      try {
-        const response = await getTaskById(id, { fields: TASK_FIELDS });
-        const task = response.data;
-
-        // Update in tasks list
-        setTasks((prev) => prev.map((t) => (t.id === id ? task : t)));
-
-        // Update selected task if it matches
-        if (selectedTask?.id === id) {
-          setSelectedTask(task);
-        }
-      } catch {
-        // Silently fail refresh
-      }
-    },
-    [selectedTask]
-  );
-
-  const updateTestCaseIncidentStatus = useCallback(
-    (status: TestCaseResolutionStatus[]) => {
-      setTestCaseResolutionStatus(status);
-    },
-    []
-  );
-
-  const contextValue = useMemo(
-    () => ({
-      tasks,
-      selectedTask,
-      loading,
-      isCommentsLoading,
-      isTestCaseResolutionLoading,
-      testCaseResolutionStatus,
-      paging,
-      fetchTasks,
-      fetchMyAssignedTasks,
-      fetchMyCreatedTasks,
-      fetchMyOwnedTasks,
-      fetchTaskById,
-      createNewTask,
-      updateTask,
-      resolveTaskById,
-      closeTaskById,
-      addComment,
-      editComment,
-      deleteComment,
-      setSelectedTask,
-      refreshTask,
-      updateTestCaseIncidentStatus,
-    }),
-    [
-      tasks,
-      selectedTask,
-      loading,
-      isCommentsLoading,
-      isTestCaseResolutionLoading,
-      testCaseResolutionStatus,
-      paging,
-      fetchTasks,
-      fetchMyAssignedTasks,
-      fetchMyCreatedTasks,
-      fetchMyOwnedTasks,
-      fetchTaskById,
-      createNewTask,
-      updateTask,
-      resolveTaskById,
-      closeTaskById,
-      addComment,
-      editComment,
-      deleteComment,
-      refreshTask,
-      updateTestCaseIncidentStatus,
-    ]
-  );
-
-  return (
-    <TaskContext.Provider value={contextValue}>{children}</TaskContext.Provider>
-  );
-};
-
-export const useTaskProvider = () => useContext(TaskContext);
-
-export default TaskProvider;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskProvider/index.ts b/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskProvider/index.ts
deleted file mode 100644
index cf766cfa4a5d..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskProvider/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-export { TaskProvider, useTaskProvider } from './TaskProvider';
-export type {
-  TaskProviderContextType,
-  TaskProviderProps,
-} from './TaskProvider.interface';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/Workflows/Edges/WorkflowEdge/WorkflowEdge.tsx b/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/Workflows/Edges/WorkflowEdge/WorkflowEdge.tsx
deleted file mode 100644
index f9b4a58fc2ca..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/Workflows/Edges/WorkflowEdge/WorkflowEdge.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *  Copyright 2026 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, Menu, Popover } from 'antd';
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  BaseEdge,
-  EdgeLabelRenderer,
-  EdgeProps,
-  getSmoothStepPath,
-} from 'reactflow';
-import {
-  WORKFLOW_EDGE_BTN_HEIGHT,
-  WORKFLOW_EDGE_BTN_WIDTH,
-} from '../../../../../constants/Workflow.constants';
-import { useWorkflowStore } from '../../useWorkflowStore';
-import './workflow-edge.less';
-
-// Constants for button size
-const [buttonWidth, buttonHeight] = [
-  WORKFLOW_EDGE_BTN_WIDTH,
-  WORKFLOW_EDGE_BTN_HEIGHT,
-];
-
-export const WorkflowEdge = (props: EdgeProps) => {
-  const {
-    id,
-    sourceX,
-    sourceY,
-    targetX,
-    targetY,
-    sourcePosition,
-    targetPosition,
-    label,
-    markerEnd,
-  } = props;
-  const { t } = useTranslation();
-  const { isEditMode } = useWorkflowStore();
-
-  const menu = (
-    <Menu>
-      <Menu.Item key="task">{t('label.task')}</Menu.Item>
-      <Menu.Item key="end">{t('label.end')}</Menu.Item>
-      <Menu.Item key="condition">{t('label.condition')}</Menu.Item>
-    </Menu>
-  );
-
-  // Get the smooth step path from the helper function
-  const [path, labelX, labelY] = getSmoothStepPath({
-    sourceX,
-    sourceY,
-    sourcePosition,
-    targetX,
-    targetY,
-    targetPosition,
-  });
-
-  const edgeLabel = React.useMemo(() => {
-    const commonStyle = {
-      position: 'absolute',
-      transform: `translate(-50%, -50%) translate(${labelX}px, ${labelY}px)`,
-      pointerEvents: 'all',
-    };
-
-    return isEditMode ? (
-      <Popover content={menu} trigger="click">
-        <Button
-          icon={<PlusOutlined />}
-          shape="circle"
-          style={
-            {
-              ...commonStyle,
-              width: buttonWidth,
-              height: buttonHeight,
-            } as React.CSSProperties
-          }
-        />
-      </Popover>
-    ) : label ? (
-      <div
-        className="workflow-edge-label"
-        style={commonStyle as React.CSSProperties}>
-        {label}
-      </div>
-    ) : null;
-  }, [isEditMode, label, labelX, labelY, menu]);
-
-  return (
-    <>
-      {/* Use the path string */}
-      <BaseEdge id={id} markerEnd={markerEnd} path={path} />
-      <EdgeLabelRenderer>{edgeLabel}</EdgeLabelRenderer>
-    </>
-  );
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/Workflows/Nodes/EndNode/EndNode.tsx b/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/Workflows/Nodes/EndNode/EndNode.tsx
deleted file mode 100644
index d05171b580ed..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/Workflows/Nodes/EndNode/EndNode.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Copyright 2026 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import { StopOutlined } from '@ant-design/icons';
-import { Typography } from 'antd';
-import { useTranslation } from 'react-i18next';
-import { Handle, Position } from 'reactflow';
-
-const EndNode = () => {
-  const { t } = useTranslation();
-
-  return (
-    <div className="end-node">
-      <StopOutlined />
-      <Typography.Text className="text-white">{t('label.end')}</Typography.Text>
-      <Handle isConnectable={false} position={Position.Top} type="target" />
-    </div>
-  );
-};
-
-export default EndNode;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/Workflows/Nodes/StartNode/StartNode.tsx b/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/Workflows/Nodes/StartNode/StartNode.tsx
deleted file mode 100644
index 2c0538bc3ea8..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/Workflows/Nodes/StartNode/StartNode.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  Copyright 2026 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import { CaretRightOutlined } from '@ant-design/icons';
-import { Typography } from 'antd';
-import { useTranslation } from 'react-i18next';
-import { Handle, Position } from 'reactflow';
-
-const StartNode = () => {
-  const { t } = useTranslation();
-
-  return (
-    <div className="start-node">
-      <CaretRightOutlined />
-      <Typography.Text className="text-white">
-        {t('label.start')}
-      </Typography.Text>
-      <Handle isConnectable={false} position={Position.Bottom} type="source" />
-    </div>
-  );
-};
-
-export default StartNode;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/Workflows/Nodes/WorkflowTaskNode/WorkflowTaskNode.tsx b/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/Workflows/Nodes/WorkflowTaskNode/WorkflowTaskNode.tsx
deleted file mode 100644
index 10f0e43b888e..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/WorkflowDefinitions/Workflows/Nodes/WorkflowTaskNode/WorkflowTaskNode.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright 2026 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import { Space, Typography } from 'antd';
-import classNames from 'classnames';
-import { useMemo } from 'react';
-import { Handle, Node, Position } from 'reactflow';
-import { getEntityName } from '../../../../../utils/EntityUtils';
-import { ReactComponent as TaskIcon } from '../../../../assets/svg/workflow-task.svg';
-import { useWorkflowStore } from '../../useWorkflowStore';
-import './task-node.less';
-
-const WorkflowTaskNode = ({ data }: Node['data']) => {
-  const { setDrawerVisible, setSelectedNode, selectedNode } =
-    useWorkflowStore();
-
-  const isActive = useMemo(() => {
-    return selectedNode?.name === data.name;
-  }, [selectedNode]);
-
-  const handleNodeClick = () => {
-    setSelectedNode(data);
-    setDrawerVisible(true);
-  };
-
-  const taskHeading = data.config.rules ? 'CHECK' : 'ACTION';
-
-  return (
-    <div
-      className={classNames('task-node', { active: isActive })}
-      onClick={handleNodeClick}>
-      <div className="task-node-header">
-        <TaskIcon height={30} width={30} />
-        <Space className="m-l-xs" direction="vertical" size={0}>
-          <Typography.Text className="text-grey-muted">
-            {taskHeading}
-          </Typography.Text>
-          <Typography.Text strong>{getEntityName(data)}</Typography.Text>
-        </Space>
-      </div>
-      <Handle isConnectable={false} position={Position.Bottom} type="source" />
-      <Handle isConnectable={false} position={Position.Top} type="target" />
-    </div>
-  );
-};
-
-export default WorkflowTaskNode;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/DataProductsSection/index.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/DataProductsSection/index.ts
deleted file mode 100644
index 8c3f908744db..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/DataProductsSection/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-export { default } from './DataProductsSection';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/DescriptionSection/index.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/DescriptionSection/index.ts
deleted file mode 100644
index 08fb1565b16d..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/DescriptionSection/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-export { default } from './DescriptionSection';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/DomainsSection/index.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/DomainsSection/index.ts
deleted file mode 100644
index 4349379b985b..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/DomainsSection/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-export { default } from './DomainsSection';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/EntityDetailsSection/index.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityDetailsSection/index.ts
deleted file mode 100644
index 7b8252c07cbb..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/EntityDetailsSection/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-export { default } from './EntityDetailsSection';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FileUpload/index.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/FileUpload/index.ts
deleted file mode 100644
index c696afeedd97..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FileUpload/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-export { default as MUIFileUpload } from './MUIFileUpload';
-export type {
-  FileUploadFileValue,
-  FileUploadUrlValue,
-  FileUploadValue,
-  FileValidationResult,
-  MUIFileUploadProps,
-} from './MUIFileUpload.interface';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/GlossaryTermsSection/index.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/GlossaryTermsSection/index.ts
deleted file mode 100644
index 5e23b9054537..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/GlossaryTermsSection/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-export { default } from './GlossaryTermsSection';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/LastRunGraph/LastRunGraph.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/LastRunGraph/LastRunGraph.component.tsx
deleted file mode 100644
index c0236391fd89..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/LastRunGraph/LastRunGraph.component.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *  Copyright 2023 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import classNames from 'classnames';
-import './last-run-graph.style.less';
-
-export const StatusBox = ({ status }: { status?: string }) => {
-  return <div className={classNames('last-run-box', status)} />;
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/MUIUserTeamSelect/index.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/MUIUserTeamSelect/index.ts
deleted file mode 100644
index 71f37038a47b..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/MUIUserTeamSelect/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-export { default as MUIUserTeamSelect } from './MUIUserTeamSelect';
-export type { MUIUserTeamSelectProps } from './MUIUserTeamSelect';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/MuiComponents/RequiredLabel/RequiredLabel.styled.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/MuiComponents/RequiredLabel/RequiredLabel.styled.tsx
deleted file mode 100644
index 5a777eb954ed..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/MuiComponents/RequiredLabel/RequiredLabel.styled.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { styled, Typography } from '@mui/material';
-
-export const RequiredLabel = styled(Typography)(({ theme }) => ({
-  fontSize: 13,
-  fontWeight: 500,
-  color: theme.palette.grey[800],
-  '&::after': { content: '" *"', color: theme.palette.error.main },
-}));
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/OverviewSection/index.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/OverviewSection/index.ts
deleted file mode 100644
index 1e1967fa72ab..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/OverviewSection/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-export { default } from './OverviewSection';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/OwnersSection/index.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/OwnersSection/index.ts
deleted file mode 100644
index b81f93285fe4..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/OwnersSection/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-export { default } from './OwnersSection';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePictureNew.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePictureNew.tsx
deleted file mode 100644
index 562eaaabc5c3..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePictureNew.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *  Copyright 2022 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { Avatar, Tooltip } from 'antd';
-import classNames from 'classnames';
-import { parseInt } from 'lodash';
-import { ImageShape } from 'Models';
-import { useMemo } from 'react';
-import { Link } from 'react-router-dom';
-import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider';
-import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface';
-import { User } from '../../../generated/entity/teams/user';
-import { useUserProfile } from '../../../hooks/user-profile/useUserProfile';
-import { getRandomColor } from '../../../utils/CommonUtils';
-import { userPermissions } from '../../../utils/PermissionsUtils';
-import { getUserPath } from '../../../utils/RouterUtils';
-import Loader from '../Loader/Loader';
-import UserPopOverCard from '../PopOverCard/UserPopOverCard';
-
-type UserData = Pick<User, 'name' | 'displayName'>;
-
-interface Props extends UserData {
-  width?: string;
-  type?: ImageShape;
-  className?: string;
-  height?: string;
-  isTeam?: boolean;
-  size?: number | 'small' | 'default' | 'large';
-  avatarType?: 'solid' | 'outlined';
-}
-
-const ProfilePictureNew = ({
-  name,
-  displayName,
-  className = '',
-  type = 'circle',
-  width = '36',
-  height,
-  isTeam = false,
-  size,
-  avatarType = 'solid',
-}: Props) => {
-  const { permissions } = usePermissionProvider();
-  const { color, character, backgroundColor } = getRandomColor(
-    displayName ?? name
-  );
-
-  const viewUserPermission = useMemo(() => {
-    return userPermissions.hasViewPermissions(ResourceEntity.USER, permissions);
-  }, [permissions]);
-
-  const [profileURL, isPicLoading] = useUserProfile({
-    permission: viewUserPermission,
-    name,
-    isTeam,
-  });
-
-  const getAvatarByName = () => {
-    const avatar = (
-      <Avatar
-        className={classNames('flex-center', className)}
-        data-testid="profile-avatar"
-        icon={character}
-        shape={type}
-        size={size ?? parseInt(width)}
-        style={{
-          color: avatarType === 'solid' ? 'default' : color,
-          backgroundColor: avatarType === 'solid' ? color : backgroundColor,
-          fontWeight: avatarType === 'solid' ? 400 : 500,
-          border: `0.5px solid ${avatarType === 'solid' ? 'default' : color}`,
-        }}
-      />
-    );
-
-    return (
-      <UserPopOverCard userName={name ?? ''}>
-        <Link className="no-underline" to={getUserPath(name ?? '')}>
-          {avatar}
-        </Link>
-      </UserPopOverCard>
-    );
-  };
-
-  const getAvatarElement = () => {
-    return isPicLoading ? (
-      <div
-        className="d-inline-block relative"
-        style={{
-          height: typeof size === 'number' ? `${size}px` : height,
-          width: typeof size === 'number' ? `${size}px` : width,
-        }}>
-        {getAvatarByName()}
-        <div
-          className="absolute inset-0 opacity-60 bg-grey-4 rounded-full"
-          data-testid="loader-cntnr">
-          <Loader
-            className="absolute inset-0"
-            size="small"
-            style={{
-              height: typeof size === 'number' ? `${size}px` : `${+width}px`,
-              width: typeof size === 'number' ? `${size}px` : `${+width}px`,
-            }}
-            type="white"
-          />
-        </div>
-      </div>
-    ) : (
-      getAvatarByName()
-    );
-  };
-
-  return profileURL ? (
-    <Tooltip placement="top" title={displayName ?? name}>
-      <Link
-        className="d-flex no-underline"
-        data-testid="owner-link"
-        to={getUserPath(name ?? '')}>
-        <Avatar
-          className={className}
-          data-testid="profile-image"
-          shape={type}
-          size={size ?? parseInt(width)}
-          src={profileURL}
-        />
-      </Link>
-    </Tooltip>
-  ) : (
-    getAvatarElement()
-  );
-};
-
-export default ProfilePictureNew;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/SectionWithEdit/index.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/SectionWithEdit/index.ts
deleted file mode 100644
index 053792cdade2..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/SectionWithEdit/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-export { default } from './SectionWithEdit';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryDataProducts/SummaryDataProducts.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryDataProducts/SummaryDataProducts.tsx
deleted file mode 100644
index b9f3ee014d2b..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryDataProducts/SummaryDataProducts.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import { Col, Row, Tag, Typography } from 'antd';
-import { useCallback, useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
-import { ReactComponent as DataProductIcon } from '../../../assets/svg/ic-data-product.svg';
-import { DataProduct } from '../../../generated/entity/domains/dataProduct';
-import { getEntityName } from '../../../utils/EntityUtils';
-import { getDataProductDetailsPath } from '../../../utils/RouterUtils';
-import { SearchedDataProps } from '../../SearchedData/SearchedData.interface';
-const SummaryDataProducts = ({
-  dataAsset,
-}: {
-  dataAsset: SearchedDataProps['data'][number]['_source'] & {
-    dataProducts: DataProduct[];
-  };
-}) => {
-  const { t } = useTranslation();
-  const navigate = useNavigate();
-
-  const dataProducts = useMemo(() => {
-    return dataAsset?.dataProducts ?? [];
-  }, [dataAsset]);
-
-  const redirectLink = useCallback((fqn: string) => {
-    navigate(getDataProductDetailsPath(fqn));
-  }, []);
-
-  return (
-    <Row className="p-md border-radius-card summary-panel-card" gutter={[0, 8]}>
-      <Col span={24}>
-        <Typography.Text
-          className="summary-panel-section-title"
-          data-testid="data-products-header">
-          {t('label.data-product-plural')}
-        </Typography.Text>
-      </Col>
-      <Col className="d-flex flex-wrap gap-2" span={24}>
-        {dataProducts.length > 0 ? (
-          dataProducts.map((product) => {
-            return (
-              <Tag
-                className="tag-chip tag-chip-content"
-                key={`dp-tags-${product.fullyQualifiedName}`}
-                onClick={() => redirectLink(product.fullyQualifiedName ?? '')}>
-                <div className="d-flex w-full">
-                  <div className="d-flex items-center p-x-xs w-full gap-1">
-                    <DataProductIcon
-                      className="align-middle"
-                      height={12}
-                      width={12}
-                    />
-                    <Typography.Paragraph
-                      className="m-0 tags-label"
-                      data-testid={`data-product-${product.fullyQualifiedName}`}>
-                      {getEntityName(product)}
-                    </Typography.Paragraph>
-                  </div>
-                </div>
-              </Tag>
-            );
-          })
-        ) : (
-          <Typography.Text className="text-sm no-data-chip-placeholder">
-            {t('label.no-data-found')}
-          </Typography.Text>
-        )}
-      </Col>
-    </Row>
-  );
-};
-
-export default SummaryDataProducts;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TagsSection/index.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/TagsSection/index.ts
deleted file mode 100644
index c23e4c39386e..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/TagsSection/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-export { default } from './TagsSection';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/UserTeamSelect/UserTeamSelect.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/UserTeamSelect/UserTeamSelect.component.tsx
deleted file mode 100644
index 87f62da95c5f..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/UserTeamSelect/UserTeamSelect.component.tsx
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- *  Copyright 2023 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-import Icon from '@ant-design/icons/lib/components/Icon';
-import { Input, Select, Space, Spin, Tabs, Typography } from 'antd';
-import { debounce, noop } from 'lodash';
-import { useCallback, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { ReactComponent as IconTeamsGrey } from '../../../assets/svg/teams-grey.svg';
-import { ReactComponent as IconUser } from '../../../assets/svg/user.svg';
-import {
-  ADD_USER_CONTAINER_HEIGHT,
-  PAGE_SIZE_MEDIUM,
-} from '../../../constants/constants';
-import { EntityType } from '../../../enums/entity.enum';
-import { SearchIndex } from '../../../enums/search.enum';
-import { EntityReference } from '../../../generated/entity/data/table';
-import { searchQuery } from '../../../rest/searchAPI';
-import {
-  formatTeamsResponse,
-  formatUsersResponse,
-} from '../../../utils/APIUtils';
-import { getCountBadge } from '../../../utils/CommonUtils';
-import {
-  getEntityName,
-  getEntityReferenceListFromEntities,
-} from '../../../utils/EntityUtils';
-import { getTermQuery } from '../../../utils/SearchUtils';
-import { UserTag } from '../UserTag/UserTag.component';
-import { UserTagSize } from '../UserTag/UserTag.interface';
-import './user-team-select.less';
-import { UserTeamSelectProps } from './UserTeamSelect.interface';
-
-export const TeamOptionRenderer = (props: EntityReference) => {
-  return (
-    <Space>
-      <Icon component={IconTeamsGrey} style={{ fontSize: '16px' }} />
-      <Typography.Text>{getEntityName(props)}</Typography.Text>
-    </Space>
-  );
-};
-
-export const UserOptionRenderer = (props: EntityReference) => {
-  return (
-    <Space>
-      <Icon component={IconUser} style={{ fontSize: '16px' }} />
-      <Typography.Text>{getEntityName(props)}</Typography.Text>
-    </Space>
-  );
-};
-
-export const UserTeamSelect = ({
-  value = [],
-  onChange = noop,
-  placeholder,
-  multiple = { user: true, team: true },
-  disabled = false,
-  showSearch = true,
-  allowClear = true,
-  size = 'middle',
-  className,
-  style,
-}: UserTeamSelectProps) => {
-  const { t } = useTranslation();
-  const [open, setOpen] = useState(false);
-  const [activeTab, setActiveTab] = useState<'teams' | 'users'>('teams');
-  const [searchText, setSearchText] = useState('');
-  const [loading, setLoading] = useState(false);
-  const [count, setCount] = useState({ team: 0, user: 0 });
-  const [userOptions, setUserOptions] = useState<EntityReference[]>([]);
-  const [teamOptions, setTeamOptions] = useState<EntityReference[]>([]);
-  const [userPage, setUserPage] = useState(1);
-  const [teamPage, setTeamPage] = useState(1);
-  const [hasMoreUsers, setHasMoreUsers] = useState(true);
-  const [hasMoreTeams, setHasMoreTeams] = useState(true);
-
-  const isMultiUser = multiple.user;
-  const isMultiTeam = multiple.team;
-
-  const fetchUserOptions = async (searchTerm: string, page = 1) => {
-    setLoading(true);
-    try {
-      const res = await searchQuery({
-        query: searchTerm,
-        pageNumber: page,
-        pageSize: PAGE_SIZE_MEDIUM,
-        queryFilter: getTermQuery({ isBot: 'false' }),
-        sortField: 'displayName.keyword',
-        sortOrder: 'asc',
-        searchIndex: SearchIndex.USER,
-      });
-
-      const data = getEntityReferenceListFromEntities(
-        formatUsersResponse(res.hits.hits),
-        EntityType.USER
-      );
-
-      setCount((pre) => ({ ...pre, user: res.hits.total.value }));
-      setHasMoreUsers(data.length === PAGE_SIZE_MEDIUM);
-
-      if (page === 1) {
-        setUserOptions(data);
-      } else {
-        setUserOptions((prev) => [...prev, ...data]);
-      }
-
-      return data;
-    } catch (error) {
-      return [];
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const fetchTeamOptions = async (searchTerm: string, page = 1) => {
-    setLoading(true);
-    try {
-      const res = await searchQuery({
-        query: searchTerm || '',
-        pageNumber: page,
-        pageSize: PAGE_SIZE_MEDIUM,
-        queryFilter: getTermQuery({}, 'must', undefined, {
-          matchTerms: { teamType: 'Group' },
-        }),
-        sortField: 'displayName.keyword',
-        sortOrder: 'asc',
-        searchIndex: SearchIndex.TEAM,
-      });
-
-      const data = getEntityReferenceListFromEntities(
-        formatTeamsResponse(res.hits.hits),
-        EntityType.TEAM
-      );
-
-      setCount((pre) => ({ ...pre, team: res.hits.total.value }));
-      setHasMoreTeams(data.length === PAGE_SIZE_MEDIUM);
-
-      if (page === 1) {
-        setTeamOptions(data);
-      } else {
-        setTeamOptions((prev) => [...prev, ...data]);
-      }
-
-      return data;
-    } catch (error) {
-      return [];
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const debouncedSearch = useCallback(
-    debounce((searchTerm: string) => {
-      if (activeTab === 'users') {
-        setUserPage(1);
-        fetchUserOptions(searchTerm, 1);
-      } else {
-        setTeamPage(1);
-        fetchTeamOptions(searchTerm, 1);
-      }
-    }, 300),
-    [activeTab]
-  );
-
-  const handleSearch = (searchTerm: string) => {
-    setSearchText(searchTerm);
-    debouncedSearch(searchTerm);
-  };
-
-  const handleTabChange = (key: string) => {
-    setActiveTab(key as 'teams' | 'users');
-    setSearchText('');
-    if (key === 'users' && userOptions.length === 0) {
-      fetchUserOptions('', 1);
-    } else if (key === 'teams' && teamOptions.length === 0) {
-      fetchTeamOptions('', 1);
-    }
-  };
-
-  const handleSelect = (selectedValue: string) => {
-    const currentOptions = activeTab === 'users' ? userOptions : teamOptions;
-    const selectedItem = currentOptions.find(
-      (item) => item.id === selectedValue
-    );
-
-    if (selectedItem) {
-      const isTeam = selectedItem.type === EntityType.TEAM;
-      const isUser = selectedItem.type === EntityType.USER;
-
-      // Check if multiple selection is allowed for this type
-      const allowMultiple = (isTeam && isMultiTeam) || (isUser && isMultiUser);
-
-      let newValue: EntityReference[];
-      if (allowMultiple) {
-        // Add to existing selection
-        newValue = [...value, selectedItem];
-      } else {
-        // Replace existing selection of the same type
-        newValue = value.filter((item) => item.type !== selectedItem.type);
-        newValue.push(selectedItem);
-      }
-
-      onChange(newValue);
-
-      // Close dropdown if single selection
-      if (!allowMultiple) {
-        setOpen(false);
-      }
-    }
-  };
-
-  const handleDeselect = (deselectedValue: string) => {
-    const newValue = value.filter((item) => item.id !== deselectedValue);
-    onChange(newValue);
-  };
-
-  const handleLoadMore = () => {
-    if (activeTab === 'users' && hasMoreUsers && !loading) {
-      const nextPage = userPage + 1;
-      setUserPage(nextPage);
-      fetchUserOptions(searchText, nextPage);
-    } else if (activeTab === 'teams' && hasMoreTeams && !loading) {
-      const nextPage = teamPage + 1;
-      setTeamPage(nextPage);
-      fetchTeamOptions(searchText, nextPage);
-    }
-  };
-
-  const renderOption = (option: EntityReference) => {
-    const isSelected = value.some((item) => item.id === option.id);
-
-    return (
-      <Select.Option
-        className={isSelected ? 'selected-option' : ''}
-        disabled={isSelected}
-        key={option.id}
-        value={option.id}>
-        {option.type === EntityType.TEAM ? (
-          <TeamOptionRenderer {...option} />
-        ) : (
-          <UserOptionRenderer {...option} />
-        )}
-      </Select.Option>
-    );
-  };
-
-  const renderSelectedValue = () => {
-    if (value.length === 0) {
-      return null;
-    }
-
-    return value.map((item) => (
-      <UserTag
-        closable
-        id={item.name ?? ''}
-        isTeam={item.type === EntityType.TEAM}
-        key={item.id}
-        name={getEntityName(item)}
-        size={UserTagSize.small}
-        onRemove={() => handleDeselect(item.id)}
-      />
-    ));
-  };
-
-  const dropdownRender = (_menu: React.ReactElement) => (
-    <div className="user-team-select-dropdown">
-      <Tabs
-        activeKey={activeTab}
-        items={[
-          {
-            label: (
-              <>
-                {t('label.team-plural')}{' '}
-                {getCountBadge(count.team, '', activeTab === 'teams')}
-              </>
-            ),
-            key: 'teams',
-          },
-          {
-            label: (
-              <>
-                {t('label.user-plural')}
-                {getCountBadge(count.user, '', activeTab === 'users')}
-              </>
-            ),
-            key: 'users',
-          },
-        ]}
-        size="small"
-        onChange={handleTabChange}
-      />
-
-      {showSearch && (
-        <div className="search-container">
-          <Input.Search
-            loading={loading}
-            placeholder={t('label.search-for-type', {
-              type: activeTab === 'users' ? t('label.user') : t('label.team'),
-            })}
-            value={searchText}
-            onChange={(e) => handleSearch(e.target.value)}
-          />
-        </div>
-      )}
-
-      <div
-        className="options-container"
-        style={{ maxHeight: ADD_USER_CONTAINER_HEIGHT, overflowY: 'auto' }}>
-        {loading && (
-          <div className="loading-container">
-            <Spin size="small" />
-          </div>
-        )}
-
-        {(activeTab === 'users' ? userOptions : teamOptions).map(renderOption)}
-
-        {((activeTab === 'users' && hasMoreUsers) ||
-          (activeTab === 'teams' && hasMoreTeams)) && (
-          <div className="load-more-container">
-            <Typography.Link disabled={loading} onClick={handleLoadMore}>
-              {t('label.load-more')}
-            </Typography.Link>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-
-  // Initialize data when dropdown opens
-  useEffect(() => {
-    if (open) {
-      if (activeTab === 'users' && userOptions.length === 0) {
-        fetchUserOptions('', 1);
-      } else if (activeTab === 'teams' && teamOptions.length === 0) {
-        fetchTeamOptions('', 1);
-      }
-    }
-  }, [open, activeTab]);
-
-  return (
-    <Select
-      allowClear={allowClear}
-      className={className}
-      disabled={disabled}
-      dropdownRender={dropdownRender}
-      dropdownStyle={{ padding: 0 }}
-      mode="multiple"
-      open={open}
-      placeholder={
-        placeholder ||
-        t('label.select-entity', { entity: t('label.owner-plural') })
-      }
-      size={size}
-      style={style}
-      suffixIcon={null}
-      tagRender={() => <></>} // We'll render tags manually
-      value={value.map((item) => item.id)}
-      onDeselect={handleDeselect}
-      onDropdownVisibleChange={setOpen}
-      onSelect={handleSelect}>
-      {/* Render selected values */}
-      <div className="selected-values-container">{renderSelectedValue()}</div>
-    </Select>
-  );
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/UserTeamSelect/UserTeamSelect.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/UserTeamSelect/UserTeamSelect.interface.ts
deleted file mode 100644
index f72c8ed7e339..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/UserTeamSelect/UserTeamSelect.interface.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright 2023 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { EntityReference } from '../../../generated/entity/data/table';
-
-export interface UserTeamSelectProps {
-  /** Selected values (users and teams) */
-  value?: EntityReference[];
-  /** Callback when selection changes */
-  onChange?: (value: EntityReference[]) => void;
-  /** Placeholder text */
-  placeholder?: string;
-  /** Configure multiple selection for users and teams */
-  multiple?: {
-    user: boolean;
-    team: boolean;
-  };
-  /** Whether the select is disabled */
-  disabled?: boolean;
-  /** Whether to show search functionality */
-  showSearch?: boolean;
-  /** Whether to show clear button */
-  allowClear?: boolean;
-  /** Size of the select component */
-  size?: 'small' | 'middle' | 'large';
-  /** Additional CSS class name */
-  className?: string;
-  /** Inline styles */
-  style?: React.CSSProperties;
-  /** Label for accessibility */
-  label?: string;
-  /** Maximum height for options container */
-  optionsHeight?: number;
-  /** Whether to show user count badges */
-  showCount?: boolean;
-  /** Default active tab */
-  defaultActiveTab?: 'teams' | 'users';
-}
-
-export interface UserTeamSelectRef {
-  /** Clear all selections */
-  clear: () => void;
-  /** Focus the select component */
-  focus: () => void;
-  /** Blur the select component */
-  blur: () => void;
-  /** Get current form values */
-  getValue: () => EntityReference[];
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/asyncTreeSelect/index.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/asyncTreeSelect/index.ts
deleted file mode 100644
index 052fd4b0a5d7..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/asyncTreeSelect/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-export * from './types';
-export { useAsyncTreeSelect } from './useAsyncTreeSelect';
-export { useTreeData } from './useTreeData';
-export { useTreeExpansion } from './useTreeExpansion';
-export { useTreeSearch } from './useTreeSearch';
-export { useTreeSelection } from './useTreeSelection';
-export { useTreeVirtualization } from './useTreeVirtualization';
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/data/useQueryBuilder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/data/useQueryBuilder.tsx
deleted file mode 100644
index 274ab2c8d486..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/data/useQueryBuilder.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { useMemo } from 'react';
-import { UrlState } from '../shared/types';
-
-interface QueryConfig {
-  [filterKey: string]: string;
-}
-
-interface UseQueryBuilderProps {
-  urlState: UrlState;
-  queryConfig: QueryConfig;
-  baseFilter?: string;
-}
-
-export const useQueryBuilder = ({
-  urlState,
-  queryConfig,
-  baseFilter = '',
-}: UseQueryBuilderProps) => {
-  const filterQuery = useMemo(() => {
-    const filterParts: string[] = [];
-
-    if (baseFilter) {
-      filterParts.push(baseFilter);
-    }
-
-    Object.entries(urlState.filters).forEach(([filterKey, values]) => {
-      if (Array.isArray(values) && values.length > 0) {
-        const queryField = queryConfig[filterKey];
-        if (queryField) {
-          const formattedValues = values
-            .map((value: string) => `"${value.replace(/"/g, '\\"')}"`)
-            .join(' OR ');
-          filterParts.push(`(${queryField}:(${formattedValues}))`);
-        }
-      }
-    });
-
-    return filterParts.join(' AND ');
-  }, [urlState.filters, queryConfig, baseFilter]);
-
-  return {
-    filterQuery,
-  };
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/shared/utils/entityFilterProcessors.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/shared/utils/entityFilterProcessors.ts
deleted file mode 100644
index 5d13acfa8ea7..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/shared/utils/entityFilterProcessors.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *  Copyright 2023 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { SearchDropdownOption } from '../../../../SearchDropdown/SearchDropdown.interface';
-
-interface AggregationBucket {
-  key: string;
-  doc_count: number;
-}
-
-interface AggregationResult {
-  status: 'fulfilled' | 'rejected';
-  value?: {
-    data: {
-      aggregations: Record<string, { buckets: AggregationBucket[] }>;
-    };
-  };
-  reason?: unknown;
-}
-
-export const processGenericOptions = (
-  result: AggregationResult,
-  aggregationKey?: string
-): SearchDropdownOption[] => {
-  if (result.status !== 'fulfilled') {
-    return [];
-  }
-
-  // Find the aggregation buckets - try common patterns
-  let buckets: AggregationBucket[] = [];
-
-  if (aggregationKey && result.value?.data.aggregations[aggregationKey]) {
-    buckets = result.value.data.aggregations[aggregationKey].buckets || [];
-  } else {
-    // Try to find buckets in any aggregation
-    const aggregations = result.value?.data.aggregations || {};
-    const aggregationValues = Object.values(aggregations);
-    if (aggregationValues.length > 0) {
-      buckets =
-        (aggregationValues[0] as { buckets?: AggregationBucket[] })?.buckets ||
-        [];
-    }
-  }
-
-  return buckets.map((bucket) => ({
-    key: bucket.key,
-    label: bucket.key,
-    count: bucket.doc_count,
-  }));
-};
-
-export const processOwnerOptions = (
-  result: AggregationResult
-): SearchDropdownOption[] => {
-  return processGenericOptions(result, 'sterms#ownerDisplayName');
-};
-
-export const processTagOptions = (
-  result: AggregationResult
-): SearchDropdownOption[] => {
-  return processGenericOptions(result, 'sterms#tags.tagFQN');
-};
-
-export const processDomainTypeOptions = (
-  result: AggregationResult
-): SearchDropdownOption[] => {
-  const options = processGenericOptions(result, 'sterms#domainType');
-
-  // Fallback to static options if no data
-  if (options.length === 0) {
-    return [
-      { key: 'Aggregate', label: 'Aggregate' },
-      { key: 'Consumer-aligned', label: 'Consumer-aligned' },
-      { key: 'Source-aligned', label: 'Source-aligned' },
-    ];
-  }
-
-  return options;
-};
-
-// Tag filtering utilities
-export const filterTagsBySource = (
-  allTagOptions: SearchDropdownOption[],
-  source: 'Classification' | 'Glossary'
-): SearchDropdownOption[] => {
-  if (source === 'Classification') {
-    return allTagOptions.filter(
-      (tag) =>
-        tag.key.includes('Classification') ||
-        tag.key.includes('.Classification.') ||
-        tag.key.startsWith('PII') ||
-        tag.key.startsWith('Sensitive') ||
-        !tag.key.includes('Glossary') // Fallback for non-glossary tags
-    );
-  } else {
-    return allTagOptions.filter(
-      (tag) =>
-        tag.key.includes('Glossary') ||
-        tag.key.includes('.Glossary.') ||
-        (!tag.key.includes('Classification') &&
-          !tag.key.includes('PII') &&
-          !tag.key.includes('Sensitive'))
-    );
-  }
-};
-
-export const processTagSourceOptions = (
-  tagSourceResult: AggregationResult,
-  tagsResult: AggregationResult
-): {
-  classificationTags: SearchDropdownOption[];
-  glossaryTerms: SearchDropdownOption[];
-} => {
-  if (
-    tagSourceResult.status !== 'fulfilled' ||
-    tagsResult.status !== 'fulfilled'
-  ) {
-    return { classificationTags: [], glossaryTerms: [] };
-  }
-
-  const allTagOptions = processTagOptions(tagsResult);
-
-  return {
-    classificationTags: filterTagsBySource(allTagOptions, 'Classification'),
-    glossaryTerms: filterTagsBySource(allTagOptions, 'Glossary'),
-  };
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/TagsCell.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/TagsCell.tsx
deleted file mode 100644
index 4b9ebaf9a6c2..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/TagsCell.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { Box, Chip } from '@mui/material';
-import { useEffect, useLayoutEffect, useRef, useState } from 'react';
-import { TagChip } from '../TagChip';
-
-interface TagsCellProps {
-  tags: Array<{
-    id?: string;
-    name?: string;
-    tagFQN?: string;
-    displayName?: string;
-  }>;
-  chipSize?: 'small' | 'large';
-}
-
-const TagsCell = ({ tags, chipSize = 'small' }: TagsCellProps) => {
-  const [visibleCount, setVisibleCount] = useState(tags.length);
-  const [measured, setMeasured] = useState(false);
-  const containerRef = useRef<HTMLDivElement>(null);
-  const measureRef = useRef<HTMLDivElement>(null);
-
-  useLayoutEffect(() => {
-    if (!containerRef.current || !measureRef.current || measured) {
-      return;
-    }
-
-    const containerWidth = containerRef.current.offsetWidth;
-    const GAP = 8;
-    const COUNT_CHIP_WIDTH = 60;
-
-    const chipElements = measureRef.current.querySelectorAll('.measure-chip');
-    let accumulatedWidth = 0;
-    let fitCount = 0;
-
-    chipElements.forEach((chip, index) => {
-      const chipWidth = (chip as HTMLElement).offsetWidth;
-      const totalWidth = accumulatedWidth + (index > 0 ? GAP : 0) + chipWidth;
-
-      const remainingTags = tags.length - index - 1;
-      const needsCountSpace = remainingTags > 0;
-      const maxAllowedWidth = needsCountSpace
-        ? containerWidth - COUNT_CHIP_WIDTH - GAP
-        : containerWidth;
-
-      if (totalWidth <= maxAllowedWidth) {
-        accumulatedWidth = totalWidth;
-        fitCount++;
-      }
-    });
-
-    setVisibleCount(Math.max(1, Math.min(fitCount, 2)));
-    setMeasured(true);
-  }, [tags, measured]);
-
-  useEffect(() => {
-    setMeasured(false);
-    setVisibleCount(tags.length);
-  }, [tags]);
-
-  const hiddenCount = tags.length - visibleCount;
-
-  return (
-    <Box
-      ref={containerRef}
-      sx={{
-        display: 'flex',
-        gap: 1,
-        width: '100%',
-        alignItems: 'center',
-        position: 'relative',
-        minHeight: chipSize === 'small' ? 24 : 32,
-      }}>
-      {!measured && (
-        <Box
-          ref={measureRef}
-          sx={{
-            display: 'flex',
-            gap: 1,
-            position: 'absolute',
-            visibility: 'hidden',
-            top: 0,
-            left: 0,
-            width: '100%',
-          }}>
-          {tags.map((tag, index) => (
-            <TagChip
-              className="measure-chip"
-              key={`measure-${tag.id || index}`}
-              label={tag.name || tag.tagFQN || ''}
-              showEllipsis={false}
-              size={chipSize}
-              sx={{
-                flexShrink: 0,
-                '& .MuiChip-label': {
-                  whiteSpace: 'nowrap',
-                },
-              }}
-            />
-          ))}
-        </Box>
-      )}
-
-      {measured && (
-        <>
-          {tags.slice(0, visibleCount).map((tag, index) => {
-            const isSingleTag = visibleCount === 1;
-
-            let maxWidth = '200px';
-            if (isSingleTag) {
-              maxWidth = hiddenCount > 0 ? 'calc(100% - 70px)' : '100%';
-            }
-
-            return (
-              <TagChip
-                key={tag.id || `${tag.tagFQN}-${index}`}
-                label={tag.displayName || tag.name || tag.tagFQN || ''}
-                maxWidth={maxWidth}
-                size={chipSize}
-              />
-            );
-          })}
-
-          {hiddenCount > 0 && (
-            <Chip
-              color="primary"
-              label={`+${hiddenCount}`}
-              size={chipSize}
-              sx={{
-                border: 'none',
-                fontWeight: 500,
-                flexShrink: 0,
-                minWidth: 'auto',
-              }}
-            />
-          )}
-        </>
-      )}
-    </Box>
-  );
-};
-
-export default TagsCell;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useCardView.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useCardView.tsx
deleted file mode 100644
index 67efb447dc92..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useCardView.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { Box, Card, CardContent } from '@mui/material';
-import { isEmpty } from 'lodash';
-import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { ColumnConfig, ListingData } from '../shared/types';
-import { useCellRenderer } from './useCellRenderer';
-
-interface UseCardViewConfig<T> {
-  listing: ListingData<T>;
-  cardTemplate: (
-    entity: T,
-    renderCell: (entity: T, column: ColumnConfig<T>) => React.ReactNode
-  ) => React.ReactNode;
-}
-
-/**
- * Renders entities in card grid using consumer-defined templates
- *
- * @description
- * Provides flexible card view rendering where the consumer defines the exact
- * card layout structure. Uses the same cell renderers as table view for
- * complete consistency. Consumer provides card template function that
- * receives entity data and renderCell function.
- *
- * @param config.listing - Entity listing data (same as table)
- * @param config.cardTemplate - Function that defines card layout structure
- *
- * @example
- * ```typescript
- * const domainCardTemplate = (entity, renderCell) => (
- *   <>
- *     <Box>{renderCell(entity, nameColumn)}</Box>
- *     <Box sx={{ display: 'flex', gap: 2 }}>
- *       <Box sx={{ flex: 1 }}>{renderCell(entity, tagColumn)}</Box>
- *       <Box sx={{ flex: 1 }}>{renderCell(entity, domainTypeColumn)}</Box>
- *     </Box>
- *     <Box>{renderCell(entity, ownerColumn)}</Box>
- *   </>
- * );
- *
- * const { cardView } = useCardView({
- *   listing: domainListing,
- *   cardTemplate: domainCardTemplate
- * });
- * ```
- *
- * @stability Stable - Uses stable cell renderer
- * @complexity Low - Simple grid with consumer-defined content
- */
-export const useCardView = <T extends { id: string }>({
-  listing,
-  cardTemplate,
-}: UseCardViewConfig<T>) => {
-  const { renderCell } = useCellRenderer({
-    columns: listing.columns,
-    renderers: listing.renderers,
-    chipSize: 'small',
-  });
-  const { t } = useTranslation();
-
-  const cardView = useMemo(
-    () =>
-      isEmpty(listing.entities) ? (
-        <Box
-          sx={{ textAlign: 'center', margin: '16px 24px', padding: '9px 0' }}>
-          {t('server.no-records-found')}
-        </Box>
-      ) : (
-        <Box
-          data-testid="card-view-container"
-          sx={{
-            display: 'grid',
-            gridTemplateColumns: 'repeat(3, 1fr)', // Strict 3 columns
-            gap: 4, // 16px spacing
-            m: 6, // 24px margin
-          }}>
-          {listing.entities.map((entity) => (
-            <Card
-              data-testid="entity-card"
-              elevation={0}
-              key={entity.id}
-              sx={{
-                height: '100%',
-                cursor: 'pointer',
-                boxShadow: 'none',
-                '& .MuiCardContent-root': {
-                  padding: '20px !important',
-                },
-                '& .entity-avatar': {
-                  width: '54px',
-                  height: '54px',
-                  borderRadius: '8px',
-                  '& .MuiAvatar-img': {
-                    width: '28px',
-                    height: '28px',
-                  },
-                  '& svg': {
-                    width: '28px',
-                    height: '28px',
-                  },
-                },
-              }}
-              onClick={() => listing.actionHandlers?.onEntityClick?.(entity)}>
-              <CardContent>{cardTemplate(entity, renderCell)}</CardContent>
-            </Card>
-          ))}
-        </Box>
-      ),
-    [listing.entities, cardTemplate, renderCell, listing.actionHandlers]
-  );
-
-  return {
-    cardView,
-    renderCell, // Expose for custom templates
-  };
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useCellRenderer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useCellRenderer.tsx
deleted file mode 100644
index 3bb2530879af..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useCellRenderer.tsx
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { AvatarGroup, Box, Typography, useTheme } from '@mui/material';
-import { Avatar } from '@openmetadata/ui-core-components';
-import { Globe01 } from '@untitledui/icons';
-import { ReactNode, useMemo } from 'react';
-import { EntityType } from '../../../../enums/entity.enum';
-import { EntityReference } from '../../../../generated/entity/type';
-import { getEntityName } from '../../../../utils/EntityUtils';
-import { getEntityAvatarProps } from '../../../../utils/IconUtils';
-import { ProfilePicture } from '../ProfilePicture';
-import { CellRenderer, ColumnConfig } from '../shared/types';
-import TagsCell from './TagsCell';
-
-const EMPTY_VALUE_INDICATOR = '-';
-
-interface UseCellRendererProps<T> {
-  columns: ColumnConfig<T>[];
-  renderers?: CellRenderer<T>;
-  chipSize?: 'small' | 'large';
-}
-
-export const useCellRenderer = <
-  T extends { id: string; name?: string; displayName?: string }
->(
-  props: UseCellRendererProps<T>
-) => {
-  const { renderers = {}, chipSize = 'large' } = props;
-  const theme = useTheme();
-
-  const defaultRenderers: CellRenderer<T> = useMemo(
-    () => ({
-      entityName: (entity: T) => {
-        const entityName = getEntityName(entity);
-
-        return (
-          <Box sx={{ display: 'flex', alignItems: 'center', gap: 1.5 }}>
-            <Avatar size="lg" {...getEntityAvatarProps(entity)} />
-            <Box>
-              <Typography
-                sx={{
-                  fontWeight: 500,
-                  color: 'text.primary',
-                  fontSize: '0.875rem',
-                  lineHeight: '20px',
-                }}>
-                {entityName}
-              </Typography>
-            </Box>
-          </Box>
-        );
-      },
-      owners: (entity: T, column?: ColumnConfig<T>) => {
-        const owners = column?.getValue
-          ? column.getValue(entity)
-          : entity[column?.key || 'owners'];
-
-        if (!owners || owners.length === 0) {
-          return (
-            <Typography sx={{ fontSize: '0.875rem', color: 'text.secondary' }}>
-              {EMPTY_VALUE_INDICATOR}
-            </Typography>
-          );
-        }
-
-        if (owners.length === 1) {
-          const owner = owners[0];
-          const isTeam = owner.type === EntityType.TEAM;
-
-          return (
-            <Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
-              <ProfilePicture
-                avatarType="solid"
-                displayName={owner.displayName}
-                isTeam={isTeam}
-                name={owner.name || ''}
-                size={16}
-              />
-              <Typography sx={{ fontSize: '0.875rem' }}>
-                {owner.displayName || owner.name}
-              </Typography>
-            </Box>
-          );
-        }
-
-        return (
-          <Box sx={{ display: 'flex', alignItems: 'left' }}>
-            <AvatarGroup
-              max={5}
-              sx={{
-                '& .MuiAvatar-root': {
-                  width: 24,
-                  height: 24,
-                  fontSize: '0.75rem',
-                },
-              }}>
-              {owners.map((owner: EntityReference, index: number) => {
-                const isTeam = owner.type === EntityType.TEAM;
-
-                return (
-                  <ProfilePicture
-                    avatarType="solid"
-                    displayName={owner.displayName}
-                    isTeam={isTeam}
-                    key={owner.id || index}
-                    name={owner.name || ''}
-                    size={24}
-                  />
-                );
-              })}
-            </AvatarGroup>
-          </Box>
-        );
-      },
-      tags: (entity: T, column?: ColumnConfig<T>) => {
-        const tags = column?.getValue
-          ? column.getValue(entity)
-          : entity[column?.key || 'tags'];
-
-        if (!tags || tags.length === 0) {
-          return (
-            <Typography sx={{ fontSize: '0.875rem', color: 'text.secondary' }}>
-              {EMPTY_VALUE_INDICATOR}
-            </Typography>
-          );
-        }
-
-        return <TagsCell chipSize={chipSize} tags={tags} />;
-      },
-      text: (entity: T, column?: ColumnConfig<T>) => {
-        const value = column?.getValue
-          ? column.getValue(entity)
-          : (entity as Record<string, unknown>)[column?.key || ''];
-
-        return (
-          <Typography sx={{ fontSize: '0.875rem' }}>
-            {value || EMPTY_VALUE_INDICATOR}
-          </Typography>
-        );
-      },
-      custom: (entity: T, column?: ColumnConfig<T>) => {
-        if (column?.customRenderer && renderers[column.customRenderer]) {
-          return renderers[column.customRenderer](entity);
-        }
-
-        return (
-          <Typography sx={{ fontSize: '0.875rem', color: 'text.secondary' }}>
-            {EMPTY_VALUE_INDICATOR}
-          </Typography>
-        );
-      },
-      domains: (entity: T, column?: ColumnConfig<T>) => {
-        const domains = column?.getValue
-          ? column.getValue(entity)
-          : (entity as Record<string, unknown>)[column?.key || 'domains'];
-
-        if (!domains || domains.length === 0) {
-          return (
-            <Typography sx={{ fontSize: '0.875rem', color: 'text.secondary' }}>
-              {EMPTY_VALUE_INDICATOR}
-            </Typography>
-          );
-        }
-
-        const domain = domains[0];
-
-        return (
-          <Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
-            <Globe01 size={16} style={{ flexShrink: 0 }} />
-            <Typography
-              sx={{
-                fontSize: '0.875rem',
-              }}>
-              {domain.displayName || domain.name}
-            </Typography>
-          </Box>
-        );
-      },
-    }),
-    [renderers, theme, chipSize]
-  );
-
-  const renderCell = useMemo(
-    () =>
-      (entity: T, column: ColumnConfig<T>): ReactNode => {
-        const allRenderers = { ...defaultRenderers, ...renderers };
-        const renderer = allRenderers[column.render];
-
-        if (renderer) {
-          return renderer(entity, column);
-        }
-
-        return <span>-</span>;
-      },
-    [defaultRenderers, renderers]
-  );
-
-  return {
-    renderCell,
-    defaultRenderers,
-    allRenderers: { ...defaultRenderers, ...renderers },
-  };
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useColumnConfig.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useColumnConfig.tsx
deleted file mode 100644
index bd82253792b3..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useColumnConfig.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { useMemo } from 'react';
-import { ColumnConfig } from '../shared/types';
-
-interface UseColumnConfigProps<T> {
-  columns: ColumnConfig<T>[];
-}
-
-export const useColumnConfig = <T,>(props: UseColumnConfigProps<T>) => {
-  const { columns } = props;
-
-  const columnMap = useMemo(() => {
-    const map: Record<string, ColumnConfig<T>> = {};
-    columns.forEach((column) => {
-      map[column.key] = column;
-    });
-
-    return map;
-  }, [columns]);
-
-  const getColumn = useMemo(
-    () =>
-      (key: string): ColumnConfig<T> | undefined => {
-        return columnMap[key];
-      },
-    [columnMap]
-  );
-
-  const getColumnKeys = useMemo(() => {
-    return columns.map((column) => column.key);
-  }, [columns]);
-
-  return {
-    columns,
-    columnMap,
-    getColumn,
-    getColumnKeys,
-  };
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useDataTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useDataTable.tsx
deleted file mode 100644
index e5e31ead9fef..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useDataTable.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import {
-  Checkbox,
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableRow,
-} from '@mui/material';
-import { isEmpty } from 'lodash';
-import { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import Loader from '../../Loader/Loader';
-import { TableViewConfig } from '../shared/types';
-import { useTableRow } from './useTableRow';
-
-export const useDataTable = <T extends { id: string }>(
-  config: TableViewConfig<T>
-) => {
-  const { t } = useTranslation();
-  const {
-    listing,
-    enableSelection = true,
-    entityLabelKey = 'Items',
-    customTableRow,
-  } = config;
-
-  // Check if filters or search are active
-  const hasActiveSearch = listing.urlState?.searchQuery?.trim();
-  const hasActiveFilters =
-    listing.urlState?.filters &&
-    Object.values(listing.urlState.filters).some(
-      (filterValues: unknown) =>
-        Array.isArray(filterValues) && filterValues.length > 0
-    );
-  const hasActiveFiltersOrSearch = hasActiveSearch || hasActiveFilters;
-
-  const dataTable = useMemo(
-    () => (
-      <Table data-testid="table-view-container">
-        <TableHead>
-          <TableRow>
-            {enableSelection && (
-              <TableCell padding="checkbox">
-                <Checkbox
-                  checked={listing.isAllSelected}
-                  indeterminate={listing.isIndeterminate}
-                  size="medium"
-                  onChange={(e) => {
-                    e.stopPropagation();
-                    listing.handleSelectAll(e.target.checked);
-                  }}
-                  onClick={(e) => {
-                    e.stopPropagation();
-                  }}
-                />
-              </TableCell>
-            )}
-            {listing.columns.map((column) => (
-              <TableCell key={column.key}>{t(column.labelKey)}</TableCell>
-            ))}
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          {listing.loading ? (
-            <TableRow>
-              <TableCell
-                align="center"
-                colSpan={listing.columns.length + (enableSelection ? 1 : 0)}>
-                <Loader />
-              </TableCell>
-            </TableRow>
-          ) : isEmpty(listing.entities) && hasActiveFiltersOrSearch ? (
-            <TableRow>
-              <TableCell
-                align="center"
-                colSpan={listing.columns.length + (enableSelection ? 1 : 0)}>
-                {t('server.no-records-found')}
-              </TableCell>
-            </TableRow>
-          ) : (
-            listing.entities.map((entity) => {
-              if (customTableRow) {
-                const CustomTableRow = customTableRow;
-
-                return (
-                  <CustomTableRow
-                    entity={entity}
-                    isSelected={listing.isSelected(entity.id)}
-                    key={entity.id}
-                    onEntityClick={
-                      listing.actionHandlers.onEntityClick || (() => {})
-                    }
-                    onSelect={listing.handleSelect}
-                  />
-                );
-              }
-
-              // Use useTableRow hook instead of EntityTableRow component
-              const TableRowHook = () => {
-                const { tableRow } = useTableRow({
-                  entity,
-                  columns: listing.columns,
-                  renderers: listing.renderers,
-                  isSelected: listing.isSelected(entity.id),
-                  onSelect: listing.handleSelect,
-                  onEntityClick:
-                    listing.actionHandlers.onEntityClick || (() => {}),
-                  enableSelection,
-                });
-
-                return tableRow;
-              };
-
-              return <TableRowHook key={entity.id} />;
-            })
-          )}
-        </TableBody>
-      </Table>
-    ),
-    [listing, enableSelection, hasActiveFiltersOrSearch, customTableRow, t]
-  );
-
-  return {
-    dataTable,
-    isEmpty: isEmpty(listing.entities),
-    hasActiveFiltersOrSearch,
-    selectedCount: listing.selectedEntities.length,
-    entityLabelKey,
-  };
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useTableRow.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useTableRow.tsx
deleted file mode 100644
index 32e1e5ee2217..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/table/useTableRow.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { Checkbox, TableCell, TableRow } from '@mui/material';
-import { useMemo } from 'react';
-import { CellRenderer, ColumnConfig } from '../shared/types';
-import { useCellRenderer } from './useCellRenderer';
-
-interface TableRowConfig<T> {
-  entity: T;
-  columns: ColumnConfig<T>[];
-  renderers: CellRenderer<T>;
-  isSelected: boolean;
-  onSelect: (id: string, checked: boolean) => void;
-  onEntityClick: (entity: T) => void;
-  enableSelection?: boolean;
-}
-
-/**
- * Renders table row using shared cell renderers
- *
- * @description
- * Creates table row structure using useCellRenderer for all cell content.
- * No duplicate rendering logic - delegates all rendering to useCellRenderer
- * for perfect consistency with card view.
- *
- * @stability Stable - Uses shared cell renderer
- * @complexity Low - Just table structure + shared rendering
- */
-export const useTableRow = <T extends { id: string; name?: string }>(
-  config: TableRowConfig<T>
-) => {
-  const { renderCell } = useCellRenderer({
-    columns: config.columns,
-    renderers: config.renderers,
-    chipSize: 'large',
-  });
-
-  const tableRow = useMemo(
-    () => (
-      <TableRow
-        hover
-        data-testid={config.entity.name}
-        sx={{ cursor: 'pointer' }}
-        onClick={() => config.onEntityClick(config.entity)}>
-        {config.enableSelection && (
-          <TableCell padding="checkbox">
-            <Checkbox
-              checked={config.isSelected}
-              onChange={(e) => {
-                e.stopPropagation();
-                config.onSelect(config.entity.id, e.target.checked);
-              }}
-              onClick={(e) => {
-                e.stopPropagation();
-              }}
-            />
-          </TableCell>
-        )}
-        {config.columns.map((column) => (
-          <TableCell key={column.key}>
-            {renderCell(config.entity, column)}
-          </TableCell>
-        ))}
-      </TableRow>
-    ),
-    [config, renderCell]
-  );
-
-  return {
-    tableRow,
-  };
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/Color.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/Color.constants.ts
index e8e8fd0ba117..20e2c5c538e9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/Color.constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/Color.constants.ts
@@ -15,7 +15,6 @@
 import { DEFAULT_THEME } from './Appearance.constants';
 
 export const GREEN_1 = '#067647';
-export const GREEN_6 = '#079455';
 export const GREEN_3 = '#48ca9e';
 export const GREEN_4 = '#039855';
 export const GREEN_3_OPACITY = '#48ca9e30';
@@ -23,14 +22,9 @@ export const YELLOW_2 = '#ffbe0e';
 export const YELLOW_3 = '#f79009';
 export const RED_1 = '#F04438';
 export const RED_3 = '#f24822';
-export const RED_3_OPACITY = '#FF7C501A';
-export const PURPLE_2 = '#7147e8';
 export const TEXT_COLOR = '#414651';
-export const GRAY_700 = '#344054';
-export const WHITE_SMOKE = '#F8F8F8';
 export const GRAY_1 = '#A1A1AA';
 export const LIGHT_GRAY = '#F1F4F9';
-export const INDIGO_1 = '#3538CD';
 export const PRIMARY_COLOR = DEFAULT_THEME.primaryColor;
 export const BLUE_1 = '#175cd3';
 export const BLUE_2 = '#3ca2f4';
@@ -41,14 +35,6 @@ export const CHART_BLUE_1 = '#4689FF';
 export const BLUE_600 = '#1677ff';
 export const BLUE_CHART_AREA_FILL = '#e6f4ff';
 export const CHART_CURSOR_STROKE = '#e8e8e8';
-export const RIPTIDE = '#76E9C6';
-export const MY_SIN = '#FEB019';
-export const SAN_MARINO = '#416BB3';
-export const SILVER_TREE = '#5CAE95';
-export const DESERT = '#B56727';
-export const PINK_SALMON = '#FF92AE';
-export const ELECTRIC_VIOLET = '#9747FF';
-export const LEMON_ZEST = '#FFD700';
 export const GREY_100 = '#f5f5f5';
 export const GREY_200 = '#E9EAEB';
 export const GRAY_600 = '#535862';
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/LocalStorage.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/LocalStorage.constants.ts
deleted file mode 100644
index eff82940f5a3..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/constants/LocalStorage.constants.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-export const LOCAL_STORAGE_AUTO_PILOT_STATUS =
-  'serviceAutoPilotDismissedStatuses';
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/MUI.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/MUI.constants.ts
deleted file mode 100644
index 2945cec7f976..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/constants/MUI.constants.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
- * Identity function for MUI Autocomplete filterOptions prop.
- * Use this when search is performed server-side (async) to prevent
- * MUI Autocomplete from applying its default client-side filtering.
- * @see https://mui.com/material-ui/react-autocomplete/#search-as-you-type
- */
-export const asyncFilterOptions = <T>(options: T[]): T[] => options;
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/MarketplaceNav.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/MarketplaceNav.constants.ts
deleted file mode 100644
index 7a464ac68ded..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/constants/MarketplaceNav.constants.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  Copyright 2026 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { ROUTES } from './constants';
-import { SIDEBAR_LIST } from './LeftSidebar.constants';
-
-export const MARKETPLACE_NAV_ITEMS = SIDEBAR_LIST.filter(
-  (item) => item.key !== ROUTES.MY_DATA
-);
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/Workflow.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/Workflow.constants.ts
deleted file mode 100644
index c770f62033e9..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/constants/Workflow.constants.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-export const WORKFLOW_EDGE_BTN_WIDTH = 40;
-export const WORKFLOW_EDGE_BTN_HEIGHT = 40;
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/bundleSuite.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/bundleSuite.constants.ts
deleted file mode 100644
index 4c0750f6bd3e..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/constants/bundleSuite.constants.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- *  Copyright 2026 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-export const BUNDLE_SUITE_PRESELECTED_TEST_CASES_STORAGE_KEY =
-  'om.preselectedBundleSuiteTestCases';
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
index 2b759dee46cf..7882c3784712 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
@@ -50,13 +50,11 @@ export const REFRESH_TOKEN_KEY = 'refreshToken';
 export const USER_DATA_SIZE = 5;
 export const INITIAL_PAGING_VALUE = 1;
 export const JSON_TAB_SIZE = 2;
-export const KNOWLEDGE_LIST_LENGTH = 8;
 export const PAGE_SIZE = 10;
 export const TABLE_CARD_PAGE_SIZE = 9;
 export const PAGE_SIZE_BASE = 15;
 export const PAGE_SIZE_MEDIUM = 25;
 export const PAGE_SIZE_LARGE = 50;
-export const PAGE_SIZE_EXTRA_LARGE = 100;
 export const AGGREGATE_PAGE_SIZE_LARGE = 1000;
 export const ES_MAX_PAGE_SIZE = 10000;
 export const API_RES_MAX_SIZE = 100000;
@@ -65,7 +63,6 @@ export const LINEAGE_CHILD_ITEMS_PER_PAGE = 10;
 export const TAG_LIST_SIZE = 3;
 export const ADD_USER_CONTAINER_HEIGHT = 250;
 export const MAX_NAME_LENGTH = 256;
-export const EXPORT_ALL_ASSETS_LIMIT = 200000;
 export const INGESTION_PROGRESS_START_VAL = 20;
 export const INGESTION_PROGRESS_END_VAL = 80;
 export const DEPLOYED_PROGRESS_VAL = 100;
@@ -83,8 +80,6 @@ export const INITIAL_PAGING_STATE = {
 };
 
 export const LAST_VERSION_FETCH_TIME_KEY = 'versionFetchTime';
-export const LOCALSTORAGE_RECENTLY_VIEWED = `recentlyViewedData`;
-export const LOCALSTORAGE_RECENTLY_SEARCHED = `recentlySearchedData`;
 export const VERSION = 'VERSION';
 export const TERM_ADMIN = 'Admin';
 export const TERM_USER = 'User';
@@ -129,8 +124,6 @@ export const pagingObject = { after: '', before: '', total: 0 };
 
 export const ES_UPDATE_DELAY = 500;
 
-export const DESCRIPTION_LENGTH = 100;
-
 export const CHART_WIDGET_DAYS_DURATION = 14;
 
 export const ROUTES = {
@@ -394,60 +387,6 @@ export const ENTITY_PATH = {
   column: 'tableColumn',
 };
 
-export const CUSTOM_PROPERTIES_DOCS =
-  'https://docs.open-metadata.org/how-to-guides/admin-guide/custom-properties';
-
-export const SUPPORTED_FORMAT_MAP = {
-  date: ['yyyy-MM-dd', 'dd-MM-yyyy', 'MM-dd-yyyy', 'yyyy/MM/dd', 'dd/MM/yyyy'],
-  dateTime: [
-    'yyyy-MM-dd HH:mm:ss',
-    'dd-MM-yyyy HH:mm:ss',
-    'MM-dd-yyyy HH:mm:ss',
-    'yyyy/MM/dd HH:mm:ss',
-    'dd/MM/yyyy HH:mm:ss',
-  ],
-  time: ['HH:mm:ss', 'HH:mm', 'mm:ss'],
-};
-
-export const ENTITY_REFERENCE_OPTIONS = [
-  {
-    label: i18n.t('label.table'),
-    value: 'table',
-  },
-  {
-    label: i18n.t('label.topic'),
-    value: 'topic',
-  },
-  {
-    label: i18n.t('label.dashboard'),
-    value: 'dashboard',
-  },
-  {
-    label: i18n.t('label.pipeline'),
-    value: 'pipeline',
-  },
-  {
-    label: i18n.t('label.ml-model'),
-    value: 'mlmodel',
-  },
-  {
-    label: i18n.t('label.container'),
-    value: 'container',
-  },
-  {
-    label: i18n.t('label.search-index'),
-    value: 'searchIndex',
-  },
-  {
-    label: i18n.t('label.stored-procedure'),
-    value: 'storedProcedure',
-  },
-  {
-    label: i18n.t('label.glossary-term'),
-    value: 'glossaryTerm',
-  },
-];
-
 export const VALIDATION_MESSAGES = {
   required: i18n.t('message.field-text-is-required', {
     fieldText: '${label}',
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/mockTourData.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/mockTourData.constants.ts
index f5a4a3743fbc..1a83eea44554 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/mockTourData.constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/mockTourData.constants.ts
@@ -15,47 +15,6 @@ import { SearchIndex } from '../enums/search.enum';
 
 /* eslint-disable max-len */
 
-export const mockFeedData = [
-  {
-    id: '52d52eb1-b990-497f-bf80-47e52c106f85',
-    href: 'http://localhost:8585/api/v1/feed/52d52eb1-b990-497f-bf80-47e52c106f85',
-    threadTs: 1646631348958,
-    about:
-      '<#E::table::bigquery_gcp.shopify.raw_product_catalog::columns::comments::description>',
-    entityId: '96e80f92-b8ce-456c-8f3c-ee7855e76f43',
-    createdBy: 'aaron_johnson0',
-    updatedAt: 1646631348959,
-    updatedBy: 'anonymous',
-    resolved: false,
-    message:
-      'This dimension table contains information about the staff accounts in the store. It contains one row per staff account. Use this table to generate a list of your staff accounts, or join it with the sales, API clients and locations tables to analyze staff performance at Shopify POS locations.',
-    postsCount: 0,
-    posts: [],
-  },
-  {
-    id: '60df2514-3bea-4337-a5a2-f0fe5c65237f',
-    href: 'http://localhost:8585/api/v1/feed/60df2514-3bea-4337-a5a2-f0fe5c65237f',
-    threadTs: 1646631340215,
-    about:
-      '<#E::table::bigquery_gcp.shopify.raw_product_catalog::columns::comments::description>',
-    entityId: '96e80f92-b8ce-456c-8f3c-ee7855e76f43',
-    createdBy: 'aaron_johnson0',
-    updatedAt: 1646631340215,
-    updatedBy: 'anonymous',
-    resolved: false,
-    message: 'Can you add a description?',
-    postsCount: 0,
-    posts: [],
-  },
-];
-
-export const mockTablePermission = {
-  Create: true,
-  Delete: true,
-  ViewAll: true,
-  EditAll: true,
-};
-
 export const mockDatasetData = {
   datasetFQN: 'sample_data.ecommerce_db.shopify.dim_address',
   tableProfile: {
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/profiler.constant.ts b/openmetadata-ui/src/main/resources/ui/src/constants/profiler.constant.ts
index 5a4ba73354df..7b40537475a6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/profiler.constant.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/profiler.constant.ts
@@ -12,7 +12,7 @@
  */
 
 import { map, startCase, values } from 'lodash';
-import { DateFilterType, StepperStepType } from 'Models';
+import { DateFilterType } from 'Models';
 import { TestCaseSearchParams } from '../components/DataQuality/DataQuality.interface';
 import { SORT_ORDER } from '../enums/common.enum';
 import { TestCaseType } from '../enums/TestSuite.enum';
@@ -302,15 +302,6 @@ export const INITIAL_DATA_ASSETS_COVERAGE_STATES = {
   total: 0,
 };
 
-export const STEPS_FOR_ADD_TEST_CASE: Array<StepperStepType> = [
-  {
-    name: 'label.configure-entity',
-    nameData: { entity: 'label.test-case-lowercase' },
-    step: 1,
-  },
-  { name: 'label.success', step: 2 },
-];
-
 export const SUPPORTED_PARTITION_TYPE_FOR_DATE_TIME = [
   DataType.Timestamp,
   DataType.Date,
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/regex.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/regex.constants.ts
index 5f5558dfabb3..884d0d50e4e9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/regex.constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/regex.constants.ts
@@ -13,7 +13,6 @@
 
 import { ADMONITION_TYPES } from './BlockEditor.constants';
 
-export const UrlEntityCharRegEx = /[#.%;?/\\]/g;
 export const EMAIL_REG_EX = /^\S+@\S+\.\S+$/;
 
 /**
@@ -50,7 +49,6 @@ export const passwordRegex =
 
 export const ONEOF_ANYOF_ALLOF_REGEX = /(oneof|anyof|allof)/;
 
-export const markdownTextAndIdRegex = /^(\S.*?)\s*\$\(id="(.*?)"\)/;
 export const MARKDOWN_MATCH_ID = /\$\(id="(.*?)"\)/;
 
 export const ENDS_WITH_NUMBER_REGEX = /\d+$/;
@@ -69,19 +67,6 @@ export const SEMICOLON_SPLITTER = /;(?=(?:(?:[^"]*"){2})*[^"]*$)/;
 // Use regex to check if the string starts and ends with escape characters
 export const VALIDATE_ESCAPE_START_END_REGEX = /^(\\+|"+)([\s\S]*?)(\\+|"+)$/;
 
-// Validates decimal numbers between 0 and 1 (inclusive)
-// Matches: 0, 0.5, 0.123, 1, 1.0, 1.00, etc.
-export const DECIMAL_ZERO_TO_ONE_REGEX = /^(0(\.\d+)?|1(\.0+)?)$/;
-
-// Validates integers between 0 and 100 (inclusive)
-// Matches: 0, 1, 9, 10, 50, 99, 100
-export const INTEGER_ZERO_TO_HUNDRED_REGEX = /^(100|[1-9]?\d)$/;
-
-// Validates locale/language codes (ISO 639-1 format)
-// Matches: en, fr, de, en-US, fr-CA, de-DE, etc.
-// Format: two lowercase letters optionally followed by hyphen and two uppercase letters
-export const LOCALE_CODE_REGEX = /^[a-z]{2}(-[A-Z]{2})?$/;
-
 // Matches URLs (http/https with content, absolute paths with content, data URIs) OR filenames with image extensions
 // Filenames restricted to alphanumeric, hyphens, underscores, and dots for security
 export const IMAGE_URL_PATTERN =
diff --git a/openmetadata-ui/src/main/resources/ui/src/enums/AutoPilotWorkflow.enum.ts b/openmetadata-ui/src/main/resources/ui/src/enums/AutoPilotWorkflow.enum.ts
deleted file mode 100644
index 8953d8b76db1..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/enums/AutoPilotWorkflow.enum.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-export enum AutoPilotWorkflowStages {
-  SERVICE_CREATION = 'ServiceCreated',
-  RUN_METADATA_INGESTION = 'RunMetadataIngestion',
-  RUN_LINEAGE_INGESTION = 'RunLineageIngestion',
-  RUN_USAGE_INGESTION = 'RunUsageIngestion',
-  RUN_DATA_INSIGHTS_APPLICATION = 'RunDataInsightsApplication',
-  RUN_WEBHOOK_INGESTION = 'RunWebhookIngestion',
-  RUN_API_COLLECTION_INGESTION = 'RunApiCollectionIngestion',
-  RUN_API_ENDPOINT_INGESTION = 'RunApiEndpointIngestion',
-  RUN_COLLATE_AI_TIER_APPLICATION = 'RunCollateAITierApplication',
-  RUN_AUTO_CLASSIFICATION_INGESTION = 'RunAutoClassificationIngestion',
-  RUN_COLLATE_AI_APPLICATION = 'RunCollateAIApplication',
-  RUN_COLLATE_AI_QUALITY_APPLICATION = 'RunCollateAIQualityApplication',
-  RUN_FINAL_DATA_INSIGHTS_APPLICATION = 'RunFinalDataInsightsApplication',
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataMarketplacePage/MarketplaceLayout.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataMarketplacePage/MarketplaceLayout.component.tsx
deleted file mode 100644
index a4fa927bd449..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataMarketplacePage/MarketplaceLayout.component.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright 2026 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Outlet } from 'react-router-dom';
-import MarketplaceNavBar from '../../components/DataMarketplace/MarketplaceNavBar/MarketplaceNavBar.component';
-import PageLayoutV2 from '../../components/PageLayoutV2/PageLayoutV2';
-import { useMarketplaceStore } from '../../hooks/useMarketplaceStore';
-
-const MarketplaceLayout = () => {
-  const { t } = useTranslation();
-  const { setMarketplaceContext } = useMarketplaceStore();
-
-  useEffect(() => {
-    setMarketplaceContext(true);
-
-    return () => setMarketplaceContext(false);
-  }, []);
-
-  return (
-    <PageLayoutV2 pageTitle={t('label.data-marketplace')}>
-      <MarketplaceNavBar />
-      <Outlet />
-    </PageLayoutV2>
-  );
-};
-
-export default MarketplaceLayout;
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataMarketplacePage/MarketplaceSubPageLayout.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataMarketplacePage/MarketplaceSubPageLayout.component.tsx
deleted file mode 100644
index 73e844a1f62c..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataMarketplacePage/MarketplaceSubPageLayout.component.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Copyright 2026 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { Outlet } from 'react-router-dom';
-
-const MarketplaceSubPageLayout = () => (
-  <div className="p-x-box" style={{ paddingTop: 'var(--ant-navbar-height)' }}>
-    <Outlet />
-  </div>
-);
-
-export default MarketplaceSubPageLayout;
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PlatformLineage/PlatformLineage.interface.ts b/openmetadata-ui/src/main/resources/ui/src/pages/PlatformLineage/PlatformLineage.interface.ts
deleted file mode 100644
index 30d5d2df401e..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/pages/PlatformLineage/PlatformLineage.interface.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- *  Copyright 2025 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-export enum LineagePlatformView {
-  Service = 'service',
-  Domain = 'domain',
-}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SearchRBACSettingsPage/SearchRBACSettingsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SearchRBACSettingsPage/SearchRBACSettingsPage.tsx
deleted file mode 100644
index 1f7b051b275c..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/pages/SearchRBACSettingsPage/SearchRBACSettingsPage.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *  Copyright 2022 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { InfoCircleOutlined } from '@ant-design/icons';
-import { Col, Row, Switch, Tooltip, Typography } from 'antd';
-import { AxiosError } from 'axios';
-import { useEffect, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import Loader from '../../components/common/Loader/Loader';
-import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component';
-import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface';
-import PageHeader from '../../components/PageHeader/PageHeader.component';
-import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1';
-import { GRAYED_OUT_COLOR } from '../../constants/constants';
-import { GlobalSettingsMenuCategory } from '../../constants/GlobalSettings.constants';
-import { PAGE_HEADERS } from '../../constants/PageHeaders.constant';
-import { SearchSettings } from '../../generated/configuration/searchSettings';
-import { Settings, SettingType } from '../../generated/settings/settings';
-import {
-  getSettingsByType,
-  updateSettingsConfig,
-} from '../../rest/settingConfigAPI';
-import { getSettingPageEntityBreadCrumb } from '../../utils/GlobalSettingsUtils';
-import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils';
-
-const SearchRBACSettingsPage = () => {
-  const { t } = useTranslation();
-
-  const [isLoading, setIsLoading] = useState(true);
-  const [searchConfig, setSearchConfig] = useState<SearchSettings>();
-  const [isUpdating, setIsUpdating] = useState(false);
-
-  const breadcrumbs: TitleBreadcrumbProps['titleLinks'] = useMemo(
-    () =>
-      getSettingPageEntityBreadCrumb(
-        GlobalSettingsMenuCategory.PREFERENCES,
-        t('label.search')
-      ),
-    []
-  );
-
-  const fetchSearchConfig = async () => {
-    try {
-      setIsLoading(true);
-
-      const loginConfig = await getSettingsByType(SettingType.SearchSettings);
-
-      setSearchConfig(loginConfig as SearchSettings);
-    } catch (error) {
-      showErrorToast(error as AxiosError);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const handleUpdateClick = async (enabled: boolean) => {
-    try {
-      setIsUpdating(true);
-
-      const configData = {
-        config_type: SettingType.SearchSettings,
-        config_value: { ...searchConfig, enableAccessControl: enabled },
-      };
-      const { data } = await updateSettingsConfig(configData as Settings);
-      showSuccessToast(
-        t('server.update-entity-success', {
-          entity: t('label.search-rbac'),
-        })
-      );
-
-      setSearchConfig(data.config_value as SearchSettings);
-    } catch (error) {
-      showErrorToast(error as AxiosError);
-    } finally {
-      setIsUpdating(false);
-    }
-  };
-
-  useEffect(() => {
-    fetchSearchConfig();
-  }, []);
-
-  if (isLoading) {
-    return <Loader />;
-  }
-
-  return (
-    <PageLayoutV1 pageTitle={t('label.search-rbac')}>
-      <Row gutter={[0, 16]}>
-        <Col span={24}>
-          <TitleBreadcrumb titleLinks={breadcrumbs} />
-        </Col>
-        <Col span={24}>
-          <Row align="middle" justify="space-between">
-            <Col>
-              <PageHeader
-                isBeta
-                data={{
-                  header: t(PAGE_HEADERS.SEARCH_RBAC.header),
-                  subHeader: t(PAGE_HEADERS.SEARCH_RBAC.subHeader),
-                }}
-              />
-            </Col>
-          </Row>
-        </Col>
-        <Col className="d-flex items-center" span={12}>
-          <Typography.Text className="m-0 text-grey-muted">
-            {t('label.enable-roles-polices-in-search')}
-            <Tooltip
-              placement="top"
-              title={t('message.enable-access-control-description')}
-              trigger="hover">
-              <InfoCircleOutlined
-                className="m-x-xss"
-                data-testid="enable-access-control-info"
-                style={{ color: GRAYED_OUT_COLOR }}
-              />
-            </Tooltip>
-          </Typography.Text>
-          <Switch
-            checked={searchConfig?.globalSettings?.enableAccessControl}
-            className="m-l-xlg"
-            disabled={isUpdating}
-            onChange={handleUpdateClick}
-          />
-        </Col>
-      </Row>
-    </PageLayoutV1>
-  );
-};
-
-export default SearchRBACSettingsPage;
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/BrowserUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/BrowserUtils.ts
deleted file mode 100644
index c03ee1eabb8d..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/utils/BrowserUtils.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright 2024 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-export const getBrowser = () => {
-  const userAgent = navigator.userAgent;
-
-  if (userAgent.match(/chrome|chromium|crios/i)) {
-    return 'Chrome';
-  } else if (userAgent.match(/firefox|fxios/i)) {
-    return 'Firefox';
-  } else if (userAgent.match(/safari/i)) {
-    return 'Safari';
-  } else if (userAgent.match(/opr\//i)) {
-    return 'Opera';
-  } else if (userAgent.match(/edg/i)) {
-    return 'Edge';
-  } else {
-    return 'Other';
-  }
-};
-
-export const getPopupSettingLink = () => {
-  const browser = getBrowser();
-  switch (browser) {
-    case 'Chrome':
-      return 'https://support.google.com/chrome/answer/95472';
-    case 'Firefox':
-      return 'https://support.mozilla.org/en-US/kb/pop-blocker-settings-exceptions-troubleshooting';
-    case 'Safari':
-      return 'https://support.apple.com/en-in/guide/safari/sfri40696/mac';
-    case 'Opera':
-      return 'https://help.opera.com/en/latest/web-preferences/#popUps';
-    case 'Edge':
-      return 'https://support.microsoft.com/en-us/microsoft-edge/block-pop-ups-in-microsoft-edge-1d8ba4f8-f385-9a0b-e944-aa47339b6bb5';
-    default:
-      return '';
-  }
-};
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.mock.ts b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.mock.ts
deleted file mode 100644
index 6d1984cc22d0..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.mock.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *  Copyright 2022 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import { LabelType, State, TagSource } from '../generated/entity/data/chart';
-
-export const mockTags = [
-  {
-    tagFQN: 'PII.NonSensitive',
-    description:
-      'PII which is easily accessible from public sources and can include zip code, race, gender, and date of birth.',
-    source: TagSource.Classification,
-    labelType: LabelType.Manual,
-    state: State.Confirmed,
-  },
-  {
-    tagFQN: 'PersonalData.Personal',
-    description:
-      'Data that can be used to directly or indirectly identify a person.',
-    source: TagSource.Classification,
-    labelType: LabelType.Manual,
-    state: State.Confirmed,
-  },
-  {
-    tagFQN: 'ab.tag',
-    description: '',
-    source: TagSource.Classification,
-    labelType: LabelType.Manual,
-    state: State.Confirmed,
-  },
-  {
-    tagFQN: 'persona.tag',
-    description: '',
-    source: TagSource.Classification,
-    labelType: LabelType.Manual,
-    state: State.Confirmed,
-  },
-  {
-    tagFQN: 'aa.tag',
-    description: '',
-    source: TagSource.Classification,
-    labelType: LabelType.Manual,
-    state: State.Confirmed,
-  },
-  {
-    tagFQN: 'ac.tag',
-    description: '',
-    source: TagSource.Classification,
-    labelType: LabelType.Manual,
-    state: State.Confirmed,
-  },
-];
-
-export const sortedMockTags = [
-  {
-    tagFQN: 'aa.tag',
-    description: '',
-    source: TagSource.Classification,
-    labelType: LabelType.Manual,
-    state: State.Confirmed,
-  },
-  {
-    tagFQN: 'ab.tag',
-    description: '',
-    source: TagSource.Classification,
-    labelType: LabelType.Manual,
-    state: State.Confirmed,
-  },
-  {
-    tagFQN: 'ac.tag',
-    description: '',
-    source: TagSource.Classification,
-    labelType: LabelType.Manual,
-    state: State.Confirmed,
-  },
-  {
-    tagFQN: 'persona.tag',
-    description: '',
-    source: TagSource.Classification,
-    labelType: LabelType.Manual,
-    state: State.Confirmed,
-  },
-  {
-    tagFQN: 'PersonalData.Personal',
-    description:
-      'Data that can be used to directly or indirectly identify a person.',
-    source: TagSource.Classification,
-    labelType: LabelType.Manual,
-    state: State.Confirmed,
-  },
-  {
-    tagFQN: 'PII.NonSensitive',
-    description:
-      'PII which is easily accessible from public sources and can include zip code, race, gender, and date of birth.',
-    source: TagSource.Classification,
-    labelType: LabelType.Manual,
-    state: State.Confirmed,
-  },
-];
-
-export const mockFQN = 'sample_data.ecommerce_db.dim_product';
-export const mockFQNWithSpecialChar1 =
-  'sample_data.ecommerce_db."dim.api/client"';
-export const mockFQNWithSpecialChar2 =
-  'sample_data."ecommerce_db"."dim.api/client"';
-export const mockFQNWithSpecialChar3 =
-  'sample_data.ecommerce_db."dim.api/"client"';
-export const mockFQNWithSpecialChar4 =
-  'sample_data.ecommerce_db."dim.api/client""';
-export const mockFQNWithSpecialChar5 =
-  'sample_data.ecommerce_db.""dim.api/client"';
-
-export const mockTableNameFromFQN = 'dim_product';
-export const mockTableNameWithSpecialChar = 'dim.api/client';
-export const mockTableNameWithSpecialChar3 = 'api/"client"';
-export const mockTableNameWithSpecialChar4 = 'api/client""';
-export const mockTableNameWithSpecialChar5 = 'api/client"';
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.tsx
index 713ebe74530f..41fe32bf25a5 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.tsx
@@ -13,10 +13,11 @@
 
 import Icon from '@ant-design/icons';
 import { capitalize, isUndefined, uniqBy, uniqueId } from 'lodash';
-import { DOMAttributes } from 'react';
+import { DOMAttributes, Suspense } from 'react';
 import { Layout } from 'react-grid-layout';
 import { ReactComponent as ArrowRightIcon } from '../assets/svg/arrow-right.svg';
 import EmptyWidgetPlaceholderV1 from '../components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholderV1';
+import WidgetWrapper from '../components/MyData/Widgets/Common/WidgetWrapper/WidgetWrapper';
 import { LandingPageWidgetKeys } from '../enums/CustomizablePage.enum';
 import { Document } from '../generated/entity/docStore/document';
 import { WidgetConfig } from '../pages/CustomizablePage/CustomizablePage.interface';
@@ -423,15 +424,17 @@ export const getWidgetFromKey = ({
   const Widget = customizeMyDataPageClassBase.getWidgetsFromKey(widgetConfig.i);
 
   return (
-    <Widget
-      currentLayout={currentLayout}
-      handleLayoutUpdate={handleLayoutUpdate}
-      handleRemoveWidget={handleRemoveWidget}
-      handleSaveLayout={handleSaveLayout}
-      isEditView={isEditView}
-      selectedGridSize={widgetConfig.w}
-      widgetKey={widgetConfig.i}
-    />
+    <Suspense fallback={<WidgetWrapper loading>{null}</WidgetWrapper>}>
+      <Widget
+        currentLayout={currentLayout}
+        handleLayoutUpdate={handleLayoutUpdate}
+        handleRemoveWidget={handleRemoveWidget}
+        handleSaveLayout={handleSaveLayout}
+        isEditView={isEditView}
+        selectedGridSize={widgetConfig.w}
+        widgetKey={widgetConfig.i}
+      />
+    </Suspense>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizeMyDataPageClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizeMyDataPageClassBase.ts
index b01c09ea14fd..a3d7fd330002 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizeMyDataPageClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizeMyDataPageClassBase.ts
@@ -11,7 +11,7 @@
  *  limitations under the License.
  */
 
-import { FC } from 'react';
+import { ComponentType, lazy } from 'react';
 import ActivityFeedImg from '../assets/img/activity-feed-widget.png';
 import CuratedAssetsImg from '../assets/img/curated-assets.png';
 import DataAssetsImg from '../assets/img/data-assets-widget.png';
@@ -25,17 +25,6 @@ import MyTaskImg from '../assets/img/my-task-widget.png';
 import TotalAssetsMediumImg from '../assets/img/total-assets-medium.png';
 import TotalAssetsImg from '../assets/img/total-assets-widget.png';
 import KnowledgeCenterWidgetImg from '../assets/img/widgets/knowledge-center-widget.png';
-import KnowledgeCenterWidget from '../components/KnowledgeCenter/KnowledgeCenterWidget/KnowledgeCenterWidget';
-import { MyFeedWidget } from '../components/MyData/FeedWidget/FeedWidget.component';
-import { MyDataWidget } from '../components/MyData/MyDataWidget/MyDataWidget.component';
-import FollowingWidget from '../components/MyData/RightSidebar/FollowingWidget';
-import CuratedAssetsWidget from '../components/MyData/Widgets/CuratedAssetsWidget/CuratedAssetsWidget';
-import DataAssetsWidget from '../components/MyData/Widgets/DataAssetsWidget/DataAssetsWidget.component';
-import DataProductsWidget from '../components/MyData/Widgets/DataProductsWidget/DataProductsWidget.component';
-import DomainsWidget from '../components/MyData/Widgets/DomainsWidget/DomainsWidget';
-import KPIWidget from '../components/MyData/Widgets/KPIWidget/KPIWidget.component';
-import MyTaskWidget from '../components/MyData/Widgets/MyTaskWidget/MyTaskWidget';
-import TotalDataAssetsWidget from '../components/MyData/Widgets/TotalDataAssetsWidget/TotalDataAssetsWidget.component';
 import {
   LandingPageWidgetKeys,
   WidgetWidths,
@@ -46,6 +35,59 @@ import {
   WidgetConfig,
 } from '../pages/CustomizablePage/CustomizablePage.interface';
 
+const KnowledgeCenterWidget = lazy(
+  () =>
+    import(
+      '../components/KnowledgeCenter/KnowledgeCenterWidget/KnowledgeCenterWidget'
+    )
+);
+const MyFeedWidget = lazy(() =>
+  import('../components/MyData/FeedWidget/FeedWidget.component').then((m) => ({
+    default: m.MyFeedWidget,
+  }))
+);
+const MyDataWidget = lazy(() =>
+  import('../components/MyData/MyDataWidget/MyDataWidget.component').then(
+    (m) => ({ default: m.MyDataWidget })
+  )
+);
+const FollowingWidget = lazy(
+  () => import('../components/MyData/RightSidebar/FollowingWidget')
+);
+const CuratedAssetsWidget = lazy(
+  () =>
+    import(
+      '../components/MyData/Widgets/CuratedAssetsWidget/CuratedAssetsWidget'
+    )
+);
+const DataAssetsWidget = lazy(
+  () =>
+    import(
+      '../components/MyData/Widgets/DataAssetsWidget/DataAssetsWidget.component'
+    )
+);
+const DataProductsWidget = lazy(
+  () =>
+    import(
+      '../components/MyData/Widgets/DataProductsWidget/DataProductsWidget.component'
+    )
+);
+const DomainsWidget = lazy(
+  () => import('../components/MyData/Widgets/DomainsWidget/DomainsWidget')
+);
+const KPIWidget = lazy(
+  () => import('../components/MyData/Widgets/KPIWidget/KPIWidget.component')
+);
+const MyTaskWidget = lazy(
+  () => import('../components/MyData/Widgets/MyTaskWidget/MyTaskWidget')
+);
+const TotalDataAssetsWidget = lazy(
+  () =>
+    import(
+      '../components/MyData/Widgets/TotalDataAssetsWidget/TotalDataAssetsWidget.component'
+    )
+);
+
 class CustomizeMyDataPageClassBase {
   defaultWidgetHeight = 3;
   landingPageWidgetMargin = 16;
@@ -178,7 +220,9 @@ class CustomizeMyDataPageClassBase {
     }
   >
    */
-  public getWidgetsFromKey(widgetKey: string): FC<WidgetCommonProps> {
+  public getWidgetsFromKey(
+    widgetKey: string
+  ): ComponentType<WidgetCommonProps> {
     if (widgetKey.startsWith(LandingPageWidgetKeys.DATA_ASSETS)) {
       return DataAssetsWidget;
     }
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/DashboardDetailsUtils.mock.ts b/openmetadata-ui/src/main/resources/ui/src/utils/DashboardDetailsUtils.mock.ts
deleted file mode 100644
index 21648610f23f..000000000000
--- a/openmetadata-ui/src/main/resources/ui/src/utils/DashboardDetailsUtils.mock.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  Copyright 2022 Collate.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import {
-  ChartType,
-  LabelType,
-  State,
-  TagSource,
-} from '../generated/entity/data/chart';
-import { DashboardServiceType } from '../generated/entity/data/dashboard';
-
-export const mockCharts = [
-  {
-    id: '86dad1d4-8830-4d35-ab03-dd6190c1f05d',
-    name: '127',
-    displayName: 'Are you an ethnic minority in your city?',
-    fullyQualifiedName: 'sample_superset.127',
-    description: '',
-    version: 3.5,
-    updatedAt: 1669804896748,
-    updatedBy: 'admin',
-    chartType: ChartType.Other,
-    sourceUrl:
-      'http://localhost:8088/superset/explore/?form_data=%7B%22slice_id%22%3A%20127%7D',
-    href: 'http://localhost:8585/api/v1/charts/86dad1d4-8830-4d35-ab03-dd6190c1f05d',
-    tags: [
-      {
-        tagFQN: 'PII.NonSensitive',
-        description:
-          'PII which is easily accessible from public sources and can include zip code, race, gender, and date of birth.',
-        source: TagSource.Classification,
-        labelType: LabelType.Manual,
-        state: State.Confirmed,
-      },
-      {
-        tagFQN: 'PersonalData.Personal',
-        description:
-          'Data that can be used to directly or indirectly identify a person.',
-        source: TagSource.Classification,
-        labelType: LabelType.Manual,
-        state: State.Confirmed,
-      },
-      {
-        tagFQN: 'ab.tag',
-        description: '',
-        source: TagSource.Classification,
-        labelType: LabelType.Manual,
-        state: State.Confirmed,
-      },
-      {
-        tagFQN: 'persona.tag',
-        description: '',
-        source: TagSource.Classification,
-        labelType: LabelType.Manual,
-        state: State.Confirmed,
-      },
-      {
-        tagFQN: 'aa.tag',
-        description: '',
-        source: TagSource.Classification,
-        labelType: LabelType.Manual,
-        state: State.Confirmed,
-      },
-      {
-        tagFQN: 'ac.tag',
-        description: '',
-        source: TagSource.Classification,
-        labelType: LabelType.Manual,
-        state: State.Confirmed,
-      },
-    ],
-    service: {
-      id: '1c7d6a14-69fe-4ee6-be3c-e6ff01c04055',
-      type: 'dashboardService',
-      name: 'sample_superset',
-      fullyQualifiedName: 'sample_superset',
-      deleted: false,
-      href: 'http://localhost:8585/api/v1/services/dashboardServices/1c7d6a14-69fe-4ee6-be3c-e6ff01c04055',
-    },
-    serviceType: DashboardServiceType.Superset,
-    changeDescription: {
-      fieldsAdded: [
-        {
-          name: 'tags',
-          newValue: '',
-        },
-      ],
-      fieldsUpdated: [],
-      fieldsDeleted: [],
-      previousVersion: 3.4,
-    },
-    deleted: false,
-  },
-];
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/DomainUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/DomainUtils.tsx
index 2934d81423d2..df31d34a865a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/DomainUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/DomainUtils.tsx
@@ -23,7 +23,6 @@ import { ActivityFeedTab } from '../components/ActivityFeed/ActivityFeedTab/Acti
 import { ActivityFeedLayoutType } from '../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.interface';
 import { CustomPropertyTable } from '../components/common/CustomPropertyTable/CustomPropertyTable';
 import { TreeListItem } from '../components/common/DomainSelectableTree/DomainSelectableTree.interface';
-import { OwnerLabel } from '../components/common/OwnerLabel/OwnerLabel.component';
 import ResizablePanels from '../components/common/ResizablePanels/ResizablePanels';
 import TabsLabel from '../components/common/TabsLabel/TabsLabel.component';
 import { GenericTab } from '../components/Customization/GenericTab/GenericTab';
@@ -35,7 +34,7 @@ import SubDomainsTable from '../components/Domain/SubDomainsTable/SubDomainsTabl
 import EntitySummaryPanel from '../components/Explore/EntitySummaryPanel/EntitySummaryPanel.component';
 import AssetsTabs from '../components/Glossary/GlossaryTerms/tabs/AssetsTabs.component';
 import { AssetsOfEntity } from '../components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface';
-import { DE_ACTIVE_COLOR, NO_DATA_PLACEHOLDER } from '../constants/constants';
+import { DE_ACTIVE_COLOR } from '../constants/constants';
 import { DOMAIN_TYPE_DATA } from '../constants/Domain.constants';
 import { DetailPageWidgetKeys } from '../enums/CustomizeDetailPage.enum';
 import { EntityTabs, EntityType } from '../enums/entity.enum';
@@ -50,7 +49,6 @@ import {
 } from '../pages/ExplorePage/ExplorePage.interface';
 import { DomainDetailPageTabProps } from './Domain/DomainClassBase';
 import { getEntityName, getEntityReferenceFromEntity } from './EntityUtils';
-import Fqn from './Fqn';
 import { t } from './i18next/LocalUtil';
 import { renderIcon } from './IconUtils';
 import {
@@ -59,21 +57,6 @@ import {
 } from './PermissionsUtils';
 import { getDomainPath } from './RouterUtils';
 
-export const getOwner = (
-  hasPermission: boolean,
-  owners: EntityReference[],
-  ownerDisplayNames: Map<string, ReactNode>
-) => {
-  if (!isEmpty(owners)) {
-    return <OwnerLabel ownerDisplayName={ownerDisplayNames} owners={owners} />;
-  }
-  if (!hasPermission) {
-    return <div>{NO_DATA_PLACEHOLDER}</div>;
-  }
-
-  return null;
-};
-
 export const getQueryFilterToIncludeDomain = (
   domainFqn: string,
   dataProductFqn: string
@@ -633,33 +616,6 @@ export const getDomainIcon = (iconURL?: string) => {
   return <DomainIcon className="domain-default-icon" />;
 };
 
-export const DomainListItemRenderer = (props: EntityReference) => {
-  const isSubDomain = Fqn.split(props.fullyQualifiedName ?? '').length > 1;
-  const fqn = `(${props.fullyQualifiedName ?? ''})`;
-
-  return (
-    <div className="d-flex items-center gap-2">
-      <DomainIcon
-        color={DE_ACTIVE_COLOR}
-        height={20}
-        name="folder"
-        width={20}
-      />
-      <div className="d-flex items-center w-max-400">
-        <Typography.Text ellipsis>{getEntityName(props)}</Typography.Text>
-        {isSubDomain && (
-          <Typography.Text
-            ellipsis
-            className="m-l-xss text-xs"
-            type="secondary">
-            {fqn}
-          </Typography.Text>
-        )}
-      </div>
-    </div>
-  );
-};
-
 export const domainBuildESQuery = (
   filters: Record<string, string[]>,
   baseFilter?: string
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/GlossaryUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/GlossaryUtils.tsx
index 89079289fb35..151bcce042d8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/GlossaryUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/GlossaryUtils.tsx
@@ -510,29 +510,6 @@ export const getGlossaryWidgetFromKey = (widget: WidgetConfig) => {
     />
   );
 };
-const processTerms = (termList: ModifiedGlossary[], keys: string[]) => {
-  termList.forEach((term) => {
-    if (
-      term.childrenCount &&
-      term.childrenCount > 0 &&
-      term.fullyQualifiedName
-    ) {
-      keys.push(term.fullyQualifiedName);
-      if (term.children && term.children.length > 0) {
-        processTerms(term.children as ModifiedGlossary[], keys as string[]);
-      }
-    }
-  });
-};
-
-export const getAllExpandableKeys = (terms: ModifiedGlossary[]): string[] => {
-  const keys: string[] = [];
-
-  processTerms(terms, keys);
-
-  return keys;
-};
-
 export const validateReferenceURL = (url: string): boolean => {
   if (!url) {
     return true;
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/RouterUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/RouterUtils.ts
index 426666848f6b..276f63c7b8e8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/RouterUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/RouterUtils.ts
@@ -11,7 +11,7 @@
  *  limitations under the License.
  */
 
-import { isUndefined } from 'lodash';
+import isUndefined from 'lodash/isUndefined';
 import { ServiceTypes } from 'Models';
 import QueryString from 'qs';
 import {
@@ -43,7 +43,7 @@ import {
 } from '../constants/GlobalSettings.constants';
 import { arrServiceTypes } from '../constants/Services.constant';
 import { AlertDetailTabs } from '../enums/Alerts.enum';
-import { EntityAction, EntityTabs, EntityType } from '../enums/entity.enum';
+import { EntityTabs, EntityType } from '../enums/entity.enum';
 import { ServiceAgentSubTabs } from '../enums/service.enum';
 import { ProfilerDashboardType } from '../enums/table.enum';
 import { PipelineType } from '../generated/api/services/ingestionPipelines/createIngestionPipeline';
@@ -459,19 +459,6 @@ export const getLogsViewerPath = (
   return path;
 };
 
-export const getGlossaryPathWithAction = (
-  fqn: string,
-  action: EntityAction
-) => {
-  let path = ROUTES.GLOSSARY_DETAILS_WITH_ACTION;
-
-  path = path
-    .replace(PLACEHOLDER_ROUTE_FQN, getEncodedFqn(fqn))
-    .replace(PLACEHOLDER_ACTION, action);
-
-  return path;
-};
-
 export const getQueryPath = (entityFqn: string, queryId: string) => {
   let path = ROUTES.QUERY_FULL_SCREEN_VIEW;
 
@@ -905,16 +892,6 @@ export const getBotsPath = (botsName: string) => {
   return path;
 };
 
-export const getAddCustomPropertyPath = (entityTypeFQN: string) => {
-  let path = ROUTES.ADD_CUSTOM_PROPERTY;
-  path = path.replace(
-    PLACEHOLDER_ROUTE_ENTITY_TYPE,
-    getEncodedFqn(entityTypeFQN)
-  );
-
-  return path;
-};
-
 export const getCreateUserPath = (bot: boolean) => {
   let path = bot ? ROUTES.CREATE_USER_WITH_BOT : ROUTES.CREATE_USER;
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/SchedularUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/SchedularUtils.tsx
index 61508f3e9d6d..2ecd8c9f2a5d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/SchedularUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/SchedularUtils.tsx
@@ -13,7 +13,9 @@
 
 import { Select } from 'antd';
 import cronstrue from 'cronstrue/i18n';
-import { isUndefined, toNumber, toString } from 'lodash';
+import isUndefined from 'lodash/isUndefined';
+import toNumber from 'lodash/toNumber';
+import toString from 'lodash/toString';
 import { RuleObject } from 'rc-field-form/es/interface';
 import {
   Combination,
@@ -220,8 +222,6 @@ export const getDefaultScheduleValue = ({
 export const getDefaultScheduleFromPeriod = (
   includePeriodOptions: string[]
 ) => {
-  // By order, return the default schedule as day, week, month and hour as a last resort
-  // if none of the previous options are included
   if (includePeriodOptions.includes('day')) {
     return DEFAULT_SCHEDULE_CRON_DAILY;
   } else if (includePeriodOptions.includes('week')) {
@@ -232,7 +232,6 @@ export const getDefaultScheduleFromPeriod = (
     return DEFAULT_SCHEDULE_CRON_HOURLY;
   }
 
-  // return the fallback schedule as daily
   return DEFAULT_SCHEDULE_CRON_DAILY;
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtils.tsx
index 986459a7a6af..4e502b147212 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtils.tsx
@@ -11,11 +11,9 @@
  *  limitations under the License.
  */
 
-import { AxiosError } from 'axios';
 import cryptoRandomString from 'crypto-random-string-with-promisify-polyfill';
 import { startCase } from 'lodash';
 import { ServiceTypes } from 'Models';
-import React from 'react';
 import {
   GlobalSettingOptions,
   GlobalSettingsMenuCategory,
@@ -30,12 +28,10 @@ import {
   SERVICE_TYPE_MAP,
 } from '../constants/Services.constant';
 import { ResourceEntity } from '../context/PermissionProvider/PermissionProvider.interface';
-import { PROMISE_STATE } from '../enums/common.enum';
 import { EntityType } from '../enums/entity.enum';
 import { SearchIndex } from '../enums/search.enum';
 import { ServiceCategory } from '../enums/service.enum';
 import { StorageServiceType } from '../generated/entity/data/container';
-import { Database } from '../generated/entity/data/database';
 import { MlModelServiceType } from '../generated/entity/data/mlmodel';
 import {
   DashboardService,
@@ -55,31 +51,14 @@ import {
 } from '../generated/entity/services/pipelineService';
 import { DatabaseServiceSearchSource } from '../interface/search.interface';
 import { ServicesType } from '../interface/service.interface';
-import { getEntityCount } from '../rest/miscAPI';
 import { searchService } from '../rest/serviceAPI';
-import {
-  getEntityDeleteMessage,
-  pluralize,
-  replaceAllSpacialCharWith_,
-} from './CommonUtils';
+import { replaceAllSpacialCharWith_ } from './CommonUtils';
 import { getDashboardURL } from './DashboardServiceUtils';
 import entityUtilClassBase from './EntityUtilClassBase';
 import { MarkdownToHTMLConverter } from './FeedUtils';
 import { t } from './i18next/LocalUtil';
 import { getBrokers } from './MessagingServiceUtils';
 import { getSettingPath } from './RouterUtils';
-import { showErrorToast } from './ToastUtils';
-
-export const getFormattedGuideText = (
-  text: string,
-  toReplace: string,
-  replacement: string,
-  isGlobal = false
-) => {
-  const regExp = isGlobal ? new RegExp(toReplace, 'g') : new RegExp(toReplace);
-
-  return text.replace(regExp, replacement);
-};
 
 export const getIngestionName = (
   serviceName: string,
@@ -127,48 +106,6 @@ export const getServiceTypesFromServiceCategory = (
   return SERVICE_TYPES_ENUM[serviceCat];
 };
 
-export const setServiceSchemaCount = (
-  data: Database[],
-  callback: (value: React.SetStateAction<number>) => void
-) => {
-  const promises = data.map((database) =>
-    getEntityCount('databaseSchemas', database.fullyQualifiedName)
-  );
-
-  Promise.allSettled(promises)
-    .then((results) => {
-      let count = 0;
-      for (const result of results) {
-        if (result.status === PROMISE_STATE.FULFILLED) {
-          count += result.value?.paging?.total || 0;
-        }
-      }
-      callback(count);
-    })
-    .catch((err: AxiosError) => showErrorToast(err));
-};
-
-export const setServiceTableCount = (
-  data: Database[],
-  callback: (value: React.SetStateAction<number>) => void
-) => {
-  const promises = data.map((database) =>
-    getEntityCount('tables', database.fullyQualifiedName)
-  );
-
-  Promise.allSettled(promises)
-    .then((results) => {
-      let count = 0;
-      for (const result of results) {
-        if (result.status === PROMISE_STATE.FULFILLED) {
-          count += result.value?.paging?.total || 0;
-        }
-      }
-      callback(count);
-    })
-    .catch((err: AxiosError) => showErrorToast(err));
-};
-
 export const getOptionalFields = (
   service: ServicesType,
   serviceName: ServiceCategory
@@ -247,74 +184,6 @@ export const getOptionalFields = (
   }
 };
 
-export const getDeleteEntityMessage = (
-  serviceName: string,
-  instanceCount: number,
-  schemaCount: number,
-  tableCount: number
-) => {
-  const service = serviceName?.slice(0, -1);
-
-  switch (serviceName) {
-    case ServiceCategory.DATABASE_SERVICES:
-      return getEntityDeleteMessage(
-        service || t('label.service'),
-        `${pluralize(instanceCount, t('label.database'))}, ${pluralize(
-          schemaCount,
-          t('label.schema')
-        )} ${t('label.and-lowercase')} ${pluralize(
-          tableCount,
-          t('label.table')
-        )}`
-      );
-
-    case ServiceCategory.MESSAGING_SERVICES:
-      return getEntityDeleteMessage(
-        service || t('label.service'),
-        pluralize(instanceCount, t('label.topic'))
-      );
-
-    case ServiceCategory.DASHBOARD_SERVICES:
-      return getEntityDeleteMessage(
-        service || t('label.service'),
-        pluralize(instanceCount, t('label.dashboard'))
-      );
-
-    case ServiceCategory.PIPELINE_SERVICES:
-      return getEntityDeleteMessage(
-        service || t('label.service'),
-        pluralize(instanceCount, t('label.pipeline'))
-      );
-
-    case ServiceCategory.METADATA_SERVICES:
-      return getEntityDeleteMessage(
-        service || t('label.service'),
-        pluralize(instanceCount, t('label.metadata'))
-      );
-
-    case ServiceCategory.STORAGE_SERVICES:
-      return getEntityDeleteMessage(
-        service || t('label.service'),
-        pluralize(instanceCount, t('label.container'))
-      );
-
-    case ServiceCategory.API_SERVICES:
-      return getEntityDeleteMessage(
-        service || t('label.service'),
-        pluralize(instanceCount, t('label.collection'))
-      );
-
-    case ServiceCategory.DRIVE_SERVICES:
-      return getEntityDeleteMessage(
-        service || t('label.service'),
-        pluralize(instanceCount, t('label.directory'))
-      );
-
-    default:
-      return;
-  }
-};
-
 export const getServiceRouteFromServiceType = (type: ServiceTypes) => {
   switch (type) {
     case ServiceCategory.MESSAGING_SERVICES:
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx
index fe0699a3ce73..60dcd3091c0c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TableUtils.tsx
@@ -1727,27 +1727,6 @@ export const mergeTagsWithGlossary = (
   return [...normalizedUpdatedTags, ...normalizedExistingGlossaryTags];
 };
 
-/**
- * Merge glossary terms with non-glossary tags
- * Used when updating glossary terms to ensure classification tags are not lost
- * @param columnTags Existing tags from the column
- * @param updatedGlossaryTerms New glossary terms to merge
- * @returns Merged tags array with classification tags preserved
- */
-export const mergeGlossaryWithTags = (
-  columnTags: Column['tags'],
-  updatedGlossaryTerms: Column['tags']
-): Column['tags'] => {
-  const nonGlossaryTags =
-    columnTags?.filter((tag) => tag.source !== TagSource.Glossary) || [];
-
-  // Normalize both arrays before merging to ensure consistent format
-  const normalizedNonGlossaryTags = normalizeTags(nonGlossaryTags);
-  const normalizedGlossaryTerms = normalizeTags(updatedGlossaryTerms || []);
-
-  return [...normalizedNonGlossaryTags, ...normalizedGlossaryTerms];
-};
-
 /**
  * Find the original index of a column in the allColumns array
  * @param column Column to find
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TaskUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/TaskUtils.ts
index d6d02e066b26..8869ef265953 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/TaskUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/TaskUtils.ts
@@ -11,50 +11,7 @@
  *  limitations under the License.
  */
 import { EntityType } from '../enums/entity.enum';
-import { Task, TaskEntityStatus, TaskEntityType } from '../rest/tasksAPI';
-
-/**
- * Check if a task is a description-related task
- */
-export const isDescriptionTask = (type?: TaskEntityType): boolean => {
-  return (
-    type === TaskEntityType.DescriptionUpdate ||
-    type === TaskEntityType.Suggestion
-  );
-};
-
-/**
- * Check if a task is a tag-related task
- */
-export const isTagsTask = (type?: TaskEntityType): boolean => {
-  return type === TaskEntityType.TagUpdate;
-};
-
-/**
- * Check if a task is a glossary approval task
- */
-export const isGlossaryApprovalTask = (type?: TaskEntityType): boolean => {
-  return (
-    type === TaskEntityType.GlossaryApproval ||
-    type === TaskEntityType.RequestApproval
-  );
-};
-
-/**
- * Check if a task is a test case resolution task
- */
-export const isTestCaseResolutionTask = (type?: TaskEntityType): boolean => {
-  return type === TaskEntityType.TestCaseResolution;
-};
-
-/**
- * Check if a task is open
- */
-export const isTaskOpen = (status?: TaskEntityStatus): boolean => {
-  return (
-    status === TaskEntityStatus.Open || status === TaskEntityStatus.InProgress
-  );
-};
+import { Task, TaskEntityStatus } from '../rest/tasksAPI';
 
 /**
  * Check if a task is closed (any terminal status)
@@ -86,54 +43,6 @@ export const getTaskEntityFQN = (task: Task): string | undefined => {
   return task.about?.fullyQualifiedName;
 };
 
-/**
- * Get the suggested value from a task's payload (for suggestion tasks)
- */
-export const getTaskSuggestedValue = (task: Task): string | undefined => {
-  if (!task.payload || typeof task.payload !== 'object') {
-    return undefined;
-  }
-
-  const payload = task.payload as Record<string, unknown>;
-
-  // For SuggestionPayload
-  if ('suggestedValue' in payload) {
-    return payload.suggestedValue as string;
-  }
-
-  // For legacy task payloads
-  if ('suggestion' in payload) {
-    return payload.suggestion as string;
-  }
-
-  if ('newValue' in payload) {
-    return payload.newValue as string;
-  }
-
-  return undefined;
-};
-
-/**
- * Get the old/current value from a task's payload
- */
-export const getTaskOldValue = (task: Task): string | undefined => {
-  if (!task.payload || typeof task.payload !== 'object') {
-    return undefined;
-  }
-
-  const payload = task.payload as Record<string, unknown>;
-
-  if ('currentValue' in payload) {
-    return payload.currentValue as string;
-  }
-
-  if ('oldValue' in payload) {
-    return payload.oldValue as string;
-  }
-
-  return undefined;
-};
-
 /**
  * Get the detail path for a task
  */
@@ -149,79 +58,3 @@ export const getTaskDetailPath = (task: Task): string => {
     task.taskId
   }`;
 };
-
-/**
- * Format task type for display
- */
-export const formatTaskType = (type?: TaskEntityType): string => {
-  if (!type) {
-    return 'Task';
-  }
-
-  const typeLabels: Record<TaskEntityType, string> = {
-    [TaskEntityType.GlossaryApproval]: 'Glossary Approval',
-    [TaskEntityType.RequestApproval]: 'Request Approval',
-    [TaskEntityType.DataAccessRequest]: 'Data Access Request',
-    [TaskEntityType.DescriptionUpdate]: 'Update Description',
-    [TaskEntityType.TagUpdate]: 'Update Tags',
-    [TaskEntityType.OwnershipUpdate]: 'Update Ownership',
-    [TaskEntityType.TierUpdate]: 'Update Tier',
-    [TaskEntityType.DomainUpdate]: 'Update Domain',
-    [TaskEntityType.Suggestion]: 'Suggestion',
-    [TaskEntityType.TestCaseResolution]: 'Test Case Resolution',
-    [TaskEntityType.IncidentResolution]: 'Incident Resolution',
-    [TaskEntityType.PipelineReview]: 'Pipeline Review',
-    [TaskEntityType.DataQualityReview]: 'Data Quality Review',
-    [TaskEntityType.CustomTask]: 'Custom Task',
-  };
-
-  return typeLabels[type] || type;
-};
-
-/**
- * Format task status for display
- */
-export const formatTaskStatus = (status?: TaskEntityStatus): string => {
-  if (!status) {
-    return 'Unknown';
-  }
-
-  return status;
-};
-
-/**
- * Get the color class for a task status badge
- */
-export const getTaskStatusColor = (
-  status?: TaskEntityStatus
-): 'success' | 'warning' | 'error' | 'processing' | 'default' => {
-  switch (status) {
-    case TaskEntityStatus.Completed:
-    case TaskEntityStatus.Approved:
-      return 'success';
-    case TaskEntityStatus.InProgress:
-    case TaskEntityStatus.Pending:
-      return 'processing';
-    case TaskEntityStatus.Rejected:
-    case TaskEntityStatus.Failed:
-    case TaskEntityStatus.Cancelled:
-      return 'error';
-    case TaskEntityStatus.Open:
-    default:
-      return 'default';
-  }
-};
-
-/**
- * Constants for task actions
- */
-export const TASK_ACTION_MODES = {
-  RESOLVE: 'resolve',
-  REJECT: 'reject',
-  CLOSE: 'close',
-  EDIT: 'edit',
-  RE_ASSIGN: 're_assign',
-} as const;
-
-export type TaskActionMode =
-  (typeof TASK_ACTION_MODES)[keyof typeof TASK_ACTION_MODES];
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ToastUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/ToastUtils.ts
index 26cbd0396caf..d8b4267f0e47 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/ToastUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/ToastUtils.ts
@@ -16,7 +16,8 @@ import {
   WarningOutlined,
 } from '@ant-design/icons';
 import { AxiosError } from 'axios';
-import { get, isEmpty, isString } from 'lodash';
+import get from 'lodash/get';
+import isString from 'lodash/isString';
 import React from 'react';
 import { ReactComponent as SuccessIcon } from '../assets/svg/ic-alert-success.svg';
 import { AlertBarProps } from '../components/AlertBar/AlertBar.interface';
@@ -71,22 +72,6 @@ export const getIconAndClassName = (type: AlertBarProps['type']) => {
   }
 };
 
-export const hashCode = (str: string) => {
-  let hash = 0,
-    i,
-    chr;
-  if (isEmpty(str)) {
-    return hash;
-  }
-  for (i = 0; i < str.length; i++) {
-    chr = str.charCodeAt(i);
-    hash = (hash << 5) - hash + chr;
-    hash |= 0; // Convert to 32bit integer
-  }
-
-  return hash;
-};
-
 /**
  * Display an error toast message.
  * @param error error text or AxiosError object
@@ -149,17 +134,6 @@ export const showSuccessToast = (message: string, autoCloseTimer = 5000) => {
     .addAlert({ type: 'success', message }, autoCloseTimer);
 };
 
-/**
- * Display a warning toast message.
- * @param message warning message.
- * @param autoCloseTimer Set the delay in ms to close the toast automatically. `Default: 5000`
- */
-export const showWarningToast = (message: string, autoCloseTimer = 5000) => {
-  useAlertStore
-    .getState()
-    .addAlert({ type: 'warning', message }, autoCloseTimer);
-};
-
 /**
  * Display an info toast message.
  * @param message info message.