diff --git a/dashboards-notifications/common/index.ts b/dashboards-notifications/common/index.ts
index 577759e2..0b77a5f3 100644
--- a/dashboards-notifications/common/index.ts
+++ b/dashboards-notifications/common/index.ts
@@ -16,7 +16,6 @@ export const NODE_API = Object.freeze({
   CREATE_CONFIG: `${NODE_API_BASE_PATH}/create_config`,
   DELETE_CONFIGS: `${NODE_API_BASE_PATH}/delete_configs`,
   UPDATE_CONFIG: `${NODE_API_BASE_PATH}/update_config`,
-  GET_EVENTS: `${NODE_API_BASE_PATH}/get_events`,
   GET_EVENT: `${NODE_API_BASE_PATH}/get_event`,
   GET_AVAILABLE_FEATURES: `${NODE_API_BASE_PATH}/features`,
   SEND_TEST_MESSAGE: `${NODE_API_BASE_PATH}/test_message`,
diff --git a/dashboards-notifications/models/interfaces.ts b/dashboards-notifications/models/interfaces.ts
index dd5a2c7c..013245ed 100644
--- a/dashboards-notifications/models/interfaces.ts
+++ b/dashboards-notifications/models/interfaces.ts
@@ -9,25 +9,8 @@ import {
   CHANNEL_TYPE,
   ENCRYPTION_TYPE,
   NOTIFICATION_SOURCE,
-  SEVERITY_TYPE,
 } from '../public/utils/constants';
 
-export interface NotificationItem {
-  event_id: string;
-  created_time_ms: number;
-  last_updated_time_ms: number;
-  tenant?: string;
-  event_source: {
-    title: string;
-    reference_id: string;
-    feature: keyof typeof NOTIFICATION_SOURCE;
-    severity: keyof typeof SEVERITY_TYPE;
-    tags?: string[];
-  };
-  status_list: ChannelStatus[]; // could be multiple channels in a notification item
-  success: boolean; // calculated in the frontend based on status_list
-}
-
 export interface ChannelStatus {
   config_id: string;
   config_name: string;
diff --git a/dashboards-notifications/public/application.tsx b/dashboards-notifications/public/application.tsx
index 669de013..7ce2fc75 100644
--- a/dashboards-notifications/public/application.tsx
+++ b/dashboards-notifications/public/application.tsx
@@ -9,14 +9,13 @@ import { HashRouter as Router, Route } from 'react-router-dom';
 import { AppMountParameters, CoreStart } from '../../../src/core/public';
 import { CoreServicesContext } from './components/coreServices';
 import Main from './pages/Main';
-import { EventService, NotificationService } from './services';
+import { NotificationService } from './services';
 import { ServicesContext } from './services/services';
 
 export const renderApp = (coreStart: CoreStart, params: AppMountParameters) => {
   const http = coreStart.http;
   const notificationService = new NotificationService(http);
-  const eventService = new EventService(http);
-  const services = { notificationService, eventService };
+  const services = { notificationService };
 
   ReactDOM.render(
     <Router>
diff --git a/dashboards-notifications/public/models/interfaces.ts b/dashboards-notifications/public/models/interfaces.ts
index 03c7ffee..ae48e39a 100644
--- a/dashboards-notifications/public/models/interfaces.ts
+++ b/dashboards-notifications/public/models/interfaces.ts
@@ -4,9 +4,7 @@
  */
 
 import { NotificationService } from '../services';
-import EventService from '../services/EventService';
 
 export interface BrowserServices {
   notificationService: NotificationService;
-  eventService: EventService;
 }
diff --git a/dashboards-notifications/public/pages/Channels/Channels.tsx b/dashboards-notifications/public/pages/Channels/Channels.tsx
index 7e90eba1..1e3ca6bd 100644
--- a/dashboards-notifications/public/pages/Channels/Channels.tsx
+++ b/dashboards-notifications/public/pages/Channels/Channels.tsx
@@ -29,7 +29,6 @@ import { NotificationService } from '../../services';
 import {
   BREADCRUMBS,
   CHANNEL_TYPE,
-  NOTIFICATION_SOURCE,
   ROUTES,
 } from '../../utils/constants';
 import { getErrorMessage } from '../../utils/helpers';
@@ -95,16 +94,6 @@ export class Channels extends Component<ChannelsProps, ChannelsState> {
         truncateText: false,
         render: (type: string) => _.get(CHANNEL_TYPE, type, '-'),
       },
-      {
-        field: 'feature_list',
-        name: 'Notification source',
-        sortable: true,
-        truncateText: true,
-        render: (features: string[]) =>
-          features
-            .map((feature) => _.get(NOTIFICATION_SOURCE, feature, '-'))
-            .join(', ') || '-',
-      },
       {
         field: 'description',
         name: 'Description',
@@ -148,8 +137,6 @@ export class Channels extends Component<ChannelsProps, ChannelsState> {
     };
     if (state.filters.state != undefined)
       queryObject.is_enabled = state.filters.state;
-    if (!_.isEmpty(state.filters.source))
-      queryObject.feature_list = state.filters.source;
     return queryObject;
   }
 
diff --git a/dashboards-notifications/public/pages/Channels/__tests__/ChannelControls.test.tsx b/dashboards-notifications/public/pages/Channels/__tests__/ChannelControls.test.tsx
index e42cda97..7d5038a7 100644
--- a/dashboards-notifications/public/pages/Channels/__tests__/ChannelControls.test.tsx
+++ b/dashboards-notifications/public/pages/Channels/__tests__/ChannelControls.test.tsx
@@ -64,11 +64,6 @@ describe('<ChannelControls /> spec', () => {
     fireEvent.click(utils.getByText('Chime'));
     expect(onFiltersChange).toBeCalledWith({ type: ['email', 'chime'] });
 
-    fireEvent.click(utils.getByText('Source'));
-    fireEvent.click(utils.getByText('Alerting'));
-    fireEvent.click(utils.getByText('Reporting'));
-    expect(onFiltersChange).toBeCalledWith({ source: ['alerting', 'reports'] });
-
-    expect(onFiltersChange).toBeCalledTimes(5);
+    expect(onFiltersChange).toBeCalledTimes(3);
   });
 });
diff --git a/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/ChannelControls.test.tsx.snap b/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/ChannelControls.test.tsx.snap
index 48f798b5..9881872a 100644
--- a/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/ChannelControls.test.tsx.snap
+++ b/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/ChannelControls.test.tsx.snap
@@ -121,44 +121,6 @@ exports[`<ChannelControls /> spec renders the component 1`] = `
           </button>
         </div>
       </div>
-      <div
-        class="euiPopover euiPopover--anchorDownCenter"
-      >
-        <div
-          class="euiPopover__anchor"
-        >
-          <button
-            class="euiButtonEmpty euiButtonEmpty--text euiFilterButton euiFilterButton--hasIcon euiFilterButton--noGrow"
-            type="button"
-          >
-            <span
-              class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                class="euiButtonEmpty__text"
-              >
-                <span
-                  class="euiFilterButton__textShift"
-                  data-text="Source"
-                  title="Source"
-                >
-                  Source
-                </span>
-              </span>
-            </span>
-          </button>
-        </div>
-      </div>
     </div>
   </div>
 </div>
diff --git a/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/ChannelDetails.test.tsx.snap b/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/ChannelDetails.test.tsx.snap
index 48601c45..49f7649d 100644
--- a/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/ChannelDetails.test.tsx.snap
+++ b/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/ChannelDetails.test.tsx.snap
@@ -168,72 +168,6 @@ exports[`<ChannelDetails/> spec handles a non-existing channel 1`] = `
       style="padding: initial;"
     />
   </div>
-  <div
-    class="euiSpacer euiSpacer--l"
-  />
-  <div
-    class="euiPanel euiPanel--paddingMedium"
-    style="max-width: 1300px;"
-  >
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
-      style="padding: 0px 0px;"
-    >
-      <div
-        class="euiFlexItem"
-      >
-        <h3
-          class="euiTitle euiTitle--small"
-        >
-          Availability
-        </h3>
-      </div>
-    </div>
-    <hr
-      class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-    />
-    <div
-      style="padding: initial;"
-    >
-      <div>
-        <div
-          class="euiSpacer euiSpacer--s"
-        />
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-        >
-          <div
-            class="euiFlexItem"
-          >
-            <dl
-              class="euiDescriptionList euiDescriptionList--row"
-              style="word-break: break-word; white-space: pre-line;"
-            >
-              <dt
-                class="euiDescriptionList__title"
-              >
-                Notification sources
-              </dt>
-              <dd
-                class="euiDescriptionList__description"
-              >
-                -
-              </dd>
-            </dl>
-          </div>
-          <div
-            class="euiFlexItem"
-          />
-          <div
-            class="euiFlexItem"
-          />
-        </div>
-        <div
-          class="euiSpacer euiSpacer--m"
-        />
-      </div>
-    </div>
-  </div>
 </div>
 `;
 
@@ -405,72 +339,6 @@ exports[`<ChannelDetails/> spec renders a specific channel 1`] = `
       style="padding: initial;"
     />
   </div>
-  <div
-    class="euiSpacer euiSpacer--l"
-  />
-  <div
-    class="euiPanel euiPanel--paddingMedium"
-    style="max-width: 1300px;"
-  >
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
-      style="padding: 0px 0px;"
-    >
-      <div
-        class="euiFlexItem"
-      >
-        <h3
-          class="euiTitle euiTitle--small"
-        >
-          Availability
-        </h3>
-      </div>
-    </div>
-    <hr
-      class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-    />
-    <div
-      style="padding: initial;"
-    >
-      <div>
-        <div
-          class="euiSpacer euiSpacer--s"
-        />
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-        >
-          <div
-            class="euiFlexItem"
-          >
-            <dl
-              class="euiDescriptionList euiDescriptionList--row"
-              style="word-break: break-word; white-space: pre-line;"
-            >
-              <dt
-                class="euiDescriptionList__title"
-              >
-                Notification sources
-              </dt>
-              <dd
-                class="euiDescriptionList__description"
-              >
-                -
-              </dd>
-            </dl>
-          </div>
-          <div
-            class="euiFlexItem"
-          />
-          <div
-            class="euiFlexItem"
-          />
-        </div>
-        <div
-          class="euiSpacer euiSpacer--m"
-        />
-      </div>
-    </div>
-  </div>
 </div>
 `;
 
diff --git a/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/Channels.test.tsx.snap b/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/Channels.test.tsx.snap
index ded7c5ed..a9f18e66 100644
--- a/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/Channels.test.tsx.snap
+++ b/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/Channels.test.tsx.snap
@@ -221,44 +221,6 @@ exports[`<Channels/> spec renders the empty component 1`] = `
               </button>
             </div>
           </div>
-          <div
-            class="euiPopover euiPopover--anchorDownCenter"
-          >
-            <div
-              class="euiPopover__anchor"
-            >
-              <button
-                class="euiButtonEmpty euiButtonEmpty--text euiFilterButton euiFilterButton--hasIcon euiFilterButton--noGrow"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width="16"
-                    xmlns="http://www.w3.org/2000/svg"
-                  />
-                  <span
-                    class="euiButtonEmpty__text"
-                  >
-                    <span
-                      class="euiFilterButton__textShift"
-                      data-text="Source"
-                      title="Source"
-                    >
-                      Source
-                    </span>
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
         </div>
       </div>
     </div>
@@ -480,37 +442,7 @@ exports[`<Channels/> spec renders the empty component 1`] = `
                 aria-live="polite"
                 aria-sort="none"
                 class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_feature_list_3"
-                role="columnheader"
-                scope="col"
-              >
-                <button
-                  class="euiTableHeaderButton"
-                  data-test-subj="tableHeaderSortButton"
-                  type="button"
-                >
-                  <span
-                    class="euiTableCellContent"
-                  >
-                    <span
-                      class="euiTableCellContent__text"
-                      title="Notification source"
-                    >
-                      Notification source
-                    </span>
-                    <span
-                      class="euiScreenReaderOnly"
-                    >
-                      Click to sort in ascending order
-                    </span>
-                  </span>
-                </button>
-              </th>
-              <th
-                aria-live="polite"
-                aria-sort="none"
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_description_4"
+                data-test-subj="tableHeaderCell_description_3"
                 role="columnheader"
                 scope="col"
               >
@@ -544,7 +476,7 @@ exports[`<Channels/> spec renders the empty component 1`] = `
             >
               <td
                 class="euiTableRowCell euiTableRowCell--isMobileFullWidth"
-                colspan="6"
+                colspan="5"
               >
                 <div
                   class="euiTableCellContent euiTableCellContent--alignCenter"
diff --git a/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/DetailsListModal.test.tsx.snap b/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/DetailsListModal.test.tsx.snap
index 30897e20..21e973a6 100644
--- a/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/DetailsListModal.test.tsx.snap
+++ b/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/DetailsListModal.test.tsx.snap
@@ -18,13 +18,6 @@ exports[`<DetailsListModal /> spec renders the component 1`] = `
   onClose={[MockFunction]}
   services={
     Object {
-      "eventService": EventService {
-        "getHistogram": [Function],
-        "getNotification": [Function],
-        "getNotifications": [Function],
-        "httpClient": [MockFunction],
-        "sendTestMessage": [Function],
-      },
       "notificationService": NotificationService {
         "createConfig": [Function],
         "deleteConfigs": [Function],
@@ -33,6 +26,7 @@ exports[`<DetailsListModal /> spec renders the component 1`] = `
         "getConfig": [Function],
         "getConfigs": [Function],
         "getEmailConfigDetails": [Function],
+        "getNotification": [Function],
         "getRecipientGroup": [Function],
         "getRecipientGroups": [Function],
         "getSESSender": [Function],
@@ -41,6 +35,7 @@ exports[`<DetailsListModal /> spec renders the component 1`] = `
         "getSenders": [Function],
         "getServerFeatures": [Function],
         "httpClient": [MockFunction],
+        "sendTestMessage": [Function],
         "updateConfig": [Function],
       },
     }
diff --git a/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/DetailsTableModal.test.tsx.snap b/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/DetailsTableModal.test.tsx.snap
index 020dbbc8..2e3fd205 100644
--- a/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/DetailsTableModal.test.tsx.snap
+++ b/dashboards-notifications/public/pages/Channels/__tests__/__snapshots__/DetailsTableModal.test.tsx.snap
@@ -19,13 +19,6 @@ exports[`<DetailsTableModal /> spec renders headers 1`] = `
   onClose={[MockFunction]}
   services={
     Object {
-      "eventService": EventService {
-        "getHistogram": [Function],
-        "getNotification": [Function],
-        "getNotifications": [Function],
-        "httpClient": [MockFunction],
-        "sendTestMessage": [Function],
-      },
       "notificationService": NotificationService {
         "createConfig": [Function],
         "deleteConfigs": [Function],
@@ -34,6 +27,7 @@ exports[`<DetailsTableModal /> spec renders headers 1`] = `
         "getConfig": [Function],
         "getConfigs": [Function],
         "getEmailConfigDetails": [Function],
+        "getNotification": [Function],
         "getRecipientGroup": [Function],
         "getRecipientGroups": [Function],
         "getSESSender": [Function],
@@ -42,6 +36,7 @@ exports[`<DetailsTableModal /> spec renders headers 1`] = `
         "getSenders": [Function],
         "getServerFeatures": [Function],
         "httpClient": [MockFunction],
+        "sendTestMessage": [Function],
         "updateConfig": [Function],
       },
     }
@@ -1854,13 +1849,6 @@ exports[`<DetailsTableModal /> spec renders parameters 1`] = `
   onClose={[MockFunction]}
   services={
     Object {
-      "eventService": EventService {
-        "getHistogram": [Function],
-        "getNotification": [Function],
-        "getNotifications": [Function],
-        "httpClient": [MockFunction],
-        "sendTestMessage": [Function],
-      },
       "notificationService": NotificationService {
         "createConfig": [Function],
         "deleteConfigs": [Function],
@@ -1869,6 +1857,7 @@ exports[`<DetailsTableModal /> spec renders parameters 1`] = `
         "getConfig": [Function],
         "getConfigs": [Function],
         "getEmailConfigDetails": [Function],
+        "getNotification": [Function],
         "getRecipientGroup": [Function],
         "getRecipientGroups": [Function],
         "getSESSender": [Function],
@@ -1877,6 +1866,7 @@ exports[`<DetailsTableModal /> spec renders parameters 1`] = `
         "getSenders": [Function],
         "getServerFeatures": [Function],
         "httpClient": [MockFunction],
+        "sendTestMessage": [Function],
         "updateConfig": [Function],
       },
     }
diff --git a/dashboards-notifications/public/pages/Channels/components/ChannelControls.tsx b/dashboards-notifications/public/pages/Channels/components/ChannelControls.tsx
index a562e93d..7537ca55 100644
--- a/dashboards-notifications/public/pages/Channels/components/ChannelControls.tsx
+++ b/dashboards-notifications/public/pages/Channels/components/ChannelControls.tsx
@@ -16,7 +16,6 @@ import _ from 'lodash';
 import React, { useContext, useEffect, useState } from 'react';
 import {
   CHANNEL_TYPE,
-  NOTIFICATION_SOURCE,
 } from '../../../../public/utils/constants';
 import { MainContext } from '../../Main/Main';
 import { ChannelFiltersType } from '../types';
@@ -42,14 +41,6 @@ export const ChannelControls = (props: ChannelControlsProps) => {
       checked: 'off',
     }))
   );
-  const [isSourcePopoverOpen, setIsSourcePopoverOpen] = useState(false);
-  const [sourceItems, setSourceItems] = useState(
-    Object.entries(NOTIFICATION_SOURCE).map(([key, value]) => ({
-      field: key,
-      display: value,
-      checked: 'off',
-    }))
-  );
 
   useEffect(() => {
     const newItems = typeItems.filter(
@@ -86,10 +77,6 @@ export const ChannelControls = (props: ChannelControlsProps) => {
         setStateItems(newItems);
         newFilters.state = checkedItems[0];
         break;
-      case 'source':
-        setSourceItems(newItems);
-        newFilters.source = checkedItems;
-        break;
       case 'type':
         setTypeItems(newItems);
         newFilters.type = checkedItems;
@@ -175,32 +162,6 @@ export const ChannelControls = (props: ChannelControlsProps) => {
               );
             })}
           </EuiPopover>
-          <EuiPopover
-            button={
-              <EuiFilterButton
-                iconType="arrowDown"
-                grow={false}
-                onClick={() => setIsSourcePopoverOpen(!isSourcePopoverOpen)}
-              >
-                {isItemSelected(sourceItems) ? <b>Source</b> : 'Source'}
-              </EuiFilterButton>
-            }
-            isOpen={isSourcePopoverOpen}
-            closePopover={() => setIsSourcePopoverOpen(false)}
-            panelPaddingSize="none"
-          >
-            {sourceItems.map((item, index) => {
-              return (
-                <EuiFilterSelectItem
-                  key={`channel-source-filter-${index}`}
-                  checked={item.checked === 'on' ? 'on' : undefined}
-                  onClick={() => updateItem(sourceItems, index, 'source')}
-                >
-                  {item.display}
-                </EuiFilterSelectItem>
-              );
-            })}
-          </EuiPopover>
         </EuiFilterGroup>
       </EuiFlexItem>
     </EuiFlexGroup>
diff --git a/dashboards-notifications/public/pages/Channels/components/details/ChannelDetails.tsx b/dashboards-notifications/public/pages/Channels/components/details/ChannelDetails.tsx
index f7d6ca51..e238cec0 100644
--- a/dashboards-notifications/public/pages/Channels/components/details/ChannelDetails.tsx
+++ b/dashboards-notifications/public/pages/Channels/components/details/ChannelDetails.tsx
@@ -14,7 +14,6 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { Toast } from '@elastic/eui/src/components/toast/global_toast_list';
-import _ from 'lodash';
 import React, { useContext, useEffect, useState } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { ChannelItemType } from '../../../../../models/interfaces';
@@ -24,7 +23,6 @@ import { ModalConsumer } from '../../../../components/Modal';
 import { ServicesContext } from '../../../../services';
 import {
   BREADCRUMBS,
-  NOTIFICATION_SOURCE,
   ROUTES,
 } from '../../../../utils/constants';
 import { renderTime } from '../../../../utils/helpers';
@@ -127,16 +125,6 @@ export function ChannelDetails(props: ChannelDetailsProps) {
     },
   ];
 
-  const sources: Array<ListItemType> = [
-    {
-      title: 'Notification sources',
-      description:
-        channel?.feature_list
-          .map((source) => _.get(NOTIFICATION_SOURCE, source, '-'))
-          .join(', ') || '-',
-    },
-  ];
-
   return (
     <>
       <EuiGlobalToastList
@@ -228,17 +216,6 @@ export function ChannelDetails(props: ChannelDetailsProps) {
       >
         <ChannelSettingsDetails channel={channel} />
       </ContentPanel>
-
-      <EuiSpacer />
-
-      <ContentPanel
-        bodyStyles={{ padding: 'initial' }}
-        title="Availability"
-        titleSize="s"
-        panelStyles={{ maxWidth: 1300 }}
-      >
-        <ChannelDetailItems listItems={sources} />
-      </ContentPanel>
     </>
   );
 }
diff --git a/dashboards-notifications/public/pages/Channels/components/details/ChannelDetailsActions.tsx b/dashboards-notifications/public/pages/Channels/components/details/ChannelDetailsActions.tsx
index d37a5000..0f113bce 100644
--- a/dashboards-notifications/public/pages/Channels/components/details/ChannelDetailsActions.tsx
+++ b/dashboards-notifications/public/pages/Channels/components/details/ChannelDetailsActions.tsx
@@ -39,7 +39,7 @@ export function ChannelDetailsActions(props: ChannelDetailsActionsProps) {
 
   const sendTestMessage = async () => {
     try {
-      await servicesContext.eventService.sendTestMessage(
+      await servicesContext.notificationService.sendTestMessage(
         props.channel.config_id,
         props.channel.feature_list[0]
       );
diff --git a/dashboards-notifications/public/pages/Channels/types.ts b/dashboards-notifications/public/pages/Channels/types.ts
index d8f9c65a..18791809 100644
--- a/dashboards-notifications/public/pages/Channels/types.ts
+++ b/dashboards-notifications/public/pages/Channels/types.ts
@@ -20,5 +20,4 @@ export type WebhookHttpType = 'HTTP' | 'HTTPS';
 export interface ChannelFiltersType {
   state?: string;
   type?: string[];
-  source?: string[];
 }
diff --git a/dashboards-notifications/public/pages/CreateChannel/CreateChannel.tsx b/dashboards-notifications/public/pages/CreateChannel/CreateChannel.tsx
index 28d40d77..fc694cc7 100644
--- a/dashboards-notifications/public/pages/CreateChannel/CreateChannel.tsx
+++ b/dashboards-notifications/public/pages/CreateChannel/CreateChannel.tsx
@@ -34,7 +34,6 @@ import {
 import { getErrorMessage } from '../../utils/helpers';
 import { HeaderItemType, WebhookHttpType, WebhookMethodType } from '../Channels/types';
 import { MainContext } from '../Main/Main';
-import { ChannelAvailabilityPanel } from './components/ChannelAvailabilityPanel';
 import { ChannelNamePanel } from './components/ChannelNamePanel';
 import { ChimeSettings } from './components/ChimeSettings';
 import { CustomWebhookSettings } from './components/CustomWebhookSettings';
@@ -127,13 +126,6 @@ export function CreateChannel(props: CreateChannelsProps) {
   const [topicArn, setTopicArn] = useState(''); // SNS topic ARN
   const [roleArn, setRoleArn] = useState(''); // IAM role ARN (optional for open source distribution)
 
-  const [
-    sourceCheckboxIdToSelectedMap,
-    setSourceCheckboxIdToSelectedMap,
-  ] = useState<{
-    [x: string]: boolean;
-  }>({});
-
   const [inputErrors, setInputErrors] = useState<InputErrorsType>({
     name: [],
     slackWebhook: [],
@@ -187,11 +179,6 @@ export function CreateChannel(props: CreateChannelsProps) {
       setName(response.name);
       setDescription(response.description || '');
       setChannelType(type);
-      setSourceCheckboxIdToSelectedMap(
-        Object.fromEntries(
-          response.feature_list.map((feature) => [feature, true])
-        )
-      );
 
       if (type === BACKEND_CHANNEL_TYPE.SLACK) {
         setSlackWebhook(response.slack?.url || '');
@@ -277,9 +264,7 @@ export function CreateChannel(props: CreateChannelsProps) {
       name,
       description,
       config_type: channelType,
-      feature_list: Object.entries(sourceCheckboxIdToSelectedMap)
-        .filter(([key, value]) => value)
-        .map(([key, value]) => key),
+      feature_list: ['alerting'], // TODO: Remove this from config when the backend no longer requires it
       is_enabled: isEnabled,
     };
     if (channelType === BACKEND_CHANNEL_TYPE.SLACK) {
@@ -340,7 +325,7 @@ export function CreateChannel(props: CreateChannelsProps) {
           throw error;
         });
 
-      await servicesContext.eventService.sendTestMessage(
+      await servicesContext.notificationService.sendTestMessage(
         tempChannelId,
         config.feature_list[0] // for test message any source works
       );
@@ -462,12 +447,6 @@ export function CreateChannel(props: CreateChannelsProps) {
           ) : null}
         </ContentPanel>
 
-        <EuiSpacer />
-        <ChannelAvailabilityPanel
-          sourceCheckboxIdToSelectedMap={sourceCheckboxIdToSelectedMap}
-          setSourceCheckboxIdToSelectedMap={setSourceCheckboxIdToSelectedMap}
-        />
-
         <EuiSpacer />
         <EuiFlexGroup gutterSize="m" justifyContent="flexEnd">
           <EuiFlexItem grow={false}>
@@ -476,9 +455,6 @@ export function CreateChannel(props: CreateChannelsProps) {
           <EuiFlexItem grow={false}>
             <EuiButton
               data-test-subj="create-channel-send-test-message-button"
-              disabled={Object.values(sourceCheckboxIdToSelectedMap).every(
-                (enabled) => !enabled
-              )}
               onClick={() => {
                 if (!isInputValid()) {
                   coreContext.notifications.toasts.addDanger(
diff --git a/dashboards-notifications/public/pages/CreateChannel/__tests__/ChannelAvailabilityPanel.test.tsx b/dashboards-notifications/public/pages/CreateChannel/__tests__/ChannelAvailabilityPanel.test.tsx
deleted file mode 100644
index b57d3d31..00000000
--- a/dashboards-notifications/public/pages/CreateChannel/__tests__/ChannelAvailabilityPanel.test.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { fireEvent, render } from '@testing-library/react';
-import React from 'react';
-import { NOTIFICATION_SOURCE } from '../../../utils/constants';
-import { ChannelAvailabilityPanel } from '../components/ChannelAvailabilityPanel';
-
-describe('<ChannelAvailabilityPanel/> spec', () => {
-  it('renders the component', () => {
-    const setSourceCheckboxIdToSelectedMap = jest.fn() as any;
-    const utils = render(
-      <ChannelAvailabilityPanel
-        sourceCheckboxIdToSelectedMap={{}}
-        setSourceCheckboxIdToSelectedMap={setSourceCheckboxIdToSelectedMap}
-      />
-    );
-    expect(utils.container.firstChild).toMatchSnapshot();
-  });
-
-  it('selects options', () => {
-    const setSourceCheckboxIdToSelectedMap = jest.fn() as any;
-    const utils = render(
-      <ChannelAvailabilityPanel
-        sourceCheckboxIdToSelectedMap={{}}
-        setSourceCheckboxIdToSelectedMap={setSourceCheckboxIdToSelectedMap}
-      />
-    );
-
-    const [key, value] = Object.entries(NOTIFICATION_SOURCE).slice(0, 1)[0];
-    const checkbox = utils.getByText(value);
-    fireEvent.click(checkbox);
-    expect(setSourceCheckboxIdToSelectedMap).toBeCalledWith({ [key]: true });
-  });
-});
diff --git a/dashboards-notifications/public/pages/CreateChannel/__tests__/CreateChannel.test.tsx b/dashboards-notifications/public/pages/CreateChannel/__tests__/CreateChannel.test.tsx
index b972770b..2078bcdd 100644
--- a/dashboards-notifications/public/pages/CreateChannel/__tests__/CreateChannel.test.tsx
+++ b/dashboards-notifications/public/pages/CreateChannel/__tests__/CreateChannel.test.tsx
@@ -38,7 +38,6 @@ describe('<CreateChannel/> spec', () => {
       </MainContext.Provider>
     );
     utils.getByTestId('create-channel-create-button').click();
-    utils.getByText('Alerting').click();
     utils.getByTestId('create-channel-send-test-message-button').click();
     expect(utils.container.firstChild).toMatchSnapshot();
   });
diff --git a/dashboards-notifications/public/pages/CreateChannel/__tests__/__snapshots__/ChannelAvailabilityPanel.test.tsx.snap b/dashboards-notifications/public/pages/CreateChannel/__tests__/__snapshots__/ChannelAvailabilityPanel.test.tsx.snap
deleted file mode 100644
index b7ab41da..00000000
--- a/dashboards-notifications/public/pages/CreateChannel/__tests__/__snapshots__/ChannelAvailabilityPanel.test.tsx.snap
+++ /dev/null
@@ -1,116 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<ChannelAvailabilityPanel/> spec renders the component 1`] = `
-<div
-  class="euiPanel euiPanel--paddingMedium"
->
-  <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
-    style="padding: 0px 0px;"
-  >
-    <div
-      class="euiFlexItem"
-    >
-      <h3
-        class="euiTitle euiTitle--small"
-      >
-        Availability
-      </h3>
-    </div>
-  </div>
-  <hr
-    class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-  />
-  <div
-    style="padding: initial;"
-  >
-    <div
-      class="euiFormRow"
-      id="random_html_id-row"
-    >
-      <div
-        class="euiFormRow__labelWrapper"
-      >
-        <label
-          class="euiFormLabel euiFormRow__label"
-          for="random_html_id"
-        >
-          Notification source
-        </label>
-      </div>
-      <div
-        class="euiFormRow__fieldWrapper"
-      >
-        <div
-          class="euiText euiText--extraSmall"
-        >
-          <div
-            class="euiTextColor euiTextColor--subdued"
-          >
-            Select the features that can use this channel.
-          </div>
-        </div>
-        <div
-          class="euiSpacer euiSpacer--s"
-        />
-        <div>
-          <div
-            class="euiCheckbox euiCheckboxGroup__item"
-          >
-            <input
-              class="euiCheckbox__input"
-              id="alerting"
-              type="checkbox"
-            />
-            <div
-              class="euiCheckbox__square"
-            />
-            <label
-              class="euiCheckbox__label"
-              for="alerting"
-            >
-              Alerting
-            </label>
-          </div>
-          <div
-            class="euiCheckbox euiCheckboxGroup__item"
-          >
-            <input
-              class="euiCheckbox__input"
-              id="index_management"
-              type="checkbox"
-            />
-            <div
-              class="euiCheckbox__square"
-            />
-            <label
-              class="euiCheckbox__label"
-              for="index_management"
-            >
-              ISM
-            </label>
-          </div>
-          <div
-            class="euiCheckbox euiCheckboxGroup__item"
-          >
-            <input
-              class="euiCheckbox__input"
-              id="reports"
-              type="checkbox"
-            />
-            <div
-              class="euiCheckbox__square"
-            />
-            <label
-              class="euiCheckbox__label"
-              for="reports"
-            >
-              Reporting
-            </label>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/dashboards-notifications/public/pages/CreateChannel/components/ChannelAvailabilityPanel.tsx b/dashboards-notifications/public/pages/CreateChannel/components/ChannelAvailabilityPanel.tsx
deleted file mode 100644
index c0bb586f..00000000
--- a/dashboards-notifications/public/pages/CreateChannel/components/ChannelAvailabilityPanel.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  EuiCheckboxGroup,
-  EuiCheckboxGroupOption,
-  EuiFormRow,
-  EuiSpacer,
-  EuiText,
-} from '@elastic/eui';
-import React from 'react';
-import { ContentPanel } from '../../../components/ContentPanel';
-import { NOTIFICATION_SOURCE } from '../../../utils/constants';
-
-interface ChannelAvailabilityPanelProps {
-  sourceCheckboxIdToSelectedMap: { [x: string]: boolean };
-  setSourceCheckboxIdToSelectedMap: (map: { [x: string]: boolean }) => void;
-}
-
-export function ChannelAvailabilityPanel(props: ChannelAvailabilityPanelProps) {
-  const sourceOptions: EuiCheckboxGroupOption[] = Object.entries(
-    NOTIFICATION_SOURCE
-  ).map(([key, value]) => ({
-    id: key,
-    label: value,
-  }));
-
-  return (
-    <ContentPanel
-      bodyStyles={{ padding: 'initial' }}
-      title="Availability"
-      titleSize="s"
-    >
-      <EuiFormRow label="Notification source">
-        <>
-          <EuiText size="xs" color="subdued">
-            Select the features that can use this channel.
-          </EuiText>
-          <EuiSpacer size="s" />
-          <EuiCheckboxGroup
-            options={sourceOptions}
-            idToSelectedMap={props.sourceCheckboxIdToSelectedMap}
-            onChange={(optionId: string) => {
-              props.setSourceCheckboxIdToSelectedMap({
-                ...props.sourceCheckboxIdToSelectedMap,
-                ...{
-                  [optionId]: !props.sourceCheckboxIdToSelectedMap[optionId],
-                },
-              });
-            }}
-          />
-        </>
-      </EuiFormRow>
-    </ContentPanel>
-  );
-}
diff --git a/dashboards-notifications/public/pages/Main/Main.tsx b/dashboards-notifications/public/pages/Main/Main.tsx
index faa135c0..4fa94d4f 100644
--- a/dashboards-notifications/public/pages/Main/Main.tsx
+++ b/dashboards-notifications/public/pages/Main/Main.tsx
@@ -20,18 +20,15 @@ import { CreateSender } from '../Emails/CreateSender';
 import { CreateSESSender } from '../Emails/CreateSESSender';
 import { EmailGroups } from '../Emails/EmailGroups';
 import { EmailSenders } from '../Emails/EmailSenders';
-import Notifications from '../Notifications';
 
 enum Navigation {
   Notifications = 'Notifications',
-  Dashboard = 'Dashboard',
   Channels = 'Channels',
   EmailSenders = 'Email senders',
   EmailGroups = 'Email recipient groups',
 }
 
 enum Pathname {
-  Notifications = '/notifications',
   Channels = '/channels',
 }
 
@@ -94,14 +91,8 @@ export default class Main extends Component<MainProps, MainState> {
       {
         name: Navigation.Notifications,
         id: 0,
-        href: `#${Pathname.Notifications}`,
+        href: `#${Pathname.Channels}`,
         items: [
-          {
-            name: Navigation.Dashboard,
-            id: 1,
-            href: `#${Pathname.Notifications}`,
-            isSelected: pathname === Pathname.Notifications,
-          },
           {
             name: Navigation.Channels,
             id: 2,
@@ -181,16 +172,6 @@ export default class Main extends Component<MainProps, MainState> {
                                 />
                               )}
                             />
-                            <Route
-                              path={ROUTES.NOTIFICATIONS}
-                              render={(props: RouteComponentProps) => (
-                                <Notifications
-                                  {...props}
-                                  services={services}
-                                  mainProps={this.state}
-                                />
-                              )}
-                            />
                             <Route
                               path={ROUTES.EMAIL_SENDERS}
                               render={(props: RouteComponentProps) => (
@@ -239,7 +220,7 @@ export default class Main extends Component<MainProps, MainState> {
                                 <CreateRecipientGroup {...props} edit={true} />
                               )}
                             />
-                            <Redirect from="/" to={ROUTES.NOTIFICATIONS} />
+                            <Redirect from="/" to={ROUTES.CHANNELS} />
                           </Switch>
                         </EuiPageBody>
                       </EuiPage>
diff --git a/dashboards-notifications/public/pages/Main/__tests__/__snapshots__/Main.test.tsx.snap b/dashboards-notifications/public/pages/Main/__tests__/__snapshots__/Main.test.tsx.snap
index e0c5d5a7..8734b4c4 100644
--- a/dashboards-notifications/public/pages/Main/__tests__/__snapshots__/Main.test.tsx.snap
+++ b/dashboards-notifications/public/pages/Main/__tests__/__snapshots__/Main.test.tsx.snap
@@ -42,7 +42,7 @@ exports[`<Main /> spec renders the component 1`] = `
         >
           <a
             class="euiSideNavItemButton euiSideNavItemButton--isClickable"
-            href="#/notifications"
+            href="#/channels"
             rel="noreferrer"
           >
             <span
@@ -58,25 +58,6 @@ exports[`<Main /> spec renders the component 1`] = `
           <div
             class="euiSideNavItem__items"
           >
-            <div
-              class="euiSideNavItem euiSideNavItem--trunk"
-            >
-              <a
-                class="euiSideNavItemButton euiSideNavItemButton--isClickable euiSideNavItemButton-isSelected"
-                href="#/notifications"
-                rel="noreferrer"
-              >
-                <span
-                  class="euiSideNavItemButton__content"
-                >
-                  <span
-                    class="euiSideNavItemButton__label"
-                  >
-                    Dashboard
-                  </span>
-                </span>
-              </a>
-            </div>
             <div
               class="euiSideNavItem euiSideNavItem--trunk"
             >
@@ -143,128 +124,58 @@ exports[`<Main /> spec renders the component 1`] = `
     class="euiPageBody"
   >
     <div
-      style="padding: 0px 25px;"
+      class="euiPanel euiPanel--paddingMedium"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
+        style="padding: 0px 0px;"
       >
         <div
           class="euiFlexItem"
         >
-          <h1
-            class="euiTitle euiTitle--large"
-          >
-            Dashboard
-          </h1>
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <a
-            class="euiButton euiButton--primary euiButton--fill"
-            data-test-subj="createChannelButton"
-            href="#/channels"
-            rel="noreferrer"
+          <h3
+            class="euiTitle euiTitle--medium"
           >
+            Channels
             <span
-              class="euiButtonContent euiButton__content"
+              style="color: rgb(159, 159, 159); font-weight: 300;"
             >
-              <span
-                class="euiButton__text"
-              >
-                Manage channels
-              </span>
+               (0)
             </span>
-          </a>
-        </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--m"
-      />
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-      >
-        <div
-          class="euiFlexItem"
-        >
-          <div
-            class="euiFormControlLayout euiFormControlLayout--fullWidth"
-          >
-            <div
-              class="euiFormControlLayout__childrenWrapper"
-            >
-              <input
-                class="euiFieldSearch euiFieldSearch--fullWidth"
-                data-test-subj="notifications-search-bar-input"
-                placeholder="Search"
-                type="search"
-                value=""
-              />
-              <div
-                class="euiFormControlLayoutIcons"
-              >
-                <span
-                  class="euiFormControlLayoutCustomIcon"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width="16"
-                    xmlns="http://www.w3.org/2000/svg"
-                  />
-                </span>
-              </div>
-            </div>
-          </div>
+          </h3>
         </div>
         <div
           class="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiSuperDatePicker__flexWrapper euiSuperDatePicker__flexWrapper--noUpdateButton"
+            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
           >
             <div
               class="euiFlexItem"
             >
               <div
-                class="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
               >
                 <div
-                  class="euiPopover euiPopover--anchorDownLeft"
-                  id="QuickSelectPopover"
+                  class="euiFlexItem euiFlexItem--flexGrowZero"
                 >
                   <div
-                    class="euiPopover__anchor euiQuickSelectPopover__anchor"
+                    class="euiPopover euiPopover--anchorDownCenter"
                   >
-                    <button
-                      aria-label="Date quick select"
-                      class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiFormControlLayout__prepend"
-                      data-test-subj="superDatePickerToggleQuickMenuButton"
-                      type="button"
+                    <div
+                      class="euiPopover__anchor"
                     >
-                      <span
-                        class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                      <button
+                        class="euiButton euiButton--primary euiButton-isDisabled"
+                        disabled=""
+                        type="button"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
-                          focusable="false"
-                          height="16"
-                          role="img"
-                          viewBox="0 0 16 16"
-                          width="16"
-                          xmlns="http://www.w3.org/2000/svg"
-                        />
                         <span
-                          class="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
+                          class="euiButtonContent euiButtonContent--iconRight euiButton__content"
                         >
                           <svg
                             aria-hidden="true"
-                            class="euiIcon euiIcon--medium euiIcon-isLoading"
+                            class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
                             focusable="false"
                             height="16"
                             role="img"
@@ -272,423 +183,477 @@ exports[`<Main /> spec renders the component 1`] = `
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
                           />
+                          <span
+                            class="euiButton__text"
+                          >
+                            Actions
+                          </span>
                         </span>
-                      </span>
-                    </button>
+                      </button>
+                    </div>
                   </div>
                 </div>
                 <div
-                  class="euiFormControlLayout__childrenWrapper"
+                  class="euiFlexItem euiFlexItem--flexGrowZero"
                 >
-                  <div
-                    class="euiDatePickerRange euiDatePickerRange--inGroup"
+                  <a
+                    class="euiButton euiButton--primary euiButton--fill"
+                    href="#/create-channel"
+                    rel="noreferrer"
                   >
-                    <button
-                      class="euiSuperDatePicker__prettyFormat"
-                      data-test-subj="superDatePickerShowDatesButton"
+                    <span
+                      class="euiButtonContent euiButton__content"
                     >
-                      Last 7 days
                       <span
-                        class="euiSuperDatePicker__prettyFormatLink"
+                        class="euiButton__text"
                       >
-                        Show dates
+                        Create channel
                       </span>
-                    </button>
-                  </div>
+                    </span>
+                  </a>
                 </div>
               </div>
             </div>
           </div>
         </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <button
-            class="euiButton euiButton--primary"
-            type="button"
-          >
-            <span
-              class="euiButtonContent euiButton__content"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              />
-              <span
-                class="euiButton__text"
-              >
-                Refresh
-              </span>
-            </span>
-          </button>
-        </div>
       </div>
-      <div
-        class="euiSpacer euiSpacer--s"
+      <hr
+        class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
       />
       <div
-        class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--wrap"
-        style="min-height: 32px;"
+        style="padding: initial;"
       >
         <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
+          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
         >
           <div
-            class="euiPopover euiPopover--anchorRightUp euiPopover--withTitle"
+            class="euiFlexItem"
           >
             <div
-              class="euiPopover__anchor"
+              class="euiFormControlLayout euiFormControlLayout--fullWidth"
             >
-              <button
-                aria-label="Change all filters"
-                class="euiButtonIcon euiButtonIcon--primary"
-                title="Change all filters"
-                type="button"
+              <div
+                class="euiFormControlLayout__childrenWrapper"
               >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
+                <input
+                  class="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+                  placeholder="Search"
+                  type="search"
                 />
-              </button>
+                <div
+                  class="euiFormControlLayoutIcons"
+                >
+                  <span
+                    class="euiFormControlLayoutCustomIcon"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
+                      focusable="false"
+                      height="16"
+                      role="img"
+                      viewBox="0 0 16 16"
+                      width="16"
+                      xmlns="http://www.w3.org/2000/svg"
+                    />
+                  </span>
+                </div>
+              </div>
             </div>
           </div>
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
           <div
-            class="euiPopover euiPopover--anchorDownLeft euiPopover--withTitle"
+            class="euiFlexItem euiFlexItem--flexGrowZero"
           >
             <div
-              class="euiPopover__anchor"
+              class="euiFilterGroup"
             >
-              <button
-                class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall"
-                type="button"
+              <div
+                class="euiPopover euiPopover--anchorDownCenter"
               >
-                <span
-                  class="euiButtonContent euiButtonEmpty__content"
+                <div
+                  class="euiPopover__anchor"
                 >
-                  <span
-                    class="euiButtonEmpty__text"
+                  <button
+                    class="euiButtonEmpty euiButtonEmpty--text euiFilterButton euiFilterButton--hasIcon euiFilterButton--noGrow"
+                    type="button"
                   >
-                    + Add filter
-                  </span>
-                </span>
-              </button>
+                    <span
+                      class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
+                        focusable="false"
+                        height="16"
+                        role="img"
+                        viewBox="0 0 16 16"
+                        width="16"
+                        xmlns="http://www.w3.org/2000/svg"
+                      />
+                      <span
+                        class="euiButtonEmpty__text"
+                      >
+                        <span
+                          class="euiFilterButton__textShift"
+                          data-text="Status"
+                          title="Status"
+                        >
+                          Status
+                        </span>
+                      </span>
+                    </span>
+                  </button>
+                </div>
+              </div>
+              <div
+                class="euiPopover euiPopover--anchorDownCenter"
+              >
+                <div
+                  class="euiPopover__anchor"
+                >
+                  <button
+                    class="euiButtonEmpty euiButtonEmpty--text euiFilterButton euiFilterButton--hasIcon euiFilterButton--noGrow"
+                    type="button"
+                  >
+                    <span
+                      class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
+                        focusable="false"
+                        height="16"
+                        role="img"
+                        viewBox="0 0 16 16"
+                        width="16"
+                        xmlns="http://www.w3.org/2000/svg"
+                      />
+                      <span
+                        class="euiButtonEmpty__text"
+                      >
+                        <span
+                          class="euiFilterButton__textShift"
+                          data-text="Type"
+                          title="Type"
+                        >
+                          Type
+                        </span>
+                      </span>
+                    </span>
+                  </button>
+                </div>
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <div
-        class="euiPanel euiPanel--paddingMedium"
-      >
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
-          style="padding: 0px 0px;"
-        >
-          <div
-            class="euiFlexItem"
-          >
-            <h3
-              class="euiTitle euiTitle--medium"
-            >
-              Notification history
-            </h3>
-          </div>
-        </div>
         <hr
           class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
         />
         <div
-          style="padding: initial;"
+          class="euiBasicTable euiBasicTable-loading"
         >
-          <div
-            class="euiBasicTable euiBasicTable-loading"
-          >
-            <div>
+          <div>
+            <div
+              class="euiTableHeaderMobile"
+            >
               <div
-                class="euiTableHeaderMobile"
+                class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
               >
                 <div
-                  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
+                  class="euiFlexItem euiFlexItem--flexGrowZero"
                 >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
-                  />
+                    class="euiCheckbox"
+                  >
+                    <input
+                      aria-label="Select all rows"
+                      class="euiCheckbox__input"
+                      disabled=""
+                      id="_selection_column-checkbox_random_html_id"
+                      type="checkbox"
+                    />
+                    <div
+                      class="euiCheckbox__square"
+                    />
+                    <label
+                      class="euiCheckbox__label"
+                      for="_selection_column-checkbox_random_html_id"
+                    >
+                      Select all rows
+                    </label>
+                  </div>
+                </div>
+                <div
+                  class="euiFlexItem euiFlexItem--flexGrowZero"
+                >
                   <div
-                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                    class="euiTableSortMobile"
                   >
                     <div
-                      class="euiTableSortMobile"
+                      class="euiPopover euiPopover--anchorDownRight"
                     >
                       <div
-                        class="euiPopover euiPopover--anchorDownRight"
+                        class="euiPopover__anchor"
                       >
-                        <div
-                          class="euiPopover__anchor"
+                        <button
+                          class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
+                          type="button"
                         >
-                          <button
-                            class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
-                            type="button"
+                          <span
+                            class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                           >
+                            <svg
+                              aria-hidden="true"
+                              class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
+                              focusable="false"
+                              height="16"
+                              role="img"
+                              viewBox="0 0 16 16"
+                              width="16"
+                              xmlns="http://www.w3.org/2000/svg"
+                            />
                             <span
-                              class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                              class="euiButtonEmpty__text"
                             >
-                              <svg
-                                aria-hidden="true"
-                                class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
-                                focusable="false"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                                xmlns="http://www.w3.org/2000/svg"
-                              />
-                              <span
-                                class="euiButtonEmpty__text"
-                              >
-                                Sorting
-                              </span>
+                              Sorting
                             </span>
-                          </button>
-                        </div>
+                          </span>
+                        </button>
                       </div>
                     </div>
                   </div>
                 </div>
               </div>
-              <table
-                class="euiTable euiTable--responsive euiTable--auto"
-                id="random_html_id"
-                tabindex="-1"
-              >
-                <caption
-                  class="euiScreenReaderOnly euiTableCaption"
-                />
-                <thead>
-                  <tr>
-                    <th
-                      aria-live="polite"
-                      aria-sort="none"
-                      class="euiTableHeaderCell"
-                      data-test-subj="tableHeaderCell_event_source.title_0"
-                      role="columnheader"
-                      scope="col"
+            </div>
+            <table
+              class="euiTable euiTable--responsive euiTable--auto"
+              id="random_html_id"
+              tabindex="-1"
+            >
+              <caption
+                class="euiScreenReaderOnly euiTableCaption"
+              />
+              <thead>
+                <tr>
+                  <th
+                    class="euiTableHeaderCellCheckbox"
+                    scope="col"
+                  >
+                    <div
+                      class="euiTableCellContent"
                     >
-                      <button
-                        class="euiTableHeaderButton"
-                        data-test-subj="tableHeaderSortButton"
-                        type="button"
+                      <div
+                        class="euiCheckbox euiCheckbox--inList euiCheckbox--noLabel"
+                      >
+                        <input
+                          aria-label="Select all rows"
+                          class="euiCheckbox__input"
+                          data-test-subj="checkboxSelectAll"
+                          disabled=""
+                          id="_selection_column-checkbox_random_html_id"
+                          type="checkbox"
+                        />
+                        <div
+                          class="euiCheckbox__square"
+                        />
+                      </div>
+                    </div>
+                  </th>
+                  <th
+                    aria-live="polite"
+                    aria-sort="ascending"
+                    class="euiTableHeaderCell"
+                    data-test-subj="tableHeaderCell_name_0"
+                    role="columnheader"
+                    scope="col"
+                  >
+                    <button
+                      class="euiTableHeaderButton euiTableHeaderButton-isSorted"
+                      data-test-subj="tableHeaderSortButton"
+                      type="button"
+                    >
+                      <span
+                        class="euiTableCellContent"
                       >
                         <span
-                          class="euiTableCellContent"
+                          class="euiTableCellContent__text"
+                          title="Name; Sorted in ascending order"
                         >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="Notification"
-                          >
-                            Notification
-                          </span>
-                          <span
-                            class="euiScreenReaderOnly"
-                          >
-                            Click to sort in ascending order
-                          </span>
+                          Name
                         </span>
-                      </button>
-                    </th>
-                    <th
-                      aria-live="polite"
-                      aria-sort="none"
-                      class="euiTableHeaderCell"
-                      data-test-subj="tableHeaderCell_event_source.feature_1"
-                      role="columnheader"
-                      scope="col"
-                    >
-                      <button
-                        class="euiTableHeaderButton"
-                        data-test-subj="tableHeaderSortButton"
-                        type="button"
-                      >
+                        <svg
+                          aria-hidden="true"
+                          aria-label="Sorted in ascending order"
+                          class="euiIcon euiIcon--medium euiIcon-isLoading euiTableSortIcon"
+                          focusable="false"
+                          height="16"
+                          role="img"
+                          viewBox="0 0 16 16"
+                          width="16"
+                          xmlns="http://www.w3.org/2000/svg"
+                        />
                         <span
-                          class="euiTableCellContent"
+                          class="euiScreenReaderOnly"
                         >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="Source type"
-                          >
-                            Source type
-                          </span>
-                          <span
-                            class="euiScreenReaderOnly"
-                          >
-                            Click to sort in ascending order
-                          </span>
+                          Click to sort in descending order
                         </span>
-                      </button>
-                    </th>
-                    <th
-                      aria-live="polite"
-                      aria-sort="none"
-                      class="euiTableHeaderCell"
-                      data-test-subj="tableHeaderCell_event_source.severity_2"
-                      role="columnheader"
-                      scope="col"
+                      </span>
+                    </button>
+                  </th>
+                  <th
+                    aria-live="polite"
+                    aria-sort="none"
+                    class="euiTableHeaderCell"
+                    data-test-subj="tableHeaderCell_is_enabled_1"
+                    role="columnheader"
+                    scope="col"
+                  >
+                    <button
+                      class="euiTableHeaderButton"
+                      data-test-subj="tableHeaderSortButton"
+                      type="button"
                     >
-                      <button
-                        class="euiTableHeaderButton"
-                        data-test-subj="tableHeaderSortButton"
-                        type="button"
+                      <span
+                        class="euiTableCellContent"
                       >
                         <span
-                          class="euiTableCellContent"
+                          class="euiTableCellContent__text"
+                          title="Notification status"
                         >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="Severity"
-                          >
-                            Severity
-                          </span>
-                          <span
-                            class="euiScreenReaderOnly"
-                          >
-                            Click to sort in ascending order
-                          </span>
+                          Notification status
                         </span>
-                      </button>
-                    </th>
-                    <th
-                      aria-live="polite"
-                      aria-sort="descending"
-                      class="euiTableHeaderCell"
-                      data-test-subj="tableHeaderCell_last_updated_time_ms_3"
-                      role="columnheader"
-                      scope="col"
-                    >
-                      <button
-                        class="euiTableHeaderButton euiTableHeaderButton-isSorted"
-                        data-test-subj="tableHeaderSortButton"
-                        type="button"
-                      >
                         <span
-                          class="euiTableCellContent"
+                          class="euiScreenReaderOnly"
                         >
-                          <span
-                            class="euiTableCellContent__text"
-                            title="Time sent; Sorted in descending order"
-                          >
-                            Time sent
-                          </span>
-                          <svg
-                            aria-hidden="true"
-                            aria-label="Sorted in descending order"
-                            class="euiIcon euiIcon--medium euiIcon-isLoading euiTableSortIcon"
-                            focusable="false"
-                            height="16"
-                            role="img"
-                            viewBox="0 0 16 16"
-                            width="16"
-                            xmlns="http://www.w3.org/2000/svg"
-                          />
-                          <span
-                            class="euiScreenReaderOnly"
-                          >
-                            Click to sort in ascending order
-                          </span>
+                          Click to sort in ascending order
                         </span>
-                      </button>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      data-test-subj="tableHeaderCell_success_4"
-                      role="columnheader"
-                      scope="col"
+                      </span>
+                    </button>
+                  </th>
+                  <th
+                    aria-live="polite"
+                    aria-sort="none"
+                    class="euiTableHeaderCell"
+                    data-test-subj="tableHeaderCell_config_type_2"
+                    role="columnheader"
+                    scope="col"
+                  >
+                    <button
+                      class="euiTableHeaderButton"
+                      data-test-subj="tableHeaderSortButton"
+                      type="button"
                     >
-                      <div
+                      <span
                         class="euiTableCellContent"
                       >
                         <span
                           class="euiTableCellContent__text"
-                          title="Sent status"
+                          title="Type"
                         >
-                          Sent status
+                          Type
                         </span>
-                      </div>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      data-test-subj="tableHeaderCell_status_list_5"
-                      role="columnheader"
-                      scope="col"
-                    >
-                      <div
-                        class="euiTableCellContent"
-                      >
                         <span
-                          class="euiTableCellContent__text"
-                          title="Channels"
+                          class="euiScreenReaderOnly"
                         >
-                          Channels
+                          Click to sort in ascending order
                         </span>
-                      </div>
-                    </th>
-                    <th
-                      class="euiTableHeaderCell"
-                      data-test-subj="tableHeaderCell_status_list_6"
-                      role="columnheader"
-                      scope="col"
+                      </span>
+                    </button>
+                  </th>
+                  <th
+                    aria-live="polite"
+                    aria-sort="none"
+                    class="euiTableHeaderCell"
+                    data-test-subj="tableHeaderCell_description_3"
+                    role="columnheader"
+                    scope="col"
+                  >
+                    <button
+                      class="euiTableHeaderButton"
+                      data-test-subj="tableHeaderSortButton"
+                      type="button"
                     >
-                      <div
+                      <span
                         class="euiTableCellContent"
                       >
                         <span
                           class="euiTableCellContent__text"
-                          title="Channel types"
+                          title="Description"
                         >
-                          Channel types
+                          Description
                         </span>
-                      </div>
-                    </th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr
-                    class="euiTableRow"
+                        <span
+                          class="euiScreenReaderOnly"
+                        >
+                          Click to sort in ascending order
+                        </span>
+                      </span>
+                    </button>
+                  </th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr
+                  class="euiTableRow"
+                >
+                  <td
+                    class="euiTableRowCell euiTableRowCell--isMobileFullWidth"
+                    colspan="5"
                   >
-                    <td
-                      class="euiTableRowCell euiTableRowCell--isMobileFullWidth"
-                      colspan="7"
+                    <div
+                      class="euiTableCellContent euiTableCellContent--alignCenter"
                     >
-                      <div
-                        class="euiTableCellContent euiTableCellContent--alignCenter"
+                      <span
+                        class="euiTableCellContent__text"
                       >
-                        <span
-                          class="euiTableCellContent__text"
+                        <div
+                          class="euiEmptyPrompt"
                         >
-                          No items found
-                        </span>
-                      </div>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
+                          <span
+                            class="euiTextColor euiTextColor--subdued"
+                          >
+                            <h2
+                              class="euiTitle euiTitle--medium"
+                            >
+                              No channels to display
+                            </h2>
+                            <div
+                              class="euiSpacer euiSpacer--m"
+                            />
+                            <div
+                              class="euiText euiText--medium"
+                            >
+                              To send or receive notifications, you will need to create a notification channel.
+                            </div>
+                          </span>
+                          <div
+                            class="euiSpacer euiSpacer--l"
+                          />
+                          <div
+                            class="euiSpacer euiSpacer--s"
+                          />
+                          <a
+                            class="euiButton euiButton--primary"
+                            href="#/create-channel"
+                            rel="noreferrer"
+                          >
+                            <span
+                              class="euiButtonContent euiButton__content"
+                            >
+                              <span
+                                class="euiButton__text"
+                              >
+                                Create channel
+                              </span>
+                            </span>
+                          </a>
+                        </div>
+                      </span>
+                    </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
           </div>
         </div>
       </div>
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/AddFilterButton.test.tsx b/dashboards-notifications/public/pages/Notifications/__tests__/AddFilterButton.test.tsx
deleted file mode 100644
index b272bb65..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/AddFilterButton.test.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { fireEvent, render } from '@testing-library/react';
-import React from 'react';
-import { AddFilterButton } from '../components/SearchBar/Filter/AddFilterButton';
-
-describe('<AddFilterButton /> spec', () => {
-  it('renders the component', () => {
-    const setFilter = jest.fn();
-    const utils = render(<AddFilterButton setFilter={setFilter} />);
-    expect(utils.container.firstChild).toMatchSnapshot();
-  });
-
-  it('renders popover', () => {
-    const setFilter = jest.fn();
-    const utils = render(<AddFilterButton setFilter={setFilter} />);
-    const button = utils.getByText('+ Add filter');
-    fireEvent.click(button);
-    expect(utils.container.firstChild).toMatchSnapshot();
-  });
-});
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/EmptyState.test.tsx b/dashboards-notifications/public/pages/Notifications/__tests__/EmptyState.test.tsx
deleted file mode 100644
index 5a8d9511..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/EmptyState.test.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { fireEvent, render } from '@testing-library/react';
-import { configure, mount, shallow } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
-import React from 'react';
-import { EmptyState } from '../components/EmptyState/EmptyState';
-
-describe('<EmptyState /> spec', () => {
-  configure({ adapter: new Adapter() });
-
-  it('renders the component with channels configured', () => {
-    const utils = render(
-      <EmptyState channels />
-    );
-    expect(utils.container.firstChild).toMatchSnapshot();
-  });
-
-  it('renders the component without channels configured', () => {
-    const utils = render(
-      <EmptyState channels={false} />
-    );
-    expect(utils.container.firstChild).toMatchSnapshot();
-  });
-
-});
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/FilterEditPopover.test.tsx b/dashboards-notifications/public/pages/Notifications/__tests__/FilterEditPopover.test.tsx
deleted file mode 100644
index 9b63e8e2..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/FilterEditPopover.test.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { fireEvent, render } from '@testing-library/react';
-import React from 'react';
-import { FilterEditPopover } from '../components/SearchBar/Filter/FilterEditPopover';
-
-describe('<FilterEditPopover /> spec', () => {
-  it('renders the component', () => {
-    const setFilter = jest.fn();
-    const utils = render(
-      <FilterEditPopover closePopover={() => {}} setFilter={setFilter} />
-    );
-    expect(utils.container.firstChild).toMatchSnapshot();
-  });
-
-  it('closes popover', () => {
-    const setFilter = jest.fn();
-    const closePopover = jest.fn();
-    const utils = render(
-      <FilterEditPopover closePopover={closePopover} setFilter={setFilter} />
-    );
-
-    const cancel = utils.getByText('Cancel');
-    fireEvent.click(cancel);
-    expect(closePopover).toBeCalled();
-  });
-
-  it('changes options', () => {
-    const setFilter = jest.fn();
-    const closePopover = jest.fn();
-    const utils = render(
-      <FilterEditPopover closePopover={closePopover} setFilter={setFilter} />
-    );
-
-    const inputs = utils.container.querySelectorAll('input');
-
-    fireEvent.change(inputs[0], [{ label: 'Status' }]);
-    fireEvent.change(inputs[1], [{ label: 'is' }]);
-  });
-});
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/Filters.test.tsx b/dashboards-notifications/public/pages/Notifications/__tests__/Filters.test.tsx
deleted file mode 100644
index 576b3081..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/Filters.test.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { render } from '@testing-library/react';
-import React from 'react';
-import { Filters, FilterType } from '../components/SearchBar/Filter/Filters';
-
-describe('<Filters /> spec', () => {
-  it('renders the component', () => {
-    const setFilters = jest.fn();
-    const filters: FilterType[] = [
-      {
-        field: 'Channel',
-        operator: 'is',
-        value: 'test',
-        inverted: false,
-        disabled: true,
-      },
-      {
-        field: 'Source',
-        operator: 'is one of',
-        value: [{ label: 'Alerting' }, { label: 'ISM' }],
-        inverted: true,
-        disabled: false,
-      },
-    ];
-    const utils = render(<Filters filters={filters} setFilters={setFilters} />);
-    expect(utils.container.firstChild).toMatchSnapshot();
-
-    utils.getByText('Channel: test').click();
-    utils.getByText('Re-enable').click();
-    // utils.getByText('Channel: test').click();
-    // utils.getByText('Exclude results').click();
-    utils.getByText('Channel: test').click();
-    utils.getByText('Delete').click();
-  });
-});
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/GlobalFilterButton.test.tsx b/dashboards-notifications/public/pages/Notifications/__tests__/GlobalFilterButton.test.tsx
deleted file mode 100644
index b9f97df4..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/GlobalFilterButton.test.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { render } from '@testing-library/react';
-import { configure } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
-import React from 'react';
-import { FilterType } from '../components/SearchBar/Filter/Filters';
-import { GlobalFilterButton } from '../components/SearchBar/Filter/GlobalFilterButton';
-
-describe('<GlobalFilterButton /> spec', () => {
-  configure({ adapter: new Adapter() });
-
-  it('renders the component', () => {
-    const setFilters = jest.fn();
-    const utils = render(
-      <GlobalFilterButton filters={[]} setFilters={setFilters} />
-    );
-    expect(utils.container.firstChild).toMatchSnapshot();
-  });
-
-  it('renders the component', () => {
-    const filters: FilterType[] = [
-      {
-        field: 'Channel',
-        operator: 'is',
-        value: 'test',
-        inverted: false,
-        disabled: true,
-      },
-      {
-        field: 'Source',
-        operator: 'is one of',
-        value: [{ label: 'Alerting' }, { label: 'ISM' }],
-        inverted: true,
-        disabled: false,
-      },
-    ];
-    const setFilters = jest.fn();
-    const utils = render(
-      <GlobalFilterButton filters={filters} setFilters={setFilters} />
-    );
-
-    utils.getByLabelText('Change all filters').click();
-    utils.getByText('Enable all').click();
-    utils.getByLabelText('Change all filters').click();
-    utils.getByText('Disable all').click();
-    // utils.getByLabelText('Change all filters').click();
-    // utils.getByText('Invert inclusion').click();
-    utils.getByLabelText('Change all filters').click();
-    utils.getByText('Invert enabled/disabled').click();
-    utils.getByLabelText('Change all filters').click();
-    utils.getByText('Remove all').click();
-
-    expect(setFilters).toBeCalledTimes(4);
-  });
-});
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/HistogramControls.test.tsx b/dashboards-notifications/public/pages/Notifications/__tests__/HistogramControls.test.tsx
deleted file mode 100644
index 63bf42f2..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/HistogramControls.test.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { render } from '@testing-library/react';
-import React from 'react';
-import { HistogramControls } from '../components/NotificationsHistogram/HistogramControls';
-
-describe('<HistogramControls /> spec', () => {
-  it('renders the component', () => {
-    const setHistogramType = jest.fn();
-    const utils = render(
-      <HistogramControls
-        histogramType="CHANNEL_TYPE"
-        setHistogramType={setHistogramType}
-      />
-    );
-    expect(utils.container.firstChild).toMatchSnapshot();
-  });
-});
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/Notifications.test.tsx b/dashboards-notifications/public/pages/Notifications/__tests__/Notifications.test.tsx
deleted file mode 100644
index 90d71bc8..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/Notifications.test.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { fireEvent, render } from '@testing-library/react';
-import { configure } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
-import React from 'react';
-import { RouteComponentProps } from 'react-router-dom';
-import Notifications from '..';
-import {
-  coreServicesMock,
-  mainStateMock,
-  notificationServiceMock,
-} from '../../../../test/mocks/serviceMock';
-import { CoreServicesContext } from '../../../components/coreServices';
-import { ServicesContext } from '../../../services';
-import { MainContext } from '../../Main/Main';
-
-describe('<Notifications /> spec', () => {
-  configure({ adapter: new Adapter() });
-
-  it('renders the component', () => {
-    const props = {
-      location: { search: '' },
-      match: { params: { id: 'test' } },
-    };
-    const utils = render(
-      <MainContext.Provider value={mainStateMock}>
-        <ServicesContext.Provider value={notificationServiceMock}>
-          <CoreServicesContext.Provider value={coreServicesMock}>
-            <Notifications
-              {...(props as RouteComponentProps<{ id: string }>)}
-              services={notificationServiceMock}
-              mainProps={mainStateMock}
-            />
-          </CoreServicesContext.Provider>
-        </ServicesContext.Provider>
-      </MainContext.Provider>
-    );
-
-    fireEvent.change(utils.getByTestId('notifications-search-bar-input'), {
-      target: { value: 'test' },
-    });
-    utils.getByText('Refresh').click();
-    expect(utils.container.firstChild).toMatchSnapshot();
-  });
-});
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/NotificationsHistogram.test.tsx b/dashboards-notifications/public/pages/Notifications/__tests__/NotificationsHistogram.test.tsx
deleted file mode 100644
index d1142cff..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/NotificationsHistogram.test.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { render } from '@testing-library/react';
-import React from 'react';
-import { NotificationsHistogram } from '../components/NotificationsHistogram/NotificationsHistogram';
-
-describe('<NotificationsHistogram /> spec', () => {
-  it('renders the component', () => {
-    const utils = render(<NotificationsHistogram />);
-    expect(utils.container.firstChild).toMatchSnapshot();
-  });
-});
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/NotificationsSearchBar.test.tsx b/dashboards-notifications/public/pages/Notifications/__tests__/NotificationsSearchBar.test.tsx
deleted file mode 100644
index 2f89eb79..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/NotificationsSearchBar.test.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { fireEvent, render } from '@testing-library/react';
-import React from 'react';
-import { FilterType } from '../components/SearchBar/Filter/Filters';
-import { NotificationsSearchBar } from '../components/SearchBar/NotificationsSearchBar';
-
-describe('<NotificationsSearchBar /> spec', () => {
-  it('renders the component', () => {
-    const filters: FilterType[] = [
-      {
-        field: 'Channel',
-        operator: 'is',
-        value: 'test',
-        inverted: false,
-        disabled: true,
-      },
-      {
-        field: 'Source',
-        operator: 'is not one of',
-        value: [{ label: 'Alerting' }, { label: 'ISM' }],
-        inverted: true,
-        disabled: false,
-      },
-    ];
-    const setStartTime = jest.fn();
-    const setEndTime = jest.fn();
-    const setSearch = jest.fn();
-    const setFilters = jest.fn();
-    const refresh = jest.fn();
-    const utils = render(
-      <NotificationsSearchBar
-        startTime="now-1d"
-        setStartTime={setStartTime}
-        endTime="now"
-        setEndTime={setEndTime}
-        search="test"
-        setSearch={setSearch}
-        filters={filters}
-        setFilters={setFilters}
-        refresh={refresh}
-      />
-    );
-    expect(utils.container.firstChild).toMatchSnapshot();
-
-    const searchBar = utils.getByPlaceholderText('Search');
-    fireEvent.change(searchBar, { target: { value: 'new query' } });
-    expect(setSearch).toBeCalledWith('new query');
-
-    utils.getByText('Refresh').click();
-    expect(refresh).toBeCalled();
-  });
-});
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/NotificationsTable.test.tsx b/dashboards-notifications/public/pages/Notifications/__tests__/NotificationsTable.test.tsx
deleted file mode 100644
index ff6e29a2..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/NotificationsTable.test.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { EuiTableSortingType } from '@elastic/eui';
-import { Pagination } from '@elastic/eui/src/components/basic_table/pagination_bar';
-import { render } from '@testing-library/react';
-import { configure } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
-import React from 'react';
-import { NotificationItem } from '../../../../models/interfaces';
-import { MOCK_DATA } from '../../../../test/mocks/mockData';
-import { NotificationsTable } from '../components/NotificationsTable/NotificationsTable';
-import { DEFAULT_PAGE_SIZE_OPTIONS } from '../utils/constants';
-
-describe('<NotificationsTable /> spec', () => {
-  configure({ adapter: new Adapter() });
-
-  const sorting: EuiTableSortingType<NotificationItem> = {
-    sort: {
-      direction: 'asc',
-      field: 'last_updated_time_ms',
-    },
-  };
-
-  it('renders the component', () => {
-  const pagination: Pagination = {
-    pageIndex: 0,
-    pageSize: 5,
-    pageSizeOptions: DEFAULT_PAGE_SIZE_OPTIONS,
-    totalItemCount: 0,
-  };
-
-    const utils = render(
-      <NotificationsTable
-        items={[]}
-        onTableChange={() => {}}
-        pagination={pagination}
-        sorting={sorting}
-        loading={false}
-      />
-    );
-    expect(utils.container.firstChild).toMatchSnapshot();
-  });
-
-  it('renders the component with items', () => {
-  const pagination: Pagination = {
-    pageIndex: 0,
-    pageSize: 5,
-    pageSizeOptions: DEFAULT_PAGE_SIZE_OPTIONS,
-    totalItemCount: 20,
-  };
-
-    const utils = render(
-      <NotificationsTable
-        items={MOCK_DATA.notifications.items}
-        onTableChange={() => {}}
-        pagination={pagination}
-        sorting={sorting}
-        loading={false}
-      />
-    );
-    expect(utils.container.firstChild).toMatchSnapshot();
-  });
-
-});
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/TableFlyout.test.tsx b/dashboards-notifications/public/pages/Notifications/__tests__/TableFlyout.test.tsx
deleted file mode 100644
index 1aa9a60a..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/TableFlyout.test.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { render } from '@testing-library/react';
-import React from 'react';
-import { MOCK_DATA } from '../../../../test/mocks/mockData';
-import { notificationServiceMock } from '../../../../test/mocks/serviceMock';
-import { ChannelCard } from '../components/NotificationsTable/Flyout/ChannelCard';
-import { TableFlyout } from '../components/NotificationsTable/Flyout/TableFlyout';
-
-describe('<TableFlyout /> spec', () => {
-
-  it('renders the component', () => {
-    const utils = render(
-      <TableFlyout
-        notificationItem={MOCK_DATA.notifications.items[0]}
-        onClose={() => {}}
-        services={notificationServiceMock}
-      />
-    );
-    expect(utils.container.firstChild).toMatchSnapshot();
-  });
-
-  it('clicks card link', () => {
-    const channel = MOCK_DATA.notifications.items[0].status_list[0]
-    const onClose = jest.fn();
-    const utils = render(
-      <ChannelCard channel={channel} onClose={onClose} />
-    );
-    utils.getByText(channel.config_name).click();
-    expect(onClose).toBeCalled();
-  });
-});
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/AddFilterButton.test.tsx.snap b/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/AddFilterButton.test.tsx.snap
deleted file mode 100644
index f88fa3b5..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/AddFilterButton.test.tsx.snap
+++ /dev/null
@@ -1,51 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<AddFilterButton /> spec renders popover 1`] = `
-<div
-  class="euiPopover euiPopover--anchorDownLeft euiPopover--withTitle"
->
-  <div
-    class="euiPopover__anchor"
-  >
-    <button
-      class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall"
-      type="button"
-    >
-      <span
-        class="euiButtonContent euiButtonEmpty__content"
-      >
-        <span
-          class="euiButtonEmpty__text"
-        >
-          + Add filter
-        </span>
-      </span>
-    </button>
-  </div>
-</div>
-`;
-
-exports[`<AddFilterButton /> spec renders the component 1`] = `
-<div
-  class="euiPopover euiPopover--anchorDownLeft euiPopover--withTitle"
->
-  <div
-    class="euiPopover__anchor"
-  >
-    <button
-      class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall"
-      type="button"
-    >
-      <span
-        class="euiButtonContent euiButtonEmpty__content"
-      >
-        <span
-          class="euiButtonEmpty__text"
-        >
-          + Add filter
-        </span>
-      </span>
-    </button>
-  </div>
-</div>
-`;
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/EmptyState.test.tsx.snap b/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/EmptyState.test.tsx.snap
deleted file mode 100644
index b3006366..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/EmptyState.test.tsx.snap
+++ /dev/null
@@ -1,123 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<EmptyState /> spec renders the component with channels configured 1`] = `
-<div
-  class="euiEmptyPrompt"
->
-  <span
-    class="euiTextColor euiTextColor--subdued"
-  >
-    <h2
-      class="euiTitle euiTitle--medium"
-    >
-      No notifications insights to display
-    </h2>
-    <div
-      class="euiSpacer euiSpacer--m"
-    />
-    <div
-      class="euiText euiText--medium"
-    >
-      <div
-        class="euiText euiText--medium"
-      >
-        Adjust your filter or create a channel.
-         
-        <a
-          class="euiLink euiLink--primary"
-          href=""
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          Learn more
-          <svg
-            aria-hidden="true"
-            aria-label="External link"
-            class="euiIcon euiIcon--small euiIcon-isLoading euiLink__externalIcon"
-            focusable="false"
-            height="16"
-            role="img"
-            viewBox="0 0 16 16"
-            width="16"
-            xmlns="http://www.w3.org/2000/svg"
-          />
-        </a>
-      </div>
-    </div>
-  </span>
-</div>
-`;
-
-exports[`<EmptyState /> spec renders the component without channels configured 1`] = `
-<div
-  class="euiEmptyPrompt"
->
-  <span
-    class="euiTextColor euiTextColor--subdued"
-  >
-    <h2
-      class="euiTitle euiTitle--medium"
-    >
-      You have no channels set up
-    </h2>
-    <div
-      class="euiSpacer euiSpacer--m"
-    />
-    <div
-      class="euiText euiText--medium"
-    >
-      <div
-        class="euiText euiText--medium"
-      >
-        <div>
-          Create a channel, and then configure actions to get notifications from features like Alerting and Index Management.
-           
-          <a
-            class="euiLink euiLink--primary"
-            href=""
-            rel="noopener noreferrer"
-            target="_blank"
-          >
-            Learn more
-            <svg
-              aria-label="External link"
-              class="euiIcon euiIcon--small euiLink__externalIcon"
-              focusable="false"
-              height="16"
-              role="img"
-              viewBox="0 0 16 16"
-              width="16"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M13 8.5a.5.5 0 111 0V12a2 2 0 01-2 2H4a2 2 0 01-2-2V4a2 2 0 012-2h3.5a.5.5 0 010 1H4a1 1 0 00-1 1v8a1 1 0 001 1h8a1 1 0 001-1V8.5zm-5.12.339a.5.5 0 11-.706-.707L13.305 2H10.5a.5.5 0 110-1H14a1 1 0 011 1v3.5a.5.5 0 11-1 0V2.72L7.88 8.838z"
-              />
-            </svg>
-          </a>
-        </div>
-      </div>
-    </div>
-  </span>
-  <div
-    class="euiSpacer euiSpacer--l"
-  />
-  <div
-    class="euiSpacer euiSpacer--s"
-  />
-  <a
-    class="euiButton euiButton--primary euiButton--fill"
-    href="#/create-channel"
-    rel="noreferrer"
-  >
-    <span
-      class="euiButtonContent euiButton__content"
-    >
-      <span
-        class="euiButton__text"
-      >
-        Create channel
-      </span>
-    </span>
-  </a>
-</div>
-`;
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/FilterEditPopover.test.tsx.snap b/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/FilterEditPopover.test.tsx.snap
deleted file mode 100644
index 5971b662..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/FilterEditPopover.test.tsx.snap
+++ /dev/null
@@ -1,234 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<FilterEditPopover /> spec renders the component 1`] = `
-<div
-  style="width: 400px;"
->
-  <button
-    style="width: 0px; height: 0px; position: fixed; margin-left: -10000px; bottom: 0px;"
-  />
-  <div
-    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
-  >
-    <div
-      class="euiFlexItem euiFlexItem--flexGrow6"
-    >
-      <div
-        class="euiFormRow"
-        id="random_html_id-row"
-      >
-        <div
-          class="euiFormRow__labelWrapper"
-        >
-          <label
-            class="euiFormLabel euiFormRow__label"
-            for="random_html_id"
-          >
-            Field
-          </label>
-        </div>
-        <div
-          class="euiFormRow__fieldWrapper"
-        >
-          <div
-            aria-expanded="false"
-            aria-haspopup="listbox"
-            class="euiComboBox"
-            role="combobox"
-          >
-            <div
-              class="euiFormControlLayout"
-            >
-              <div
-                class="euiFormControlLayout__childrenWrapper"
-              >
-                <div
-                  class="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap"
-                  data-test-subj="comboBoxInput"
-                  tabindex="-1"
-                >
-                  <p
-                    class="euiComboBoxPlaceholder"
-                  >
-                    Select a field first
-                  </p>
-                  <div
-                    class="euiComboBox__input"
-                    style="font-size: 14px; display: inline-block;"
-                  >
-                    <input
-                      aria-controls=""
-                      data-test-subj="comboBoxSearchInput"
-                      id="random_html_id"
-                      role="textbox"
-                      style="box-sizing: content-box; width: 2px;"
-                      value=""
-                    />
-                    <div
-                      style="position: absolute; top: 0px; left: 0px; visibility: hidden; height: 0px; overflow: scroll; white-space: pre; font-family: -webkit-small-control; letter-spacing: normal; text-transform: none;"
-                    />
-                  </div>
-                </div>
-                <div
-                  class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                >
-                  <button
-                    aria-label="Open list of options"
-                    class="euiFormControlLayoutCustomIcon euiFormControlLayoutCustomIcon--clickable"
-                    data-test-subj="comboBoxToggleListButton"
-                    type="button"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    />
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="euiFlexItem euiFlexItem--flexGrow5"
-    >
-      <div
-        class="euiFormRow"
-        id="random_html_id-row"
-      >
-        <div
-          class="euiFormRow__labelWrapper"
-        >
-          <label
-            class="euiFormLabel euiFormRow__label"
-            for="random_html_id"
-          >
-            Operator
-          </label>
-        </div>
-        <div
-          class="euiFormRow__fieldWrapper"
-        >
-          <div
-            aria-expanded="false"
-            aria-haspopup="listbox"
-            class="euiComboBox euiComboBox-isDisabled"
-            role="combobox"
-          >
-            <div
-              class="euiFormControlLayout"
-            >
-              <div
-                class="euiFormControlLayout__childrenWrapper"
-              >
-                <div
-                  class="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap"
-                  data-test-subj="comboBoxInput"
-                  tabindex="-1"
-                >
-                  <p
-                    class="euiComboBoxPlaceholder"
-                  >
-                    Waiting
-                  </p>
-                  <div
-                    class="euiComboBox__input"
-                    style="font-size: 14px; display: inline-block;"
-                  >
-                    <input
-                      aria-controls=""
-                      data-test-subj="comboBoxSearchInput"
-                      disabled=""
-                      id="random_html_id"
-                      role="textbox"
-                      style="box-sizing: content-box; width: 2px;"
-                      value=""
-                    />
-                    <div
-                      style="position: absolute; top: 0px; left: 0px; visibility: hidden; height: 0px; overflow: scroll; white-space: pre; font-family: -webkit-small-control; letter-spacing: normal; text-transform: none;"
-                    />
-                  </div>
-                </div>
-                <div
-                  class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                >
-                  <button
-                    aria-label="Open list of options"
-                    class="euiFormControlLayoutCustomIcon euiFormControlLayoutCustomIcon--clickable"
-                    data-test-subj="comboBoxToggleListButton"
-                    disabled=""
-                    type="button"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    />
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="euiSpacer euiSpacer--m"
-  />
-  <div
-    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
-  >
-    <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
-    >
-      <button
-        class="euiButtonEmpty euiButtonEmpty--primary"
-        data-test-subj="filter-popover-cancel-button"
-        type="button"
-      >
-        <span
-          class="euiButtonContent euiButtonEmpty__content"
-        >
-          <span
-            class="euiButtonEmpty__text"
-          >
-            Cancel
-          </span>
-        </span>
-      </button>
-    </div>
-    <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
-    >
-      <button
-        class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
-        disabled=""
-        type="button"
-      >
-        <span
-          class="euiButtonContent euiButton__content"
-        >
-          <span
-            class="euiButton__text"
-          >
-            Save
-          </span>
-        </span>
-      </button>
-    </div>
-  </div>
-</div>
-`;
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/Filters.test.tsx.snap b/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/Filters.test.tsx.snap
deleted file mode 100644
index 29200744..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/Filters.test.tsx.snap
+++ /dev/null
@@ -1,160 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<Filters /> spec renders the component 1`] = `
-<div
-  class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--wrap"
-  style="min-height: 32px;"
->
-  <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
-  >
-    <div
-      class="euiPopover euiPopover--anchorRightUp euiPopover--withTitle"
-    >
-      <div
-        class="euiPopover__anchor"
-      >
-        <button
-          aria-label="Change all filters"
-          class="euiButtonIcon euiButtonIcon--primary"
-          title="Change all filters"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
-            focusable="false"
-            height="16"
-            role="img"
-            viewBox="0 0 16 16"
-            width="16"
-            xmlns="http://www.w3.org/2000/svg"
-          />
-        </button>
-      </div>
-    </div>
-  </div>
-  <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
-  >
-    <div
-      class="euiPopover euiPopover--anchorDownCenter"
-    >
-      <div
-        class="euiPopover__anchor"
-      >
-        <span
-          class="euiBadge euiBadge--iconRight globalFilterItem globalFilterItem-isDisabled"
-          style="background-color: rgb(231, 233, 240); color: rgb(0, 0, 0);"
-        >
-          <span
-            class="euiBadge__content"
-          >
-            <button
-              aria-label="Open filter settings"
-              class="euiBadge__childButton"
-              title="Channel: test"
-            >
-              Channel: test
-            </button>
-            <button
-              aria-label="Remove filter"
-              class="euiBadge__iconButton"
-              title="Remove filter"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--small euiIcon-isLoading euiBadge__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              />
-            </button>
-          </span>
-        </span>
-      </div>
-    </div>
-  </div>
-  <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
-  >
-    <div
-      class="euiPopover euiPopover--anchorDownCenter"
-    >
-      <div
-        class="euiPopover__anchor"
-      >
-        <span
-          class="euiBadge euiBadge--hollow euiBadge--iconRight globalFilterItem globalFilterItem-isExcluded"
-        >
-          <span
-            class="euiBadge__content"
-          >
-            <button
-              aria-label="Open filter settings"
-              class="euiBadge__childButton"
-              title="NOT Source: is one of Alerting, ISM"
-            >
-              <span
-                class="euiTextColor euiTextColor--danger"
-              >
-                NOT 
-              </span>
-              <span
-                class="euiTextColor euiTextColor--default"
-              >
-                Source: is one of Alerting, ISM
-              </span>
-            </button>
-            <button
-              aria-label="Remove filter"
-              class="euiBadge__iconButton"
-              title="Remove filter"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--small euiIcon-isLoading euiBadge__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              />
-            </button>
-          </span>
-        </span>
-      </div>
-    </div>
-  </div>
-  <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
-  >
-    <div
-      class="euiPopover euiPopover--anchorDownLeft euiPopover--withTitle"
-    >
-      <div
-        class="euiPopover__anchor"
-      >
-        <button
-          class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall"
-          type="button"
-        >
-          <span
-            class="euiButtonContent euiButtonEmpty__content"
-          >
-            <span
-              class="euiButtonEmpty__text"
-            >
-              + Add filter
-            </span>
-          </span>
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/GlobalFilterButton.test.tsx.snap b/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/GlobalFilterButton.test.tsx.snap
deleted file mode 100644
index e8690e29..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/GlobalFilterButton.test.tsx.snap
+++ /dev/null
@@ -1,29 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<GlobalFilterButton /> spec renders the component 1`] = `
-<div
-  class="euiPopover euiPopover--anchorRightUp euiPopover--withTitle"
->
-  <div
-    class="euiPopover__anchor"
-  >
-    <button
-      aria-label="Change all filters"
-      class="euiButtonIcon euiButtonIcon--primary"
-      title="Change all filters"
-      type="button"
-    >
-      <svg
-        aria-hidden="true"
-        class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
-        focusable="false"
-        height="16"
-        role="img"
-        viewBox="0 0 16 16"
-        width="16"
-        xmlns="http://www.w3.org/2000/svg"
-      />
-    </button>
-  </div>
-</div>
-`;
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/HistogramControls.test.tsx.snap b/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/HistogramControls.test.tsx.snap
deleted file mode 100644
index 1e2ad90c..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/HistogramControls.test.tsx.snap
+++ /dev/null
@@ -1,62 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<HistogramControls /> spec renders the component 1`] = `
-<div
-  class="euiPopover euiPopover--anchorDownCenter euiPopover--displayBlock euiSuperSelect euiSuperSelect--fullWidth"
->
-  <div
-    class="euiPopover__anchor"
-  >
-    <input
-      type="hidden"
-      value="CHANNEL_TYPE"
-    />
-    <div
-      class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-    >
-      <label
-        class="euiFormLabel euiFormControlLayout__prepend"
-      >
-        Slice by
-      </label>
-      <div
-        class="euiFormControlLayout__childrenWrapper"
-      >
-        <span
-          class="euiScreenReaderOnly"
-          id="random_html_id"
-        >
-          Select an option: Channel type, is selected
-        </span>
-        <button
-          aria-haspopup="true"
-          aria-labelledby="undefined random_html_id"
-          class="euiSuperSelectControl euiSuperSelectControl--fullWidth euiSuperSelectControl--inGroup"
-          style="width: 300px;"
-          type="button"
-        >
-          Channel type
-        </button>
-        <div
-          class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-        >
-          <span
-            class="euiFormControlLayoutCustomIcon"
-          >
-            <svg
-              aria-hidden="true"
-              class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-              focusable="false"
-              height="16"
-              role="img"
-              viewBox="0 0 16 16"
-              width="16"
-              xmlns="http://www.w3.org/2000/svg"
-            />
-          </span>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/Notifications.test.tsx.snap b/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/Notifications.test.tsx.snap
deleted file mode 100644
index 9d5078f9..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/Notifications.test.tsx.snap
+++ /dev/null
@@ -1,555 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<Notifications /> spec renders the component 1`] = `
-<div
-  style="padding: 0px 25px;"
->
-  <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-  >
-    <div
-      class="euiFlexItem"
-    >
-      <h1
-        class="euiTitle euiTitle--large"
-      >
-        Dashboard
-      </h1>
-    </div>
-    <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
-    >
-      <a
-        class="euiButton euiButton--primary euiButton--fill"
-        data-test-subj="createChannelButton"
-        href="#/channels"
-        rel="noreferrer"
-      >
-        <span
-          class="euiButtonContent euiButton__content"
-        >
-          <span
-            class="euiButton__text"
-          >
-            Manage channels
-          </span>
-        </span>
-      </a>
-    </div>
-  </div>
-  <div
-    class="euiSpacer euiSpacer--m"
-  />
-  <div
-    class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
-  >
-    <div
-      class="euiFlexItem"
-    >
-      <div
-        class="euiFormControlLayout euiFormControlLayout--fullWidth"
-      >
-        <div
-          class="euiFormControlLayout__childrenWrapper"
-        >
-          <input
-            class="euiFieldSearch euiFieldSearch--fullWidth"
-            data-test-subj="notifications-search-bar-input"
-            placeholder="Search"
-            type="search"
-            value="test"
-          />
-          <div
-            class="euiFormControlLayoutIcons"
-          >
-            <span
-              class="euiFormControlLayoutCustomIcon"
-            >
-              <svg
-                aria-hidden="true"
-                class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                focusable="false"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-                xmlns="http://www.w3.org/2000/svg"
-              />
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
-    >
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiSuperDatePicker__flexWrapper euiSuperDatePicker__flexWrapper--noUpdateButton"
-      >
-        <div
-          class="euiFlexItem"
-        >
-          <div
-            class="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
-          >
-            <div
-              class="euiPopover euiPopover--anchorDownLeft"
-              id="QuickSelectPopover"
-            >
-              <div
-                class="euiPopover__anchor euiQuickSelectPopover__anchor"
-              >
-                <button
-                  aria-label="Date quick select"
-                  class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiFormControlLayout__prepend"
-                  data-test-subj="superDatePickerToggleQuickMenuButton"
-                  type="button"
-                >
-                  <span
-                    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    />
-                    <span
-                      class="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="euiIcon euiIcon--medium euiIcon-isLoading"
-                        focusable="false"
-                        height="16"
-                        role="img"
-                        viewBox="0 0 16 16"
-                        width="16"
-                        xmlns="http://www.w3.org/2000/svg"
-                      />
-                    </span>
-                  </span>
-                </button>
-              </div>
-            </div>
-            <div
-              class="euiFormControlLayout__childrenWrapper"
-            >
-              <div
-                class="euiDatePickerRange euiDatePickerRange--inGroup"
-              >
-                <button
-                  class="euiSuperDatePicker__prettyFormat"
-                  data-test-subj="superDatePickerShowDatesButton"
-                >
-                  Last 7 days
-                  <span
-                    class="euiSuperDatePicker__prettyFormatLink"
-                  >
-                    Show dates
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
-    >
-      <button
-        class="euiButton euiButton--primary"
-        type="button"
-      >
-        <span
-          class="euiButtonContent euiButton__content"
-        >
-          <svg
-            aria-hidden="true"
-            class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
-            focusable="false"
-            height="16"
-            role="img"
-            viewBox="0 0 16 16"
-            width="16"
-            xmlns="http://www.w3.org/2000/svg"
-          />
-          <span
-            class="euiButton__text"
-          >
-            Refresh
-          </span>
-        </span>
-      </button>
-    </div>
-  </div>
-  <div
-    class="euiSpacer euiSpacer--s"
-  />
-  <div
-    class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--wrap"
-    style="min-height: 32px;"
-  >
-    <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
-    >
-      <div
-        class="euiPopover euiPopover--anchorRightUp euiPopover--withTitle"
-      >
-        <div
-          class="euiPopover__anchor"
-        >
-          <button
-            aria-label="Change all filters"
-            class="euiButtonIcon euiButtonIcon--primary"
-            title="Change all filters"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
-              focusable="false"
-              height="16"
-              role="img"
-              viewBox="0 0 16 16"
-              width="16"
-              xmlns="http://www.w3.org/2000/svg"
-            />
-          </button>
-        </div>
-      </div>
-    </div>
-    <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
-    >
-      <div
-        class="euiPopover euiPopover--anchorDownLeft euiPopover--withTitle"
-      >
-        <div
-          class="euiPopover__anchor"
-        >
-          <button
-            class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall"
-            type="button"
-          >
-            <span
-              class="euiButtonContent euiButtonEmpty__content"
-            >
-              <span
-                class="euiButtonEmpty__text"
-              >
-                + Add filter
-              </span>
-            </span>
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="euiSpacer euiSpacer--l"
-  />
-  <div
-    class="euiPanel euiPanel--paddingMedium"
-  >
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
-      style="padding: 0px 0px;"
-    >
-      <div
-        class="euiFlexItem"
-      >
-        <h3
-          class="euiTitle euiTitle--medium"
-        >
-          Notification history
-        </h3>
-      </div>
-    </div>
-    <hr
-      class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-    />
-    <div
-      style="padding: initial;"
-    >
-      <div
-        class="euiBasicTable euiBasicTable-loading"
-      >
-        <div>
-          <div
-            class="euiTableHeaderMobile"
-          >
-            <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
-            >
-              <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
-              />
-              <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
-              >
-                <div
-                  class="euiTableSortMobile"
-                >
-                  <div
-                    class="euiPopover euiPopover--anchorDownRight"
-                  >
-                    <div
-                      class="euiPopover__anchor"
-                    >
-                      <button
-                        class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
-                        type="button"
-                      >
-                        <span
-                          class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
-                            focusable="false"
-                            height="16"
-                            role="img"
-                            viewBox="0 0 16 16"
-                            width="16"
-                            xmlns="http://www.w3.org/2000/svg"
-                          />
-                          <span
-                            class="euiButtonEmpty__text"
-                          >
-                            Sorting
-                          </span>
-                        </span>
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <table
-            class="euiTable euiTable--responsive euiTable--auto"
-            id="random_html_id"
-            tabindex="-1"
-          >
-            <caption
-              class="euiScreenReaderOnly euiTableCaption"
-            />
-            <thead>
-              <tr>
-                <th
-                  aria-live="polite"
-                  aria-sort="none"
-                  class="euiTableHeaderCell"
-                  data-test-subj="tableHeaderCell_event_source.title_0"
-                  role="columnheader"
-                  scope="col"
-                >
-                  <button
-                    class="euiTableHeaderButton"
-                    data-test-subj="tableHeaderSortButton"
-                    type="button"
-                  >
-                    <span
-                      class="euiTableCellContent"
-                    >
-                      <span
-                        class="euiTableCellContent__text"
-                        title="Notification"
-                      >
-                        Notification
-                      </span>
-                      <span
-                        class="euiScreenReaderOnly"
-                      >
-                        Click to sort in ascending order
-                      </span>
-                    </span>
-                  </button>
-                </th>
-                <th
-                  aria-live="polite"
-                  aria-sort="none"
-                  class="euiTableHeaderCell"
-                  data-test-subj="tableHeaderCell_event_source.feature_1"
-                  role="columnheader"
-                  scope="col"
-                >
-                  <button
-                    class="euiTableHeaderButton"
-                    data-test-subj="tableHeaderSortButton"
-                    type="button"
-                  >
-                    <span
-                      class="euiTableCellContent"
-                    >
-                      <span
-                        class="euiTableCellContent__text"
-                        title="Source type"
-                      >
-                        Source type
-                      </span>
-                      <span
-                        class="euiScreenReaderOnly"
-                      >
-                        Click to sort in ascending order
-                      </span>
-                    </span>
-                  </button>
-                </th>
-                <th
-                  aria-live="polite"
-                  aria-sort="none"
-                  class="euiTableHeaderCell"
-                  data-test-subj="tableHeaderCell_event_source.severity_2"
-                  role="columnheader"
-                  scope="col"
-                >
-                  <button
-                    class="euiTableHeaderButton"
-                    data-test-subj="tableHeaderSortButton"
-                    type="button"
-                  >
-                    <span
-                      class="euiTableCellContent"
-                    >
-                      <span
-                        class="euiTableCellContent__text"
-                        title="Severity"
-                      >
-                        Severity
-                      </span>
-                      <span
-                        class="euiScreenReaderOnly"
-                      >
-                        Click to sort in ascending order
-                      </span>
-                    </span>
-                  </button>
-                </th>
-                <th
-                  aria-live="polite"
-                  aria-sort="descending"
-                  class="euiTableHeaderCell"
-                  data-test-subj="tableHeaderCell_last_updated_time_ms_3"
-                  role="columnheader"
-                  scope="col"
-                >
-                  <button
-                    class="euiTableHeaderButton euiTableHeaderButton-isSorted"
-                    data-test-subj="tableHeaderSortButton"
-                    type="button"
-                  >
-                    <span
-                      class="euiTableCellContent"
-                    >
-                      <span
-                        class="euiTableCellContent__text"
-                        title="Time sent; Sorted in descending order"
-                      >
-                        Time sent
-                      </span>
-                      <svg
-                        aria-hidden="true"
-                        aria-label="Sorted in descending order"
-                        class="euiIcon euiIcon--medium euiIcon-isLoading euiTableSortIcon"
-                        focusable="false"
-                        height="16"
-                        role="img"
-                        viewBox="0 0 16 16"
-                        width="16"
-                        xmlns="http://www.w3.org/2000/svg"
-                      />
-                      <span
-                        class="euiScreenReaderOnly"
-                      >
-                        Click to sort in ascending order
-                      </span>
-                    </span>
-                  </button>
-                </th>
-                <th
-                  class="euiTableHeaderCell"
-                  data-test-subj="tableHeaderCell_success_4"
-                  role="columnheader"
-                  scope="col"
-                >
-                  <div
-                    class="euiTableCellContent"
-                  >
-                    <span
-                      class="euiTableCellContent__text"
-                      title="Sent status"
-                    >
-                      Sent status
-                    </span>
-                  </div>
-                </th>
-                <th
-                  class="euiTableHeaderCell"
-                  data-test-subj="tableHeaderCell_status_list_5"
-                  role="columnheader"
-                  scope="col"
-                >
-                  <div
-                    class="euiTableCellContent"
-                  >
-                    <span
-                      class="euiTableCellContent__text"
-                      title="Channels"
-                    >
-                      Channels
-                    </span>
-                  </div>
-                </th>
-                <th
-                  class="euiTableHeaderCell"
-                  data-test-subj="tableHeaderCell_status_list_6"
-                  role="columnheader"
-                  scope="col"
-                >
-                  <div
-                    class="euiTableCellContent"
-                  >
-                    <span
-                      class="euiTableCellContent__text"
-                      title="Channel types"
-                    >
-                      Channel types
-                    </span>
-                  </div>
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr
-                class="euiTableRow"
-              >
-                <td
-                  class="euiTableRowCell euiTableRowCell--isMobileFullWidth"
-                  colspan="7"
-                >
-                  <div
-                    class="euiTableCellContent euiTableCellContent--alignCenter"
-                  >
-                    <span
-                      class="euiTableCellContent__text"
-                    >
-                      No items found
-                    </span>
-                  </div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/NotificationsHistogram.test.tsx.snap b/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/NotificationsHistogram.test.tsx.snap
deleted file mode 100644
index 1065c840..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/NotificationsHistogram.test.tsx.snap
+++ /dev/null
@@ -1,129 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<NotificationsHistogram /> spec renders the component 1`] = `
-<div
-  class="euiPanel euiPanel--paddingMedium"
->
-  <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
-    style="padding: 0px 0px;"
-  >
-    <div
-      class="euiFlexItem"
-    >
-      <h3
-        class="euiTitle euiTitle--medium"
-      >
-        Notifications by channel type
-      </h3>
-    </div>
-    <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
-    >
-      <div
-        class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
-      >
-        <div
-          class="euiFlexItem"
-        >
-          <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
-          >
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <div
-                class="euiPopover euiPopover--anchorDownCenter euiPopover--displayBlock euiSuperSelect euiSuperSelect--fullWidth"
-              >
-                <div
-                  class="euiPopover__anchor"
-                >
-                  <input
-                    type="hidden"
-                    value=""
-                  />
-                  <div
-                    class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--group"
-                  >
-                    <label
-                      class="euiFormLabel euiFormControlLayout__prepend"
-                    >
-                      Slice by
-                    </label>
-                    <div
-                      class="euiFormControlLayout__childrenWrapper"
-                    >
-                      <span
-                        class="euiScreenReaderOnly"
-                        id="random_html_id"
-                      >
-                        Select an option: 
-                        , is selected
-                      </span>
-                      <button
-                        aria-haspopup="true"
-                        aria-labelledby="undefined random_html_id"
-                        class="euiSuperSelectControl euiSuperSelectControl--fullWidth euiSuperSelectControl--inGroup"
-                        style="width: 300px;"
-                        type="button"
-                      />
-                      <div
-                        class="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
-                      >
-                        <span
-                          class="euiFormControlLayoutCustomIcon"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-                            focusable="false"
-                            height="16"
-                            role="img"
-                            viewBox="0 0 16 16"
-                            width="16"
-                            xmlns="http://www.w3.org/2000/svg"
-                          />
-                        </span>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <hr
-    class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-  />
-  <div
-    style="padding: initial;"
-  >
-    <div
-      class="euiSpacer euiSpacer--l"
-    />
-    <div
-      class="echChart"
-      style="width: 100%; height: 250px;"
-    >
-      <div
-        class="echChartBackground"
-        style="background-color: transparent;"
-      />
-      <div
-        class="echChartStatus"
-        data-ech-render-complete="false"
-        data-ech-render-count="0"
-      />
-      <div
-        class="echChartResizer"
-      />
-      <div
-        class="echContainer"
-      />
-    </div>
-  </div>
-</div>
-`;
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/NotificationsSearchBar.test.tsx.snap b/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/NotificationsSearchBar.test.tsx.snap
deleted file mode 100644
index c81b1fcf..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/NotificationsSearchBar.test.tsx.snap
+++ /dev/null
@@ -1,152 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<NotificationsSearchBar /> spec renders the component 1`] = `
-<div
-  class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
->
-  <div
-    class="euiFlexItem"
-  >
-    <div
-      class="euiFormControlLayout euiFormControlLayout--fullWidth"
-    >
-      <div
-        class="euiFormControlLayout__childrenWrapper"
-      >
-        <input
-          class="euiFieldSearch euiFieldSearch--fullWidth"
-          data-test-subj="notifications-search-bar-input"
-          placeholder="Search"
-          type="search"
-          value="test"
-        />
-        <div
-          class="euiFormControlLayoutIcons"
-        >
-          <span
-            class="euiFormControlLayoutCustomIcon"
-          >
-            <svg
-              aria-hidden="true"
-              class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
-              focusable="false"
-              height="16"
-              role="img"
-              viewBox="0 0 16 16"
-              width="16"
-              xmlns="http://www.w3.org/2000/svg"
-            />
-          </span>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
-  >
-    <div
-      class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiSuperDatePicker__flexWrapper euiSuperDatePicker__flexWrapper--noUpdateButton"
-    >
-      <div
-        class="euiFlexItem"
-      >
-        <div
-          class="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
-        >
-          <div
-            class="euiPopover euiPopover--anchorDownLeft"
-            id="QuickSelectPopover"
-          >
-            <div
-              class="euiPopover__anchor euiQuickSelectPopover__anchor"
-            >
-              <button
-                aria-label="Date quick select"
-                class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiFormControlLayout__prepend"
-                data-test-subj="superDatePickerToggleQuickMenuButton"
-                type="button"
-              >
-                <span
-                  class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
-                    focusable="false"
-                    height="16"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width="16"
-                    xmlns="http://www.w3.org/2000/svg"
-                  />
-                  <span
-                    class="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="euiIcon euiIcon--medium euiIcon-isLoading"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    />
-                  </span>
-                </span>
-              </button>
-            </div>
-          </div>
-          <div
-            class="euiFormControlLayout__childrenWrapper"
-          >
-            <div
-              class="euiDatePickerRange euiDatePickerRange--inGroup"
-            >
-              <button
-                class="euiSuperDatePicker__prettyFormat"
-                data-test-subj="superDatePickerShowDatesButton"
-              >
-                Last 1 day
-                <span
-                  class="euiSuperDatePicker__prettyFormatLink"
-                >
-                  Show dates
-                </span>
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="euiFlexItem euiFlexItem--flexGrowZero"
-  >
-    <button
-      class="euiButton euiButton--primary"
-      type="button"
-    >
-      <span
-        class="euiButtonContent euiButton__content"
-      >
-        <svg
-          aria-hidden="true"
-          class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
-          focusable="false"
-          height="16"
-          role="img"
-          viewBox="0 0 16 16"
-          width="16"
-          xmlns="http://www.w3.org/2000/svg"
-        />
-        <span
-          class="euiButton__text"
-        >
-          Refresh
-        </span>
-      </span>
-    </button>
-  </div>
-</div>
-`;
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/NotificationsTable.test.tsx.snap b/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/NotificationsTable.test.tsx.snap
deleted file mode 100644
index 51b5c38a..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/NotificationsTable.test.tsx.snap
+++ /dev/null
@@ -1,920 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<NotificationsTable /> spec renders the component 1`] = `
-<div
-  class="euiPanel euiPanel--paddingMedium"
->
-  <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
-    style="padding: 0px 0px;"
-  >
-    <div
-      class="euiFlexItem"
-    >
-      <h3
-        class="euiTitle euiTitle--medium"
-      >
-        Notification history
-      </h3>
-    </div>
-  </div>
-  <hr
-    class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-  />
-  <div
-    style="padding: initial;"
-  >
-    <div
-      class="euiBasicTable"
-    >
-      <div>
-        <div
-          class="euiTableHeaderMobile"
-        >
-          <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
-          >
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            />
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <div
-                class="euiTableSortMobile"
-              >
-                <div
-                  class="euiPopover euiPopover--anchorDownRight"
-                >
-                  <div
-                    class="euiPopover__anchor"
-                  >
-                    <button
-                      class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
-                      type="button"
-                    >
-                      <span
-                        class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
-                          focusable="false"
-                          height="16"
-                          role="img"
-                          viewBox="0 0 16 16"
-                          width="16"
-                          xmlns="http://www.w3.org/2000/svg"
-                        />
-                        <span
-                          class="euiButtonEmpty__text"
-                        >
-                          Sorting
-                        </span>
-                      </span>
-                    </button>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <table
-          class="euiTable euiTable--responsive euiTable--auto"
-          id="random_html_id"
-          tabindex="-1"
-        >
-          <caption
-            class="euiScreenReaderOnly euiTableCaption"
-          />
-          <thead>
-            <tr>
-              <th
-                aria-live="polite"
-                aria-sort="none"
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_event_source.title_0"
-                role="columnheader"
-                scope="col"
-              >
-                <button
-                  class="euiTableHeaderButton"
-                  data-test-subj="tableHeaderSortButton"
-                  type="button"
-                >
-                  <span
-                    class="euiTableCellContent"
-                  >
-                    <span
-                      class="euiTableCellContent__text"
-                      title="Notification"
-                    >
-                      Notification
-                    </span>
-                    <span
-                      class="euiScreenReaderOnly"
-                    >
-                      Click to sort in ascending order
-                    </span>
-                  </span>
-                </button>
-              </th>
-              <th
-                aria-live="polite"
-                aria-sort="none"
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_event_source.feature_1"
-                role="columnheader"
-                scope="col"
-              >
-                <button
-                  class="euiTableHeaderButton"
-                  data-test-subj="tableHeaderSortButton"
-                  type="button"
-                >
-                  <span
-                    class="euiTableCellContent"
-                  >
-                    <span
-                      class="euiTableCellContent__text"
-                      title="Source type"
-                    >
-                      Source type
-                    </span>
-                    <span
-                      class="euiScreenReaderOnly"
-                    >
-                      Click to sort in ascending order
-                    </span>
-                  </span>
-                </button>
-              </th>
-              <th
-                aria-live="polite"
-                aria-sort="none"
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_event_source.severity_2"
-                role="columnheader"
-                scope="col"
-              >
-                <button
-                  class="euiTableHeaderButton"
-                  data-test-subj="tableHeaderSortButton"
-                  type="button"
-                >
-                  <span
-                    class="euiTableCellContent"
-                  >
-                    <span
-                      class="euiTableCellContent__text"
-                      title="Severity"
-                    >
-                      Severity
-                    </span>
-                    <span
-                      class="euiScreenReaderOnly"
-                    >
-                      Click to sort in ascending order
-                    </span>
-                  </span>
-                </button>
-              </th>
-              <th
-                aria-live="polite"
-                aria-sort="ascending"
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_last_updated_time_ms_3"
-                role="columnheader"
-                scope="col"
-              >
-                <button
-                  class="euiTableHeaderButton euiTableHeaderButton-isSorted"
-                  data-test-subj="tableHeaderSortButton"
-                  type="button"
-                >
-                  <span
-                    class="euiTableCellContent"
-                  >
-                    <span
-                      class="euiTableCellContent__text"
-                      title="Time sent; Sorted in ascending order"
-                    >
-                      Time sent
-                    </span>
-                    <svg
-                      aria-hidden="true"
-                      aria-label="Sorted in ascending order"
-                      class="euiIcon euiIcon--medium euiIcon-isLoading euiTableSortIcon"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    />
-                    <span
-                      class="euiScreenReaderOnly"
-                    >
-                      Click to sort in descending order
-                    </span>
-                  </span>
-                </button>
-              </th>
-              <th
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_success_4"
-                role="columnheader"
-                scope="col"
-              >
-                <div
-                  class="euiTableCellContent"
-                >
-                  <span
-                    class="euiTableCellContent__text"
-                    title="Sent status"
-                  >
-                    Sent status
-                  </span>
-                </div>
-              </th>
-              <th
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_status_list_5"
-                role="columnheader"
-                scope="col"
-              >
-                <div
-                  class="euiTableCellContent"
-                >
-                  <span
-                    class="euiTableCellContent__text"
-                    title="Channels"
-                  >
-                    Channels
-                  </span>
-                </div>
-              </th>
-              <th
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_status_list_6"
-                role="columnheader"
-                scope="col"
-              >
-                <div
-                  class="euiTableCellContent"
-                >
-                  <span
-                    class="euiTableCellContent__text"
-                    title="Channel types"
-                  >
-                    Channel types
-                  </span>
-                </div>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              class="euiTableRow"
-            >
-              <td
-                class="euiTableRowCell euiTableRowCell--isMobileFullWidth"
-                colspan="7"
-              >
-                <div
-                  class="euiTableCellContent euiTableCellContent--alignCenter"
-                >
-                  <span
-                    class="euiTableCellContent__text"
-                  >
-                    No items found
-                  </span>
-                </div>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`<NotificationsTable /> spec renders the component with items 1`] = `
-<div
-  class="euiPanel euiPanel--paddingMedium"
->
-  <div
-    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
-    style="padding: 0px 0px;"
-  >
-    <div
-      class="euiFlexItem"
-    >
-      <h3
-        class="euiTitle euiTitle--medium"
-      >
-        Notification history
-      </h3>
-    </div>
-  </div>
-  <hr
-    class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-  />
-  <div
-    style="padding: initial;"
-  >
-    <div
-      class="euiBasicTable"
-    >
-      <div>
-        <div
-          class="euiTableHeaderMobile"
-        >
-          <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsBaseline euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
-          >
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            />
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              <div
-                class="euiTableSortMobile"
-              >
-                <div
-                  class="euiPopover euiPopover--anchorDownRight"
-                >
-                  <div
-                    class="euiPopover__anchor"
-                  >
-                    <button
-                      class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
-                      type="button"
-                    >
-                      <span
-                        class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="euiIcon euiIcon--medium euiButtonContent__icon"
-                          focusable="false"
-                          height="16"
-                          role="img"
-                          viewBox="0 0 16 16"
-                          width="16"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M13.069 5.157L8.384 9.768a.546.546 0 01-.768 0L2.93 5.158a.552.552 0 00-.771 0 .53.53 0 000 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 000-.76.552.552 0 00-.771 0z"
-                            fill-rule="non-zero"
-                          />
-                        </svg>
-                        <span
-                          class="euiButtonEmpty__text"
-                        >
-                          Sorting
-                        </span>
-                      </span>
-                    </button>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <table
-          class="euiTable euiTable--responsive euiTable--auto"
-          id="random_html_id"
-          tabindex="-1"
-        >
-          <caption
-            class="euiScreenReaderOnly euiTableCaption"
-          />
-          <thead>
-            <tr>
-              <th
-                aria-live="polite"
-                aria-sort="none"
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_event_source.title_0"
-                role="columnheader"
-                scope="col"
-              >
-                <button
-                  class="euiTableHeaderButton"
-                  data-test-subj="tableHeaderSortButton"
-                  type="button"
-                >
-                  <span
-                    class="euiTableCellContent"
-                  >
-                    <span
-                      class="euiTableCellContent__text"
-                      title="Notification"
-                    >
-                      Notification
-                    </span>
-                    <span
-                      class="euiScreenReaderOnly"
-                    >
-                      Click to sort in ascending order
-                    </span>
-                  </span>
-                </button>
-              </th>
-              <th
-                aria-live="polite"
-                aria-sort="none"
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_event_source.feature_1"
-                role="columnheader"
-                scope="col"
-              >
-                <button
-                  class="euiTableHeaderButton"
-                  data-test-subj="tableHeaderSortButton"
-                  type="button"
-                >
-                  <span
-                    class="euiTableCellContent"
-                  >
-                    <span
-                      class="euiTableCellContent__text"
-                      title="Source type"
-                    >
-                      Source type
-                    </span>
-                    <span
-                      class="euiScreenReaderOnly"
-                    >
-                      Click to sort in ascending order
-                    </span>
-                  </span>
-                </button>
-              </th>
-              <th
-                aria-live="polite"
-                aria-sort="none"
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_event_source.severity_2"
-                role="columnheader"
-                scope="col"
-              >
-                <button
-                  class="euiTableHeaderButton"
-                  data-test-subj="tableHeaderSortButton"
-                  type="button"
-                >
-                  <span
-                    class="euiTableCellContent"
-                  >
-                    <span
-                      class="euiTableCellContent__text"
-                      title="Severity"
-                    >
-                      Severity
-                    </span>
-                    <span
-                      class="euiScreenReaderOnly"
-                    >
-                      Click to sort in ascending order
-                    </span>
-                  </span>
-                </button>
-              </th>
-              <th
-                aria-live="polite"
-                aria-sort="ascending"
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_last_updated_time_ms_3"
-                role="columnheader"
-                scope="col"
-              >
-                <button
-                  class="euiTableHeaderButton euiTableHeaderButton-isSorted"
-                  data-test-subj="tableHeaderSortButton"
-                  type="button"
-                >
-                  <span
-                    class="euiTableCellContent"
-                  >
-                    <span
-                      class="euiTableCellContent__text"
-                      title="Time sent; Sorted in ascending order"
-                    >
-                      Time sent
-                    </span>
-                    <svg
-                      aria-label="Sorted in ascending order"
-                      class="euiIcon euiIcon--medium euiTableSortIcon"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M8 4.207v8.237c0 .307-.224.556-.5.556s-.5-.249-.5-.556V4.207L2.904 8.303a.5.5 0 01-.707-.707l4.242-4.242a1.5 1.5 0 012.122 0l4.242 4.242a.5.5 0 11-.707.707L8 4.207z"
-                      />
-                    </svg>
-                    <span
-                      class="euiScreenReaderOnly"
-                    >
-                      Click to sort in descending order
-                    </span>
-                  </span>
-                </button>
-              </th>
-              <th
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_success_4"
-                role="columnheader"
-                scope="col"
-              >
-                <div
-                  class="euiTableCellContent"
-                >
-                  <span
-                    class="euiTableCellContent__text"
-                    title="Sent status"
-                  >
-                    Sent status
-                  </span>
-                </div>
-              </th>
-              <th
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_status_list_5"
-                role="columnheader"
-                scope="col"
-              >
-                <div
-                  class="euiTableCellContent"
-                >
-                  <span
-                    class="euiTableCellContent__text"
-                    title="Channels"
-                  >
-                    Channels
-                  </span>
-                </div>
-              </th>
-              <th
-                class="euiTableHeaderCell"
-                data-test-subj="tableHeaderCell_status_list_6"
-                role="columnheader"
-                scope="col"
-              >
-                <div
-                  class="euiTableCellContent"
-                >
-                  <span
-                    class="euiTableCellContent__text"
-                    title="Channel types"
-                  >
-                    Channel types
-                  </span>
-                </div>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              class="euiTableRow euiTableRow-isSelectable"
-            >
-              <td
-                class="euiTableRowCell"
-              >
-                <div
-                  class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
-                >
-                  Notification
-                </div>
-                <div
-                  class="euiTableCellContent euiTableCellContent--truncateText euiTableCellContent--overflowingContent"
-                >
-                  <button
-                    class="euiLink euiLink--primary"
-                    type="button"
-                  >
-                    test notification
-                  </button>
-                </div>
-              </td>
-              <td
-                class="euiTableRowCell"
-              >
-                <div
-                  class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
-                >
-                  Source type
-                </div>
-                <div
-                  class="euiTableCellContent euiTableCellContent--truncateText euiTableCellContent--overflowingContent"
-                >
-                  Reporting
-                </div>
-              </td>
-              <td
-                class="euiTableRowCell"
-              >
-                <div
-                  class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
-                >
-                  Severity
-                </div>
-                <div
-                  class="euiTableCellContent euiTableCellContent--overflowingContent"
-                >
-                  Info
-                </div>
-              </td>
-              <td
-                class="euiTableRowCell"
-              >
-                <div
-                  class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
-                >
-                  Time sent
-                </div>
-                <div
-                  class="euiTableCellContent euiTableCellContent--overflowingContent"
-                >
-                  06/07/21 4:53 pm GMT
-                </div>
-              </td>
-              <td
-                class="euiTableRowCell"
-              >
-                <div
-                  class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
-                >
-                  Sent status
-                </div>
-                <div
-                  class="euiTableCellContent euiTableCellContent--overflowingContent"
-                >
-                  <div
-                    class="euiHealth"
-                  >
-                    <div
-                      class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                    >
-                      <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="euiIcon euiIcon--medium euiIcon--danger euiIcon-isLoading"
-                          focusable="false"
-                          height="16"
-                          role="img"
-                          viewBox="0 0 16 16"
-                          width="16"
-                          xmlns="http://www.w3.org/2000/svg"
-                        />
-                      </div>
-                      <div
-                        class="euiFlexItem euiFlexItem--flexGrowZero"
-                      >
-                        <button
-                          class="euiLink euiLink--primary"
-                          type="button"
-                        >
-                          Error
-                        </button>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </td>
-              <td
-                class="euiTableRowCell"
-              >
-                <div
-                  class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
-                >
-                  Channels
-                </div>
-                <div
-                  class="euiTableCellContent euiTableCellContent--truncateText euiTableCellContent--overflowingContent"
-                >
-                  2 channels
-                </div>
-              </td>
-              <td
-                class="euiTableRowCell"
-              >
-                <div
-                  class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
-                >
-                  Channel types
-                </div>
-                <div
-                  class="euiTableCellContent euiTableCellContent--overflowingContent"
-                >
-                  Slack, Email
-                </div>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-      <div>
-        <div
-          class="euiSpacer euiSpacer--m"
-        />
-        <div
-          class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
-        >
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <div
-              class="euiPopover euiPopover--anchorUpRight euiPopover--withTitle"
-            >
-              <div
-                class="euiPopover__anchor"
-              >
-                <button
-                  class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall"
-                  data-test-subj="tablePaginationPopoverButton"
-                  type="button"
-                >
-                  <span
-                    class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="euiIcon euiIcon--medium euiButtonContent__icon"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M13.069 5.157L8.384 9.768a.546.546 0 01-.768 0L2.93 5.158a.552.552 0 00-.771 0 .53.53 0 000 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 000-.76.552.552 0 00-.771 0z"
-                        fill-rule="non-zero"
-                      />
-                    </svg>
-                    <span
-                      class="euiButtonEmpty__text"
-                    >
-                      Rows per page
-                      : 
-                      5
-                    </span>
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-          <div
-            class="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <nav
-              class="euiPagination"
-            >
-              <button
-                aria-label="Previous page"
-                class="euiButtonIcon euiButtonIcon--text"
-                data-test-subj="pagination-button-previous"
-                disabled=""
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                />
-              </button>
-              <ul
-                class="euiPagination__list"
-              >
-                <li
-                  class="euiPagination__item"
-                >
-                  <button
-                    aria-controls="random_html_id"
-                    aria-current="true"
-                    aria-label="Page 1 of 4"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
-                    data-test-subj="pagination-button-0"
-                    disabled=""
-                    type="button"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        1
-                      </span>
-                    </span>
-                  </button>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <a
-                    aria-controls="random_html_id"
-                    aria-label="Page 2 of 4"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
-                    data-test-subj="pagination-button-1"
-                    href="#random_html_id"
-                    rel="noreferrer"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        2
-                      </span>
-                    </span>
-                  </a>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <a
-                    aria-controls="random_html_id"
-                    aria-label="Page 3 of 4"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
-                    data-test-subj="pagination-button-2"
-                    href="#random_html_id"
-                    rel="noreferrer"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        3
-                      </span>
-                    </span>
-                  </a>
-                </li>
-                <li
-                  class="euiPagination__item"
-                >
-                  <a
-                    aria-controls="random_html_id"
-                    aria-label="Page 4 of 4"
-                    class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
-                    data-test-subj="pagination-button-3"
-                    href="#random_html_id"
-                    rel="noreferrer"
-                  >
-                    <span
-                      class="euiButtonContent euiButtonEmpty__content"
-                    >
-                      <span
-                        class="euiButtonEmpty__text"
-                      >
-                        4
-                      </span>
-                    </span>
-                  </a>
-                </li>
-              </ul>
-              <a
-                aria-controls="random_html_id"
-                aria-label="Next page, 2"
-                class="euiButtonIcon euiButtonIcon--text"
-                data-test-subj="pagination-button-next"
-                href="#random_html_id"
-                rel="noreferrer"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
-                  focusable="false"
-                  height="16"
-                  role="img"
-                  viewBox="0 0 16 16"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                />
-              </a>
-            </nav>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/TableFlyout.test.tsx.snap b/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/TableFlyout.test.tsx.snap
deleted file mode 100644
index b6a1f4ca..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/TableFlyout.test.tsx.snap
+++ /dev/null
@@ -1,437 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<TableFlyout /> spec renders the component 1`] = `
-<div>
-  <div
-    aria-hidden="true"
-    data-aria-hidden="true"
-    data-focus-guard="true"
-    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-    tabindex="0"
-  />
-  <div
-    aria-hidden="true"
-    data-aria-hidden="true"
-    data-focus-guard="true"
-    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-    tabindex="1"
-  />
-  <div
-    data-focus-lock-disabled="false"
-  >
-    <div
-      class="euiFlyout euiFlyout--small"
-      role="dialog"
-      tabindex="0"
-    >
-      <button
-        aria-label="Close this dialog"
-        class="euiButtonIcon euiButtonIcon--text euiFlyout__closeButton"
-        data-test-subj="euiFlyoutCloseButton"
-        type="button"
-      >
-        <svg
-          aria-hidden="true"
-          class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
-          focusable="false"
-          height="16"
-          role="img"
-          viewBox="0 0 16 16"
-          width="16"
-          xmlns="http://www.w3.org/2000/svg"
-        />
-      </button>
-      <div
-        class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
-      >
-        <h2
-          class="euiTitle euiTitle--medium"
-        >
-          Notification details
-        </h2>
-      </div>
-      <div
-        class="euiFlyoutBody"
-      >
-        <div
-          class="euiFlyoutBody__overflow"
-        >
-          <div
-            class="euiFlyoutBody__overflowContent"
-          >
-            <dl
-              class="euiDescriptionList euiDescriptionList--row"
-            >
-              <dt
-                class="euiDescriptionList__title"
-              >
-                Notification
-              </dt>
-              <dd
-                class="euiDescriptionList__description"
-              >
-                test notification
-              </dd>
-            </dl>
-            <div
-              class="euiSpacer euiSpacer--l"
-            />
-            <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-            >
-              <div
-                class="euiFlexItem"
-              >
-                <dl
-                  class="euiDescriptionList euiDescriptionList--row"
-                >
-                  <dt
-                    class="euiDescriptionList__title"
-                  >
-                    Source
-                  </dt>
-                  <dd
-                    class="euiDescriptionList__description"
-                  >
-                    <a
-                      class="euiLink euiLink--primary"
-                      href="reports-dashboards#/report_details/reference_id"
-                      rel="noopener noreferrer"
-                      target="_blank"
-                    >
-                      Report
-                      <svg
-                        aria-hidden="true"
-                        aria-label="External link"
-                        class="euiIcon euiIcon--small euiIcon-isLoading euiLink__externalIcon"
-                        focusable="false"
-                        height="16"
-                        role="img"
-                        viewBox="0 0 16 16"
-                        width="16"
-                        xmlns="http://www.w3.org/2000/svg"
-                      />
-                    </a>
-                  </dd>
-                </dl>
-              </div>
-              <div
-                class="euiFlexItem"
-              >
-                <dl
-                  class="euiDescriptionList euiDescriptionList--row"
-                >
-                  <dt
-                    class="euiDescriptionList__title"
-                  >
-                    Source type
-                  </dt>
-                  <dd
-                    class="euiDescriptionList__description"
-                  >
-                    Reporting
-                  </dd>
-                </dl>
-              </div>
-            </div>
-            <div
-              class="euiSpacer euiSpacer--l"
-            />
-            <dl
-              class="euiDescriptionList euiDescriptionList--row"
-            >
-              <dt
-                class="euiDescriptionList__title"
-              >
-                Time sent
-              </dt>
-              <dd
-                class="euiDescriptionList__description"
-              >
-                06/07/21 4:53 pm GMT
-              </dd>
-            </dl>
-            <div
-              class="euiSpacer euiSpacer--l"
-            />
-            <h4
-              class="euiTitle euiTitle--xsmall"
-            >
-              Channels sent
-            </h4>
-            <div>
-              <div
-                class="euiSpacer euiSpacer--s"
-              />
-              <div
-                class="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--hasChildren"
-              >
-                <div
-                  class="euiCard__content"
-                >
-                  <span
-                    class="euiTitle euiTitle--xsmall euiCard__title"
-                    id="random_html_idTitle"
-                  >
-                    <button
-                      class="euiLink euiLink--primary"
-                      type="button"
-                    >
-                      slack test
-                    </button>
-                  </span>
-                  <div
-                    class="euiText euiText--small euiCard__description"
-                    id="random_html_idDescription"
-                  >
-                    <p />
-                  </div>
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <dl
-                        class="euiDescriptionList euiDescriptionList--row"
-                      >
-                        <dt
-                          class="euiDescriptionList__title"
-                          style="color: rgb(105, 112, 125); font-size: 0.6875rem; font-weight: normal;"
-                        >
-                          Channel type
-                        </dt>
-                        <dd
-                          class="euiDescriptionList__description"
-                        >
-                          Slack
-                        </dd>
-                      </dl>
-                    </div>
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <dl
-                        class="euiDescriptionList euiDescriptionList--row"
-                      >
-                        <dt
-                          class="euiDescriptionList__title"
-                          style="color: rgb(105, 112, 125); font-size: 0.6875rem; font-weight: normal;"
-                        >
-                          Sent status
-                        </dt>
-                        <dd
-                          class="euiDescriptionList__description"
-                        >
-                          <div
-                            class="euiHealth"
-                          >
-                            <div
-                              class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                            >
-                              <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero"
-                              >
-                                <svg
-                                  aria-hidden="true"
-                                  class="euiIcon euiIcon--medium euiIcon--success euiIcon-isLoading"
-                                  focusable="false"
-                                  height="16"
-                                  role="img"
-                                  viewBox="0 0 16 16"
-                                  width="16"
-                                  xmlns="http://www.w3.org/2000/svg"
-                                />
-                              </div>
-                              <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero"
-                              >
-                                <div
-                                  class="euiText euiText--small"
-                                >
-                                  Sent
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </dd>
-                      </dl>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div>
-              <div
-                class="euiSpacer euiSpacer--s"
-              />
-              <div
-                class="euiCard euiCard--paddingMedium euiCard--leftAligned euiCard--hasChildren"
-              >
-                <div
-                  class="euiCard__content"
-                >
-                  <span
-                    class="euiTitle euiTitle--xsmall euiCard__title"
-                    id="random_html_idTitle"
-                  >
-                    <button
-                      class="euiLink euiLink--primary"
-                      type="button"
-                    >
-                      emailtest
-                    </button>
-                  </span>
-                  <div
-                    class="euiText euiText--small euiCard__description"
-                    id="random_html_idDescription"
-                  >
-                    <p />
-                  </div>
-                  <div
-                    class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-                  >
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <dl
-                        class="euiDescriptionList euiDescriptionList--row"
-                      >
-                        <dt
-                          class="euiDescriptionList__title"
-                          style="color: rgb(105, 112, 125); font-size: 0.6875rem; font-weight: normal;"
-                        >
-                          Channel type
-                        </dt>
-                        <dd
-                          class="euiDescriptionList__description"
-                        >
-                          Email
-                        </dd>
-                      </dl>
-                    </div>
-                    <div
-                      class="euiFlexItem"
-                    >
-                      <dl
-                        class="euiDescriptionList euiDescriptionList--row"
-                      >
-                        <dt
-                          class="euiDescriptionList__title"
-                          style="color: rgb(105, 112, 125); font-size: 0.6875rem; font-weight: normal;"
-                        >
-                          Sent status
-                        </dt>
-                        <dd
-                          class="euiDescriptionList__description"
-                        >
-                          <div
-                            class="euiHealth"
-                          >
-                            <div
-                              class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-                            >
-                              <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero"
-                              >
-                                <svg
-                                  aria-hidden="true"
-                                  class="euiIcon euiIcon--medium euiIcon--danger euiIcon-isLoading"
-                                  focusable="false"
-                                  height="16"
-                                  role="img"
-                                  viewBox="0 0 16 16"
-                                  width="16"
-                                  xmlns="http://www.w3.org/2000/svg"
-                                />
-                              </div>
-                              <div
-                                class="euiFlexItem euiFlexItem--flexGrowZero"
-                              >
-                                <div
-                                  class="euiText euiText--small"
-                                >
-                                  Error
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </dd>
-                      </dl>
-                    </div>
-                  </div>
-                  <dl
-                    class="euiDescriptionList euiDescriptionList--row"
-                  >
-                    <dt
-                      class="euiDescriptionList__title"
-                      style="color: rgb(105, 112, 125); font-size: 0.6875rem; font-weight: normal;"
-                    >
-                      Error details
-                    </dt>
-                    <dd
-                      class="euiDescriptionList__description"
-                    >
-                      <div
-                        class="euiText euiText--small"
-                        style="line-break: anywhere;"
-                      >
-                        failed
-                      </div>
-                      <div
-                        class="euiText euiText--small"
-                      >
-                        <li>
-                          test@email.com: failed
-                           (
-                          500
-                          )
-                        </li>
-                      </div>
-                    </dd>
-                  </dl>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="euiFlyoutFooter"
-      >
-        <button
-          class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--flushLeft"
-          type="button"
-        >
-          <span
-            class="euiButtonContent euiButtonEmpty__content"
-          >
-            <svg
-              aria-hidden="true"
-              class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonContent__icon"
-              focusable="false"
-              height="16"
-              role="img"
-              viewBox="0 0 16 16"
-              width="16"
-              xmlns="http://www.w3.org/2000/svg"
-            />
-            <span
-              class="euiButtonEmpty__text"
-            >
-              Close
-            </span>
-          </span>
-        </button>
-      </div>
-    </div>
-  </div>
-  <div
-    aria-hidden="true"
-    data-aria-hidden="true"
-    data-focus-guard="true"
-    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-    tabindex="0"
-  />
-</div>
-`;
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/filterHelpers.test.tsx.snap b/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/filterHelpers.test.tsx.snap
deleted file mode 100644
index 4f1d30bb..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/__snapshots__/filterHelpers.test.tsx.snap
+++ /dev/null
@@ -1,31 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`test filter helper functions renders combobox 1`] = `
-<div
-  class="euiSpacer euiSpacer--s"
-/>
-`;
-
-exports[`test filter helper functions renders combobox 2`] = `
-<div
-  class="euiSpacer euiSpacer--s"
-/>
-`;
-
-exports[`test filter helper functions renders combobox 3`] = `
-<div
-  class="euiSpacer euiSpacer--s"
-/>
-`;
-
-exports[`test filter helper functions renders combobox 4`] = `
-<div
-  class="euiSpacer euiSpacer--s"
-/>
-`;
-
-exports[`test filter helper functions renders textfield 1`] = `
-<div
-  class="euiSpacer euiSpacer--s"
-/>
-`;
diff --git a/dashboards-notifications/public/pages/Notifications/__tests__/filterHelpers.test.tsx b/dashboards-notifications/public/pages/Notifications/__tests__/filterHelpers.test.tsx
deleted file mode 100644
index fb036d76..00000000
--- a/dashboards-notifications/public/pages/Notifications/__tests__/filterHelpers.test.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { fireEvent, render } from '@testing-library/react';
-import { CHANNEL_TYPE } from '../../../utils/constants';
-import { FilterType } from '../components/SearchBar/Filter/Filters';
-import {
-  getFilterFieldOptions,
-  getFilterOperatorOptions,
-  getOperatorString,
-  getValueComponent,
-  isSingleSelection,
-} from '../components/SearchBar/utils/filterHelpers';
-
-describe('test filter helper functions', () => {
-  it('returns filter field options', () => {
-    const options = getFilterFieldOptions();
-    expect(options).toEqual([
-      { label: 'Channel' },
-      { label: 'Channel type' },
-      { label: 'Severity' },
-      { label: 'Source' },
-      { label: 'Status' },
-    ]);
-  });
-
-  it('returns filter operator options', () => {
-    const channelOperators = getFilterOperatorOptions('Channel');
-    expect(channelOperators).toEqual([
-      { label: 'is' },
-      // { label: 'is not' },
-    ]);
-
-    const sourceOperators = getFilterOperatorOptions('Source');
-    expect(sourceOperators).toEqual([
-      { label: 'is' },
-      // { label: 'is not' },
-      { label: 'is one of' },
-      // { label: 'is not one of' },
-    ]);
-  });
-
-  it('returns operator as string', () => {
-    expect(getOperatorString('is one of', true)).toEqual('is not one of');
-    expect(getOperatorString('is not one of', false)).toEqual('is one of');
-    expect(getOperatorString('is', true)).toEqual('is not');
-    expect(getOperatorString('is not', true)).toEqual('is not');
-  });
-
-  it('renders textfield', () => {
-    const setValue = jest.fn();
-    const utils = render(
-      getValueComponent('Channel', 'is', 0, setValue, CHANNEL_TYPE)
-    );
-    expect(utils.container.firstChild).toMatchSnapshot();
-
-    const input = utils.container.querySelector('input')!;
-    fireEvent.change(input, { target: { value: '100' } });
-    expect(setValue).toBeCalledWith('100');
-  });
-
-  it('renders combobox', () => {
-    const setValue = jest.fn();
-    expect(
-      render(getValueComponent('Channel type', 'is', 0, setValue, CHANNEL_TYPE))
-        .container.firstChild
-    ).toMatchSnapshot();
-    expect(
-      render(getValueComponent('Severity', 'is', 0, setValue, CHANNEL_TYPE))
-        .container.firstChild
-    ).toMatchSnapshot();
-    expect(
-      render(getValueComponent('Source', 'is', 0, setValue, CHANNEL_TYPE))
-        .container.firstChild
-    ).toMatchSnapshot();
-    expect(
-      render(getValueComponent('Status', 'is', 0, setValue, CHANNEL_TYPE))
-        .container.firstChild
-    ).toMatchSnapshot();
-  });
-
-  it('checks for single selection', () => {
-    expect(isSingleSelection('is one of')).toBeFalsy;
-    expect(isSingleSelection('is not')).toBeFalsy;
-    expect(isSingleSelection({ operator: 'is not one of' } as FilterType))
-      .toBeFalsy;
-  });
-
-  // not implemented
-  it.skip('returns query string from filters', () => {
-    const filters: FilterType[] = [
-      {
-        field: 'Channel',
-        operator: 'is',
-        value: 'test',
-        inverted: false,
-        disabled: true,
-      },
-      {
-        field: 'Source',
-        operator: 'is not one of',
-        value: [{ label: 'Alerting' }, { label: 'ISM' }],
-        inverted: true,
-        disabled: false,
-      },
-      {
-        field: 'Status',
-        operator: 'is',
-        value: [{ label: 'Sent' }],
-        inverted: false,
-        disabled: false,
-      },
-    ];
-    const queryString = filterToQueryString(filters);
-    expect(queryString).toEqual('-(Source:Alerting OR ISM) +(Status:Sent)');
-  });
-});
diff --git a/dashboards-notifications/public/pages/Notifications/components/EmptyState/EmptyState.tsx b/dashboards-notifications/public/pages/Notifications/components/EmptyState/EmptyState.tsx
deleted file mode 100644
index fe9e6ad6..00000000
--- a/dashboards-notifications/public/pages/Notifications/components/EmptyState/EmptyState.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { EuiButton, EuiEmptyPrompt, EuiLink, EuiText } from '@elastic/eui';
-import React from 'react';
-import { DOCUMENTATION_LINK, ROUTES } from '../../../../utils/constants';
-
-interface EmptyStateProps {
-  // false if user has no channels, true if no matching search results
-  channels: boolean;
-}
-
-export function EmptyState(props: EmptyStateProps) {
-  return (
-    <>
-      {props.channels ? (
-        <EuiEmptyPrompt
-          title={<h2>No notifications insights to display</h2>}
-          body={
-            <EuiText>
-              Adjust your filter or create a channel.{' '}
-              <EuiLink href={DOCUMENTATION_LINK} target="_blank" external>
-                Learn more
-              </EuiLink>
-            </EuiText>
-          }
-        />
-      ) : (
-        <EuiEmptyPrompt
-          title={<h2>You have no channels set up</h2>}
-          body={
-            <EuiText>
-              <div>
-                Create a channel, and then configure actions to get
-                notifications from features like Alerting and Index Management.{' '}
-                <EuiLink href={DOCUMENTATION_LINK} target="_blank" external>
-                  Learn more
-                </EuiLink>
-              </div>
-            </EuiText>
-          }
-          actions={
-            <EuiButton href={`#${ROUTES.CREATE_CHANNEL}`} fill>
-              Create channel
-            </EuiButton>
-          }
-        />
-      )}
-    </>
-  );
-}
diff --git a/dashboards-notifications/public/pages/Notifications/components/NotificationsHistogram/HistogramControls.tsx b/dashboards-notifications/public/pages/Notifications/components/NotificationsHistogram/HistogramControls.tsx
deleted file mode 100644
index 38f3b63a..00000000
--- a/dashboards-notifications/public/pages/Notifications/components/NotificationsHistogram/HistogramControls.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { HISTOGRAM_TYPE } from '../../../../utils/constants';
-import { EuiSuperSelect, EuiSuperSelectOption } from '@elastic/eui';
-import React from 'react';
-
-interface HistogramControlsProps {
-  histogramType: keyof typeof HISTOGRAM_TYPE;
-  setHistogramType: (histogramType: keyof typeof HISTOGRAM_TYPE) => void;
-}
-
-export function HistogramControls(props: HistogramControlsProps) {
-  const histogramTypeOptions: Array<EuiSuperSelectOption<
-    keyof typeof HISTOGRAM_TYPE
-  >> = Object.entries(HISTOGRAM_TYPE).map(([value, inputDisplay]) => ({
-    value: value as keyof typeof HISTOGRAM_TYPE,
-    inputDisplay,
-  }));
-
-  return (
-    <>
-      <EuiSuperSelect
-        style={{ width: 300 }}
-        prepend="Slice by"
-        fullWidth
-        options={histogramTypeOptions}
-        valueOfSelected={props.histogramType}
-        onChange={props.setHistogramType}
-      />
-    </>
-  );
-}
diff --git a/dashboards-notifications/public/pages/Notifications/components/NotificationsHistogram/NotificationsHistogram.tsx b/dashboards-notifications/public/pages/Notifications/components/NotificationsHistogram/NotificationsHistogram.tsx
deleted file mode 100644
index 27271d03..00000000
--- a/dashboards-notifications/public/pages/Notifications/components/NotificationsHistogram/NotificationsHistogram.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  Axis,
-  BarSeries,
-  Chart,
-  Datum,
-  niceTimeFormatByDay,
-  ScaleType,
-  Settings,
-  timeFormatter,
-} from '@elastic/charts';
-import { euiPaletteColorBlind, EuiSpacer } from '@elastic/eui';
-import _ from 'lodash';
-import React from 'react';
-import {
-  ContentPanel,
-  ContentPanelActions,
-} from '../../../../components/ContentPanel';
-import { HISTOGRAM_TYPE } from '../../../../utils/constants';
-import { HistogramControls } from './HistogramControls';
-
-interface NotificationsHistogramProps {
-  histogramType: keyof typeof HISTOGRAM_TYPE;
-  setHistogramType: (histogramType: keyof typeof HISTOGRAM_TYPE) => void;
-  histogramData: Array<Datum>;
-}
-
-export function NotificationsHistogram(props: NotificationsHistogramProps) {
-  const formatter = timeFormatter(niceTimeFormatByDay(1));
-  return (
-    <>
-      <ContentPanel
-        actions={
-          <ContentPanelActions
-            actions={[
-              {
-                component: (
-                  <HistogramControls
-                    histogramType={props.histogramType}
-                    setHistogramType={props.setHistogramType}
-                  />
-                ),
-              },
-            ]}
-          />
-        }
-        bodyStyles={{ padding: 'initial' }}
-        title={`Notifications by ${_.get(
-          HISTOGRAM_TYPE,
-          props.histogramType,
-          Object.values(HISTOGRAM_TYPE)[0]
-        ).toLowerCase()}`}
-        titleSize="m"
-      >
-        <EuiSpacer />
-        <Chart size={{ height: 250 }}>
-          <Settings
-            theme={{
-              colors: {
-                vizColors: euiPaletteColorBlind({ sortBy: 'natural' }),
-              },
-            }}
-            showLegend={true}
-          />
-          <BarSeries
-            id="status"
-            name="Status"
-            data={props.histogramData}
-            xAccessor={'x'}
-            yAccessors={['y']}
-            splitSeriesAccessors={['g']}
-            stackAccessors={['g']}
-            xScaleType={ScaleType.Time}
-          />
-          <Axis id="bottom-axis" position="bottom" tickFormat={formatter} />
-          <Axis id="left-axis" position="left" showGridLines />
-        </Chart>
-      </ContentPanel>
-    </>
-  );
-}
diff --git a/dashboards-notifications/public/pages/Notifications/components/NotificationsTable/Flyout/ChannelCard.tsx b/dashboards-notifications/public/pages/Notifications/components/NotificationsTable/Flyout/ChannelCard.tsx
deleted file mode 100644
index e635f9e3..00000000
--- a/dashboards-notifications/public/pages/Notifications/components/NotificationsTable/Flyout/ChannelCard.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  EuiCard,
-  EuiDescriptionList,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiHealth,
-  EuiLink,
-  EuiText,
-} from '@elastic/eui';
-import _ from 'lodash';
-import React from 'react';
-import { ChannelStatus } from '../../../../../../models/interfaces';
-import { isStatusCodeSuccess } from '../../../../../services/utils/helper';
-import { CHANNEL_TYPE, ROUTES } from '../../../../../utils/constants';
-
-interface ChannelCardProps {
-  channel: ChannelStatus;
-  onClose: () => void;
-}
-
-export function ChannelCard(props: ChannelCardProps) {
-  const renderList = (
-    title: NonNullable<React.ReactNode>,
-    description: NonNullable<React.ReactNode>
-  ) => {
-    return (
-      <EuiDescriptionList
-        titleProps={{
-          style: {
-            color: '#69707D',
-            fontSize: '0.6875rem',
-            fontWeight: 'normal',
-          },
-        }}
-        listItems={[{ title, description }]}
-      />
-    );
-  };
-
-  const renderStatus = (status: string) => {
-    const success = isStatusCodeSuccess(status);
-    const color = success ? 'success' : 'danger';
-    const label = success ? 'Sent' : 'Error';
-    return (
-      <EuiHealth color={color}>
-        <EuiText size="s">{label}</EuiText>
-      </EuiHealth>
-    );
-  };
-
-  const renderEmailRecipientStatus = () => {
-    if (!props.channel.email_recipient_status?.length) return null;
-    return (
-      <EuiText size="s">
-        {props.channel.email_recipient_status.map((status, i) => {
-          let statusText = `${status.recipient}: `;
-          if (status.delivery_status.status_text.startsWith('Success'))
-            statusText += 'Success';
-          else if (
-            status.delivery_status.status_code === '403' ||
-            status.delivery_status.status_code === '404'
-          )
-            // do not display recipient email if not found or no access
-            statusText = status.delivery_status.status_text;
-          else statusText += status.delivery_status.status_text;
-          return (
-            <li key={`${status.recipient}-${i}`}>
-              {statusText} ({status.delivery_status.status_code})
-            </li>
-          );
-        })}
-      </EuiText>
-    );
-  };
-
-  return (
-    <>
-      <EuiCard
-        textAlign="left"
-        title={
-          <EuiLink
-            onClick={() => {
-              location.assign(
-                `#${ROUTES.CHANNEL_DETAILS}/${props.channel.config_id}`
-              );
-              props.onClose();
-            }}
-          >
-            {props.channel.config_name}
-          </EuiLink>
-        }
-        titleSize="xs"
-        description=""
-      >
-        <EuiFlexGroup>
-          <EuiFlexItem>
-            {renderList(
-              'Channel type',
-              _.get(CHANNEL_TYPE, props.channel.config_type, '-')
-            )}
-          </EuiFlexItem>
-          <EuiFlexItem>
-            {renderList(
-              'Sent status',
-              renderStatus(props.channel.delivery_status.status_code)
-            )}
-          </EuiFlexItem>
-        </EuiFlexGroup>
-        {!isStatusCodeSuccess(props.channel.delivery_status.status_code) &&
-          renderList(
-            'Error details',
-            <>
-              <EuiText style={{ lineBreak: 'anywhere' }} size="s">
-                {props.channel.delivery_status.status_text}
-              </EuiText>
-              {renderEmailRecipientStatus()}
-            </>
-          )}
-      </EuiCard>
-    </>
-  );
-}
diff --git a/dashboards-notifications/public/pages/Notifications/components/NotificationsTable/Flyout/TableFlyout.tsx b/dashboards-notifications/public/pages/Notifications/components/NotificationsTable/Flyout/TableFlyout.tsx
deleted file mode 100644
index 21ce0742..00000000
--- a/dashboards-notifications/public/pages/Notifications/components/NotificationsTable/Flyout/TableFlyout.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  EuiButtonEmpty,
-  EuiDescriptionList,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFlyout,
-  EuiFlyoutBody,
-  EuiFlyoutFooter,
-  EuiFlyoutHeader,
-  EuiLink,
-  EuiSpacer,
-  EuiTitle,
-} from '@elastic/eui';
-import _ from 'lodash';
-import React from 'react';
-import { NotificationItem } from '../../../../../../models/interfaces';
-import { ModalRootProps } from '../../../../../components/Modal/ModalRoot';
-import { NOTIFICATION_SOURCE } from '../../../../../utils/constants';
-import { renderTime } from '../../../../../utils/helpers';
-import { getReferenceText, getReferenceURL } from '../../../utils/helpers';
-import { ChannelCard } from './ChannelCard';
-
-interface TableFlyoutProps extends ModalRootProps {
-  notificationItem: NotificationItem;
-  onClose: () => void;
-}
-
-export function TableFlyout(props: TableFlyoutProps) {
-  return (
-    <>
-      <EuiFlyout size="s" onClose={props.onClose}>
-        <EuiFlyoutHeader hasBorder>
-          <EuiTitle>
-            <h2>Notification details</h2>
-          </EuiTitle>
-        </EuiFlyoutHeader>
-        <EuiFlyoutBody>
-          <EuiDescriptionList
-            listItems={[
-              {
-                title: 'Notification',
-                description: props.notificationItem.event_source.title,
-              },
-            ]}
-          />
-          <EuiSpacer />
-          <EuiFlexGroup>
-            <EuiFlexItem>
-              <EuiDescriptionList
-                listItems={[
-                  {
-                    title: 'Source',
-                    description: (
-                      <EuiLink
-                        href={getReferenceURL(props.notificationItem)}
-                        target="_blank"
-                        external
-                      >
-                        {getReferenceText(props.notificationItem)}
-                      </EuiLink>
-                    ),
-                  },
-                ]}
-              />
-            </EuiFlexItem>
-            <EuiFlexItem>
-              <EuiDescriptionList
-                listItems={[
-                  {
-                    title: 'Source type',
-                    description: _.get(
-                      NOTIFICATION_SOURCE,
-                      props.notificationItem.event_source.feature,
-                      '-'
-                    ),
-                  },
-                ]}
-              />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-          <EuiSpacer />
-          <EuiDescriptionList
-            listItems={[
-              {
-                title: 'Time sent',
-                description: renderTime(
-                  props.notificationItem.last_updated_time_ms
-                ),
-              },
-            ]}
-          />
-          <EuiSpacer />
-          <EuiTitle size="xs">
-            <h4>Channels sent</h4>
-          </EuiTitle>
-          {props.notificationItem.status_list.map((channelStatus) => (
-            <div key={`channel-card-${channelStatus.config_id}`}>
-              <EuiSpacer size="s" />
-              <ChannelCard channel={channelStatus} onClose={props.onClose} />
-            </div>
-          ))}
-        </EuiFlyoutBody>
-        <EuiFlyoutFooter>
-          <EuiButtonEmpty iconType="cross" onClick={props.onClose} flush="left">
-            Close
-          </EuiButtonEmpty>
-        </EuiFlyoutFooter>
-      </EuiFlyout>
-    </>
-  );
-}
diff --git a/dashboards-notifications/public/pages/Notifications/components/NotificationsTable/NotificationsTable.tsx b/dashboards-notifications/public/pages/Notifications/components/NotificationsTable/NotificationsTable.tsx
deleted file mode 100644
index e1d8dcff..00000000
--- a/dashboards-notifications/public/pages/Notifications/components/NotificationsTable/NotificationsTable.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  EuiBasicTable,
-  EuiHealth,
-  EuiLink,
-  EuiTableFieldDataColumnType,
-  EuiTableSortingType,
-} from '@elastic/eui';
-import { Criteria } from '@elastic/eui/src/components/basic_table/basic_table';
-import { Pagination } from '@elastic/eui/src/components/basic_table/pagination_bar';
-import _ from 'lodash';
-import React from 'react';
-import {
-  ChannelStatus,
-  NotificationItem,
-} from '../../../../../models/interfaces';
-import { ContentPanel } from '../../../../components/ContentPanel';
-import { ModalConsumer } from '../../../../components/Modal';
-import {
-  CHANNEL_TYPE,
-  NOTIFICATION_SOURCE,
-  SEVERITY_TYPE,
-} from '../../../../utils/constants';
-import { renderTime } from '../../../../utils/helpers';
-import { TableFlyout } from './Flyout/TableFlyout';
-
-interface NotificationsTableProps {
-  items: NotificationItem[];
-  onTableChange: ({
-    page: tablePage,
-    sort,
-  }: Criteria<NotificationItem>) => void;
-  pagination: Pagination;
-  sorting: EuiTableSortingType<NotificationItem>;
-  loading: boolean;
-}
-
-export function NotificationsTable(props: NotificationsTableProps) {
-  const columns: EuiTableFieldDataColumnType<NotificationItem>[] = [
-    {
-      field: 'event_source.title',
-      name: 'Notification',
-      sortable: true,
-      truncateText: true,
-      render: (title, item) => (
-        <ModalConsumer>
-          {({ onShow }) => (
-            <EuiLink
-              onClick={() => onShow(TableFlyout, { notificationItem: item })}
-            >
-              {title}
-            </EuiLink>
-          )}
-        </ModalConsumer>
-      ),
-    },
-    {
-      field: 'event_source.feature',
-      name: 'Source type',
-      sortable: true,
-      truncateText: true,
-      render: (source) => _.get(NOTIFICATION_SOURCE, source, '-'),
-    },
-    {
-      field: 'event_source.severity',
-      name: 'Severity',
-      sortable: true,
-      truncateText: false,
-      render: (severity) => _.get(SEVERITY_TYPE, severity, '-'),
-    },
-    {
-      field: 'last_updated_time_ms',
-      name: 'Time sent',
-      sortable: true,
-      truncateText: false,
-      render: renderTime,
-      dataType: 'date',
-    },
-    {
-      field: 'success',
-      name: 'Sent status',
-      sortable: false,
-      render: (success, item: NotificationItem) => {
-        const color = success ? 'success' : 'danger';
-        const label = success ? 'Sent' : 'Error';
-        return (
-          <EuiHealth color={color}>
-            {success ? (
-              label
-            ) : (
-              <ModalConsumer>
-                {({ onShow }) => (
-                  <EuiLink
-                    onClick={() =>
-                      onShow(TableFlyout, { notificationItem: item })
-                    }
-                  >
-                    {label}
-                  </EuiLink>
-                )}
-              </ModalConsumer>
-            )}
-          </EuiHealth>
-        );
-      },
-    },
-    {
-      field: 'status_list',
-      name: 'Channels',
-      sortable: false,
-      truncateText: true,
-      render: (status_list: ChannelStatus[]) =>
-        status_list.length === 1
-          ? status_list[0].config_name
-          : `${status_list.length} channels`,
-    },
-    {
-      field: 'status_list',
-      name: 'Channel types',
-      sortable: false,
-      truncateText: false,
-      render: (status_list: ChannelStatus[]) =>
-        status_list
-          .map((channel) => _.get(CHANNEL_TYPE, channel.config_type, '-'))
-          .join(', '),
-    },
-  ];
-
-  return (
-    <>
-      <ContentPanel
-        bodyStyles={{ padding: 'initial' }}
-        title="Notification history"
-        titleSize="m"
-      >
-        <EuiBasicTable
-          columns={columns}
-          tableLayout="auto"
-          itemId="id"
-          isSelectable={true}
-          items={props.items}
-          onChange={props.onTableChange}
-          pagination={props.pagination}
-          sorting={props.sorting}
-          loading={props.loading}
-        />
-      </ContentPanel>
-    </>
-  );
-}
diff --git a/dashboards-notifications/public/pages/Notifications/components/SearchBar/Filter/AddFilterButton.tsx b/dashboards-notifications/public/pages/Notifications/components/SearchBar/Filter/AddFilterButton.tsx
deleted file mode 100644
index f49a030e..00000000
--- a/dashboards-notifications/public/pages/Notifications/components/SearchBar/Filter/AddFilterButton.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { EuiButtonEmpty, EuiPopover, EuiPopoverTitle } from '@elastic/eui';
-import React, { useState } from 'react';
-import { FilterEditPopover } from './FilterEditPopover';
-import { FilterType } from './Filters';
-
-interface AddFilterButtonProps {
-  setFilter: (newFilter: FilterType, index?: number) => void;
-}
-
-export function AddFilterButton(props: AddFilterButtonProps) {
-  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
-  const button = (
-    <EuiButtonEmpty
-      size="xs"
-      onClick={() => {
-        setIsPopoverOpen(true);
-      }}
-    >
-      + Add filter
-    </EuiButtonEmpty>
-  );
-
-  return (
-    <>
-      <EuiPopover
-        button={button}
-        isOpen={isPopoverOpen}
-        closePopover={() => setIsPopoverOpen(false)}
-        anchorPosition="downLeft"
-        withTitle
-      >
-        <EuiPopoverTitle>{'Add filter'}</EuiPopoverTitle>
-        <FilterEditPopover
-          setFilter={props.setFilter}
-          closePopover={() => setIsPopoverOpen(false)}
-        />
-      </EuiPopover>
-    </>
-  );
-}
diff --git a/dashboards-notifications/public/pages/Notifications/components/SearchBar/Filter/FilterEditPopover.tsx b/dashboards-notifications/public/pages/Notifications/components/SearchBar/Filter/FilterEditPopover.tsx
deleted file mode 100644
index 005fc6f3..00000000
--- a/dashboards-notifications/public/pages/Notifications/components/SearchBar/Filter/FilterEditPopover.tsx
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  EuiButton,
-  EuiButtonEmpty,
-  EuiComboBox,
-  EuiComboBoxOptionOption,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFormRow,
-  EuiSpacer,
-} from '@elastic/eui';
-import React, { useContext, useMemo, useState } from 'react';
-import { MainContext } from '../../../../Main/Main';
-import {
-  FilterOperatorType,
-  FilterFieldType,
-  getFilterOperatorOptions,
-  getOperatorString,
-  getFilterFieldOptions,
-  getValueComponent,
-} from '../utils/filterHelpers';
-import { FilterType } from './Filters';
-
-interface FilterEditPopoverProps {
-  filter?: FilterType;
-  closePopover: () => void;
-  index?: number;
-  setFilter: (newFilter: FilterType, index?: number) => void;
-}
-
-export function FilterEditPopover(props: FilterEditPopoverProps) {
-  const mainStateContext = useContext(MainContext)!;
-  const [selectedFieldOptions, setSelectedFieldOptions] = useState<
-    Array<EuiComboBoxOptionOption<string>>
-  >(props.filter ? [{ label: props.filter.field }] : []);
-  const [selectedOperatorOptions, setSelectedOperatorOptions] = useState<
-    Array<EuiComboBoxOptionOption<string>>
-  >(
-    props.filter
-      ? [
-          {
-            label: getOperatorString(
-              props.filter.operator,
-              props.filter.inverted
-            ),
-          },
-        ]
-      : []
-  );
-  const [filterValue, setFilterValue] = useState<FilterType['value']>(
-    props.filter?.value || []
-  );
-
-  const filterFieldOptions = useMemo(getFilterFieldOptions, []);
-
-  return (
-    <div style={{ width: 400 }}>
-      {/* invisible button workaround to prevent auto focus on context menu panel switch */}
-      <button
-        style={{
-          width: 0,
-          height: 0,
-          position: 'fixed',
-          marginLeft: -10000,
-          bottom: 0,
-        }}
-      />
-      <EuiFlexGroup gutterSize="s">
-        <EuiFlexItem grow={6}>
-          <EuiFormRow label="Field">
-            <EuiComboBox
-              placeholder="Select a field first"
-              isClearable={false}
-              options={filterFieldOptions}
-              selectedOptions={selectedFieldOptions}
-              onChange={(e) => {
-                setSelectedFieldOptions(e);
-                setSelectedOperatorOptions([]);
-                setFilterValue(null);
-              }}
-              singleSelection={{ asPlainText: true }}
-            />
-          </EuiFormRow>
-        </EuiFlexItem>
-        <EuiFlexItem grow={5}>
-          <EuiFormRow label="Operator">
-            <EuiComboBox
-              placeholder={
-                selectedFieldOptions.length === 0 ? 'Waiting' : 'Select'
-              }
-              isClearable={false}
-              isDisabled={selectedFieldOptions.length === 0}
-              options={
-                selectedFieldOptions.length === 0
-                  ? []
-                  : getFilterOperatorOptions(
-                      selectedFieldOptions[0].label as FilterFieldType
-                    )
-              }
-              selectedOptions={selectedOperatorOptions}
-              onChange={(e) => {
-                setSelectedOperatorOptions(e);
-                setFilterValue(null);
-              }}
-              singleSelection={{ asPlainText: true }}
-            />
-          </EuiFormRow>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      {selectedOperatorOptions.length > 0 &&
-        getValueComponent(
-          selectedFieldOptions[0].label as FilterFieldType,
-          selectedOperatorOptions[0].label as FilterOperatorType,
-          filterValue,
-          setFilterValue,
-          mainStateContext.availableChannels
-        )}
-      <EuiSpacer size="m" />
-      <EuiFlexGroup gutterSize="s" justifyContent="flexEnd">
-        <EuiFlexItem grow={false}>
-          <EuiButtonEmpty
-            data-test-subj="filter-popover-cancel-button"
-            onClick={props.closePopover}
-          >
-            Cancel
-          </EuiButtonEmpty>
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiButton
-            fill
-            disabled={
-              selectedFieldOptions.length === 0 ||
-              selectedOperatorOptions.length === 0 ||
-              !(filterValue && filterValue.length > 0)
-            }
-            onClick={() => {
-              props.closePopover();
-              props.setFilter(
-                {
-                  field: selectedFieldOptions[0].label as FilterFieldType,
-                  operator: selectedOperatorOptions[0]
-                    .label as FilterOperatorType,
-                  value: filterValue,
-                  inverted: selectedOperatorOptions[0].label.includes('not'),
-                  disabled: props.filter ? props.filter.disabled : false,
-                },
-                props.index
-              );
-            }}
-          >
-            Save
-          </EuiButton>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </div>
-  );
-}
diff --git a/dashboards-notifications/public/pages/Notifications/components/SearchBar/Filter/Filters.tsx b/dashboards-notifications/public/pages/Notifications/components/SearchBar/Filter/Filters.tsx
deleted file mode 100644
index 4a2e51a1..00000000
--- a/dashboards-notifications/public/pages/Notifications/components/SearchBar/Filter/Filters.tsx
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  EuiBadge,
-  EuiContextMenu,
-  EuiContextMenuPanelDescriptor,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiIcon,
-  EuiPopover,
-  EuiTextColor,
-} from '@elastic/eui';
-import { EuiComboBoxOptionOption } from '@elastic/eui/src/components/combo_box/types';
-import React, { useMemo, useState } from 'react';
-import {
-  FilterFieldType,
-  FilterOperatorType,
-  isSingleSelection,
-} from '../utils/filterHelpers';
-import { AddFilterButton } from './AddFilterButton';
-import { FilterEditPopover } from './FilterEditPopover';
-import { GlobalFilterButton } from './GlobalFilterButton';
-
-export interface FilterType {
-  field: FilterFieldType;
-  operator: FilterOperatorType;
-  value: string | Array<EuiComboBoxOptionOption<string>> | null;
-  inverted: boolean;
-  disabled: boolean;
-}
-
-interface FiltersProps {
-  filters: FilterType[];
-  setFilters: (filters: FilterType[]) => void;
-}
-
-export function Filters(props: FiltersProps) {
-  // set a filter at an index. if newFilter doesn't exist, remove filter at the index
-  // if index doesn't exist, append newFilter to the end
-  const setFilter = (newFilter: FilterType | null, index?: number) => {
-    if (index === undefined) index = props.filters.length;
-    const newFilters = [...props.filters];
-    if (newFilter) newFilters.splice(index, 1, newFilter);
-    else newFilters.splice(index, 1);
-    props.setFilters(newFilters);
-  };
-
-  const getFilterPopoverPanels = (
-    filter: FilterType,
-    index: number,
-    closePopover: () => void
-  ): EuiContextMenuPanelDescriptor[] => [
-    {
-      id: 0,
-      items: [
-        {
-          name: 'Edit filter',
-          icon: <EuiIcon type="invert" size="m" />,
-          panel: 1,
-        },
-        // {
-        //   name: `${filter.inverted ? 'Include' : 'Exclude'} results`,
-        //   icon: (
-        //     <EuiIcon
-        //       type={filter.inverted ? 'plusInCircle' : 'minusInCircle'}
-        //       size="m"
-        //     />
-        //   ),
-        //   onClick: () => {
-        //     filter.inverted = !filter.inverted;
-        //     setFilter(filter, index);
-        //   },
-        // },
-        {
-          name: filter.disabled ? 'Re-enable' : 'Temporarily disable',
-          icon: (
-            <EuiIcon type={filter.disabled ? 'eye' : 'eyeClosed'} size="m" />
-          ),
-          onClick: () => {
-            filter.disabled = !filter.disabled;
-            setFilter(filter, index);
-          },
-        },
-        {
-          name: 'Delete',
-          icon: <EuiIcon type="trash" size="m" />,
-          onClick: () => setFilter(null, index),
-        },
-      ],
-    },
-    {
-      id: 1,
-      width: 430,
-      title: 'Edit filter',
-      content: (
-        <div style={{ margin: 15 }}>
-          <FilterEditPopover
-            filter={filter}
-            index={index}
-            setFilter={setFilter}
-            closePopover={closePopover}
-          />
-        </div>
-      ),
-    },
-  ];
-
-  const renderFilters = () => {
-    const FilterBadge = ({
-      filter,
-      index,
-    }: {
-      filter: FilterType;
-      index: number;
-    }) => {
-      const [isPopoverOpen, setIsPopoverOpen] = useState(false);
-      const className =
-        'globalFilterItem' +
-        (filter.disabled ? ' globalFilterItem-isDisabled' : '') +
-        (filter.inverted ? ' globalFilterItem-isExcluded' : '');
-
-      let singleSelection = isSingleSelection(filter);
-      let value;
-      if (typeof filter.value === 'string') {
-        value = filter.value;
-      } else if (Array.isArray(filter.value)) {
-        // combo box array
-        value = filter.value.map((option) => option.label).join(', ');
-        if (!singleSelection) value = 'is one of ' + value;
-      }
-
-      const filterLabel = filter.inverted ? (
-        <>
-          <EuiTextColor color={filter.disabled ? 'default' : 'danger'}>
-            {'NOT '}
-          </EuiTextColor>
-          <EuiTextColor color="default">{`${filter.field}: ${value}`}</EuiTextColor>
-        </>
-      ) : (
-        `${filter.field}: ${value}`
-      );
-
-      const badge = (
-        <EuiBadge
-          className={className}
-          onClick={() => setIsPopoverOpen(true)}
-          onClickAriaLabel="Open filter settings"
-          color={filter.disabled ? '#e7e9f0' : 'hollow'}
-          iconType="cross"
-          iconSide="right"
-          iconOnClick={() => setFilter(null, index)}
-          iconOnClickAriaLabel="Remove filter"
-        >
-          {filterLabel}
-        </EuiBadge>
-      );
-      return (
-        <EuiFlexItem grow={false} key={`filter-${index}`}>
-          <EuiPopover
-            isOpen={isPopoverOpen}
-            closePopover={() => setIsPopoverOpen(false)}
-            panelPaddingSize="none"
-            button={badge}
-          >
-            <EuiContextMenu
-              initialPanelId={0}
-              panels={getFilterPopoverPanels(filter, index, () =>
-                setIsPopoverOpen(false)
-              )}
-            />
-          </EuiPopover>
-        </EuiFlexItem>
-      );
-    };
-
-    return (
-      <>
-        {props.filters.length > 0
-          ? props.filters.map((filter, i) => (
-              <FilterBadge filter={filter} index={i} key={i} />
-            ))
-          : null}
-      </>
-    );
-  };
-
-  const filterComponents = useMemo(() => renderFilters(), [props.filters]);
-
-  return (
-    <>
-      <EuiFlexGroup
-        gutterSize="xs"
-        alignItems="center"
-        responsive={false}
-        style={{ minHeight: 32 }}
-        wrap
-      >
-        <EuiFlexItem grow={false}>
-          <GlobalFilterButton
-            filters={props.filters}
-            setFilters={props.setFilters}
-          />
-        </EuiFlexItem>
-        {filterComponents}
-        <EuiFlexItem grow={false}>
-          <AddFilterButton setFilter={setFilter} />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </>
-  );
-}
diff --git a/dashboards-notifications/public/pages/Notifications/components/SearchBar/Filter/GlobalFilterButton.tsx b/dashboards-notifications/public/pages/Notifications/components/SearchBar/Filter/GlobalFilterButton.tsx
deleted file mode 100644
index 6fb19942..00000000
--- a/dashboards-notifications/public/pages/Notifications/components/SearchBar/Filter/GlobalFilterButton.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  EuiButtonIcon,
-  EuiContextMenu,
-  EuiIcon,
-  EuiPopover,
-} from '@elastic/eui';
-import React, { useState } from 'react';
-import { FilterType } from './Filters';
-
-interface GlobalFilterButtonProps {
-  filters: FilterType[];
-  setFilters: (filters: FilterType[]) => void;
-}
-
-export function GlobalFilterButton(props: GlobalFilterButtonProps) {
-  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
-  const globalPopoverPanels = [
-    {
-      id: 0,
-      title: 'Change all filters',
-      items: [
-        {
-          name: 'Enable all',
-          icon: <EuiIcon type="eye" size="m" />,
-          onClick: () => {
-            props.setFilters(
-              props.filters.map((filter) => ({ ...filter, disabled: false }))
-            );
-            setIsPopoverOpen(false);
-          },
-        },
-        {
-          name: 'Disable all',
-          icon: <EuiIcon type="eyeClosed" size="m" />,
-          onClick: () => {
-            props.setFilters(
-              props.filters.map((filter) => ({ ...filter, disabled: true }))
-            );
-            setIsPopoverOpen(false);
-          },
-        },
-        // {
-        //   name: 'Invert inclusion',
-        //   icon: <EuiIcon type="invert" size="m" />,
-        //   onClick: () => {
-        //     props.setFilters(
-        //       props.filters.map((filter) => ({
-        //         ...filter,
-        //         inverted: !filter.inverted,
-        //       }))
-        //     );
-        //     setIsPopoverOpen(false);
-        //   },
-        // },
-        {
-          name: 'Invert enabled/disabled',
-          icon: <EuiIcon type="eye" size="m" />,
-          onClick: () => {
-            props.setFilters(
-              props.filters.map((filter) => ({
-                ...filter,
-                disabled: !filter.disabled,
-              }))
-            );
-            setIsPopoverOpen(false);
-          },
-        },
-        {
-          name: 'Remove all',
-          icon: <EuiIcon type="trash" size="m" />,
-          onClick: () => {
-            props.setFilters([]);
-            setIsPopoverOpen(false);
-          },
-        },
-      ],
-    },
-  ];
-
-  return (
-    <EuiPopover
-      isOpen={isPopoverOpen}
-      closePopover={() => setIsPopoverOpen(false)}
-      button={
-        <EuiButtonIcon
-          onClick={() => setIsPopoverOpen(true)}
-          iconType="filter"
-          title="Change all filters"
-          aria-label="Change all filters"
-        />
-      }
-      anchorPosition="rightUp"
-      panelPaddingSize="none"
-      withTitle
-    >
-      <EuiContextMenu initialPanelId={0} panels={globalPopoverPanels} />
-    </EuiPopover>
-  );
-}
diff --git a/dashboards-notifications/public/pages/Notifications/components/SearchBar/NotificationsSearchBar.tsx b/dashboards-notifications/public/pages/Notifications/components/SearchBar/NotificationsSearchBar.tsx
deleted file mode 100644
index ec49dc6b..00000000
--- a/dashboards-notifications/public/pages/Notifications/components/SearchBar/NotificationsSearchBar.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  EuiButton,
-  EuiFieldSearch,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiSpacer,
-  EuiSuperDatePicker,
-  ShortDate,
-} from '@elastic/eui';
-import React, { useState } from 'react';
-import { Filters, FilterType } from './Filter/Filters';
-
-interface NotificationsSearchBarProps {
-  startTime: ShortDate;
-  setStartTime: (startTime: ShortDate) => void;
-  endTime: ShortDate;
-  setEndTime: (endTime: ShortDate) => void;
-  search: string;
-  setSearch: (search: string) => void;
-  filters: FilterType[];
-  setFilters: (filters: FilterType[]) => void;
-  refresh: () => void;
-}
-
-export function NotificationsSearchBar(props: NotificationsSearchBarProps) {
-  const [query, setQuery] = useState(props.search);
-
-  return (
-    <>
-      <EuiFlexGroup gutterSize="s" alignItems="center">
-        <EuiFlexItem>
-          <EuiFieldSearch
-            data-test-subj="notifications-search-bar-input"
-            fullWidth
-            isClearable={false}
-            placeholder="Search"
-            value={query}
-            onChange={(e) => setQuery(e.target.value)}
-            onSearch={props.setSearch}
-          />
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiSuperDatePicker
-            start={props.startTime}
-            end={props.endTime}
-            showUpdateButton={false}
-            onTimeChange={(e) => {
-              props.setStartTime(e.start);
-              props.setEndTime(e.end);
-            }}
-          />
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiButton
-            iconType="refresh"
-            onClick={() => {
-              props.setSearch(query);
-              props.refresh();
-            }}
-          >
-            Refresh
-          </EuiButton>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer size="s" />
-      <Filters filters={props.filters} setFilters={props.setFilters} />
-    </>
-  );
-}
diff --git a/dashboards-notifications/public/pages/Notifications/components/SearchBar/utils/filterHelpers.tsx b/dashboards-notifications/public/pages/Notifications/components/SearchBar/utils/filterHelpers.tsx
deleted file mode 100644
index 4421567a..00000000
--- a/dashboards-notifications/public/pages/Notifications/components/SearchBar/utils/filterHelpers.tsx
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { EuiComboBox, EuiFieldText, EuiFormRow, EuiSpacer } from '@elastic/eui';
-import React from 'react';
-import {
-  CHANNEL_TYPE,
-  NOTIFICATION_SOURCE,
-  SEVERITY_TYPE,
-} from '../../../../../utils/constants';
-import { FilterType } from '../Filter/Filters';
-
-export interface FilterParamsType {
-  'status_list.config_name'?: string[];
-  'status_list.config_type'?: Array<keyof typeof CHANNEL_TYPE>;
-  'event_source.feature'?: Array<keyof typeof NOTIFICATION_SOURCE>;
-  'event_source.severity'?: Array<keyof typeof SEVERITY_TYPE>;
-  'status_list.delivery_status.status_code'?: string[];
-}
-
-export type FilterFieldType =
-  | 'Channel'
-  | 'Channel type'
-  | 'Severity'
-  | 'Source'
-  | 'Status';
-
-export type FilterOperatorType =
-  | 'is'
-  | 'is not'
-  | 'is one of'
-  | 'is not one of';
-
-export type FilterValueType = string | number | string[] | number[];
-
-export const getFilterFieldOptions = () => {
-  return [
-    { label: 'Channel' },
-    { label: 'Channel type' },
-    { label: 'Severity' },
-    { label: 'Source' },
-    { label: 'Status' },
-  ];
-};
-
-export const getFilterOperatorOptions = (field: FilterFieldType) => {
-  if (field === 'Channel' || field === 'Status') {
-    return [
-      { label: 'is' },
-      // { label: 'is not' },
-    ];
-  }
-  return [
-    { label: 'is' },
-    // { label: 'is not' },
-    { label: 'is one of' },
-    // { label: 'is not one of' },
-  ];
-};
-
-export const getOperatorString = (
-  operator: FilterOperatorType,
-  inverted: boolean
-) => {
-  if (operator === 'is' || operator === 'is not')
-    return inverted ? 'is not' : 'is';
-  if (operator === 'is one of' || operator === 'is not one of')
-    return inverted ? 'is not one of' : 'is one of';
-  return '';
-};
-
-export const getValueComponent = (
-  field: FilterFieldType,
-  operator: FilterOperatorType,
-  value: any,
-  setValue: (v: any) => void,
-  availableChannels: { [feature: string]: string }
-) => {
-  // only Channel filters should be inputbox, others should be combobox
-  if (field === 'Channel')
-    return (
-      <>
-        <EuiSpacer size="s" />
-        <EuiFormRow label="Value">
-          <EuiFieldText
-            placeholder="Enter a value"
-            value={value || ''}
-            onChange={(e) => setValue(e.target.value)}
-          />
-        </EuiFormRow>
-      </>
-    );
-
-  let options;
-
-  if (field === 'Channel type')
-    options = Object.entries(availableChannels).map(([key, value]) => ({
-      label: value,
-      value: key,
-    }));
-  else if (field === 'Severity')
-    options = Object.entries(SEVERITY_TYPE).map(([key, value]) => ({
-      label: value,
-      value: key,
-    }));
-  else if (field === 'Source')
-    options = Object.entries(NOTIFICATION_SOURCE).map(([key, value]) => ({
-      label: value,
-      value: key,
-    }));
-  else if (field === 'Status')
-    options = [{ label: 'Sent' }, { label: 'Error' }];
-
-  const singleSelection = isSingleSelection(operator);
-  const placeholder = singleSelection ? 'Select a value' : 'Select values';
-
-  return (
-    <>
-      <EuiSpacer size="s" />
-      <EuiFormRow label="Value">
-        <EuiComboBox
-          fullWidth
-          placeholder={placeholder}
-          options={options}
-          selectedOptions={value || []}
-          singleSelection={singleSelection}
-          onChange={setValue}
-          isClearable={true}
-        />
-      </EuiFormRow>
-    </>
-  );
-};
-
-export const isSingleSelection = (filterOrOperator: FilterType | string) => {
-  const checkSingleSelection = (operator: string) =>
-    operator === 'is' || operator === 'is not';
-
-  return checkSingleSelection(
-    typeof filterOrOperator === 'string'
-      ? filterOrOperator
-      : filterOrOperator.operator
-  );
-};
-
-const toBackendField = (field: FilterFieldType) => {
-  switch (field) {
-    case 'Channel':
-      return 'status_list.config_name';
-    case 'Channel type':
-      return 'status_list.config_type';
-    case 'Severity':
-      return 'event_source.severity';
-    case 'Source':
-      return 'event_source.feature';
-    case 'Status':
-      return 'status_list.delivery_status.status_code';
-    default:
-      return '';
-  }
-};
-
-export const filtersToQueryParams = (filters: FilterType[]) => {
-  const filterParams: FilterParamsType = {};
-  filters
-    .filter((filter) => !filter.disabled && filter.value != null)
-    .forEach((filter) => {
-      const field = toBackendField(filter.field);
-      if (!field) return;
-      if (!filterParams[field]) filterParams[field] = [];
-
-      if (field === 'status_list.delivery_status.status_code') {
-        const queryForSuccess =
-          (filter.value === 'Sent' && !filter.inverted) ||
-          (filter.value === 'Error' && filter.inverted);
-        filterParams[field]!.push(queryForSuccess ? '200' : '!200');
-        return;
-      }
-
-      const inverted = filter.inverted ? '!' : '';
-      const values =
-        typeof filter.value === 'string'
-          ? [filter.value]
-          : filter.value!.map((option) => option.value || option.label);
-      for (const value of values) {
-        filterParams[field]!.push(`${inverted}${value}`);
-      }
-    });
-  return filterParams;
-};
diff --git a/dashboards-notifications/public/pages/Notifications/containers/Notifications.tsx b/dashboards-notifications/public/pages/Notifications/containers/Notifications.tsx
deleted file mode 100644
index cc941f9a..00000000
--- a/dashboards-notifications/public/pages/Notifications/containers/Notifications.tsx
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Datum } from '@elastic/charts';
-import dateMath from '@elastic/datemath';
-import {
-  EuiButton,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiSpacer,
-  EuiTableSortingType,
-  EuiTitle,
-  ShortDate,
-  SortDirection,
-} from '@elastic/eui';
-import { Criteria } from '@elastic/eui/src/components/basic_table/basic_table';
-import { Pagination } from '@elastic/eui/src/components/basic_table/pagination_bar';
-import _ from 'lodash';
-import queryString from 'querystring';
-import React, { Component } from 'react';
-import { RouteComponentProps } from 'react-router-dom';
-import { NotificationItem, TableState } from '../../../../models/interfaces';
-import { CoreServicesContext } from '../../../components/coreServices';
-import { BrowserServices } from '../../../models/interfaces';
-import {
-  BREADCRUMBS,
-  CHANNEL_TYPE,
-  HISTOGRAM_TYPE,
-  ROUTES,
-} from '../../../utils/constants';
-import { getErrorMessage } from '../../../utils/helpers';
-import { MainState } from '../../Main/Main';
-import { EmptyState } from '../components/EmptyState/EmptyState';
-import { NotificationsTable } from '../components/NotificationsTable/NotificationsTable';
-import { FilterType } from '../components/SearchBar/Filter/Filters';
-import { NotificationsSearchBar } from '../components/SearchBar/NotificationsSearchBar';
-import { filtersToQueryParams } from '../components/SearchBar/utils/filterHelpers';
-import { DEFAULT_PAGE_SIZE_OPTIONS } from '../utils/constants';
-import { getURLQueryParams } from '../utils/helpers';
-
-interface NotificationsProps extends RouteComponentProps {
-  services: BrowserServices;
-  mainProps: MainState;
-}
-
-interface NotificationsState extends TableState<NotificationItem> {
-  startTime: ShortDate;
-  endTime: ShortDate;
-  filters: Array<FilterType>;
-  histogramType: keyof typeof HISTOGRAM_TYPE;
-  histogramData: Array<Datum>;
-  isChannelConfigured: boolean;
-}
-
-export default class Notifications extends Component<
-  NotificationsProps,
-  NotificationsState
-> {
-  static contextType = CoreServicesContext;
-
-  constructor(props: NotificationsProps) {
-    super(props);
-
-    const urlParams =
-      this.props.location.search ||
-      sessionStorage.getItem('NotificationsQueryParams') ||
-      '';
-    const {
-      from,
-      size,
-      search,
-      sortField,
-      sortDirection,
-      startTime,
-      endTime,
-      filters,
-      histogramType,
-    } = getURLQueryParams(urlParams);
-
-    this.state = {
-      total: 0,
-      from,
-      size,
-      search,
-      sortField,
-      sortDirection,
-      items: [],
-      selectedItems: [],
-      loading: true,
-      startTime,
-      endTime,
-      filters,
-      histogramType,
-      histogramData: [],
-      isChannelConfigured: true,
-    };
-
-    this.getNotifications = _.debounce(this.getNotifications, 200);
-  }
-
-  async componentDidMount() {
-    this.context.chrome.setBreadcrumbs([
-      BREADCRUMBS.NOTIFICATIONS,
-      BREADCRUMBS.DASHBOARD,
-    ]);
-    window.scrollTo(0, 0);
-    await this.getNotifications();
-    try {
-      const isChannelConfigured =
-        await this.props.services.notificationService.getChannels({
-          config_type: Object.keys(CHANNEL_TYPE),
-          from_index: 0,
-          max_items: 1,
-          sort_field: 'name',
-          sort_order: SortDirection.ASC,
-        });
-      if (!isChannelConfigured?.total) {
-        this.setState({ isChannelConfigured: false });
-      }
-    } catch (error) {
-      this.setState({ isChannelConfigured: false });
-    }
-  }
-
-  async componentDidUpdate(
-    prevProps: NotificationsProps,
-    prevState: NotificationsState
-  ) {
-    const prevQuery = Notifications.serializeSearchParams(prevState);
-    const currQuery = Notifications.serializeSearchParams(this.state);
-    if (!_.isEqual(prevQuery, currQuery)) {
-      await this.getNotifications();
-    }
-  }
-
-  static serializeSearchParams(state: NotificationsState) {
-    return {
-      from_index: state.from,
-      max_items: state.size,
-      query: state.search,
-      sort_field: state.sortField,
-      sort_order: state.sortDirection,
-      startTime: state.startTime,
-      endTime: state.endTime,
-      filters: JSON.stringify(state.filters),
-      // histogramType: state.histogramType,
-    };
-  }
-
-  static getQueryObjectFromState(state: NotificationsState) {
-    const filterParams = filtersToQueryParams(state.filters);
-    return {
-      from_index: state.from,
-      max_items: state.size,
-      query: state.search,
-      sort_field: state.sortField,
-      sort_order: state.sortDirection,
-      last_updated_time_ms: `${dateMath
-        .parse(state.startTime)
-        ?.valueOf()}..${dateMath
-        .parse(state.endTime, { roundUp: true })
-        ?.valueOf()}`,
-      ...filterParams,
-    };
-  }
-
-  getNotifications = async () => {
-    this.setState({ loading: true });
-    try {
-      const { services, history } = this.props;
-      const searchParams = Notifications.serializeSearchParams(this.state);
-      const queryParamsString = queryString.stringify(searchParams);
-      history.replace({ ...this.props.location, search: queryParamsString });
-      sessionStorage.setItem('NotificationsQueryParams', queryParamsString);
-
-      const queryObject = Notifications.getQueryObjectFromState(this.state);
-      const getNotificationsResponse = await services.eventService.getNotifications(
-        queryObject
-      );
-      // const getHistogramResponse = await services.eventService.getHistogram(
-      //   queryObject
-      // );
-      this.setState({
-        items: getNotificationsResponse.items,
-        total: getNotificationsResponse.total,
-        // histogramData: getHistogramResponse,
-      });
-    } catch (err) {
-      this.context.notifications.toasts.addDanger(
-        getErrorMessage(err, 'There was a problem loading notifications.')
-      );
-    }
-    this.setState({ loading: false });
-  };
-
-  onTableChange = ({
-    page: tablePage,
-    sort,
-  }: Criteria<NotificationItem>): void => {
-    const { index: page, size } = tablePage!;
-    const { field: sortField, direction: sortDirection } = sort!;
-    this.setState({ from: page * size, size, sortField, sortDirection });
-  };
-
-  onSearchChange = (search: string): void => {
-    this.setState({ from: 0, search });
-  };
-
-  setStartTime = (startTime: ShortDate) => {
-    this.setState({ from: 0, startTime });
-  };
-  setEndTime = (endTime: ShortDate) => {
-    this.setState({ from: 0, endTime });
-  };
-  setFilters = (filters: FilterType[]) => {
-    this.setState({ from: 0, filters });
-    this.getNotifications();
-  };
-  setHistogramType = (histogramType: keyof typeof HISTOGRAM_TYPE) => {
-    this.setState({ histogramType });
-  };
-
-  render() {
-    const page = Math.floor(this.state.from / this.state.size);
-
-    const pagination: Pagination = {
-      pageIndex: page,
-      pageSize: this.state.size,
-      pageSizeOptions: DEFAULT_PAGE_SIZE_OPTIONS,
-      totalItemCount: this.state.total,
-    };
-
-    const sorting: EuiTableSortingType<NotificationItem> = {
-      sort: {
-        direction: this.state.sortDirection,
-        field: this.state.sortField,
-      },
-    };
-
-    if (
-      !this.state.loading &&
-      this.state.total === 0 &&
-      !this.state.isChannelConfigured
-    ) {
-      return <EmptyState channels={false} />;
-    }
-
-    return (
-      <div style={{ padding: '0px 25px' }}>
-        <EuiFlexGroup alignItems="center">
-          <EuiFlexItem>
-            <EuiTitle size="l">
-              <h1>Dashboard</h1>
-            </EuiTitle>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiButton
-              href={`#${ROUTES.CHANNELS}`}
-              data-test-subj="createChannelButton"
-              fill
-            >
-              Manage channels
-            </EuiButton>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-
-        <EuiSpacer size="m" />
-        <NotificationsSearchBar
-          startTime={this.state.startTime}
-          setStartTime={this.setStartTime}
-          endTime={this.state.endTime}
-          setEndTime={this.setEndTime}
-          search={this.state.search}
-          setSearch={this.onSearchChange}
-          filters={this.state.filters}
-          setFilters={this.setFilters}
-          refresh={this.getNotifications}
-        />
-
-        {this.state.loading || this.state.total > 0 ? (
-          <>
-            {/* <EuiSpacer />
-            <NotificationsHistogram
-              histogramType={this.state.histogramType}
-              setHistogramType={this.setHistogramType}
-              histogramData={this.state.histogramData}
-            /> */}
-
-            <EuiSpacer />
-            <NotificationsTable
-              items={this.state.items}
-              onTableChange={this.onTableChange}
-              pagination={pagination}
-              sorting={sorting}
-              loading={this.state.loading}
-            />
-          </>
-        ) : (
-          <EmptyState channels={true} />
-        )}
-      </div>
-    );
-  }
-}
diff --git a/dashboards-notifications/public/pages/Notifications/containers/index.ts b/dashboards-notifications/public/pages/Notifications/containers/index.ts
deleted file mode 100644
index 7fb09198..00000000
--- a/dashboards-notifications/public/pages/Notifications/containers/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import Notifications from './Notifications';
-
-export default Notifications;
diff --git a/dashboards-notifications/public/pages/Notifications/index.ts b/dashboards-notifications/public/pages/Notifications/index.ts
deleted file mode 100644
index 71317ff2..00000000
--- a/dashboards-notifications/public/pages/Notifications/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import Notifications from './containers/Notifications';
-
-export default Notifications;
diff --git a/dashboards-notifications/public/pages/Notifications/utils/__tests__/helpers.test.ts b/dashboards-notifications/public/pages/Notifications/utils/__tests__/helpers.test.ts
deleted file mode 100644
index 0d3bd68e..00000000
--- a/dashboards-notifications/public/pages/Notifications/utils/__tests__/helpers.test.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { DEFAULT_QUERY_PARAMS } from '../constants';
-import { getURLQueryParams } from '../helpers';
-
-describe('test url params', () => {
-  it('parses empty url query params', () => {
-    const emptyParams = getURLQueryParams('');
-    expect(emptyParams).toEqual(DEFAULT_QUERY_PARAMS);
-  });
-
-  it('parses url query params', () => {
-    const params = getURLQueryParams(
-      [
-        'from_index=100',
-        'max_items=200',
-        'query=test%20query',
-        'sort_field=last_updated_time_ms',
-        'sort_order=asc',
-        'startTime=now-1w',
-        'endTime=now',
-        'filters=',
-      ].join('&')
-    );
-    expect(params).toEqual({
-      from: 100,
-      search: 'test query',
-      size: 200,
-      sortDirection: 'asc',
-      sortField: 'last_updated_time_ms',
-      startTime: 'now-1w',
-      endTime: 'now',
-      filters: [],
-      histogramType: 'Channel type',
-    });
-  });
-
-  it('parses invalid url query params', () => {
-    const params = getURLQueryParams(
-      [
-        'from_index=test',
-        'max_items=test',
-        'query=',
-        'sort_field=last_updated_time_ms',
-        'sort_order=asc',
-        'startTime=',
-        'endTime=',
-        'filters=invalidFilters',
-      ].join('&')
-    );
-    expect(params).toEqual({
-      from: 0,
-      search: '',
-      size: 10,
-      sortDirection: 'asc',
-      sortField: 'last_updated_time_ms',
-      startTime: 'now-7d',
-      endTime: 'now',
-      filters: [],
-      histogramType: 'Channel type',
-    });
-  });
-});
diff --git a/dashboards-notifications/public/pages/Notifications/utils/constants.ts b/dashboards-notifications/public/pages/Notifications/utils/constants.ts
index 0bf5c183..bbef1503 100644
--- a/dashboards-notifications/public/pages/Notifications/utils/constants.ts
+++ b/dashboards-notifications/public/pages/Notifications/utils/constants.ts
@@ -3,19 +3,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SortDirection } from '@elastic/eui';
-import { HISTOGRAM_TYPE } from '../../../utils/constants';
-
 export const DEFAULT_PAGE_SIZE_OPTIONS = [5, 10, 20, 50];
