diff --git a/src/components/settings.vue b/src/components/settings.vue
index cec4f0a..57e8266 100644
--- a/src/components/settings.vue
+++ b/src/components/settings.vue
@@ -35,19 +35,12 @@
     name: "Settings",
 
     setup() {
-      let toggleSettings = ref(false);
+      const toggleSettings = ref(false);
 
       const { post } = useIpc();
       const { logout } = useAuth();
       const router = useRouter();
 
-
-      // When settings is showing.
-      const onActive = () => {
-        toggleSettings.value = true;
-        window.addEventListener("keydown", onEscape);
-      }
-
       // Listen for escape key to close settings.
       const onEscape = (e: any) => {
         if(e.key === "Escape") {
@@ -56,6 +49,12 @@
         window.removeEventListener("keydown", onEscape);
       }
 
+      // When settings is showing.
+      const onActive = () => {
+        toggleSettings.value = true;
+        window.addEventListener("keydown", onEscape);
+      }
+
       // When user clicks logout button in settings.
       const onLogout = () => {
         logout();
diff --git a/src/views/messenger.vue b/src/views/messenger.vue
index 7b2a8a4..a74fe94 100644
--- a/src/views/messenger.vue
+++ b/src/views/messenger.vue
@@ -10,14 +10,11 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, onMounted, onUnmounted } from "vue";
+import { defineComponent, onMounted, onUnmounted } from "vue";
 import MessageItem from "@/components/messageItem.vue";
 import InputItem from "@/components/inputItem/inputItem.vue";
 import Settings from "@/components/settings.vue";
 import useMitt from "@/modules/mitt";
-import { useRouter } from "vue-router";
-import { useAuth } from "@/modules/auth";
-import  { useIpc } from "@/modules/ipc";
 import useMessages from '@/modules/messages';
 
 export default defineComponent({
@@ -29,36 +26,9 @@ export default defineComponent({
   },
   setup() {
 
-    const { post } = useIpc();
-    const { logout } = useAuth();
-    const router = useRouter();
     const { emitter } = useMitt();
     const { messages, addMessage, updateMessage } = useMessages();
 
-    // controls settings rendering. 
-    const toggleSettings = ref(false);
-
-    // Listen for escape key to close settings.
-    const onEscape = (e: KeyboardEvent) => {
-      if(e.key === "Escape") {
-        toggleSettings.value = false;
-      }
-      window.removeEventListener("keydown", onEscape);
-    }
-
-    // When user clicks settings button.
-    const onSettings = () => {
-      toggleSettings.value = true;
-      window.addEventListener("keydown", onEscape);
-    }
-
-    // When user clicks logout button in settings.
-    const onLogout = () => {
-      logout();
-      router.push({ name: "login" });
-      post("logout", "");
-    } 
-
     const onRenderMessage = (_event: any, payload: any) => { 
 
       // render message if there is content.