diff --git a/src/lib/server/entity/AuthMethod.ts b/src/lib/server/entity/AuthMethod.ts
index bcc5e48..5ab7da4 100644
--- a/src/lib/server/entity/AuthMethod.ts
+++ b/src/lib/server/entity/AuthMethod.ts
@@ -1,4 +1,4 @@
-import {BeforeInsert, Column, Entity, ManyToOne, PrimaryColumn} from 'typeorm';
+import {Column, Entity, ManyToOne, PrimaryColumn} from 'typeorm';
 
 import {AuthProvider} from '$lib/server/auth';
 import {User} from '$lib/server/entity/User';
@@ -20,9 +20,4 @@ export class AuthMethod {
 		onDelete: 'CASCADE',
 	})
 	user!: User;
-
-	@BeforeInsert()
-	private beforeInsert () {
-		this.id = ulidMonotonic();
-	}
 }
diff --git a/src/lib/server/entity/AuthSession.ts b/src/lib/server/entity/AuthSession.ts
index 91d2e16..259a5db 100644
--- a/src/lib/server/entity/AuthSession.ts
+++ b/src/lib/server/entity/AuthSession.ts
@@ -1,4 +1,4 @@
-import {BeforeInsert, Entity, ManyToOne, PrimaryColumn} from 'typeorm';
+import {Entity, ManyToOne, PrimaryColumn} from 'typeorm';
 
 import {AuthMethod} from '$lib/server/entity/AuthMethod';
 import {ulidMonotonic} from '$lib/server/ulid';
@@ -17,9 +17,4 @@ export class AuthSession {
 	authMethod!: AuthMethod;
 
 	// TODO expiration of sessions?
-
-	@BeforeInsert()
-	private beforeInsert () {
-		this.id = ulidMonotonic();
-	}
 }
diff --git a/src/lib/server/entity/AuthState.ts b/src/lib/server/entity/AuthState.ts
index bd1efb4..64f5351 100644
--- a/src/lib/server/entity/AuthState.ts
+++ b/src/lib/server/entity/AuthState.ts
@@ -1,5 +1,5 @@
 import * as crypto from 'node:crypto';
-import {BeforeInsert, Column, Entity, ManyToOne, PrimaryColumn} from 'typeorm';
+import {Column, Entity, PrimaryColumn} from 'typeorm';
 
 import {AuthProvider} from '$lib/server/auth';
 import {ulidMonotonic} from '$lib/server/ulid';
diff --git a/src/lib/server/entity/Edge.ts b/src/lib/server/entity/Edge.ts
index e828215..f84a048 100644
--- a/src/lib/server/entity/Edge.ts
+++ b/src/lib/server/entity/Edge.ts
@@ -1,4 +1,4 @@
-import {BeforeInsert, Entity, ManyToOne, PrimaryColumn} from 'typeorm';
+import {Entity, ManyToOne, PrimaryColumn} from 'typeorm';
 
 import {Node} from '$lib/server/entity/Node';
 import {ulidMonotonic} from '$lib/server/ulid';
@@ -21,9 +21,4 @@ export class Edge {
 		onDelete: 'CASCADE',
 	})
 	tail!: Node;
-
-	@BeforeInsert()
-	beforeInsert () {
-		this.id = ulidMonotonic();
-	}
 }
diff --git a/src/lib/server/entity/Node.ts b/src/lib/server/entity/Node.ts
index 6c37c7a..57b53a1 100644
--- a/src/lib/server/entity/Node.ts
+++ b/src/lib/server/entity/Node.ts
@@ -1,4 +1,4 @@
-import {BeforeInsert, Column, Entity, OneToMany, PrimaryColumn} from 'typeorm';
+import {Column, Entity, OneToMany, PrimaryColumn} from 'typeorm';
 
 import {Edge} from '$lib/server/entity/Edge';
 import {ulidMonotonic} from '$lib/server/ulid';
@@ -22,9 +22,4 @@ export class Node {
 		onDelete: 'CASCADE',
 	})
 	incomingEdges!: Edge[];
-
-	@BeforeInsert()
-	private beforeInsert () {
-		this.id = ulidMonotonic();
-	}
 }
diff --git a/src/lib/server/entity/User.ts b/src/lib/server/entity/User.ts
index b6d4a8f..b4c892c 100644
--- a/src/lib/server/entity/User.ts
+++ b/src/lib/server/entity/User.ts
@@ -1,5 +1,4 @@
 import {
-	BeforeInsert,
 	Column,
 	CreateDateColumn,
 	Entity,
@@ -23,9 +22,4 @@ export class User {
 
 	@OneToMany(() => AuthMethod, authMethod => authMethod.user)
 	authMethods!: AuthMethod[];
-
-	@BeforeInsert()
-	private beforeInsert () {
-		this.id = ulidMonotonic();
-	}
 }
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
index e8105fb..0a31efd 100644
--- a/src/routes/+layout.server.ts
+++ b/src/routes/+layout.server.ts
@@ -3,14 +3,6 @@ import {getUserFromSessionID} from '$lib/server/sessionutil';
 
 import type {LayoutServerLoad} from './$types';
 
-async function findSession (sessionID?: string) {
-	const dataSource = await getDataSource();
-	const sessionsRepo = dataSource.getRepository(AuthSession);
-
-	if (!sessionID) { return null; }
-	return await sessionsRepo.findOne({where: {id: sessionID}});
-}
-
 export const load: LayoutServerLoad = async ({cookies}) => {
 	return JSON.parse(JSON.stringify({
 		user: await getUserFromSessionID(cookies.get(Cookie.SESSION_ID)),
diff --git a/src/routes/auth/[provider]/+page.server.ts b/src/routes/auth/[provider]/+page.server.ts
index d860834..7ac84cc 100644
--- a/src/routes/auth/[provider]/+page.server.ts
+++ b/src/routes/auth/[provider]/+page.server.ts
@@ -1,16 +1,9 @@
 import {redirect} from '@sveltejs/kit';
-import * as crypto from 'node:crypto';
 
+import {AuthProvider, authProviderImplementations} from '$lib/server/auth';
+import {Cookie} from '$lib/server/cookies';
 import {getDataSource} from '$lib/server/db';
 import {AuthState} from '$lib/server/entity/AuthState';
-
-import {env} from '$env/dynamic/private';
-import {
-	AuthProvider,
-	type AuthProviderImplementation,
-	authProviderImplementations,
-} from '$lib/server/auth';
-import {Cookie} from '$lib/server/cookies';
 import type {PageServerLoad} from './$types';
 
 export const load: PageServerLoad = async ({cookies, params, url}) => {