diff --git a/src/main/java/com/gymtracker/database/Database.java b/src/main/java/com/gymtracker/database/Database.java
deleted file mode 100644
index 728efac1f37cd213cb44f8347d3b37f7dcbb51fd..0000000000000000000000000000000000000000
--- a/src/main/java/com/gymtracker/database/Database.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.gymtracker.database;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.sql.SQLException;
-
-import io.github.cdimascio.dotenv.Dotenv;
-
-public class Database {
-    private static Connection connection = null;
-
-    public static Connection getConnection() throws SQLException {
-        if(connection == null) {
-            try {
-                Dotenv dotenv = Dotenv.configure().directory("/").load();
-
-                String name = dotenv.get("MYSQL_DATABASE");
-                String port = dotenv.get("MYSQL_TCP_PORT");
-                String username = dotenv.get("MYSQL_USER");
-                String password = dotenv.get("MYSQL_ROOT_PASSWORD");
-
-                String url = "jdbc:mysql://db-java:" + port + "/" + name;
-                connection = DriverManager.getConnection(url, username, password);
-            } catch(SQLException e) {
-                throw new SQLException("Error establishing database connection", e);
-            }
-        }
-        return connection;
-    }
-
-    public static ResultSet executeQuery(String query) throws SQLException {
-        try (Statement statement = getConnection().createStatement()) {
-            return statement.executeQuery(query);
-        } catch(SQLException e) {
-            throw new SQLException("Error executing query: " + query, e);
-        }
-    }
-
-    public static int executeUpdate(String query) throws  SQLException {
-        try (Statement statement = getConnection().createStatement()) {
-            return statement.executeUpdate(query);
-        } catch(SQLException e) {
-            throw new SQLException("Error executing update: " + query, e);
-        }
-    }
-}
diff --git a/src/main/java/com/gymtracker/example/TestingService.java b/src/main/java/com/gymtracker/example/TestingService.java
index 49b0076280889dfcea22f9ebc8f6520440a64b71..ce01a720e281769125e3780442851c12be7a8491 100644
--- a/src/main/java/com/gymtracker/example/TestingService.java
+++ b/src/main/java/com/gymtracker/example/TestingService.java
@@ -1,13 +1,10 @@
 package com.gymtracker.example;
 
-import com.gymtracker.database.Database;
-
 import javax.jws.HandlerChain;
 import javax.jws.WebMethod;
 import javax.jws.WebService;
 import javax.xml.ws.WebServiceContext;
 import javax.annotation.Resource;
-import java.sql.SQLException;
 
 @WebService
 @HandlerChain(file = "log_and_auth.xml")
diff --git a/src/main/java/com/gymtracker/model/Application.java b/src/main/java/com/gymtracker/model/Application.java
index 95ac3772819a461720ac14c720fded0ae2eeb8df..ede0d805852f6399f81a9e5226637072262687e2 100644
--- a/src/main/java/com/gymtracker/model/Application.java
+++ b/src/main/java/com/gymtracker/model/Application.java
@@ -1,91 +1,5 @@
 package com.gymtracker.model;
 
-import com.gymtracker.database.Database;
-
-import java.lang.reflect.Field;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.List;
-
 public class Application {
-    private String username;
-    private Integer gym_id;
-    private Boolean acceptance;
-    private String trainer_name;
-    private String trainer_description;
-    private String application_description;
-
-    public Application() {
-        this.username = "";
-        this.gym_id = 0;
-        this.acceptance = Boolean.FALSE;
-        this.trainer_name = "";
-        this.trainer_description = "";
-        this.application_description = "";
-    }
-
-    public Application(String username, Integer gym_id, Boolean acceptance, String trainer_name, String trainer_description, String application_description) {
-        this.username = username;
-        this.gym_id = gym_id;
-        this.acceptance = acceptance;
-        this.trainer_name = trainer_name;
-        this.trainer_description = trainer_description;
-        this.application_description = application_description;
-    }
-
-    private static List<Application> toList(ResultSet resultSet) {
-        try {
-            Class<Application> clazz = Application.class;
-
-            List<Application> list = new ArrayList<Application>();
-            while (resultSet.next()) {
-                Application instance = clazz.newInstance();
-                for (Field field : clazz.getDeclaredFields()) {
-                    field.setAccessible(true);
-                    field.set(instance, resultSet.getObject(field.getName()));
-                }
-                list.add(instance);
-            }
-
-            return list;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-
-    public static List<Application> getAll() {
-        try {
-            String query = "SELECT * FROM application";
-            ResultSet resultSet = Database.executeQuery(query);
-            return toList(resultSet);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public static Application findByUsername(String username) {
-        try {
-            String query = "SELECT * FROM application WHERE `username` = " + username;
-            ResultSet resultSet = Database.executeQuery(query);
-            return (Application) toList(resultSet).get(0);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public static Application findByGymID(Integer gym_id) {
-        try {
-            String query = "SELECT * FROM application WHERE `gym_id` = " + gym_id;
-            ResultSet resultSet = Database.executeQuery(query);
-            return (Application) toList(resultSet).get(0);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
 
 }