diff --git a/layouts/default.vue b/layouts/default.vue
index 9cb6dbc..e994ab7 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -15,7 +15,6 @@ const route = useRoute()
 
 const auth = useAuthStore()
 
-//profileStore.initializeData((await supabase.auth.getUser()).data.user.id)
 
 const month = dayjs().format("MM")
 
diff --git a/pages/banking/statements/[mode]/[[id]].vue b/pages/banking/statements/[mode]/[[id]].vue
index 4c7e4cd..b23655f 100644
--- a/pages/banking/statements/[mode]/[[id]].vue
+++ b/pages/banking/statements/[mode]/[[id]].vue
@@ -16,7 +16,6 @@ const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
 const mode = ref(route.params.mode || "show")
-const supabase = useSupabaseClient()
 
 const itemInfo = ref({statementallocations:[]})
 const oldItemInfo = ref({})
@@ -202,15 +201,7 @@ const archiveStatement = async () => {
   let temp = itemInfo.value
   delete temp.statementallocations
 
-  await dataStore.updateItem("bankstatements", {...temp,archived:true})
-
-
-  const {data,error} = await supabase.from("historyitems").insert({
-    createdBy: useProfileStore().activeProfile.id,
-    tenant: useProfileStore().currentTenant,
-    text: "Bankbuchung archiviert",
-    bankStatement: itemInfo.value.id
-  })
+  await useEntities("bankstatements").archive(temp.id)
 }
 
 </script>
diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index cfde563..d27017c 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -9,7 +9,6 @@ const dataStore = useDataStore()
 const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
-const supabase = useSupabaseClient()
 const modal = useModal()
 const auth = useAuthStore()
 
@@ -134,7 +133,8 @@ const setupPage = async () => {
       console.log(route.query.loadMode)
 
       if (route.query.loadMode === "deliveryNotes") {
-        let linkedDocuments = (await supabase.from("createddocuments").select().in("id", JSON.parse(route.query.linkedDocuments))).data
+        let linkedDocuments = (await useEntities("createddocuments").select()).filter(i => JSON.parse(route.query.linkedDocuments).includes(i.id))
+        //let linkedDocuments = (await supabase.from("createddocuments").select().in("id", JSON.parse(route.query.linkedDocuments))).data
 
         //TODO: Implement Checking for Same Customer, Contact and Project