-
-export const DEFAULT_QUERY_PARAMS = {
-  from: 0,
-  search: '',
-  size: 10,
-  sortDirection: SortDirection.DESC,
-  sortField: 'last_updated_time_ms',
-  startTime: 'now-7d',
-  endTime: 'now',
-  filters: [],
-  histogramType: Object.values(HISTOGRAM_TYPE)[0],
-};
diff --git a/dashboards-notifications/public/pages/Notifications/utils/helpers.ts b/dashboards-notifications/public/pages/Notifications/utils/helpers.ts
deleted file mode 100644
index 09cd7fd4..00000000
--- a/dashboards-notifications/public/pages/Notifications/utils/helpers.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Direction, ShortDate } from '@elastic/eui';
-import queryString from 'query-string';
-import { NotificationItem } from '../../../../models/interfaces';
-import { HISTOGRAM_TYPE } from '../../../utils/constants';
-import { FilterType } from '../components/SearchBar/Filter/Filters';
-import { DEFAULT_QUERY_PARAMS } from './constants';
-
-export type NotificationsQueryParams = {
-  from: number;
-  size: number;
-  search: string;
-  sortDirection: Direction;
-  sortField: string;
-  startTime: ShortDate;
-  endTime: ShortDate;
-  filters: FilterType[];
-  histogramType: keyof typeof HISTOGRAM_TYPE;
-};
-
-export const getURLQueryParams = (
-  queryParams: string
-): NotificationsQueryParams => {
-  const {
-    from_index: from,
-    max_items: size,
-    query: search,
-    sort_field: sortField,
-    sort_order: sortDirection,
-    startTime,
-    endTime,
-    filters,
-    histogramType,
-  } = queryString.parse(queryParams);
-
-  let parsedFilters = DEFAULT_QUERY_PARAMS.filters;
-  if (typeof filters === 'string' && filters.trim().length > 0)
-    try {
-      parsedFilters = JSON.parse(filters);
-    } catch (error) {}
-
-  return <NotificationsQueryParams>{
-    // @ts-ignore
-    from: isNaN(parseInt(from, 10))
-      ? DEFAULT_QUERY_PARAMS.from
-      : parseInt(from as string, 10),
-    // @ts-ignore
-    size: isNaN(parseInt(size, 10))
-      ? DEFAULT_QUERY_PARAMS.size
-      : parseInt(size as string, 10),
-    search: typeof search !== 'string' ? DEFAULT_QUERY_PARAMS.search : search,
-    sortField:
-      typeof sortField !== 'string'
-        ? DEFAULT_QUERY_PARAMS.sortField
-        : sortField,
-    sortDirection:
-      typeof sortDirection !== 'string'
-        ? DEFAULT_QUERY_PARAMS.sortDirection
-        : sortDirection,
-    startTime:
-      typeof startTime !== 'string' || startTime.length === 0
-        ? DEFAULT_QUERY_PARAMS.startTime
-        : startTime,
-    endTime:
-      typeof endTime !== 'string' || endTime.length === 0
-        ? DEFAULT_QUERY_PARAMS.endTime
-        : endTime,
-    filters: parsedFilters,
-    histogramType:
-      typeof histogramType !== 'string'
-        ? DEFAULT_QUERY_PARAMS.histogramType
-        : histogramType,
-  };
-};
-
-export const getReferenceURL = (item: NotificationItem) => {
-  const id = item.event_source.reference_id;
-  switch (item.event_source.feature) {
-    case 'alerting':
-      return `alerting#/monitors/${id}`;
-    case 'index_management':
-      return `opensearch_index_management_dashboards#/index-policies?search=${id}`;
-    case 'reports':
-      return `reports-dashboards#/report_details/${id}`;
-    default:
-      return '#';
-  }
-};
-
-export const getReferenceText = (item: NotificationItem) => {
-  switch (item.event_source.feature) {
-    case 'alerting':
-      return 'Monitor';
-    case 'index_management':
-      return 'Index Management';
-    case 'reports':
-      return 'Report';
-    default:
-      return '-';
-  }
-};
diff --git a/dashboards-notifications/public/services/EventService.ts b/dashboards-notifications/public/services/EventService.ts
deleted file mode 100644
index 94717e94..00000000
--- a/dashboards-notifications/public/services/EventService.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { HttpFetchQuery, HttpSetup } from '../../../../src/core/public';
-import { NODE_API } from '../../common';
-import { NOTIFICATION_SOURCE } from '../utils/constants';
-import { eventListToNotifications, eventToNotification } from './utils/helper';
-
-interface EventsResponse {
-  total_hits: number;
-  event_list: any[];
-}
-
-export default class EventService {
-  httpClient: HttpSetup;
-
-  constructor(httpClient: HttpSetup) {
-    this.httpClient = httpClient;
-  }
-
-  getHistogram = async (queryObject: object) => {
-    // TODO needs backend support
-    // return MOCK_GET_HISTOGRAM();
-  };
-
-  getNotifications = async (queryObject: HttpFetchQuery) => {
-    const response = await this.httpClient.get<EventsResponse>(
-      NODE_API.GET_EVENTS,
-      {
-        query: queryObject,
-      }
-    );
-    return {
-      items: eventListToNotifications(response.event_list),
-      total: response.total_hits || 0,
-    };
-  };
-
-  getNotification = async (id: string) => {
-    const response = await this.httpClient.get<EventsResponse>(
-      `${NODE_API.GET_EVENT}/${id}`
-    );
-    return eventToNotification(response.event_list[0]);
-  };
-
-  sendTestMessage = async (
-    configId: string,
-    feature: keyof typeof NOTIFICATION_SOURCE
-  ) => {
-    const response = await this.httpClient.get(
-      `${NODE_API.SEND_TEST_MESSAGE}/${configId}`,
-      {
-        query: {
-          feature,
-        },
-      }
-    );
-    if (response.event_id != null) {
-      await this.getNotification(response.event_id).then((response) => {
-        if (!response.success) {
-          const error = new Error('Failed to send the test message.');
-          error.stack = JSON.stringify(response.status_list, null, 2);
-          throw error;
-        }
-      });
-    } else {
-      console.error(response);
-      const error = new Error('Failed to send the test message.');
-      error.stack = JSON.stringify(response, null, 2);
-      throw error;
-    }
-    return response;
-  };
-}
diff --git a/dashboards-notifications/public/services/NotificationService.ts b/dashboards-notifications/public/services/NotificationService.ts
index 81b58283..b7e35469 100644
--- a/dashboards-notifications/public/services/NotificationService.ts
+++ b/dashboards-notifications/public/services/NotificationService.ts
@@ -14,7 +14,7 @@ import {
   SenderType,
   SESSenderItemType,
 } from '../../models/interfaces';
