diff --git a/container/src/LuigiCompoundContainer.svelte b/container/src/LuigiCompoundContainer.svelte
index cfbe262d58..1e5794d68e 100644
--- a/container/src/LuigiCompoundContainer.svelte
+++ b/container/src/LuigiCompoundContainer.svelte
@@ -127,7 +127,7 @@
       compound: compoundConfig,
       viewUrl: viewurl,
       webcomponent: GenericHelperFunctions.checkWebcomponentValue(webcomponent) || true
-    }; // TODO: fill with sth
+    };
     if (!thisComponent.getNoShadow()) {
       mainComponent.innerHTML=''
       const shadow = thisComponent.attachShadow({ mode: "open"});
diff --git a/container/src/services/container.service.ts b/container/src/services/container.service.ts
index 0c3ff0b33e..c25d3d53af 100644
--- a/container/src/services/container.service.ts
+++ b/container/src/services/container.service.ts
@@ -107,7 +107,7 @@ export class ContainerService {
                     msg: LuigiInternalMessageID.SEND_CONTEXT_HANDSHAKE,
                     context: targetCnt.context || {},
                     internal: {},
-                    authData: targetCnt.authData || {},
+                    authData: targetCnt.authData || {}
                   },
                   '*'
                 );
@@ -115,7 +115,6 @@ export class ContainerService {
               case LuigiInternalMessageID.NAVIGATION_REQUEST:
                 this.dispatch(Events.NAVIGATION_REQUEST, targetCnt, event.data.params);
                 break;
-              // TODO 1: handle alerts with ids on next iteration
               case LuigiInternalMessageID.ALERT_REQUEST:
                 this.dispatch(Events.ALERT_REQUEST, targetCnt, event);
                 break;
@@ -164,7 +163,6 @@ export class ContainerService {
               case LuigiInternalMessageID.GET_CURRENT_ROUTE_REQUEST:
                 this.dispatch(Events.GET_CURRENT_ROUTE_REQUEST, targetCnt, event);
                 break;
-              // TODO: discuss if actually needed as the only scenario is when microfrontend initially starts
               case LuigiInternalMessageID.NAVIGATION_COMPLETED_REPORT:
                 this.dispatch(Events.NAVIGATION_COMPLETED_REPORT, targetCnt, event);
                 break;
diff --git a/container/src/services/webcomponents.service.ts b/container/src/services/webcomponents.service.ts
index 73ba84b42c..0461c1f6b6 100644
--- a/container/src/services/webcomponents.service.ts
+++ b/container/src/services/webcomponents.service.ts
@@ -364,7 +364,7 @@ export class WebComponentService {
 
     if (wc.__postProcess) {
       const url =
-        new URL(document.baseURI).origin === new URL(viewUrl, document.baseURI).origin // TODO: check if needed
+        new URL(document.baseURI).origin === new URL(viewUrl, document.baseURI).origin
           ? new URL('./', new URL(viewUrl, document.baseURI))
           : new URL('./', viewUrl);
       wc.__postProcess(ctx, clientAPI, url.origin + url.pathname);
diff --git a/core/src/App.svelte b/core/src/App.svelte
index 87bb0beddb..7cda9cd47d 100644
--- a/core/src/App.svelte
+++ b/core/src/App.svelte
@@ -746,7 +746,6 @@
         msg: 'luigi.ux.alert.hide',
         id,
         dismissKey
-        //TODO: update docu for this param
       };
       IframeHelpers.sendMessageToIframe(iframe, message);
     } else if (alert.promise) {
diff --git a/scripts/tools/release-cli/release-cli.js b/scripts/tools/release-cli/release-cli.js
index 3d54c18cf2..b05c667a45 100644
--- a/scripts/tools/release-cli/release-cli.js
+++ b/scripts/tools/release-cli/release-cli.js
@@ -119,19 +119,6 @@ function addToChangelog(versionText, changelog, lastline) {
   logHeadline('Appended changelog');
 }
 
-// function replaceInAllFiles(search, replace) {
-//   try {
-//     // TODO: Getting errors while it is working fine from command line. Seems node cannot handle pipes while evaluating commands.
-//     require('child_process').execSync(
-//       `cd ${__dirname} && ./replaceInAllFiles.sh "${search}" "${replace}"`,
-//       { stdio: [0, 1, 2] }
-//     );
-//     logHeadline('\nReplaced version in files.');
-//   } catch (error) {
-//     logError('Replace error:', error);
-//   }
-// }
-
 /**
  * PROMPT
  */
@@ -233,12 +220,6 @@ function addToChangelog(versionText, changelog, lastline) {
     }
   } // end if changelog
 
-  /**
-   * REPLACE VERSION IN FILES
-   */
-  // TODO: disabled due to runtime errors and added as console log
-  // replaceInAllFiles('NEXTRELEASE', `${input.version}`);
-
   /**
    * UPDATE PACKAGE-LOCKS
    * Skip when running in ci for nightly.
diff --git a/test/e2e-test-application/cypress/e2e/tests/0-js-test-app/js-test-app-theming.cy.js b/test/e2e-test-application/cypress/e2e/tests/0-js-test-app/js-test-app-theming.cy.js
index c0103f30e8..a5d93d3545 100644
--- a/test/e2e-test-application/cypress/e2e/tests/0-js-test-app/js-test-app-theming.cy.js
+++ b/test/e2e-test-application/cypress/e2e/tests/0-js-test-app/js-test-app-theming.cy.js
@@ -324,11 +324,6 @@ describe('JS-TEST-APP 2', () => {
           .openAsModal('/home/one');
       });
 
-      // TODO - Accessing LuigiCLient directly results in flaky behavoir, skip for now
-      // cy.getModalWindow().then(win => {
-      //   assert.deepEqual(win.LuigiClient.getNodeParams(), { mp: 'one' });
-      // });
-
       cy.expectPathToBe('/home?mymodal=' + encodeURIComponent('/home/one?~mp=one'));
     });
 
@@ -346,11 +341,6 @@ describe('JS-TEST-APP 2', () => {
           .openAsModal('/home/one');
       });
 
-      // TODO - Accessing LuigiCLient directly results in flaky behavoir, skip for now
-      // cy.getModalWindow().then(win => {
-      //   assert.deepEqual(win.LuigiClient.getNodeParams(), { mp: 'one' });
-      // });
-
       cy.expectPathToBe('/home');
       cy.location().should(location => {
         expect(location.search).to.eq('?mymodal=' + encodeURIComponent('/home/one?~mp=one'));