diff --git a/src/services/account.handler.ts b/src/services/account.handler.ts
index 9bb87ef..2557213 100644
--- a/src/services/account.handler.ts
+++ b/src/services/account.handler.ts
@@ -8,60 +8,16 @@ import type {
 } from "@/interfaces/api.interface";
 import type { IUserData } from "@/interfaces/userdata.interface";
 import ApiRequest from "@/services/apiRequest";
-import { useEncodedLocalStorage } from "@/services/localStorage";
-import { createContext, useContext, useState } from "react";
-
-const UserDataContext = createContext<IUserData | null>(null);
-const [userData, setUserData] = useEncodedLocalStorage<IUserData | null>(
-	"user_data",
-	null,
-);
-
-//TODO Run register task
-export async function doRegister(
-	registerData: IApiRegisterReq,
-): Promise<IApiRegisterRes | null> {
-	console.trace(registerData);
-	try {
-		const ReqRes = await ApiRequest.standard.post.json<IApiRegisterReq, IApiRegisterRes>(
-			"auth/signup",
-			registerData,
-		);
-		console.trace(ReqRes.data);
-		if (ReqRes.data.user) {
-			setUserData(ReqRes.data.user);
-		}
-		ReqRes.data.message?.forEach((err) => console.warn(err));
-		return ReqRes.data;
-	} catch (error) {
-		console.error("Error during registration:", error);
-		return null;
-	}
-}
-
-//TODO Run login task
-export async function doLogin(loginData: IApiLoginReq) {
-	try {
-		const ReqRes = await ApiRequest.standard.post.json<IApiLoginReq, IApiLoginRes>(
-			"auth/login",
-			loginData,
-		);
-		console.trace(ReqRes.data);
-		//if (ReqRes.data.user) {
-		//  setUserData(ReqRes.data.user)
-		//}
-		ReqRes.data.message?.forEach((err) => console.warn(err));
-		return ReqRes.data;
-	} catch (err) {
-		console.error("Error during login:", err);
-		return null;
-	}
-}
+import { EReturnState, IStandardisedReturn } from "@/services/general.interface";
+import { useLocalStorage } from "@/services/localStorage";
+import type { Dispatch, SetStateAction } from "react";
 
 //TODO Run disconnect task
 export function doDisconnect() {
 	if (typeof window !== "undefined") {
 		window.localStorage.removeItem("sub");
+		//Redirect to homepage
+		window.location.href = "/";
 		return true;
 	}
 	console.log(