diff --git a/README.md b/README.md
index 3a88ae4..937ffea 100644
--- a/README.md
+++ b/README.md
@@ -6,23 +6,18 @@
 
 ---
 
--   [Links](#links)
 -   [Installation](#installation)
--   [Start](#start)
+    -   [Installation for development](#installation-for-development)
+    -   [Installation for production](#installation-for-production)
+-   [Start the development server](#start-the-development-server)
 -   [Project structure](#project-structure)
+-   [Stable version](#stable-version)
+-   [Deploying](#deploying)
 -   [Visual Studio Code](#visual-studio-code)
 -   [Scripts](#scripts)
 -   [Gnerate a new React component](#gnerate-a-new-react-component)
--   [Add a TODO](#add-a-todo)
--   [Pre-commit hooks](#pre-commit-hooks)
--   [Extensions](#extensions)
-
----
-
-## Links
-
--   [TODOS](./todos.md)
--   [IDEAS](./ideas.md)
+-   [Git hooks](#git-hooks)
+-   [Packages and tools](#packages-and-tools)
 
 ---
 
@@ -51,7 +46,7 @@ npm run prepare
 
 5. Check the `.env.development` file and make sure all the variables are set correctly.
 
-6. [Start the frontend development server](#start).
+6. [Start the frontend development server](#start-the-development-server)
 
 ### Installation for production
 
@@ -80,7 +75,7 @@ npm run build
 
 ---
 
-## Start
+## Start the development server
 
 To start the frontend development server run:
 
@@ -88,9 +83,13 @@ To start the frontend development server run:
 npm run start
 ```
 
-This script will make preparations to start the newest version.
+This script will make preparations to start the frontend development server:
 
-_Check the console for instructions!_
+-   Check if the backend server is running (_if not it will warn you_)
+-   Creates the table structure in the backend server (_if not already created_)
+-   Start the frontend development server and opens the browser
+
+**_Check the console for instructions!_**
 
 > Note that also the backend server should be running. Otherwise the frontend will not work correctly. See [here](https://github.com/lw86ruwo/wannadbBackend) for more information.
 
@@ -98,7 +97,11 @@ _Check the console for instructions!_
 
 ## Project structure
 
--   **[scripts](scripts)** - Scripts for the project
+-   **[.github](.github)** - GitHub related files
+    -   **[workflows](.github/workflows)** - GitHub actions workflows
+-   **[.husky](.husky)** - Git hooks managed by husky
+-   **[.vscode](.vscode)** - Visual Studio Code settings
+-   **[scripts](scripts)** - Scripts for development
 -   **[src](src)** - The source code
     -   **[assets](src/assets)** - The assets
     -   **[audio](src/audio)** - The audio files
@@ -113,6 +116,38 @@ _Check the console for instructions!_
 
 ---
 
+## Stable version
+
+To manage stable versions of the frontend, a separate branch `stable` is used. When you have a stable version of the frontend, you can merge it into the `stable` branch. This will ensure that in the stable branch is always a version of the frontend that is working.
+
+To create a new stable version, you have the following options:
+
+-   Run the `Create New Stable Version (Manual)`workflow:
+    -   Go to the `Actions` tab on GitHub
+    -   Select the `Create New Stable Version (Manual)` workflow
+    -   Open the `Run workflow` dropdown
+    -   Click on the `Run workflow` button again
+-   Run the `Create New Stable Version (Push)` workflow:
+    -   Create a commit with the message containing `[stable]` and push it to the `main` branch. This will trigger the `Create New Stable Version (Push)` workflow and create a new stable version.
+
+> The same concept applies to the backend and makes sure (when you have done it correctly) that the stable versions of the frontend and backend are always compatible and stable.
+
+---
+
+## Deploying
+
+To deploy a new version of the frontend you can run the `scripts/deploy.sh` script. This script will update the frontend and backend to the latest version.
+
+You can specify from which branch you want to deploy from via the `-b`flag. E.g. When you want to the newest version from the `stable` branch you can run:
+
+```bash
+./scripts/deploy.sh -b stable
+```
+
+_**Note:**_ This script will only work if the frontend is in the directory `/home/wannadb/frontend` on the server and the backend is in the directory `/home/wannadb/backend` on the server. To change this you have to modify the environment variables in the script.
+
+---
+
 ## Visual Studio Code
 
 **I recommend using [Visual Studio Code](https://code.visualstudio.com/) as your IDE.**
@@ -127,12 +162,12 @@ In the [.vscode](.vscode) folder you can find some settings in the [settings.jso
 Run a script with:
 
 ```bash
-npm run <script>
+npm run <script-name>
 ```
 
 -   **dev** - Start the frontend development server
 -   **serve** - Start the frontend development server
--   **start** - Pull the latest changes and start the frontend development server
+-   **start** - Check and prepare the backend and start the frontend development server
 -   **build** - Build the frontend
 -   **lint** - Check for linting errors
 -   **preview** - Preview the built frontend
@@ -140,13 +175,13 @@ npm run <script>
 -   **format:check** - Check if the code is formatted
 -   **test** - Run the tests
 -   **test:watch** - Run the tests in watch mode
--   **backend** - Start the backend server
+-   **prepare** - Install husky
 -   **generate _\<component-name\>_** - Generate a new React component
--   **todo _\<todo\>_** - Add a new TODO
--   **comment:check** - Check if all functions and classes have a comment
+-   **comment:check** - Check if all functions and classes have comments
 -   **backend:check** - Checks if the backend is running
 -   **backend:create** - Creates all the necessary resources in the backend
 -   **txt:create** - Create some sample text files
+-   **server:update** - Deploy the server to the latest version
 
 ---
 
@@ -166,31 +201,32 @@ This is for the purpose of consistency. So that all components are generated the
 
 ---
 
-## Stable Version
-
-...
-
----
-
-## Pre-commit hooks
+## Git hooks
 
-The pre-commit hooks are managed by [husky](https://typicode.github.io/husky/#/).
+The commit hooks are managed by [husky](https://typicode.github.io/husky/#/).
 
--   **Format** - Check if the code is formatted correctly
--   **Linting** - Check for linting errors
--   **Comment check** - Check if all functions and classes have a comment
--   **Tests** - Run the tests
--   **Commit message** - Enforce more meaningful commit messages
+-   **pre-commit** - Runs before the commit
+    -   **Format** - Check if the code is formatted correctly
+    -   **Linting** - Check for linting errors
+    -   **Comment check** - Check if all functions and classes have a comment
+    -   **Tests** - Run the tests
+    -   **Build** - Build the frontend
+-   **commit-msg** - Runs after the commit message is entered
+    -   **Commit message** - Enforce more meaningful commit messages
 
-> If you cant commit that means that one of the hooks failed. Please fix the error and try again.
+> If you can't commit that means that one of the checks failed. Please fix the error and try again.
 
 ---
 
-## Extensions
+## Packages and tools
 
 -   **Vite** - Bundler
+-   **React** - Frontend library
+-   **Typescript** - Typed JavaScript
+-   **SAAS** - CSS preprocessor
+-   **Axios** - HTTP client
 -   **ESLint** - Linting utility for JavaScript and JSX
 -   **Prettier** - Code formatter
 -   **Huksy** - Git hooks
 -   **Vitest** - Test runner
--   **Jest** - Testing framework
+-   **Bootstrap Icons** - Icons
diff --git a/ideas.md b/ideas.md
deleted file mode 100644
index de67cad..0000000
--- a/ideas.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# IDEAS wannadbFrontend
-
-<!-- -   [ ] This is an idea example -->
diff --git a/package-lock.json b/package-lock.json
index 9ca809d..383410a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -564,246 +564,6 @@
 			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
 			"dev": true
 		},
-		"node_modules/@esbuild/android-arm": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.9.tgz",
-			"integrity": "sha512-jkYjjq7SdsWuNI6b5quymW0oC83NN5FdRPuCbs9HZ02mfVdAP8B8eeqLSYU3gb6OJEaY5CQabtTFbqBf26H3GA==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/android-arm64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.9.tgz",
-			"integrity": "sha512-q4cR+6ZD0938R19MyEW3jEsMzbb/1rulLXiNAJQADD/XYp7pT+rOS5JGxvpRW8dFDEfjW4wLgC/3FXIw4zYglQ==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/android-x64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.9.tgz",
-			"integrity": "sha512-KOqoPntWAH6ZxDwx1D6mRntIgZh9KodzgNOy5Ebt9ghzffOk9X2c1sPwtM9P+0eXbefnDhqYfkh5PLP5ULtWFA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"android"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/darwin-arm64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.9.tgz",
-			"integrity": "sha512-KBJ9S0AFyLVx2E5D8W0vExqRW01WqRtczUZ8NRu+Pi+87opZn5tL4Y0xT0mA4FtHctd0ZgwNoN639fUUGlNIWw==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/darwin-x64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.9.tgz",
-			"integrity": "sha512-vE0VotmNTQaTdX0Q9dOHmMTao6ObjyPm58CHZr1UK7qpNleQyxlFlNCaHsHx6Uqv86VgPmR4o2wdNq3dP1qyDQ==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/freebsd-arm64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.9.tgz",
-			"integrity": "sha512-uFQyd/o1IjiEk3rUHSwUKkqZwqdvuD8GevWF065eqgYfexcVkxh+IJgwTaGZVu59XczZGcN/YMh9uF1fWD8j1g==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"freebsd"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/freebsd-x64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.9.tgz",
-			"integrity": "sha512-WMLgWAtkdTbTu1AWacY7uoj/YtHthgqrqhf1OaEWnZb7PQgpt8eaA/F3LkV0E6K/Lc0cUr/uaVP/49iE4M4asA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"freebsd"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-arm": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.9.tgz",
-			"integrity": "sha512-C/ChPohUYoyUaqn1h17m/6yt6OB14hbXvT8EgM1ZWaiiTYz7nWZR0SYmMnB5BzQA4GXl3BgBO1l8MYqL/He3qw==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-arm64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.9.tgz",
-			"integrity": "sha512-PiPblfe1BjK7WDAKR1Cr9O7VVPqVNpwFcPWgfn4xu0eMemzRp442hXyzF/fSwgrufI66FpHOEJk0yYdPInsmyQ==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-ia32": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.9.tgz",
-			"integrity": "sha512-f37i/0zE0MjDxijkPSQw1CO/7C27Eojqb+r3BbHVxMLkj8GCa78TrBZzvPyA/FNLUMzP3eyHCVkAopkKVja+6Q==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-loong64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.9.tgz",
-			"integrity": "sha512-t6mN147pUIf3t6wUt3FeumoOTPfmv9Cc6DQlsVBpB7eCpLOqQDyWBP1ymXn1lDw4fNUSb/gBcKAmvTP49oIkaA==",
-			"cpu": [
-				"loong64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-mips64el": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.9.tgz",
-			"integrity": "sha512-jg9fujJTNTQBuDXdmAg1eeJUL4Jds7BklOTkkH80ZgQIoCTdQrDaHYgbFZyeTq8zbY+axgptncko3v9p5hLZtw==",
-			"cpu": [
-				"mips64el"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-ppc64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.9.tgz",
-			"integrity": "sha512-tkV0xUX0pUUgY4ha7z5BbDS85uI7ABw3V1d0RNTii7E9lbmV8Z37Pup2tsLV46SQWzjOeyDi1Q7Wx2+QM8WaCQ==",
-			"cpu": [
-				"ppc64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-riscv64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.9.tgz",
-			"integrity": "sha512-DfLp8dj91cufgPZDXr9p3FoR++m3ZJ6uIXsXrIvJdOjXVREtXuQCjfMfvmc3LScAVmLjcfloyVtpn43D56JFHg==",
-			"cpu": [
-				"riscv64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/linux-s390x": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.9.tgz",
-			"integrity": "sha512-zHbglfEdC88KMgCWpOl/zc6dDYJvWGLiUtmPRsr1OgCViu3z5GncvNVdf+6/56O2Ca8jUU+t1BW261V6kp8qdw==",
-			"cpu": [
-				"s390x"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
 		"node_modules/@esbuild/linux-x64": {
 			"version": "0.19.9",
 			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.9.tgz",
@@ -820,102 +580,6 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/@esbuild/netbsd-x64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.9.tgz",
-			"integrity": "sha512-GThgZPAwOBOsheA2RUlW5UeroRfESwMq/guy8uEe3wJlAOjpOXuSevLRd70NZ37ZrpO6RHGHgEHvPg1h3S1Jug==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"netbsd"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/openbsd-x64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.9.tgz",
-			"integrity": "sha512-Ki6PlzppaFVbLnD8PtlVQfsYw4S9n3eQl87cqgeIw+O3sRr9IghpfSKY62mggdt1yCSZ8QWvTZ9jo9fjDSg9uw==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"openbsd"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/sunos-x64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.9.tgz",
-			"integrity": "sha512-MLHj7k9hWh4y1ddkBpvRj2b9NCBhfgBt3VpWbHQnXRedVun/hC7sIyTGDGTfsGuXo4ebik2+3ShjcPbhtFwWDw==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"sunos"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/win32-arm64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.9.tgz",
-			"integrity": "sha512-GQoa6OrQ8G08guMFgeXPH7yE/8Dt0IfOGWJSfSH4uafwdC7rWwrfE6P9N8AtPGIjUzdo2+7bN8Xo3qC578olhg==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/win32-ia32": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.9.tgz",
-			"integrity": "sha512-UOozV7Ntykvr5tSOlGCrqU3NBr3d8JqPes0QWN2WOXfvkWVGRajC+Ym0/Wj88fUgecUCLDdJPDF0Nna2UK3Qtg==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@esbuild/win32-x64": {
-			"version": "0.19.9",
-			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.9.tgz",
-			"integrity": "sha512-oxoQgglOP7RH6iasDrhY+R/3cHrfwIDvRlT4CGChflq6twk8iENeVvMJjmvBb94Ik1Z+93iGO27err7w6l54GQ==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"win32"
-			],
-			"engines": {
-				"node": ">=12"
-			}
-		},
 		"node_modules/@eslint-community/eslint-utils": {
 			"version": "4.4.0",
 			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -1150,110 +814,6 @@
 				"node": ">=14.0.0"
 			}
 		},
-		"node_modules/@rollup/rollup-android-arm-eabi": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.8.0.tgz",
-			"integrity": "sha512-zdTObFRoNENrdPpnTNnhOljYIcOX7aI7+7wyrSpPFFIOf/nRdedE6IYsjaBE7tjukphh1tMTojgJ7p3lKY8x6Q==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"android"
-			]
-		},
-		"node_modules/@rollup/rollup-android-arm64": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.8.0.tgz",
-			"integrity": "sha512-aiItwP48BiGpMFS9Znjo/xCNQVwTQVcRKkFKsO81m8exrGjHkCBDvm9PHay2kpa8RPnZzzKcD1iQ9KaLY4fPQQ==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"android"
-			]
-		},
-		"node_modules/@rollup/rollup-darwin-arm64": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.8.0.tgz",
-			"integrity": "sha512-zhNIS+L4ZYkYQUjIQUR6Zl0RXhbbA0huvNIWjmPc2SL0cB1h5Djkcy+RZ3/Bwszfb6vgwUvcVJYD6e6Zkpsi8g==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			]
-		},
-		"node_modules/@rollup/rollup-darwin-x64": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.8.0.tgz",
-			"integrity": "sha512-A/FAHFRNQYrELrb/JHncRWzTTXB2ticiRFztP4ggIUAfa9Up1qfW8aG2w/mN9jNiZ+HB0t0u0jpJgFXG6BfRTA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.8.0.tgz",
-			"integrity": "sha512-JsidBnh3p2IJJA4/2xOF2puAYqbaczB3elZDT0qHxn362EIoIkq7hrR43Xa8RisgI6/WPfvb2umbGsuvf7E37A==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-arm64-gnu": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.8.0.tgz",
-			"integrity": "sha512-hBNCnqw3EVCkaPB0Oqd24bv8SklETptQWcJz06kb9OtiShn9jK1VuTgi7o4zPSt6rNGWQOTDEAccbk0OqJmS+g==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-arm64-musl": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.8.0.tgz",
-			"integrity": "sha512-Fw9ChYfJPdltvi9ALJ9wzdCdxGw4wtq4t1qY028b2O7GwB5qLNSGtqMsAel1lfWTZvf4b6/+4HKp0GlSYg0ahA==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-riscv64-gnu": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.8.0.tgz",
-			"integrity": "sha512-BH5xIh7tOzS9yBi8dFrCTG8Z6iNIGWGltd3IpTSKp6+pNWWO6qy8eKoRxOtwFbMrid5NZaidLYN6rHh9aB8bEw==",
-			"cpu": [
-				"riscv64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
 		"node_modules/@rollup/rollup-linux-x64-gnu": {
 			"version": "4.8.0",
 			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.8.0.tgz",
@@ -1280,45 +840,6 @@
 				"linux"
 			]
 		},
-		"node_modules/@rollup/rollup-win32-arm64-msvc": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.8.0.tgz",
-			"integrity": "sha512-ge7saUz38aesM4MA7Cad8CHo0Fyd1+qTaqoIo+Jtk+ipBi4ATSrHWov9/S4u5pbEQmLjgUjB7BJt+MiKG2kzmA==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"win32"
-			]
-		},
-		"node_modules/@rollup/rollup-win32-ia32-msvc": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.8.0.tgz",
-			"integrity": "sha512-p9E3PZlzurhlsN5h9g7zIP1DnqKXJe8ZUkFwAazqSvHuWfihlIISPxG9hCHCoA+dOOspL/c7ty1eeEVFTE0UTw==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"win32"
-			]
-		},
-		"node_modules/@rollup/rollup-win32-x64-msvc": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.8.0.tgz",
-			"integrity": "sha512-kb4/auKXkYKqlUYTE8s40FcJIj5soOyRLHKd4ugR0dCq0G2EfcF54eYcfQiGkHzjidZ40daB4ulsFdtqNKZtBg==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"optional": true,
-			"os": [
-				"win32"
-			]
-		},
 		"node_modules/@sinclair/typebox": {
 			"version": "0.27.8",
 			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
@@ -3103,20 +2624,6 @@
 			"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
 			"dev": true
 		},
-		"node_modules/fsevents": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-			"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-			"dev": true,
-			"hasInstallScript": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-			}
-		},
 		"node_modules/function-bind": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
diff --git a/package.json b/package.json
index 590c0af..2b49284 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 	"scripts": {
 		"dev": "vite",
 		"serve": "vite",
-		"start": "npm install && npm run backend:check && npm run backend:create && vite --open",
+		"start": "npm run backend:check && npm run backend:create && vite --open",
 		"build": "tsc && vite build",
 		"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
 		"preview": "vite preview",
@@ -23,8 +23,7 @@
 		"backend:create": "npm run backend:create:tables",
 		"backend:create:tables": "python scripts/create_table.py",
 		"txt:create": "python scripts/create_txt.py",
-		"server:update": "git pull && ./scripts/create_table.sh && npm run build",
-		"postgres:open": "docker exec -it $(docker ps -aqf \"name=postgres\") psql -d userManagement -U postgres"
+		"server:update": "git pull && ./scripts/create_table.sh && npm run build"
 	},
 	"dependencies": {
 		"axios": "^1.6.2",
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index d155fc5..776fb46 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# Environment variables
+
+HOME_DIR="/home/wannadb"
+FRONTEND_DIR="$HOME_DIR/frontend"
+BACKEND_DIR="$HOME_DIR/backend"
+
 # check if the flag -b is set
 while getopts b: flag
 do
@@ -10,12 +16,12 @@ done
 
 if [ ! -z "$branch" ]
 then
-    echo "Updating to branch $branch"
+    echo "Updating on branch $branch"
 fi
 
 echo "Updating the frontend..."
 
-cd /home/wannadb/frontend
+cd $FRONTEND_DIR
 
 if [ ! -z "$branch" ]
 then
@@ -25,7 +31,7 @@ fi
 npm run server:update
 
 echo "Updating the backend.."
-cd /home/wannadb/backend
+cd $BACKEND_DIR
 
 if [ ! -z "$branch" ]
 then
diff --git a/src/components/AttributeAdder/AttributeAdder.tsx b/src/components/AttributeAdder/AttributeAdder.tsx
index cd5a0a9..d2f7c57 100644
--- a/src/components/AttributeAdder/AttributeAdder.tsx
+++ b/src/components/AttributeAdder/AttributeAdder.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import './AttributeAdder.scss';
 import Icon from '../Icon/Icon';
 import { useIsDocbaseTaskRunning } from '../../providers/DocBaseTaskProvider';
@@ -12,7 +12,7 @@ interface Props {
 }
 
 /**
- * A component that allows the user to add attributes to there document base
+ * A component that allows the user to add attributes to their document base
  */
 function AttributeAdder({
 	onListChange,
@@ -22,24 +22,10 @@ function AttributeAdder({
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	onRerun = (_list: string[]) => {},
 }: Props) {
-	const [attList, setAttList] = useState<string[]>([]);
+	const [attList, setAttList] = useState<string[]>(initialList);
 
 	const isDocBaseTaskRunning = useIsDocbaseTaskRunning();
 
-	useEffect(
-		() => {
-			if (
-				import.meta.env.VITE_APP_LOG === 'true' &&
-				initialList.length == 0
-			) {
-				initialList.push('Country', 'Animal');
-			}
-			setAttributeList(initialList);
-		},
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-		[]
-	);
-
 	const [inputvalue, setInputValue] = useState<string>('');
 
 	const addAttribute = (att: string) => {
diff --git a/src/components/CustomNuggetEditor/CustomNuggetEditor.tsx b/src/components/CustomNuggetEditor/CustomNuggetEditor.tsx
index 4349cef..bc1bd0d 100644
--- a/src/components/CustomNuggetEditor/CustomNuggetEditor.tsx
+++ b/src/components/CustomNuggetEditor/CustomNuggetEditor.tsx
@@ -71,9 +71,7 @@ function CustomNuggetEditor({ doc, docBase }: Props) {
 						clearInterval(interval);
 						return;
 					} else if (res.state.toUpperCase().trim() === 'SUCCESS') {
-						// TODO
 						showNotification('Success', 'Nugget confirmed');
-
 						clearInterval(interval);
 					}
 				});
diff --git a/src/components/FileUpload/FileUpload.tsx b/src/components/FileUpload/FileUpload.tsx
index 598c106..a9723d2 100644
--- a/src/components/FileUpload/FileUpload.tsx
+++ b/src/components/FileUpload/FileUpload.tsx
@@ -71,10 +71,6 @@ function FileUpload({ organizationProp, afterUpload }: Props) {
 		setstagedFiles([]);
 	};
 
-	/* const discardFiles = () => {
-		setstagedFiles([]);
-	}; */
-
 	const removeFile = (index: number) => {
 		const newFiles = [...files];
 		newFiles.splice(index, 1);
@@ -171,14 +167,6 @@ function FileUpload({ organizationProp, afterUpload }: Props) {
 					multiple={true}
 				/>
 			</div>
-			{/* <div className="hor mb">
-				<button className="btn" onClick={() => addFile()}>
-					Add
-				</button>
-				<button className="btn" onClick={discardFiles}>
-					Discard
-				</button>
-			</div> */}
 			{files.map((file, index) => (
 				<li className="file" key={index}>
 					<div className="dot"></div>
diff --git a/src/components/MatchingEditor/MatchingEditor.scss b/src/components/MatchingEditor/MatchingEditor.scss
deleted file mode 100644
index 0975fbe..0000000
--- a/src/components/MatchingEditor/MatchingEditor.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.MatchingEditor {
-	.text {
-		font-size: 20px;
-		background-color: var(--btn-color);
-		width: 90%;
-		padding: 20px 20px;
-		border-radius: 15px;
-	}
-	.word {
-		cursor: pointer;
-	}
-	.selected {
-		background-color: yellow;
-		color: black;
-		border-radius: 2px;
-	}
-	.btnBox {
-		margin-top: 20px;
-	}
-}
diff --git a/src/components/MatchingEditor/MatchingEditor.tsx b/src/components/MatchingEditor/MatchingEditor.tsx
deleted file mode 100644
index ec7e075..0000000
--- a/src/components/MatchingEditor/MatchingEditor.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-import { useState } from 'react';
-import './MatchingEditor.scss';
-
-interface WordCoordinate {
-	line: number;
-	word: number;
-}
-
-/**
- * A component to choose the matching word from the text
- */
-function MatchingEditor() {
-	const [selectedWord, setSelectedWord] = useState<WordCoordinate>({
-		line: -1,
-		word: -1,
-	});
-
-	// TODO get the text from the backend
-	const text =
-		'Hello World!\nThis is a test file.\nIt is used to test the file viewer.';
-	/* const text =
-		'Hello World!\nThis is a test file.\nIt is used to test the file viewer.\n\nThis is a new paragraph.\n\nThis is another new paragraph.\n\nThis is a third new paragraph.\n\nThis is a fourth new paragraph.\n\nThis is a fifth new paragraph.\n\nThis is a sixth new paragraph.\n\nThis is a seventh new paragraph.\n\nThis is an eighth new paragraph.\n\nThis is a ninth new paragraph.\n\nThis is a tenth new paragraph.\n\nThis is an eleventh new paragraph.\n\nThis is a twelfth new paragraph.\n\nThis is a thirteenth new paragraph.\n\nThis is a fourteenth new paragraph.\n\nThis is a fifteenth new paragraph.\n\nThis is a sixteenth new paragraph.\n\nThis is a seventeenth new paragraph.\n\nThis is an eighteenth new paragraph.\n\nThis is a nineteenth new paragraph.\n\nThis is a twentieth new paragraph.\n\nThis is a twenty-first new paragraph.\n\nThis is a twenty-second new paragraph.\n\nThis is a twenty-third new paragraph.\n\nThis is a twenty-fourth new paragraph.\n\nThis is a twenty-fifth new paragraph.\n\nThis is a twenty-sixth new paragraph.\n\nThis is a twenty-seventh new paragraph.\n\nThis is a twenty-eighth new paragraph.\n\nThis is a twenty-ninth new paragraph.\n\nThis is a thirtieth new paragraph.\n\nThis is a thirty-first new paragraph.\n\nThis is a thirty-second new paragraph.\n\nThis is a thirty-third new paragraph.\n\nThis is a thirty-fourth new paragraph.\n\nThis is a thirty-fifth new paragraph.\n\nThis is a thirty-sixth new paragraph.\n\nThis is a thirty-seventh new paragraph.\n\nThis is a thirty-eighth new paragraph.\n\nThis is a thirty-ninth new paragraph.\n\nThis is a fortieth new paragraph.\n\nThis is a forty-first new paragraph.\n\nThis is a forty-second new paragraph.\n\nThis is a forty-third new paragraph.\n\nThis is a forty-fourth new paragraph.\n\nThis is a forty-fifth new paragraph.\n\nThis is a forty-sixth new paragraph.\n\nThis is a forty-seventh new paragraph.\n\nThis is a forty-eighth new paragrap';
- */
-	const lines = text.split('\n');
-
-	const skipLeft = () => {
-		if (selectedWord.word <= 0 && selectedWord.line <= 0) {
-			return;
-		}
-
-		if (selectedWord.word > 0) {
-			setSelectedWord({
-				line: selectedWord.line,
-				word: selectedWord.word - 1,
-			});
-		} else {
-			setSelectedWord({
-				line: selectedWord.line - 1,
-				word: lines[selectedWord.line - 1].split(' ').length - 1,
-			});
-		}
-	};
-
-	const skipRight = () => {
-		if (
-			selectedWord.word >=
-				lines[selectedWord.line].split(' ').length - 1 &&
-			selectedWord.line >= lines.length - 1
-		) {
-			return;
-		}
-
-		if (
-			selectedWord.word <
-			lines[selectedWord.line].split(' ').length - 1
-		) {
-			setSelectedWord({
-				line: selectedWord.line,
-				word: selectedWord.word + 1,
-			});
-		} else {
-			setSelectedWord({
-				line: selectedWord.line + 1,
-				word: 0,
-			});
-		}
-	};
-
-	return (
-		<div className="MatchingEditor">
-			<div className="text">
-				{lines.map((line, lineIndex) => {
-					const words = line.split(' ');
-					return (
-						<div key={lineIndex + 'line'}>
-							{words.map((word, wordIndex) => {
-								return (
-									<span key={lineIndex + '' + wordIndex}>
-										<span
-											className={
-												'word' +
-												(selectedWord.line ===
-													lineIndex &&
-												selectedWord.word === wordIndex
-													? ' selected'
-													: '')
-											}
-											key={lineIndex + '' + wordIndex}
-											onClick={() => {
-												setSelectedWord({
-													line: lineIndex,
-													word: wordIndex,
-												});
-											}}
-										>
-											{word}
-										</span>
-										<span
-											className="space"
-											onClick={() => {
-												setSelectedWord({
-													line: lineIndex,
-													word: wordIndex,
-												});
-											}}
-											key={
-												lineIndex +
-												'' +
-												wordIndex +
-												'space'
-											}
-										>
-											{' '}
-										</span>
-									</span>
-								);
-							})}
-							<br />
-						</div>
-					);
-				})}
-			</div>
-
-			<div className="btnBox hor">
-				<button className="btn" onClick={skipLeft}>
-					Skip Left
-				</button>
-				<button className="btn" onClick={skipRight}>
-					Skip Right
-				</button>
-				<button className="btn">Confirm Match</button>
-				<button className="btn">There is No Match</button>
-			</div>
-		</div>
-	);
-}
-export default MatchingEditor;
diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx
index 14b122b..514dfc4 100644
--- a/src/components/Navbar/Navbar.tsx
+++ b/src/components/Navbar/Navbar.tsx
@@ -67,10 +67,7 @@ function Navbar() {
 				<Link to="/">Home</Link>
 				<Link to="/about">About</Link>
 				<Link to="/settings">Settings</Link>
-				<Link to="/help">
-					{/* <i className="bi bi-question-circle icon"></i> */}
-					Help
-				</Link>
+				<Link to="/help">Help</Link>
 				{isLoggedIn() ? (
 					<Link to={'/profile'}>
 						<div className="profilePicture">
diff --git a/src/components/NuggetText/NuggetText.tsx b/src/components/NuggetText/NuggetText.tsx
index ac9ed4f..253492e 100644
--- a/src/components/NuggetText/NuggetText.tsx
+++ b/src/components/NuggetText/NuggetText.tsx
@@ -88,8 +88,6 @@ function NuggetText({ doc, docBase, interactive = false }: Props) {
 	};
 
 	const confirmNugget = (nugget: Nugget) => {
-		//TODO
-		// get random time between 1000 amd 2000
 		setTimeout(
 			() => {
 				addToConfirmedNuggets(nugget);
@@ -115,31 +113,8 @@ function NuggetText({ doc, docBase, interactive = false }: Props) {
 			interactiveTaskId
 		).then((res) => {
 			if (res === undefined) {
-				//showNotification('Error', 'Failed to confirm nugget');
 				return;
 			}
-
-			/* const taskId = res;
-			const interval = setInterval(() => {
-				APIService.getTaskStatus(taskId).then((res) => {
-					Logger.log('Confirm nugget start*****' + interval);
-					Logger.log(res);
-					Logger.log('Confirm nugget end*****');
-					if (
-						res == undefined ||
-						res.state.toUpperCase().trim() === 'FAILURE'
-					) {
-						// showNotification('Error', 'Failed to confirm nugget');
-						clearInterval(interval);
-						return;
-					} else if (res.state.toUpperCase().trim() === 'SUCCESS') {
-						// TODO
-						// showNotification('Success', 'Nugget confirmed');
-
-						clearInterval(interval);
-					}
-				});
-			}, 1000); */
 		});
 	};
 
@@ -151,8 +126,6 @@ function NuggetText({ doc, docBase, interactive = false }: Props) {
 					start
 				)}
 				<span className="box">
-					{/* 					<span className="attribute-label">att</span>
-					 */}
 					<span
 						className={
 							selectedNugget === undefined
@@ -189,19 +162,6 @@ function NuggetText({ doc, docBase, interactive = false }: Props) {
 								>
 									Confirm Nugget
 								</Icon>
-								{/* <Icon
-									style={{
-										color: 'black',
-										fontSize: '1.2rem',
-										paddingRight: '10px',
-									}}
-									cls="bi bi-hand-thumbs-down icon"
-									onClicked={() => {
-										Logger.log('Decline Nugget');
-									}}
-								>
-									Decline Nugget
-								</Icon> */}
 							</>
 						)}
 					</span>
diff --git a/src/components/NuggetViewer/NuggetDocumentViewer.tsx b/src/components/NuggetViewer/NuggetDocumentViewer.tsx
index 4c64403..a9ebd62 100644
--- a/src/components/NuggetViewer/NuggetDocumentViewer.tsx
+++ b/src/components/NuggetViewer/NuggetDocumentViewer.tsx
@@ -1,8 +1,6 @@
 import NuggetDocument from '../../types/NuggetDocument';
-import Icon from '../Icon/Icon';
 import NuggetText from '../NuggetText/NuggetText';
 import './NuggetDocumentViewer.scss';
-import { useGetOrderedNuggets } from '../../providers/DocBaseTaskProvider';
 import DocBase from '../../types/DocBase';
 import CustomNuggetEditor from '../CustomNuggetEditor/CustomNuggetEditor';
 import { useState } from 'react';
@@ -18,7 +16,6 @@ interface Props {
  * @param doc The NuggetDocument to display
  */
 function NuggetDocumentViewer({ docBase, doc, interactive = false }: Props) {
-	const getOrderedNuggets = useGetOrderedNuggets();
 	const [customNugget, setCustomNugget] = useState<boolean>(false);
 
 	return (
@@ -27,25 +24,6 @@ function NuggetDocumentViewer({ docBase, doc, interactive = false }: Props) {
 				<b>
 					Document: <i>{doc.name}</i>
 				</b>
-				{!interactive && (
-					<Icon
-						cls="bi bi-info-circle ml"
-						style={{
-							//TODO
-							display: 'none',
-						}}
-						onClicked={() => {
-							getOrderedNuggets(
-								docBase.organizationId,
-								docBase.name,
-								doc.name,
-								doc.content
-							);
-						}}
-					>
-						Get more information about this document
-					</Icon>
-				)}
 			</p>
 			{!customNugget ? (
 				<NuggetText
diff --git a/src/data/getRandomBaseName.ts b/src/data/getRandomBaseName.ts
index 18e35ba..6b0d23f 100644
--- a/src/data/getRandomBaseName.ts
+++ b/src/data/getRandomBaseName.ts
@@ -1,3 +1,4 @@
+/** Gets a name suggestion for a new docbase. */
 const getRandomBaseName = (): string => {
 	const names = [
 		'TuringBase',
diff --git a/src/data/getRandomOrgName.ts b/src/data/getRandomOrgName.ts
index 117d9c6..b70c258 100644
--- a/src/data/getRandomOrgName.ts
+++ b/src/data/getRandomOrgName.ts
@@ -1,3 +1,4 @@
+/** Returns a random organization name */
 const getRandomOrgName = (): string => {
 	const adjectives = [
 		'Quantum',
diff --git a/src/data/getRandomTip.ts b/src/data/getRandomTip.ts
index 4546f68..0ebd986 100644
--- a/src/data/getRandomTip.ts
+++ b/src/data/getRandomTip.ts
@@ -1,3 +1,4 @@
+/** Get a tip for the usage of the website */
 const getRandomTip = (): string => {
 	const tips = [
 		'Click on your profile to view and create a organization',
diff --git a/src/data/getRandomUsername.ts b/src/data/getRandomUsername.ts
index 0ad7663..d756785 100644
--- a/src/data/getRandomUsername.ts
+++ b/src/data/getRandomUsername.ts
@@ -1,3 +1,4 @@
+/** Get a random username suggestion */
 const getRandomUsername = (): string => {
 	const adjetives = [
 		'goofy',
diff --git a/src/index.scss b/src/index.scss
index c12b746..fb7d1e9 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -9,9 +9,11 @@ body {
 a {
 	color: var(--text-color);
 }
+
 input {
 	font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
 }
+
 .content {
 	margin-top: 150px;
 	margin-left: 50px;
diff --git a/src/providers/AudioProvider.tsx b/src/providers/AudioProvider.tsx
index e3209e7..7cd1ebd 100644
--- a/src/providers/AudioProvider.tsx
+++ b/src/providers/AudioProvider.tsx
@@ -71,7 +71,6 @@ export function AudioProvider({ children }: Props) {
 		}
 		const a = new Audio(audio);
 		a.addEventListener('canplaythrough', () => {
-			/* the audio is now playable; play it if permissions allow */
 			a.play();
 		});
 		a.play();
diff --git a/src/providers/DocBaseTaskProvider.tsx b/src/providers/DocBaseTaskProvider.tsx
index b4e95e0..2d9f6a4 100644
--- a/src/providers/DocBaseTaskProvider.tsx
+++ b/src/providers/DocBaseTaskProvider.tsx
@@ -310,7 +310,6 @@ export function DocBaseTaskProvider({ children }: Props) {
 		setIsRunning(true);
 
 		const updateInterval = setInterval(() => {
-			// TODO use type
 			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			APIService.getTaskStatus(taskId).then((res): any => {
 				Logger.log(res);
@@ -688,12 +687,6 @@ export function DocBaseTaskProvider({ children }: Props) {
 		Logger.log('Task ID: ' + taskId);
 
 		sessionStorage.setItem('docbaseId', taskId);
-		/* setLoadingScreen(
-			true,
-			'Loading Docbase ' + baseName + '...',
-			'Please wait...',
-			taskId
-		); */
 
 		//setLoadingScreenLock(true);
 		setIsRunning(true);
@@ -729,37 +722,7 @@ export function DocBaseTaskProvider({ children }: Props) {
 					Logger.log(res);
 					Logger.log(JSON.stringify(res));
 
-					/* const att = res.meta.feedback_request_to_ui.attribute.name;
-					let attList: string[] = [];
-					if (att) {
-						attList = [att];
-					}
-
-					const docBase = new DocBase(
-						baseName,
-						organizationId,
-						attList
-					);
-					try {
-						Logger.log(res.meta.document_base_to_ui.nuggets);
-						for (const nugget of res.meta.document_base_to_ui
-							.nuggets) {
-							docBase.addNugget(
-								nugget.document.name,
-								nugget.document.text,
-								nugget.start_char,
-								nugget.end_char
-							);
-						}
-					} catch (error) {
-						Logger.error(error);
-						showNotification(
-							'Error',
-							'Something went wrong translating the nuggets.'
-						);
-					} */
 					sessionStorage.removeItem('docbaseId');
-					//setDocBase(docBase);
 					setIsRunning(false);
 					clearInterval(updateInterval);
 					return;
diff --git a/src/providers/NotificationProvider.tsx b/src/providers/NotificationProvider.tsx
index c6d8a00..3493b47 100644
--- a/src/providers/NotificationProvider.tsx
+++ b/src/providers/NotificationProvider.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable react-refresh/only-export-components */
 import React, { ReactNode, useState } from 'react';
 import '../index.scss';
@@ -7,25 +8,16 @@ import { MyAudio, usePlayAudio } from './AudioProvider';
 
 const NotificationContext = React.createContext({
 	showNotification: (
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		_heading: string,
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		_info: string,
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		_buttonText?: string
 	) => {},
 	showChoice: (
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		_heading: string,
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		_info: string,
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		_onAccept: () => void,
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		_onReject: () => void,
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		_acceptText?: string,
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		_rejectText?: string
 	) => {},
 });
diff --git a/src/providers/StorageProvider.tsx b/src/providers/StorageProvider.tsx
index 8c6e6c7..11c3bbe 100644
--- a/src/providers/StorageProvider.tsx
+++ b/src/providers/StorageProvider.tsx
@@ -77,6 +77,7 @@ export function useGetFromLS() {
 	}
 	return context.getFromLS;
 }
+
 interface Props {
 	children: ReactNode;
 }
diff --git a/src/types/DocBase.ts b/src/types/DocBase.ts
index 7b34686..621e0c0 100644
--- a/src/types/DocBase.ts
+++ b/src/types/DocBase.ts
@@ -37,10 +37,6 @@ class DocBase {
 	}
 
 	async fetchOrderedNuggets() {
-		/* 		for (const doc of this.docs) {
-			await doc.fetchOrderNuggets(this.organizationId, this.name);
-		}
-		*/
 		await this.docs[0].fetchOrderNuggets(this.organizationId, this.name);
 	}
 }
diff --git a/src/types/NuggetDocument.ts b/src/types/NuggetDocument.ts
index a9e8547..4e8c7b8 100644
--- a/src/types/NuggetDocument.ts
+++ b/src/types/NuggetDocument.ts
@@ -1,5 +1,4 @@
 import APIService from '../utils/ApiService';
-import Logger from '../utils/Logger';
 import Nugget from './Nugget';
 
 /**
@@ -41,7 +40,6 @@ class NuggetDocument {
 		this.nuggets.push(
 			new Nugget(startChar, endChar, this.content, this.name)
 		);
-		// order nuggets by startChar
 		this.nuggets.sort((a, b) => a.startChar - b.startChar);
 	}
 
@@ -61,14 +59,10 @@ class NuggetDocument {
 		while (resp.state.toUpperCase().trim() !== 'SUCCESS') {
 			await new Promise((resolve) => setTimeout(resolve, 1000));
 			resp = await APIService.getTaskStatus(taskID);
-			Logger.log('Task status getORderNuggets:');
-			Logger.log(resp);
 			if (resp.state.toUpperCase().trim() === 'SUCCESS') {
 				break;
 			}
 		}
-		Logger.log('Task status getORderNuggets:');
-		Logger.log(resp);
 	}
 }
 
diff --git a/src/utils/ApiService.test.ts b/src/utils/ApiService.test.ts
index 86a6900..3320db3 100644
--- a/src/utils/ApiService.test.ts
+++ b/src/utils/ApiService.test.ts
@@ -230,7 +230,6 @@ describe('APIService', () => {
 		expect(memberList).toBeDefined();
 		expect(memberList).toStrictEqual([salt]);
 	});
-	// missing negative test for getMembersForOrganization
 
 	test('should not be able ot leave organisation if not a member', async () => {
 		await APIService.login(salt, salt);
@@ -278,7 +277,6 @@ describe('APIService', () => {
 	test('should delete file successfully', async () => {
 		await APIService.login(salt, salt);
 
-		// use file that got uploaded in the 'should upload file successfully' test for now
 		const documents = await APIService.getDocumentForOrganization(
 			saltOrganisationID as number
 		);
@@ -293,9 +291,6 @@ describe('APIService', () => {
 			).length
 		);
 	});
-	// test dokumentBase
-
-	// test getTaskStatus
 
 	test('should get user name suggestions successfully', async () => {
 		await APIService.login(salt, salt);
@@ -309,12 +304,6 @@ describe('APIService', () => {
 			['12test', '12test2', '123test', '123test2'].sort()
 		);
 
-		//const sug1 = await APIService.getUserNameSuggestion('1');
-		// TODO
-		//expect(sug1.length).toBe(5);
-		/* expect(sug1.sort()).toEqual(
-			['1test', '12test', '12test2', '123test', '123test2'].sort()
-		); */
 		expect(
 			(await APIService.getUserNameSuggestion('001122233')).length
 		).toBe(0);
@@ -333,11 +322,6 @@ describe('APIService', () => {
 			saltOrganisationID as number
 		);
 		expect(documents).toBeDefined();
-		for (let i = 0; i < documents.length; i++) {
-			//const buffer = Buffer.from(await blobs[i].arrayBuffer());
-			// TODO
-			//expect(documents[i].content).toBe(buffer.toString());
-		}
 	});
 	test('should update file successfully', async () => {
 		await APIService.login(salt, salt);
diff --git a/src/utils/ApiService.ts b/src/utils/ApiService.ts
index 1318232..c172f4c 100644
--- a/src/utils/ApiService.ts
+++ b/src/utils/ApiService.ts
@@ -415,7 +415,6 @@ class APIService {
 	static async getDocumentBaseForOrganization(
 		organizationID: number
 	): Promise<MyDocument[]> {
-		// NILS MACH MA TEST
 		try {
 			const response = await axios
 				.get(
diff --git a/src/views/AddToOrg/AddToOrg.tsx b/src/views/AddToOrg/AddToOrg.tsx
index 27efd85..5abc5db 100644
--- a/src/views/AddToOrg/AddToOrg.tsx
+++ b/src/views/AddToOrg/AddToOrg.tsx
@@ -121,7 +121,6 @@ function AddToOrg() {
 				<button
 					className="btn"
 					onClick={() => {
-						// go back to last page
 						window.history.back();
 					}}
 				>
diff --git a/src/views/CreateOrg/CreateOrg.tsx b/src/views/CreateOrg/CreateOrg.tsx
index 379900f..fdc5471 100644
--- a/src/views/CreateOrg/CreateOrg.tsx
+++ b/src/views/CreateOrg/CreateOrg.tsx
@@ -105,7 +105,6 @@ function CreateOrg() {
 				<button
 					className="btn"
 					onClick={() => {
-						// go back to last page
 						window.history.back();
 					}}
 				>
diff --git a/src/views/Home/Home.tsx b/src/views/Home/Home.tsx
index ea24dfb..28cbe4e 100644
--- a/src/views/Home/Home.tsx
+++ b/src/views/Home/Home.tsx
@@ -38,36 +38,6 @@ function Home() {
 						Hi {username.slice(0, -2)}
 						<span className="db">{username.slice(-2)}</span> 👋
 					</h1>
-					{/* <div className="userStudy">
-						<h2>User Study</h2>
-						<p>
-							<b>
-								If you are from the user study, you can download
-								some sample documents{' '}
-								<a
-									href="https://github.com/cophilot/wannadb-sample-txt/archive/refs/heads/main.zip"
-									target="_blank"
-								>
-									here
-								</a>{' '}
-								to use them for the upload.
-							</b>
-						</p>
-						<p>
-							<i>
-								If the link does not download the file, please
-								click{' '}
-								<a
-									href="https://github.com/cophilot/wannadb-sample-txt?tab=readme-ov-file#how-to-download"
-									target="_blank"
-									rel="noreferrer"
-								>
-									here
-								</a>{' '}
-								and download the file manually.
-							</i>
-						</p>
-					</div> */}
 					<h2>
 						T<span className="db">ip</span>
 					</h2>
@@ -132,7 +102,6 @@ function Home() {
 					<FileUpload
 						organizationProp={undefined}
 						afterUpload={() => {
-							//window.location.reload();
 							setCounter(counter + 1);
 						}}
 					></FileUpload>
diff --git a/src/views/Register/Register.tsx b/src/views/Register/Register.tsx
index 215b558..cb73aeb 100644
--- a/src/views/Register/Register.tsx
+++ b/src/views/Register/Register.tsx
@@ -41,7 +41,6 @@ function Register() {
 		}
 
 		// All inputs are valid, register the user at the backend
-
 		APIService.register(name, password).then((success) => {
 			if (!success) {
 				setErrorMessage('Username already taken!');