diff --git a/desktop/core/src/desktop/js/apps/admin/ServerLogs/ServerLogsHeader.tsx b/desktop/core/src/desktop/js/apps/admin/ServerLogs/ServerLogsHeader.tsx
index 8a6a096ba1b..b0d983ef81c 100644
--- a/desktop/core/src/desktop/js/apps/admin/ServerLogs/ServerLogsHeader.tsx
+++ b/desktop/core/src/desktop/js/apps/admin/ServerLogs/ServerLogsHeader.tsx
@@ -78,7 +78,6 @@ const ServerLogsHeader: React.FC<ServerLogsHeaderProps> = ({
 
         <Button
           className="server__download-button"
-          data-event="download-button"
           icon={<Download />}
           onClick={handleDownloadClick}
         >
diff --git a/desktop/core/src/desktop/js/apps/editor/components/result/reactExample/ReactExample.tsx b/desktop/core/src/desktop/js/apps/editor/components/result/reactExample/ReactExample.tsx
index a2c829569bc..54b85d75e21 100644
--- a/desktop/core/src/desktop/js/apps/editor/components/result/reactExample/ReactExample.tsx
+++ b/desktop/core/src/desktop/js/apps/editor/components/result/reactExample/ReactExample.tsx
@@ -89,7 +89,7 @@ const ReactExample: FunctionComponent<ReactExampleProps> = ({ activeExecutable,
           defaultCurrent={1}
           total={500}
         />
-        <PrimaryButton data-event="" icon={<PlusCircleIcon />} onClick={showModal}>
+        <PrimaryButton icon={<PlusCircleIcon />} onClick={showModal}>
           {t('Open (cuix button)')}
         </PrimaryButton>
         <Dropdown menu={{ items }}>
diff --git a/desktop/core/src/desktop/js/apps/newimporter/ImporterSourceSelector/ImporterSourceSelector.tsx b/desktop/core/src/desktop/js/apps/newimporter/ImporterSourceSelector/ImporterSourceSelector.tsx
index 07a2ff8f255..5360441130e 100644
--- a/desktop/core/src/desktop/js/apps/newimporter/ImporterSourceSelector/ImporterSourceSelector.tsx
+++ b/desktop/core/src/desktop/js/apps/newimporter/ImporterSourceSelector/ImporterSourceSelector.tsx
@@ -94,7 +94,6 @@ const ImporterSourceSelector = ({ setFileMetaData }: ImporterSourceSelectorProps
               className="hue-importer__source-selector-option-button"
               size="large"
               icon={<DocumentationIcon />}
-              data-event={''}
               onClick={handleUploadClick}
             ></Button>
             <span className="hue-importer__source-selector-option-btn-title">
diff --git a/desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserTab/StorageBrowserTab.tsx b/desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserTab/StorageBrowserTab.tsx
index c3e39a8bc9b..28948c4a898 100644
--- a/desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserTab/StorageBrowserTab.tsx
+++ b/desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserTab/StorageBrowserTab.tsx
@@ -143,7 +143,6 @@ const StorageBrowserTab = ({ fileSystem, testId }: StorageBrowserTabProps): JSX.
                 setFilePath(fileSystem.userHomeDirectory);
               }}
               className="hue-storage-browser-tab__title-bar-button"
-              data-event=""
               title={t('Home')}
               icon={<HomeIcon />}
             >
@@ -153,7 +152,6 @@ const StorageBrowserTab = ({ fileSystem, testId }: StorageBrowserTabProps): JSX.
               <BorderlessButton
                 onClick={onTrashClick}
                 className="hue-storage-browser-tab__title-bar-button"
-                data-event=""
                 title={t('Trash')}
                 icon={<DeleteIcon />}
                 disabled={!trashData?.trashPath}
@@ -164,7 +162,6 @@ const StorageBrowserTab = ({ fileSystem, testId }: StorageBrowserTabProps): JSX.
             <BorderlessButton
               onClick={reloadData}
               className="hue-storage-browser-tab__title-bar-button"
-              data-event=""
               title={t('Refresh')}
               icon={<RefreshIcon />}
             >
diff --git a/desktop/core/src/desktop/js/apps/storageBrowser/StorageDirectoryPage/StorageDirectoryActions/CreateAndUpload/CreateAndUploadAction.tsx b/desktop/core/src/desktop/js/apps/storageBrowser/StorageDirectoryPage/StorageDirectoryActions/CreateAndUpload/CreateAndUploadAction.tsx
index 097037ab1c4..c433accbd44 100644
--- a/desktop/core/src/desktop/js/apps/storageBrowser/StorageDirectoryPage/StorageDirectoryActions/CreateAndUpload/CreateAndUploadAction.tsx
+++ b/desktop/core/src/desktop/js/apps/storageBrowser/StorageDirectoryPage/StorageDirectoryActions/CreateAndUpload/CreateAndUploadAction.tsx
@@ -137,7 +137,7 @@ const CreateAndUploadAction = ({
         }}
         trigger={['click']}
       >
-        <PrimaryButton data-event="">
+        <PrimaryButton>
           {t('New')}
           <DropDownIcon />
         </PrimaryButton>
diff --git a/desktop/core/src/desktop/js/apps/storageBrowser/StorageFilePage/StorageFilePage.tsx b/desktop/core/src/desktop/js/apps/storageBrowser/StorageFilePage/StorageFilePage.tsx
index bf9b33e6179..39b97cfc55d 100644
--- a/desktop/core/src/desktop/js/apps/storageBrowser/StorageFilePage/StorageFilePage.tsx
+++ b/desktop/core/src/desktop/js/apps/storageBrowser/StorageFilePage/StorageFilePage.tsx
@@ -156,11 +156,7 @@ const StorageFilePage = ({ fileStats, onReload }: StorageFilePageProps): JSX.Ele
               {t('Content')}
               <div className="preview__action-group">
                 {isEditingEnabled && (
-                  <PrimaryButton
-                    data-testid="preview--edit--button"
-                    data-event=""
-                    onClick={handleEdit}
-                  >
+                  <PrimaryButton data-testid="preview--edit--button" onClick={handleEdit}>
                     {t('Edit')}
                   </PrimaryButton>
                 )}
@@ -168,7 +164,6 @@ const StorageFilePage = ({ fileStats, onReload }: StorageFilePageProps): JSX.Ele
                   <>
                     <PrimaryButton
                       data-testid="preview--save--button"
-                      data-event=""
                       onClick={handleSave}
                       disabled={fileContent === data?.contents}
                     >
@@ -177,7 +172,6 @@ const StorageFilePage = ({ fileStats, onReload }: StorageFilePageProps): JSX.Ele
                     <Button
                       role="button"
                       data-testid="preview--cancel--button"
-                      data-event=""
                       onClick={handleCancel}
                     >
                       {t('Cancel')}
@@ -186,11 +180,7 @@ const StorageFilePage = ({ fileStats, onReload }: StorageFilePageProps): JSX.Ele
                 )}
                 {config?.storage_browser.enable_file_download_button && (
                   <a href={fileDownloadUrl}>
-                    <PrimaryButton
-                      data-testid="preview--download--button"
-                      data-event=""
-                      onClick={handleDownload}
-                    >
+                    <PrimaryButton data-testid="preview--download--button" onClick={handleDownload}>
                       {t('Download')}
                     </PrimaryButton>
                   </a>
@@ -218,11 +208,7 @@ const StorageFilePage = ({ fileStats, onReload }: StorageFilePageProps): JSX.Ele
               {fileType === SupportedFileTypes.DOCUMENT && (
                 <div className="preview__document">
                   <div>
-                    <PrimaryButton
-                      data-testid=""
-                      data-event=""
-                      onClick={() => window.open(filePreviewUrl)}
-                    >
+                    <PrimaryButton data-testid="" onClick={() => window.open(filePreviewUrl)}>
                       {t('Preview document')}
                     </PrimaryButton>
                   </div>
diff --git a/desktop/core/src/desktop/js/reactComponents/LoadingErrorWrapper/LoadingErrorWrapper.tsx b/desktop/core/src/desktop/js/reactComponents/LoadingErrorWrapper/LoadingErrorWrapper.tsx
index 3be225faaf1..50614913b15 100644
--- a/desktop/core/src/desktop/js/reactComponents/LoadingErrorWrapper/LoadingErrorWrapper.tsx
+++ b/desktop/core/src/desktop/js/reactComponents/LoadingErrorWrapper/LoadingErrorWrapper.tsx
@@ -68,11 +68,7 @@ const LoadingErrorWrapper = ({
             description={error.description}
             closable={error.closable}
             onClick={error.onClick}
-            action={
-              <BorderlessButton onClick={error.onClick} data-event="">
-                {error.action}
-              </BorderlessButton>
-            }
+            action={<BorderlessButton onClick={error.onClick}>{error.action}</BorderlessButton>}
           />
         ))}
       </>
diff --git a/desktop/core/src/desktop/js/reactComponents/Pagination/Pagination.tsx b/desktop/core/src/desktop/js/reactComponents/Pagination/Pagination.tsx
index 05c660566c5..80878a1773b 100644
--- a/desktop/core/src/desktop/js/reactComponents/Pagination/Pagination.tsx
+++ b/desktop/core/src/desktop/js/reactComponents/Pagination/Pagination.tsx
@@ -65,7 +65,6 @@ const Pagination = ({
             setPageNumber(1);
           }}
           className="hue-pagination__page-size-menu-item-btn"
-          data-event={''}
         >
           {option}
         </BorderlessButton>
@@ -81,7 +80,6 @@ const Pagination = ({
           <Dropdown menu={{ items: pageSizeOptionsMenu }}>
             <BorderlessButton
               className="hue-pagination__page-size-menu-btn"
-              data-event={''}
               icon={<DropdownIcon />}
               iconPosition="right"
             >
@@ -99,7 +97,6 @@ const Pagination = ({
         <BorderlessButton
           onClick={() => setPageNumber(1)}
           className="hue-pagination__control-button"
-          data-event={''}
           disabled={pageStats.pageNumber === 1}
           title={t('First Page')}
           icon={<PageFirstIcon />}
@@ -107,7 +104,6 @@ const Pagination = ({
         <BorderlessButton
           onClick={() => setPageNumber(pageStats.pageNumber - 1)}
           className="hue-pagination__control-button"
-          data-event={''}
           disabled={pageStats.pageNumber === 1}
           title={t('First Page')}
           icon={<PagePreviousIcon />}
@@ -115,7 +111,6 @@ const Pagination = ({
         <BorderlessButton
           onClick={() => setPageNumber(pageStats.pageNumber + 1)}
           className="hue-pagination__control-button"
-          data-event={''}
           disabled={pageStats.pageNumber === pageStats.totalPages}
           title={t('Next Page')}
           icon={<PageNextIcon />}
@@ -123,7 +118,6 @@ const Pagination = ({
         <BorderlessButton
           onClick={() => setPageNumber(pageStats.totalPages)}
           className="hue-pagination__control-button"
-          data-event={''}
           disabled={pageStats.pageNumber === pageStats.totalPages}
           title={t('Last Page')}
           icon={<PageLastIcon />}
diff --git a/desktop/core/src/desktop/js/reactComponents/PathBrowser/OverflowingItem/OverflowingItem.tsx b/desktop/core/src/desktop/js/reactComponents/PathBrowser/OverflowingItem/OverflowingItem.tsx
index d59d6c22470..c15eb2db904 100644
--- a/desktop/core/src/desktop/js/reactComponents/PathBrowser/OverflowingItem/OverflowingItem.tsx
+++ b/desktop/core/src/desktop/js/reactComponents/PathBrowser/OverflowingItem/OverflowingItem.tsx
@@ -55,7 +55,6 @@ const OverflowingItem = ({ label, onClick, testId }: OverflowingItemProps): JSX.
         className="hue-path-browser__overflowing-label"
         onClick={onClick}
         data-testid={`${testId}-label`}
-        data-event={''}
       >
         <span ref={textElementRef}>{label}</span>
       </BorderlessButton>
diff --git a/desktop/core/src/desktop/js/reactComponents/PathBrowser/PathBrowser.tsx b/desktop/core/src/desktop/js/reactComponents/PathBrowser/PathBrowser.tsx
index 6aa695aedb9..57a8068d294 100644
--- a/desktop/core/src/desktop/js/reactComponents/PathBrowser/PathBrowser.tsx
+++ b/desktop/core/src/desktop/js/reactComponents/PathBrowser/PathBrowser.tsx
@@ -167,7 +167,6 @@ const PathBrowser = ({
                 data-testid={`${testId}-dropdown`}
               >
                 <BorderlessButton
-                  data-event=""
                   className="hue-path-browser__dropdown-button"
                   data-testid={`${testId}-dropdown-btn`}
                 >
@@ -205,14 +204,12 @@ const PathBrowser = ({
           onClick={() => setIsEditMode(true)}
           className="hue-path-browser__edit-path-btn"
           data-testid="hue-path-browser__edit-path-btn"
-          data-event={''}
           title={'Edit Path'}
           icon={<EditIcon />}
         />
         <BorderlessButton
           onClick={() => navigator.clipboard.writeText(filePath)}
           className="hue-path-browser__copy-path-btn"
-          data-event={''}
           title={'Copy Path'}
           icon={<CopyPathIcon />}
         />