diff --git a/web/src/components/DateTime.vue b/web/src/components/DateTime.vue
index 8660a075ac..43b1ab81c7 100644
--- a/web/src/components/DateTime.vue
+++ b/web/src/components/DateTime.vue
@@ -199,84 +199,86 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
               <q-separator v-if="!disableRelative" class="q-my-sm" />
 
               <table v-if="!hideRelativeTime" class="q-px-md startEndTime">
-                <tr>
-                  <td class="label tw-px-2">Start time</td>
-                  <td class="label tw-px-2">End time</td>
-                </tr>
-                <tr>
-                  <td>
-                    <q-input
-                      v-model="selectedTime.startTime"
-                      dense
-                      filled
-                      mask="fulltime"
-                      :rules="['fulltime']"
-                      @blur="
-                        resetTime(selectedTime.startTime, selectedTime.endTime)
-                      "
-                    >
-                      <template #append>
-                        <q-icon name="access_time" class="cursor-pointer">
-                          <q-popup-proxy
-                            transition-show="scale"
-                            transition-hide="scale"
-                            style="z-index: 10002"
-                          >
-                            <q-time
-                              v-model="selectedTime.startTime"
-                              with-seconds
+                <tbody>
+                  <tr>
+                    <td class="label tw-px-2">Start time</td>
+                    <td class="label tw-px-2">End time</td>
+                  </tr>
+                  <tr>
+                    <td>
+                      <q-input
+                        v-model="selectedTime.startTime"
+                        dense
+                        filled
+                        mask="fulltime"
+                        :rules="['fulltime']"
+                        @blur="
+                          resetTime(selectedTime.startTime, selectedTime.endTime)
+                        "
+                      >
+                        <template #append>
+                          <q-icon name="access_time" class="cursor-pointer">
+                            <q-popup-proxy
+                              transition-show="scale"
+                              transition-hide="scale"
+                              style="z-index: 10002"
                             >
-                              <div class="row items-center justify-end">
-                                <q-btn
-                                  v-close-popup
-                                  label="Close"
-                                  color="primary"
-                                  flat
-                                />
-                              </div>
-                            </q-time>
-                          </q-popup-proxy>
-                        </q-icon>
-                      </template>
-                    </q-input>
-                  </td>
-                  <td>
-                    <q-input
-                      v-model="selectedTime.endTime"
-                      dense
-                      filled
-                      mask="fulltime"
-                      :rules="['fulltime']"
-                      @blur="
-                        resetTime(selectedTime.startTime, selectedTime.endTime)
-                      "
-                    >
-                      <template #append>
-                        <q-icon name="access_time" class="cursor-pointer">
-                          <q-popup-proxy
-                            transition-show="scale"
-                            transition-hide="scale"
-                            style="z-index: 10002"
-                          >
-                            <q-time
-                              v-model="selectedTime.endTime"
-                              :with-seconds="true"
+                              <q-time
+                                v-model="selectedTime.startTime"
+                                with-seconds
+                              >
+                                <div class="row items-center justify-end">
+                                  <q-btn
+                                    v-close-popup
+                                    label="Close"
+                                    color="primary"
+                                    flat
+                                  />
+                                </div>
+                              </q-time>
+                            </q-popup-proxy>
+                          </q-icon>
+                        </template>
+                      </q-input>
+                    </td>
+                    <td>
+                      <q-input
+                        v-model="selectedTime.endTime"
+                        dense
+                        filled
+                        mask="fulltime"
+                        :rules="['fulltime']"
+                        @blur="
+                          resetTime(selectedTime.startTime, selectedTime.endTime)
+                        "
+                      >
+                        <template #append>
+                          <q-icon name="access_time" class="cursor-pointer">
+                            <q-popup-proxy
+                              transition-show="scale"
+                              transition-hide="scale"
+                              style="z-index: 10002"
                             >
-                              <div class="row items-center justify-end">
-                                <q-btn
-                                  v-close-popup
-                                  label="Close"
-                                  color="primary"
-                                  flat
-                                />
-                              </div>
-                            </q-time>
-                          </q-popup-proxy>
-                        </q-icon>
-                      </template>
-                    </q-input>
-                  </td>
-                </tr>
+                              <q-time
+                                v-model="selectedTime.endTime"
+                                :with-seconds="true"
+                              >
+                                <div class="row items-center justify-end">
+                                  <q-btn
+                                    v-close-popup
+                                    label="Close"
+                                    color="primary"
+                                    flat
+                                  />
+                                </div>
+                              </q-time>
+                            </q-popup-proxy>
+                          </q-icon>
+                        </template>
+                      </q-input>
+                    </td>
+                  </tr>
+                </tbody>
               </table>
             </div>
           </q-tab-panel>
