diff --git a/src/KonvaContainer/ContextualLoadingBar.tsx b/src/KonvaContainer/ContextualLoadingBar.tsx
index e5862711ab..109339dcf9 100644
--- a/src/KonvaContainer/ContextualLoadingBar.tsx
+++ b/src/KonvaContainer/ContextualLoadingBar.tsx
@@ -1,13 +1,9 @@
-import { useSignals } from "@preact/signals-react/runtime";
-
 import { LoadingBar } from "~/components/ui";
 import { uiAccess } from "~/signals/uiAccess";
 
 // import { useSignalRenderCounter } from "~/hooks/useSignalRenderCounter";
 
 export const ContextualLoadingBar = () => {
-  useSignals();
-
   // TODO: Testing the signal render efficiency
   // useSignalRenderCounter<typeof loadingBar.signal.value>(
   //   "ContextualLoadingBar",
diff --git a/src/KonvaContainer/ContextualToolbarImage.tsx b/src/KonvaContainer/ContextualToolbarImage.tsx
index ed49b4ab19..3ea2137535 100644
--- a/src/KonvaContainer/ContextualToolbarImage.tsx
+++ b/src/KonvaContainer/ContextualToolbarImage.tsx
@@ -1,5 +1,4 @@
 import { MouseEventHandler } from "react";
-import { useSignals } from "@preact/signals-react/runtime";
 import { Transition } from "@headlessui/react";
 import { twMerge } from "tailwind-merge";
 
@@ -11,8 +10,6 @@ import { ToolbarImageButtonNames } from "~/components/features/ToolbarImage/enum
 import { transitionTimingStyles } from "~/components/styles";
 
 export const ContextualToolbarImage = () => {
-  useSignals();
-
   const { isShowing, position, ...rest } = uiAccess.imageToolbar.signal.value;
   const buttonsProps = Object.values(ToolbarImageButtonNames).reduce(
     (acc, buttonName) => {
diff --git a/src/components/features/ErrorDialogue/index.tsx b/src/components/features/ErrorDialogue/index.tsx
index 407efcdb7f..7a9a488190 100644
--- a/src/components/features/ErrorDialogue/index.tsx
+++ b/src/components/features/ErrorDialogue/index.tsx
@@ -1,4 +1,3 @@
-import { useSignals } from "@preact/signals-react/runtime";
 import { twMerge } from "tailwind-merge";
 import { uiAccess } from "~/signals/uiAccess";
 import { paperWrapperStyles } from "~/components/styles";
@@ -11,7 +10,6 @@ import {
 import { Button } from "~/components/ui";
 
 export const ErrorDialog = () => {
-  useSignals();
   const props = uiAccess.errorDialogue.signal.value;
   const { isShowing, title, message } = props;
 
diff --git a/src/components/features/ToolbarMain/index.tsx b/src/components/features/ToolbarMain/index.tsx
index 5df832a1f7..3149b7fc6f 100644
--- a/src/components/features/ToolbarMain/index.tsx
+++ b/src/components/features/ToolbarMain/index.tsx
@@ -1,4 +1,4 @@
-import { useSignals, useSignalEffect } from "@preact/signals-react/runtime";
+import { useSignalEffect } from "@preact/signals-react/runtime";
 import { useCallback, useState } from "react";
 import {
   faArrowRotateLeft,
@@ -35,7 +35,6 @@ const initialState = {
 
 export const ToolbarMain = () => {
   //// for testing
-  useSignals();
   const {
     signals: { isMobile },
   } = layout;
@@ -57,9 +56,6 @@ export const ToolbarMain = () => {
     if (node) {
       window.addEventListener("click", handleClickOutside);
     }
-    return () => {
-      window.removeEventListener("click", handleClickOutside);
-    };
   }, []);
 
   return (
diff --git a/src/components/features/ToolbarUserProfile/ProfileDropdown.tsx b/src/components/features/ToolbarUserProfile/ProfileDropdown.tsx
index 999d50e530..b2e11e3bc2 100644
--- a/src/components/features/ToolbarUserProfile/ProfileDropdown.tsx
+++ b/src/components/features/ToolbarUserProfile/ProfileDropdown.tsx
@@ -1,4 +1,3 @@
-import { useSignals } from "@preact/signals-react/runtime";
 import { twMerge } from "tailwind-merge";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import {
@@ -18,7 +17,6 @@ import {
 } from "~/components/styles";
 
 export function ProfileDropdown() {
-  useSignals();
   const {
     signals: { userInfo },
     fetchers: { logout },
diff --git a/src/pages/login.tsx b/src/pages/login.tsx
index 3d0d274e82..9a84a929ec 100644
--- a/src/pages/login.tsx
+++ b/src/pages/login.tsx
@@ -1,5 +1,4 @@
 import { useRef } from "react";
-import { useSignals } from "@preact/signals-react/runtime";
 import { useNavigate, useSearchParams, Link } from "react-router-dom";
 import { useSignalEffect } from "@preact/signals-react/runtime";
 
@@ -11,7 +10,6 @@ import { paperWrapperStyles } from "~/components/styles";
 import { twMerge } from "tailwind-merge";
 
 export const Login = () => {
-  useSignals();
   const {
     signals: { status: authStatus },
     fetchers: { login },
diff --git a/src/pages/sandbox/ContextualToolbarForm.tsx b/src/pages/sandbox/ContextualToolbarForm.tsx
index 1b670eda2a..485dc04c30 100644
--- a/src/pages/sandbox/ContextualToolbarForm.tsx
+++ b/src/pages/sandbox/ContextualToolbarForm.tsx
@@ -1,5 +1,4 @@
 import { useState } from "react";
-import { useSignals } from "@preact/signals-react/runtime";
 
 import { Input, Button } from "~/components/ui";
 import { uiAccess } from "~/signals";
@@ -9,7 +8,6 @@ import { ToolbarImageButtonData } from "~/components/features/ToolbarImage/data"
 import { ToolbarImageButtonNames } from "~/components/features/ToolbarImage/enums";
 
 export const ContextualToolbarForm = () => {
-  useSignals();
   const imageToolbar = uiAccess.imageToolbar;
 
   const {
diff --git a/src/signals/uiEvents/imageToolbar.ts b/src/signals/uiEvents/imageToolbar.ts
index 98e8294d98..15b2ad411a 100644
--- a/src/signals/uiEvents/imageToolbar.ts
+++ b/src/signals/uiEvents/imageToolbar.ts
@@ -40,7 +40,6 @@ export const eventsHandlers = Object.values(ToolbarImageButtonNames).reduce(
 export const dispatchers = Object.values(ToolbarImageButtonNames).reduce(
   (acc, buttonName) => {
     acc[buttonName] = (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
-      // console.log("dispatch", buttonName);
       events[buttonName].value = e;
     };
     return acc;