diff --git a/aula/schema.sql b/aula/schema.sql
index e25e593..eb1cf40 100644
--- a/aula/schema.sql
+++ b/aula/schema.sql
@@ -1,12 +1,10 @@
 \i schema_drop.sql;
 
 CREATE TABLE IF NOT EXISTS users (
-    user_id SERIAL PRIMARY KEY,
+    cpr_num INTEGER PRIMARY KEY,
     first_name varchar(64) NOT NULL,
     last_name varchar(64) NOT NULL,
     password varchar(120) NOT NULL,
-    email varchar(64) NOT NULL UNIQUE,
-    address varchar(64) NOT NULL,
     role varchar(64) NOT NULL CHECK ( role in ('student', 'parent', 'teacher') )
 );
 
@@ -26,28 +24,22 @@ CREATE TABLE IF NOT EXISTS messages (
     message_id SERIAL PRIMARY KEY,
     content text NOT NULL,
     thread_id integer REFERENCES threads(thread_id) NOT NULL,
-    author_id integer REFERENCES users(user_id) NOT NULL,
+    author_cpr_num integer REFERENCES users(cpr_num) NOT NULL,
     created_date timestamp NOT NULL DEFAULT now()
 );
 
 CREATE TABLE IF NOT EXISTS posts (
     post_id SERIAL PRIMARY KEY,
     group_id integer REFERENCES groups(group_id) NOT NULL,
-    author_id integer REFERENCES users(user_id) NOt NULL,
+    author_cpr_num integer REFERENCES users(cpr_num) NOt NULL,
     title varchar(64) NOT NULL,
     content text NOT NULL,
     created_date timestamp NOT NULL DEFAULT now()
 );
 
 -- Relationships
-CREATE TABLE IF NOT EXISTS users_threads (
-    user_id integer REFERENCES users(user_id) NOT NULL,
-    thread_id integer REFERENCES threads(thread_id) NOT NULL,
-    PRIMARY KEY (user_id, thread_id)
-);
-
 CREATE TABLE IF NOT EXISTS users_groups (
-    user_id integer REFERENCES users(user_id) NOT NULL,
+    user_cpr_num integer REFERENCES users(cpr_num) NOT NULL,
     group_id integer REFERENCES groups(group_id) NOT NULL,
-    PRIMARY KEY (user_id, group_id)
+    PRIMARY KEY (user_cpr_num, group_id)
 );
\ No newline at end of file
diff --git a/aula/schema_ins.sql b/aula/schema_ins.sql
index 8a0b0ea..7f170de 100644
--- a/aula/schema_ins.sql
+++ b/aula/schema_ins.sql
@@ -1,23 +1,23 @@
-TRUNCATE users, groups, threads, messages, posts, users_groups, users_threads;
+TRUNCATE users, groups, threads, messages, posts, users_groups;
 
-INSERT INTO public.users(user_id, first_name, last_name, password, email, address, role) VALUES 
-    (5000, 'Gordon', 'Freeman', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'gordon@test.dk', 'Black Mesa', 'teacher'),
-    (5001, 'Rachel', 'Green', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'rachel@test.dk', 'Cnetral Park', 'parent'),
-    (5002,'Joey', 'Trib', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'joey@test.dk', 'New York', 'student'),
-    (5003,'Chandler', 'Bing', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'chandler@test.dk', 'Central Park', 'student'),
-    (5004,'Phoebe', 'Buffay', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'phoebe@test.dk', 'Central Perk', 'parent'),
-    (5005,'Ross', 'Geller', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'ross@test.dk', 'Central Perk', 'student');
+INSERT INTO public.users(cpr_num, first_name, last_name, password, role) VALUES 
+    (5000, 'Gordon', 'Freeman', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'teacher'),
+    (5001, 'Rachel', 'Green', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'parent'),
+    (5002,'Joey', 'Trib', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'student'),
+    (5003,'Chandler', 'Bing', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'student'),
+    (5004,'Phoebe', 'Buffay', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'parent'),
+    (5005,'Ross', 'Geller', '$2b$12$KFkp1IEMGT4QrWwjPGhE3ejOv6Z3pYhx/S4qOoFbanR2sMiZqgeJO', 'student');
 
 INSERT INTO public.groups(group_id, name, mandatory) VALUES 
     (1000, 'fodbold', TRUE), 
     (1001,'3a', FALSE);
 
-INSERT INTO users_groups (user_id, group_id) VALUES (5000, 1000), (5001, 1001);
+INSERT INTO users_groups (cpr_num, group_id) VALUES (5000, 1000), (5001, 1001);
 
 INSERT INTO threads(thread_id ,title, group_id) VALUES
     (2000, 'Anbefalinger til fodboldsko?', 1000);
 
-INSERT INTO messages (content, thread_id, author_id, created_date) VALUES
+INSERT INTO messages (content, thread_id, author_cpr_num, created_date) VALUES
     ('Eleverne har ondt i fødderne når de spiller fodbild. Hvem kender et godt skomærke?', 2000, 5000, NOW() - INTERVAL '3.189 day'),
     ('Jeg tror min søn har nogle han er glad for. Jeg spørger ham lige', 2000, 5002, NOW() - INTERVAL '2.951 day'),
     ('Tak', 2000, 5000, NOW() - INTERVAL '1.894 day'),
@@ -30,10 +30,4 @@ INSERT INTO messages (content, thread_id, author_id, created_date) VALUES
     ('Hvorfor er det ligepludselig mig der skal holde styr på om skolen uddeler sko eller ej?', 2000, 5001, NOW() - INTERVAL '0.898 hour'),
     ('Fordi du er dit barns mor?', 2000, 5003, NOW() - INTERVAL '0.89 hour');
 
-INSERT INTO users_threads (user_id, thread_id) VALUES
-    (5000, 2000),
-    (5001, 2000),
-    (5002, 2000),
-    (5003, 2000);
-
-INSERT INTO posts (post_id, group_id, author_id, title, content) VALUES (6000, 1000, 5001, 'Fodbold på torsdag', 'HUSK BOLDEN DENNE GANG!!');
+INSERT INTO posts (post_id, group_id, author_cpr_num, title, content) VALUES (6000, 1000, 5001, 'Fodbold på torsdag', 'HUSK BOLDEN DENNE GANG!!');