diff --git a/client/Database/database.ts b/client/Database/database.ts
index f5e1c6785c5e8410b5c779cd8b99b0bf04506c75..67b41bcb35b82f43b44639a55c8d255b39d6b465 100644
--- a/client/Database/database.ts
+++ b/client/Database/database.ts
@@ -18,24 +18,24 @@ import {
 import { getAuth } from "firebase/auth";
 
 // C3 solutions databasen - ska användas för P&S
-const firebaseConfig = {
-  apiKey: "AIzaSyDqkaVZMr11J4mfnR0auqoQilZyPfyD-x4",
-  authDomain: "c3solutions-dc109.firebaseapp.com",
-  projectId: "c3solutions-dc109",
-  storageBucket: "c3solutions-dc109.appspot.com",
-  messagingSenderId: "902143402555",
-  appId: "1:902143402555:web:29213e81de0a0cba38b21e",
-};
+// const firebaseConfig = {
+//   apiKey: "AIzaSyDqkaVZMr11J4mfnR0auqoQilZyPfyD-x4",
+//   authDomain: "c3solutions-dc109.firebaseapp.com",
+//   projectId: "c3solutions-dc109",
+//   storageBucket: "c3solutions-dc109.appspot.com",
+//   messagingSenderId: "902143402555",
+//   appId: "1:902143402555:web:29213e81de0a0cba38b21e",
+// };
 
 // const firebaseConfig = {
-  // apiKey: "AIzaSyAMfD8V0belL6GxbuoehL__6YTFZH4pyoc",
-  // authDomain: "company3-backup.firebaseapp.com",
-  // projectId: "company3-backup",
-  // storageBucket: "company3-backup.appspot.com",
-  // messagingSenderId: "820650717800",
-  // appId: "1:820650717800:web:7557c7734ed59d3f7281dd"
+//   apiKey: "AIzaSyAMfD8V0belL6GxbuoehL__6YTFZH4pyoc",
+//   authDomain: "company3-backup.firebaseapp.com",
+//   projectId: "company3-backup",
+//   storageBucket: "company3-backup.appspot.com",
+//   messagingSenderId: "820650717800",
+//   appId: "1:820650717800:web:7557c7734ed59d3f7281dd"
 // };
-/*
+
 const firebaseConfig = {
   apiKey: "AIzaSyBIsZq_yOsJljp1woIxndJO1GkW6soh-g4",
   authDomain: "company3-456bb.firebaseapp.com",
@@ -45,7 +45,6 @@ const firebaseConfig = {
   appId: "1:310033686522:web:63198bb0db679c98ee4e43",
   measurementId: "G-PFLDQY00DB"
 };
-*/
 
 const app = initializeApp(firebaseConfig);
 export const auth = getAuth();
@@ -99,11 +98,6 @@ async function createUser(
       tasks: [],
       manager: manager,
     });
-    // Atomically add user to unit.
-    const unitRef = doc(unitCollection, unitId);
-    await updateDoc(unitRef, {
-      members: arrayUnion(userRef.id),
-    });
   } catch (error) {
     console.log(error);
   }
@@ -124,8 +118,6 @@ interface improvementWork {
   completed: boolean;
   ongoing: boolean;
   tasks: [];
-  // TODO Replace with userImprovementWork collection
-  members: [];
   patientRiskLevel: string;
   area: string;
   p1: string;
@@ -197,8 +189,6 @@ async function createImprovementWork(
       completed: false,
       ongoing: false,
       tasks: [],
-      // TODO Remove members array
-      members: [],
       patientRiskLevel: patientRiskLevel,
       area: area,
       p1: p1,
@@ -299,7 +289,7 @@ interface Task {
   startDate: Date;
   stage: string;
   content: string;
-  members: string[]; // Assuming this is an array of user IDs
+  completed: boolean;
 }
 async function createTaskOnImprovementWork(
   taskId: string | null,
@@ -318,7 +308,7 @@ async function createTaskOnImprovementWork(
       startDate,
       stage,
       content,
-      members: [], // Initialize with an empty array
+      completed: false,
     };
 
     if (taskId) {
@@ -447,7 +437,6 @@ interface Unit {
   id?: string; // Optional because it can be auto-generated
   hospitalId: string;
   name: string;
-  members: string[]; // Assuming this is an array of user IDs
 }
 async function createUnit(
   unitId: string | null, //should be auto?
@@ -458,7 +447,6 @@ async function createUnit(
     const unitData: Unit = {
       hospitalId,
       name,
-      members: [],
     };
 
     if (unitId) {