diff --git a/src/apps/Android/build.gradle.kts b/src/apps/Android/build.gradle.kts
index b12e2fc..3102a4c 100644
--- a/src/apps/Android/build.gradle.kts
+++ b/src/apps/Android/build.gradle.kts
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.1.0" apply false
+    id("com.android.application") version "8.1.1" apply false
     id("org.jetbrains.kotlin.android") version "1.8.0" apply false
 }
\ No newline at end of file
diff --git a/src/server/backend/db/db.js b/src/server/backend/db/db.js
index 76f0c21..c4cd3c8 100644
--- a/src/server/backend/db/db.js
+++ b/src/server/backend/db/db.js
@@ -186,7 +186,7 @@ module.exports.deleteJSONDataSimple = ( db, identifier ) => {
 };
 
 const gc = () => {
-    // this function acts as the database garbage collector. TicketTimeout can be changed from the GUI. TODO: Add
+    // this function acts as the database garbage collector. TicketTimeout can be changed from the GUI.
     this.getData( 'temp' ).then( tempData => {
         let data = tempData;
         console.info( 'Garbage Collecting' );
diff --git a/src/server/backend/helperRoutes.js b/src/server/backend/helperRoutes.js
index 43974eb..70c98a2 100644
--- a/src/server/backend/helperRoutes.js
+++ b/src/server/backend/helperRoutes.js
@@ -13,7 +13,6 @@ module.exports = ( app, settings ) => {
         res.sendFile( path.join( __dirname + '/../ui/home/templates/' + settings.startPage + '/supportFiles/' + req.params.file ) );
     } );
 
-    // TODO: Decide if removed or not
     app.get( '/startPage/helperFunction', ( req, res ) => {
         res.sendFile( path.join( __dirname + '/../ui/home/helper.js' ) );
     } );
diff --git a/src/webapp/main/src/views/admin/PluginsView.vue b/src/webapp/main/src/views/admin/PluginsView.vue
index 0949f5b..ab954d2 100644
--- a/src/webapp/main/src/views/admin/PluginsView.vue
+++ b/src/webapp/main/src/views/admin/PluginsView.vue
@@ -21,7 +21,6 @@
                 <p style="margin: 0">(Version V{{ plugin.version }}, maintained by {{ plugin.maintainer }})</p>
             </a>
         </div>
-        <!-- TODO: Get all installed plugins -->
     </div>
 </template>
 
diff --git a/src/webapp/main/src/views/admin/SettingsView.vue b/src/webapp/main/src/views/admin/SettingsView.vue
index 126ac63..d3538a7 100644
--- a/src/webapp/main/src/views/admin/SettingsView.vue
+++ b/src/webapp/main/src/views/admin/SettingsView.vue
@@ -302,8 +302,6 @@
                 }
             },
             handlePopupReturns( data ) {
-                console.log( data );
-                // TODO: Delete user
                 if ( data.status === 'cancel' ) {
                     return;
                 } else if ( data.status === 'settings' ) {
@@ -446,7 +444,6 @@
             this.loadAdminAccounts();
         }
     };
-    // TODO: Load gateways and settings for gateways from server.
 </script>
 
 
diff --git a/src/webapp/setup/src/views/SetupRootView.vue b/src/webapp/setup/src/views/SetupRootView.vue
index 7a65027..715b832 100644
--- a/src/webapp/setup/src/views/SetupRootView.vue
+++ b/src/webapp/setup/src/views/SetupRootView.vue
@@ -50,7 +50,6 @@
     import notifications from '../components/notifications.vue';
 
     const lookup = [ '@', '!', '.', ',', '?', '%', '&', '-', '_', ':', ';', '*', '§', '<', '>', '{', '}', '[', ']', '(', ')', '/', '#' ];
-    // TODO: Also add this to user signup
     export default {
         data () {
             return {
@@ -119,7 +118,6 @@
                 }
             },
             submit () {
-                // TODO: Maybe require confirming email before proceeding
                 if ( this.formData.mail && this.formData.password && this.formData.password2 ) {
                     if ( this.checkEmail() ) {
                         if ( this.formData.password == this.formData.password2 ) {