diff --git a/src/main/java/NTNU/IDATT1002/database/LoadDatabase.java b/src/main/java/NTNU/IDATT1002/database/LoadDatabase.java
deleted file mode 100644
index 24aecc11b2470f38cc2a3d3d7f33bba5849db64c..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/database/LoadDatabase.java
+++ /dev/null
@@ -1,274 +0,0 @@
-package NTNU.IDATT1002.database;
-
-import NTNU.IDATT1002.Config;
-import NTNU.IDATT1002.models.Image;
-import NTNU.IDATT1002.models.Tag;
-import NTNU.IDATT1002.models.User;
-import NTNU.IDATT1002.service.AlbumService;
-import NTNU.IDATT1002.service.ImageService;
-import NTNU.IDATT1002.service.UserService;
-
-import javax.persistence.EntityManager;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-
-
-/**
- * Loads test data into the database.
- */
-public class LoadDatabase {
-
-    private static UserService userService;
-    private static AlbumService albumService;
-    private static ImageService imageService;
-
-    static {
-        EntityManager entityManager = Config.createEntityManager();
-
-        userService = new UserService(entityManager);
-        albumService = new AlbumService(entityManager);
-        imageService = new ImageService(entityManager);
-    }
-
-    public static void load() {
-
-        User user = userService.createUser("LarseKaren@mail.com",
-                "LarseKaren",
-                "Larse",
-                "Karen",
-                "+47",
-                "00000000",
-                new Date(),
-                "123")
-                .get();
-        ArrayList<Tag> tags = new ArrayList<>(Arrays.asList(
-                new Tag("#winter"),
-                new Tag("#nature"),
-                new Tag("#mountains")
-        ));
-        Image image = imageService.createImage(user,
-                new File("t14-test-images/1.jpg"),
-                tags, " ").get();
-        albumService.createAlbum("First",
-                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
-                user,
-                Arrays.asList(new Tag("#winter"),
-                        new Tag("#nature"),
-                        new Tag("#mountains")),
-                Arrays.asList(image));
-
-
-
-        tags = new ArrayList<>(Arrays.asList(
-                new Tag("#winter"),
-                new Tag("#nature"),
-                new Tag("#ice")
-        ));
-        image = imageService.createImage(user,
-                new File("t14-test-images/7.jpg"),
-                tags, " ").get();
-        albumService.createAlbum("Seventh",
-                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
-                user,
-                Arrays.asList(new Tag("#winter"),
-                        new Tag("#nature"),
-                        new Tag("#ice")),
-                Arrays.asList(image));
-
-
-
-        tags = new ArrayList<>(Arrays.asList(
-                new Tag("#winter"),
-                new Tag("#nature"),
-                new Tag("#water")
-        ));
-        user = userService.createUser("SteiraGuten@mail.com",
-                "SteiraGuten",
-                "Steira",
-                "Guten",
-                "+47",
-                "00000000",
-                new Date(),
-                "123")
-                .get();
-        image = imageService.createImage(user,
-                new File("t14-test-images/2.jpg"),
-                tags, " ").get();
-        albumService.createAlbum("Second",
-                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
-                user,
-                Arrays.asList(new Tag("#mountains"),
-                        new Tag("#water"),
-                        new Tag("#nature")),
-                Arrays.asList(image));
-
-
-        tags = new ArrayList<>(Arrays.asList(
-                new Tag("#fjords"),
-                new Tag("#nature"),
-                new Tag("#mountains")
-        ));
-        image = imageService.createImage(user,
-                new File("t14-test-images/10.jpg"),
-                tags, " ").get();
-        albumService.createAlbum("Tenth",
-                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
-                user,
-                Arrays.asList(new Tag("#fjords"),
-                        new Tag("#nature"),
-                        new Tag("#mountains")),
-                Arrays.asList(image));
-
-
-
-        user = userService.createUser("MogenBogen@mail.com",
-                "MogenBogen",
-                "Mogen",
-                "Bogen",
-                "+47",
-                "00000000",
-                new Date(),
-                "123")
-                .get();
-        tags = new ArrayList<>(Arrays.asList(
-                new Tag("#mountains"),
-                new Tag("#nature"),
-                new Tag("#water")
-        ));
-        image = imageService.createImage(user,
-                new File("t14-test-images/3.jpg"),
-                tags, " ").get();
-        albumService.createAlbum("Third",
-                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
-                user,
-                Arrays.asList(new Tag("#mountains"),
-                        new Tag("#water"),
-                        new Tag("#nature")),
-                Arrays.asList(image));
-
-
-
-        tags = new ArrayList<>(Arrays.asList(
-                new Tag("#art"),
-                new Tag("#nature"),
-                new Tag("#river")
-        ));
-        image = imageService.createImage(user,
-                new File("t14-test-images/9.jpg"),
-                tags, " ").get();
-        albumService.createAlbum("Ninth",
-                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
-                user,
-                Arrays.asList(new Tag("#art"),
-                        new Tag("#nature"),
-                        new Tag("#river")),
-                Arrays.asList(image));
-
-
-
-
-        user = userService.createUser("Nicolaysen@mail.com",
-                "Nicolaysen",
-                "Nicolai",
-                "Sen",
-                "+47",
-                "00000000",
-                new Date(),
-                "123")
-                .get();
-        tags = new ArrayList<>(Arrays.asList(
-                new Tag("#mountains"),
-                new Tag("#nature"),
-                new Tag("#grass")
-        ));
-        image = imageService.createImage(user,
-                new File("t14-test-images/4.jpg"),
-                tags, " ").get();
-
-        albumService.createAlbum("Fourth",
-                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
-                user,
-                Arrays.asList(new Tag("#mountains"),
-                        new Tag("#grass"),
-                        new Tag("#nature")),
-                Arrays.asList(image));
-
-
-
-        tags = new ArrayList<>(Arrays.asList(
-                new Tag("#mountains"),
-                new Tag("#dock"),
-                new Tag("#water")
-        ));
-        image = imageService.createImage(user,
-                new File("t14-test-images/5.jpg"),
-                tags, " ").get();
-        albumService.createAlbum("Fifth",
-                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
-                user,
-                Arrays.asList(new Tag("#mountains"),
-                        new Tag("#water"),
-                        new Tag("#dock")),
-                Arrays.asList(image));
-
-
-
-
-        user = userService.createUser("MaseMads@mail.com",
-                "MaseMads",
-                "Mase",
-                "Mads",
-                "+47",
-                "00000000",
-                new Date(),
-                "123")
-                .get();
-        tags = new ArrayList<>(Arrays.asList(
-                new Tag("#mountains"),
-                new Tag("#nature"),
-                new Tag("#waterfall")
-        ));
-        image = imageService.createImage(user,
-                new File("t14-test-images/6.jpg"),
-                tags, " ").get();
-        albumService.createAlbum("Sixth",
-                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
-                user,
-                Arrays.asList(new Tag("#mountains"),
-                        new Tag("#waterfall"),
-                        new Tag("#nature")),
-                Arrays.asList(image));
-
-
-
-
-        user = userService.createUser("JensenMannen@mail.com",
-                "JensenMannen",
-                "Jense",
-                "Mannen",
-                "+47",
-                "00000000",
-                new Date(),
-                "123")
-                .get();
-        tags = new ArrayList<>(Arrays.asList(
-                new Tag("#winter"),
-                new Tag("#nature"),
-                new Tag("#mountains")
-        ));
-        image = imageService.createImage(user,
-                new File("t14-test-images/8.jpg"),
-                tags, " ").get();
-        albumService.createAlbum("Eighth",
-                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
-                user,
-                Arrays.asList(new Tag("#winter"),
-                        new Tag("#nature"),
-                        new Tag("#mountains")),
-                Arrays.asList(image));
-
-
-    }
-}
diff --git a/src/main/java/NTNU/IDATT1002/database/package-info.java b/src/main/java/NTNU/IDATT1002/database/package-info.java
deleted file mode 100644
index d2588519c2fbc777fe131b31cce61095a5c0b72a..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/database/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Provides a fixture and populates an empty database with this.
- * The images are defined in a folder 't14-test-images' and is not
- * available on version control.
- */
-package NTNU.IDATT1002.database;
\ No newline at end of file