diff --git a/web/src/components/actionScripts/FileItem.vue b/web/src/components/actionScripts/FileItem.vue
index 210e23e967..5cfbcd9411 100644
--- a/web/src/components/actionScripts/FileItem.vue
+++ b/web/src/components/actionScripts/FileItem.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, defineProps, defineEmits, computed, nextTick, watch } from "vue";
+import { ref, computed, nextTick, watch } from "vue";
 
 const props = defineProps<{
   name: string;
diff --git a/web/src/components/alerts/AddDestination.vue b/web/src/components/alerts/AddDestination.vue
index 6ac0ff3213..39ea025aba 100644
--- a/web/src/components/alerts/AddDestination.vue
+++ b/web/src/components/alerts/AddDestination.vue
@@ -333,11 +333,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import {
   ref,
   computed,
-  defineProps,
   onBeforeMount,
   onActivated,
-  defineEmits,
-  reactive,
 } from "vue";
 import type { Ref, PropType } from "vue";
 import { useI18n } from "vue-i18n";
@@ -353,7 +350,6 @@ import type {
 import { useRouter } from "vue-router";
 import { isValidResourceName } from "@/utils/zincutils";
 import AppTabs from "@/components/common/AppTabs.vue";
-import actionService from "@/services/action_scripts";
 import config from "@/aws-exports";
 import useActions from "@/composables/useActions";
 
diff --git a/web/src/components/alerts/AddTemplate.vue b/web/src/components/alerts/AddTemplate.vue
index b14b425391..4706078fd5 100644
--- a/web/src/components/alerts/AddTemplate.vue
+++ b/web/src/components/alerts/AddTemplate.vue
@@ -212,15 +212,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <script lang="ts" setup>
 import {
   ref,
-  onMounted,
-  defineProps,
   onBeforeMount,
   onActivated,
-  defineEmits,
-  watch,
   computed,
   defineAsyncComponent,
-  defineComponent,
 } from "vue";
 import type { Ref } from "vue";
 import { useI18n } from "vue-i18n";
diff --git a/web/src/components/alerts/AlertsContainer.vue b/web/src/components/alerts/AlertsContainer.vue
index 9953922f91..35466f3f74 100644
--- a/web/src/components/alerts/AlertsContainer.vue
+++ b/web/src/components/alerts/AlertsContainer.vue
@@ -65,7 +65,7 @@
     
   </template>
   <script setup lang="ts">
-  import { defineProps, ref, onMounted, computed, watch, defineEmits } from "vue";
+  import { computed } from "vue";
   import { useStore } from "vuex";
   
   const props = defineProps({
diff --git a/web/src/components/alerts/FieldsInput.vue b/web/src/components/alerts/FieldsInput.vue
index 90f3234942..17e17f4a51 100644
--- a/web/src/components/alerts/FieldsInput.vue
+++ b/web/src/components/alerts/FieldsInput.vue
@@ -151,7 +151,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script lang="ts" setup>
-import { defineProps, ref,computed } from "vue";
+import { ref, computed } from "vue";
 import { useI18n } from "vue-i18n";
 import { outlinedDelete } from "@quasar/extras/material-icons-outlined";
 import { useStore } from "vuex";
diff --git a/web/src/components/alerts/FilterCondition.vue b/web/src/components/alerts/FilterCondition.vue
index 58f9d92490..97e5f39d1e 100644
--- a/web/src/components/alerts/FilterCondition.vue
+++ b/web/src/components/alerts/FilterCondition.vue
@@ -117,7 +117,7 @@
     },
     });
 
-import { defineProps, ref,computed } from "vue";
+import { ref, computed } from "vue";
 import { useI18n } from "vue-i18n";
 import { outlinedDelete } from "@quasar/extras/material-icons-outlined";
 import { useStore } from "vuex";
diff --git a/web/src/components/alerts/VariablesInput.vue b/web/src/components/alerts/VariablesInput.vue
index c4ad0a4d05..5dd6a22a5e 100644
--- a/web/src/components/alerts/VariablesInput.vue
+++ b/web/src/components/alerts/VariablesInput.vue
@@ -131,9 +131,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script setup lang="ts">
-import { defineProps } from "vue";
 import { useI18n } from "vue-i18n";
-import { outlinedDelete, outlinedInfo } from "@quasar/extras/material-icons-outlined";
+import { outlinedDelete } from "@quasar/extras/material-icons-outlined";
 import { useStore } from "vuex";
 
 const props = defineProps({
diff --git a/web/src/components/cipherkeys/AddCipherKey.vue b/web/src/components/cipherkeys/AddCipherKey.vue
index d35dfd625c..04305b68f0 100644
--- a/web/src/components/cipherkeys/AddCipherKey.vue
+++ b/web/src/components/cipherkeys/AddCipherKey.vue
@@ -194,7 +194,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   </q-page>
 </template>
 <script lang="ts" setup>
-import { ref, onBeforeMount, onActivated, defineEmits, computed } from "vue";
+import { ref, onBeforeMount, onActivated, computed } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
 import { useStore } from "vuex";
diff --git a/web/src/components/common/AppTabs.vue b/web/src/components/common/AppTabs.vue
index 1beb7fa214..122b138d9e 100644
--- a/web/src/components/common/AppTabs.vue
+++ b/web/src/components/common/AppTabs.vue
@@ -40,8 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script setup lang="ts">
-import { computed, defineProps } from "vue";
-
 interface Tab {
   label: string;
   value: string;
diff --git a/web/src/components/functions/FullViewContainer.vue b/web/src/components/functions/FullViewContainer.vue
index 61d782cd7e..0d5db4fb2e 100644
--- a/web/src/components/functions/FullViewContainer.vue
+++ b/web/src/components/functions/FullViewContainer.vue
@@ -40,7 +40,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { defineProps, ref, onMounted, computed, watch, defineEmits } from "vue";
+import { computed } from "vue";
 import { useStore } from "vuex";
 
 const props = defineProps({
diff --git a/web/src/components/functions/FunctionsToolbar.vue b/web/src/components/functions/FunctionsToolbar.vue
index d0be90c7b6..5bcd2f8936 100644
--- a/web/src/components/functions/FunctionsToolbar.vue
+++ b/web/src/components/functions/FunctionsToolbar.vue
@@ -133,12 +133,8 @@
 </template>
 <script setup lang="ts">
 import {
-  defineComponent,
   ref,
-  onMounted,
   computed,
-  watch,
-  defineEmits,
 } from "vue";
 import { useI18n } from "vue-i18n";
 import { useQuasar } from "quasar";
diff --git a/web/src/components/functions/TestFunction.vue b/web/src/components/functions/TestFunction.vue
index 7291d1eef2..b8bc02f41e 100644
--- a/web/src/components/functions/TestFunction.vue
+++ b/web/src/components/functions/TestFunction.vue
@@ -315,7 +315,6 @@
 import {
   onBeforeMount,
   ref,
-  defineProps,
   defineExpose,
   computed,
   nextTick,
diff --git a/web/src/components/iam/roles/EntityPermissionTable.vue b/web/src/components/iam/roles/EntityPermissionTable.vue
index ad628fe736..07df774b5b 100644
--- a/web/src/components/iam/roles/EntityPermissionTable.vue
+++ b/web/src/components/iam/roles/EntityPermissionTable.vue
@@ -45,9 +45,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script setup lang="ts">
-import { ref, defineEmits } from "vue";
+import { ref } from "vue";
 import { useI18n } from "vue-i18n";
-import { defineProps } from "vue";
 import AppTable from "@/components/AppTable.vue";
 import usePermissions from "@/composables/iam/usePermissions";
 import type { Entity } from "@/ts/interfaces";
diff --git a/web/src/components/iam/roles/PermissionsTable.vue b/web/src/components/iam/roles/PermissionsTable.vue
index caa64722a0..ff101845ec 100644
--- a/web/src/components/iam/roles/PermissionsTable.vue
+++ b/web/src/components/iam/roles/PermissionsTable.vue
@@ -244,7 +244,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <script setup lang="ts">
 import { ref } from "vue";
-import { defineEmits } from "vue";
 import { useI18n } from "vue-i18n";
 
 const props = defineProps({
diff --git a/web/src/components/logstream/StreamFieldInputs.vue b/web/src/components/logstream/StreamFieldInputs.vue
index 1902607448..182ea431b8 100644
--- a/web/src/components/logstream/StreamFieldInputs.vue
+++ b/web/src/components/logstream/StreamFieldInputs.vue
@@ -134,7 +134,6 @@
 </template>
 
 <script lang="ts" setup>
-import { defineProps, ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { outlinedDelete } from "@quasar/extras/material-icons-outlined";
 import { useStore } from "vuex";
diff --git a/web/src/components/pipeline/NodeForm/AssociateFunction.vue b/web/src/components/pipeline/NodeForm/AssociateFunction.vue
index 03a53c4101..f5ccc37a76 100644
--- a/web/src/components/pipeline/NodeForm/AssociateFunction.vue
+++ b/web/src/components/pipeline/NodeForm/AssociateFunction.vue
@@ -169,8 +169,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import {
   ref,
   type Ref,
-  defineEmits,
-  onBeforeMount,
   watch,
   nextTick,
   defineAsyncComponent,
diff --git a/web/src/components/pipeline/NodeForm/ExternalDestination.vue b/web/src/components/pipeline/NodeForm/ExternalDestination.vue
index a4568b075b..2eb0efd7c0 100644
--- a/web/src/components/pipeline/NodeForm/ExternalDestination.vue
+++ b/web/src/components/pipeline/NodeForm/ExternalDestination.vue
@@ -272,12 +272,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import {
   ref,
   computed,
-  defineProps,
   onBeforeMount,
   onActivated,
-  defineEmits,
   watch,
-  reactive,
 } from "vue";
 import type { Ref } from "vue";
 import { useI18n } from "vue-i18n";
diff --git a/web/src/components/pipeline/NodeForm/Stream.vue b/web/src/components/pipeline/NodeForm/Stream.vue
index f08a445c4f..244196e502 100644
--- a/web/src/components/pipeline/NodeForm/Stream.vue
+++ b/web/src/components/pipeline/NodeForm/Stream.vue
@@ -171,13 +171,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   />
 </template>
 <script lang="ts" setup>
-import { ref, type Ref, defineEmits, onMounted, watch, defineAsyncComponent, computed } from "vue";
+import { ref, type Ref, onMounted, watch, computed } from "vue";
 import { useI18n } from "vue-i18n";
 import { useStore } from "vuex";
 import ConfirmDialog from "../../ConfirmDialog.vue";
 import useDragAndDrop from "@/plugins/pipelines/useDnD";
 import useStreams from "@/composables/useStreams";
-import pipelineService from "@/services/pipelines";
 import usePipelines from "@/composables/usePipelines";
 
 import AddStream from "@/components/logstream/AddStream.vue";
diff --git a/web/src/components/pipeline/PipelineEditor.vue b/web/src/components/pipeline/PipelineEditor.vue
index 89c558ff04..068e0c9588 100644
--- a/web/src/components/pipeline/PipelineEditor.vue
+++ b/web/src/components/pipeline/PipelineEditor.vue
@@ -200,7 +200,6 @@ import {
   watch,
   ref,
   type Ref,
-  defineEmits,
 } from "vue";
 import { getImageURL } from "@/utils/zincutils";
 import AssociateFunction from "@/components/pipeline/NodeForm/AssociateFunction.vue";
diff --git a/web/src/components/pipeline/StreamSelection.vue b/web/src/components/pipeline/StreamSelection.vue
index 6795d96e71..70619588e7 100644
--- a/web/src/components/pipeline/StreamSelection.vue
+++ b/web/src/components/pipeline/StreamSelection.vue
@@ -165,7 +165,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <script lang="ts" setup>
 import useStreams from "@/composables/useStreams";
-import { ref, computed, type Ref, defineEmits } from "vue";
+import { ref, computed, type Ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { useStore } from "vuex";
 
diff --git a/web/src/components/rum/sessionReplay/SessionLocationColumn.vue b/web/src/components/rum/sessionReplay/SessionLocationColumn.vue
index 9c3a4114d3..63141de3e5 100644
--- a/web/src/components/rum/sessionReplay/SessionLocationColumn.vue
+++ b/web/src/components/rum/sessionReplay/SessionLocationColumn.vue
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   </div>
 </template>
 <script lang="ts" setup>
-import { defineProps } from "vue";
 import "flag-icons/css/flag-icons.min.css";
 
 defineProps({
diff --git a/web/src/plugins/logs/TenstackTable.vue b/web/src/plugins/logs/TenstackTable.vue
index a358ea513e..40d087afd5 100644
--- a/web/src/plugins/logs/TenstackTable.vue
+++ b/web/src/plugins/logs/TenstackTable.vue
@@ -367,7 +367,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import {
   ref,
   computed,
-  defineEmits,
   watch,
   nextTick,
   onMounted,
diff --git a/web/src/plugins/logs/data-table/CellActions.vue b/web/src/plugins/logs/data-table/CellActions.vue
index af529528b4..d56390975c 100644
--- a/web/src/plugins/logs/data-table/CellActions.vue
+++ b/web/src/plugins/logs/data-table/CellActions.vue
@@ -49,11 +49,10 @@
 </template>
 
 <script setup lang="ts">
-import { defineProps, defineEmits, computed } from "vue";
+import { computed } from "vue";
 import { useStore } from "vuex";
 import EqualIcon from "@/components/icons/EqualIcon.vue";
 import NotEqualIcon from "@/components/icons/NotEqualIcon.vue";
-import { getImageURL } from "@/utils/zincutils";
 import O2AIContextAddBtn from "@/components/common/O2AIContextAddBtn.vue";
 
 defineProps({
diff --git a/web/src/plugins/pipelines/CustomNode.vue b/web/src/plugins/pipelines/CustomNode.vue
index bd10f8db6e..e9fc654949 100644
--- a/web/src/plugins/pipelines/CustomNode.vue
+++ b/web/src/plugins/pipelines/CustomNode.vue
@@ -17,20 +17,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <script setup>
 import { Handle } from "@vue-flow/core";
 import useDragAndDrop from "./useDnD";
-import { defineEmits, ref } from "vue";
+import { ref } from "vue";
 import { useI18n } from "vue-i18n";
 import ConfirmDialog from "@/components/ConfirmDialog.vue";
 import { getImageURL } from "@/utils/zincutils";
 
 import config from "@/aws-exports";
 
-const streamImage = getImageURL("images/pipeline/stream.svg");
-
 const functionImage = getImageURL("images/pipeline/function.svg");
 const streamOutputImage = getImageURL("images/pipeline/outputStream.svg");
-const streamRouteImage = getImageURL("images/pipeline/route.svg");
 const conditionImage = getImageURL("images/pipeline/condition.svg");
-const queryImage = getImageURL("images/pipeline/query.svg");
 const externalOutputImage = getImageURL("images/pipeline/externalOutput.svg");
 
 
diff --git a/web/src/plugins/traces/fields-sidebar/AdvancedValuesFilter.vue b/web/src/plugins/traces/fields-sidebar/AdvancedValuesFilter.vue
index 11ca772428..6d8cab468d 100644
--- a/web/src/plugins/traces/fields-sidebar/AdvancedValuesFilter.vue
+++ b/web/src/plugins/traces/fields-sidebar/AdvancedValuesFilter.vue
@@ -104,7 +104,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, defineEmits } from "vue";
+import { ref } from "vue";
 import { debounce } from "quasar";
 import { watch } from "vue";
 import { cloneDeep } from "lodash-es";
diff --git a/web/src/utils/common.ts b/web/src/utils/common.ts
index 8579fbf2e0..74b2e85076 100644
--- a/web/src/utils/common.ts
+++ b/web/src/utils/common.ts
@@ -16,11 +16,9 @@
 import { ref } from "vue";
 import organizationsService from "../services/organizations";
 import { useLocalOrganization, getPath } from "./zincutils";
-import { useStore } from "vuex";
 
 const selectedOrg = ref("");
 const orgOptions = ref([{ label: Number, value: String }]);
-const store = useStore();
 
 export const getDefaultOrganization = async (
   userInfo: any,
diff --git a/web/src/views/RUM/AppSessions.vue b/web/src/views/RUM/AppSessions.vue
index e8fdbe9385..82e94b911b 100644
--- a/web/src/views/RUM/AppSessions.vue
+++ b/web/src/views/RUM/AppSessions.vue
@@ -156,7 +156,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <script setup lang="ts">
 import {
   ref,
-  defineProps,
   onMounted,
   type Ref,
   onBeforeMount,