-import { CHANNEL_TYPE } from '../utils/constants';
+import {CHANNEL_TYPE, NOTIFICATION_SOURCE} from '../utils/constants';
 import {
   configListToChannels,
   configListToRecipientGroups,
@@ -24,6 +24,7 @@ import {
   configToRecipientGroup,
   configToSender,
   configToSESSender,
+  eventToNotification,
 } from './utils/helper';
 
 interface ConfigsResponse {
@@ -31,6 +32,11 @@ interface ConfigsResponse {
   config_list: any[];
 }
 
+interface EventsResponse {
+  total_hits: number;
+  event_list: any[];
+}
+
 export default class NotificationService {
   httpClient: HttpSetup;
 
@@ -229,4 +235,40 @@ export default class NotificationService {
       return null;
     }
   };
+
+  getNotification = async (id: string) => {
+    const response = await this.httpClient.get<EventsResponse>(
+        `${NODE_API.GET_EVENT}/${id}`
+    );
+    return eventToNotification(response.event_list[0]);
+  };
+
+  sendTestMessage = async (
+      configId: string,
+      feature: keyof typeof NOTIFICATION_SOURCE
+  ) => {
+    const response = await this.httpClient.get(
+        `${NODE_API.SEND_TEST_MESSAGE}/${configId}`,
+        {
+          query: {
+            feature,
+          },
+        }
+    );
+    if (response.event_id != null) {
+      await this.getNotification(response.event_id).then((response) => {
+        if (!response.success) {
+          const error = new Error('Failed to send the test message.');
+          error.stack = JSON.stringify(response.status_list, null, 2);
+          throw error;
+        }
+      });
+    } else {
+      console.error(response);
+      const error = new Error('Failed to send the test message.');
+      error.stack = JSON.stringify(response, null, 2);
+      throw error;
+    }
+    return response;
+  };
 }
diff --git a/dashboards-notifications/public/services/index.ts b/dashboards-notifications/public/services/index.ts
index 77d824d6..7865d960 100644
--- a/dashboards-notifications/public/services/index.ts
+++ b/dashboards-notifications/public/services/index.ts
@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import EventService from './EventService';
 import NotificationService from './NotificationService';
 import { ServicesConsumer, ServicesContext } from './services';
 
-export { ServicesConsumer, ServicesContext, NotificationService, EventService };
+export { ServicesConsumer, ServicesContext, NotificationService };
diff --git a/dashboards-notifications/public/services/utils/helper.ts b/dashboards-notifications/public/services/utils/helper.ts
index 2c2e509e..bc6ac799 100644
--- a/dashboards-notifications/public/services/utils/helper.ts
+++ b/dashboards-notifications/public/services/utils/helper.ts
@@ -5,7 +5,6 @@
 
 import {
   ChannelItemType,
-  NotificationItem,
   RecipientGroupItemType,
   SenderItemType,
   SESSenderItemType,
@@ -77,12 +76,11 @@ export const isStatusCodeSuccess = (statusCode: string) => {
   return statusCode !== "207" && /^2\d\d/.test(statusCode);
 };
 
-export const eventToNotification = (event: any): NotificationItem => {
+export const eventToNotification = (event: any) => {
   const success = event.event.status_list.every(
     (status: any) => isStatusCodeSuccess(status.delivery_status.status_code)
   );
   return {
-    event_source: event.event.event_source,
     status_list: event.event.status_list,
     event_id: event.event_id,
     created_time_ms: event.created_time_ms,
@@ -90,7 +88,3 @@ export const eventToNotification = (event: any): NotificationItem => {
     success,
   };
 };
-
-export const eventListToNotifications = (events: any[]): NotificationItem[] => {
-  return events?.map((event) => eventToNotification(event)) || [];
-};
diff --git a/dashboards-notifications/public/utils/constants.ts b/dashboards-notifications/public/utils/constants.ts
index aed0abd9..88df348a 100644
--- a/dashboards-notifications/public/utils/constants.ts
+++ b/dashboards-notifications/public/utils/constants.ts
@@ -25,7 +25,6 @@ export const ROUTES = Object.freeze({
 
 export const BREADCRUMBS = Object.freeze({
   NOTIFICATIONS: { text: 'Notifications', href: '#/' },
-  DASHBOARD: { text: 'Dashboard', href: `#${ROUTES.NOTIFICATIONS}` },
   CHANNELS: { text: 'Channels', href: `#${ROUTES.CHANNELS}` },
   CHANNEL_DETAILS: { text: 'Channels', href: `#${ROUTES.CHANNEL_DETAILS}` },
   CREATE_CHANNEL: { text: 'Create channel', href: `#${ROUTES.CREATE_CHANNEL}` },
@@ -94,11 +93,3 @@ export const CUSTOM_WEBHOOK_ENDPOINT_TYPE = Object.freeze({
   WEBHOOK_URL: 'Webhook URL',
   CUSTOM_URL: 'Custom attributes URL',
 });
-
-export const HISTOGRAM_TYPE = Object.freeze({
-  CHANNEL_TYPE: 'Channel type',
-  SOURCE: 'Notification source',
-  STATUS: 'Notification status',
-  SEVERITY: 'Severity',
-  TOP_10_CHANNELS: 'Top 10 channels',
-});
diff --git a/dashboards-notifications/server/clusters/notificationsPlugin.ts b/dashboards-notifications/server/clusters/notificationsPlugin.ts
index 0dc0eadd..89c1b1a4 100644
--- a/dashboards-notifications/server/clusters/notificationsPlugin.ts
+++ b/dashboards-notifications/server/clusters/notificationsPlugin.ts
@@ -66,13 +66,6 @@ export function NotificationsPlugin(Client: any, config: any, components: any) {
     needBody: true,
   });
 
-  notifications.getEvents = clientAction({
-    url: {
-      fmt: OPENSEARCH_API.EVENTS,
-    },
-    method: 'GET',
-  });
-
   notifications.getEventById = clientAction({
     url: {
       fmt: `${OPENSEARCH_API.EVENTS}/<%=eventId%>`,
diff --git a/dashboards-notifications/server/routes/eventRoutes.ts b/dashboards-notifications/server/routes/eventRoutes.ts
index b87b1516..0db439c8 100644
--- a/dashboards-notifications/server/routes/eventRoutes.ts
+++ b/dashboards-notifications/server/routes/eventRoutes.ts
@@ -9,85 +9,8 @@ import {
   IRouter,
 } from '../../../../src/core/server';
 import { NODE_API } from '../../common';
-import { joinRequestParams } from '../utils/helper';
 
 export function eventRoutes(router: IRouter) {
-  router.get(
-    {
-      path: NODE_API.GET_EVENTS,
-      validate: {
-        query: schema.object({
-          from_index: schema.number(),
-          max_items: schema.number(),
-          query: schema.maybe(schema.string()),
-          sort_field: schema.string(),
-          sort_order: schema.string(),
-          last_updated_time_ms: schema.maybe(schema.string()),
-          'status_list.config_name': schema.maybe(
-            schema.oneOf([schema.arrayOf(schema.string()), schema.string()])
-          ),
-          'status_list.config_type': schema.maybe(
-            schema.oneOf([schema.arrayOf(schema.string()), schema.string()])
-          ),
-          'event_source.feature': schema.maybe(
-            schema.oneOf([schema.arrayOf(schema.string()), schema.string()])
-          ),
-          'event_source.severity': schema.maybe(
-            schema.oneOf([schema.arrayOf(schema.string()), schema.string()])
-          ),
-          'status_list.delivery_status.status_code': schema.maybe(
-            schema.oneOf([schema.arrayOf(schema.string()), schema.string()])
-          ),
-        }),
-      },
-    },
-    async (context, request, response) => {
-      const query = request.query.query;
-      const last_updated_time_ms = request.query.last_updated_time_ms;
-      const config_name = joinRequestParams(
-        request.query['status_list.config_name']
-      );
-      const config_type = joinRequestParams(
-        request.query['status_list.config_type']
-      );
-      const feature = joinRequestParams(request.query['event_source.feature']);
-      const severity = joinRequestParams(
-        request.query['event_source.severity']
-      );
-      const status_code = joinRequestParams(
-        request.query['status_list.delivery_status.status_code']
-      );
-
-      // @ts-ignore
-      const client: ILegacyScopedClusterClient = context.notificationsContext.notificationsClient.asScoped(
-        request
-      );
-      try {
-        const resp = await client.callAsCurrentUser('notifications.getEvents', {
-          from_index: request.query.from_index,
-          max_items: request.query.max_items,
-          sort_field: request.query.sort_field,
-          sort_order: request.query.sort_order,
-          ...(query && { text_query: query }),
-          ...(last_updated_time_ms && { last_updated_time_ms }),
-          ...(config_name && { 'status_list.config_name': config_name }),
-          ...(config_type && { 'status_list.config_type': config_type }),
-          ...(feature && { 'event_source.feature': feature }),
-          ...(severity && { 'event_source.severity': severity }),
-          ...(status_code && {
-            'status_list.delivery_status.status_code': status_code,
-          }),
-        });
-        return response.ok({ body: resp });
-      } catch (error) {
-        return response.custom({
-          statusCode: error.statusCode || 500,
-          body: error.message,
-        });
-      }
-    }
-  );
-
   router.get(
     {
       path: `${NODE_API.GET_EVENT}/{eventId}`,
diff --git a/dashboards-notifications/test/mocks/mockData.ts b/dashboards-notifications/test/mocks/mockData.ts
index a902ae6e..0f5449cd 100644
--- a/dashboards-notifications/test/mocks/mockData.ts
+++ b/dashboards-notifications/test/mocks/mockData.ts
@@ -5,7 +5,6 @@
 
 import {
   ChannelItemType,
-  NotificationItem,
   RecipientGroupItemType,
   SenderItemType,
   SESSenderItemType,
@@ -190,51 +189,6 @@ const mockRecipientGroup: RecipientGroupItemType = {
   },
 };
 
-const mockNotification: NotificationItem = {
-  event_id: 'qcuW53kBSU9z3nsaFegV',
-  last_updated_time_ms: 1623084806565,
-  created_time_ms: 1623084806565,
-  tenant: '',
-  event_source: {
-    title: 'test notification',
-    reference_id: 'reference_id',
-    feature: 'reports',
-    severity: 'info',
-    tags: ['tag1', 'tag2'],
-  },
-  success: false,
-  status_list: [
-    {
-      config_id: '8KUO2HkBtN9Xw674azJS',
-      config_type: 'slack',
-      config_name: 'slack test',
-      email_recipient_status: [],
-      delivery_status: {
-        status_code: '200',
-        status_text: 'success',
-      },
-    },
-    {
-      config_id: 'oMvr2HkBSU9z3nsaFujT',
-      config_type: 'email',
-      config_name: 'emailtest',
-      email_recipient_status: [
-        {
-          recipient: 'test@email.com',
-          delivery_status: {
-            status_code: '500',
-            status_text: 'failed',
-          },
-        },
-      ],
-      delivery_status: {
-        status_code: '500',
-        status_text: 'failed',
-      },
-    },
-  ],
-};
-
 export const MOCK_DATA = {
   channels: {
     items: [
@@ -268,8 +222,4 @@ export const MOCK_DATA = {
     items: [mockRecipientGroup],
     total: 1,
   },
-  notifications: {
-    items: [mockNotification],
-    total: 1,
-  },
 };
diff --git a/dashboards-notifications/test/mocks/serviceMock.ts b/dashboards-notifications/test/mocks/serviceMock.ts
index 14239fa0..24972dc1 100644
--- a/dashboards-notifications/test/mocks/serviceMock.ts
+++ b/dashboards-notifications/test/mocks/serviceMock.ts
@@ -5,7 +5,7 @@
 
 import { CoreStart } from 'opensearch-dashboards/public';
 import { MainState } from '../../public/pages/Main/Main';
-import { EventService, NotificationService } from '../../public/services';
+import { NotificationService } from '../../public/services';
 import { CHANNEL_TYPE } from '../../public/utils/constants';
 import httpClientMock from './httpClientMock';
 
@@ -26,10 +26,8 @@ const coreServicesMock = ({
 } as unknown) as CoreStart;
 
 const browserServicesMock = new NotificationService(httpClientMock);
-const eventServiceMock = new EventService(httpClientMock);
 const notificationServiceMock = {
   notificationService: browserServicesMock,
-  eventService: eventServiceMock,
 };
 
 const mainStateMock: MainState = {