diff --git a/FitConnect/Encryption/CertificateHelper.cs b/FitConnect/Encryption/CertificateHelper.cs
index e49343b4079b7a493445fb343724aa53b1d8eb92..874a6d6a7ff8d3e89b869a7c0e221375220c5057 100644
--- a/FitConnect/Encryption/CertificateHelper.cs
+++ b/FitConnect/Encryption/CertificateHelper.cs
@@ -24,9 +24,6 @@ public class CertificateHelper {
         X509Certificate2[]? rootCertificate = null,
         X509Certificate2[]? extras = null,
         LogLevel logLevel = LogLevel.Warning) {
-        // Working notes
-        // https://git.fitko.de/fit-connect/planning/-/issues/142
-        // https://docs.microsoft.com/en-us/dotnet/api/system.security.cryptography.x509certificates.x509chain.build?view=net-5.0
 
         var certificateChain = new X509Chain();
         if (extras != null)
diff --git a/FitConnect/Models/FitConnectEnvironment.cs b/FitConnect/Models/FitConnectEnvironment.cs
index fd377f512e52e9f507a0deb46d3355522337d847..e8070fd9f5528ca984aaf6213d9f0cbcc1727e7a 100644
--- a/FitConnect/Models/FitConnectEnvironment.cs
+++ b/FitConnect/Models/FitConnectEnvironment.cs
@@ -1,9 +1,6 @@
 namespace FitConnect.Models;
 
 public class FitConnectEnvironment {
-    // List of Domains
-    // https://wiki.fit-connect.fitko.dev/de/Betrieb/Dokumentation/Domains
-
     public static readonly FitConnectEnvironment Develop = new(
         "https://auth-dev.fit-connect.fitko.dev/token",
         new[] { "https://submission-api-dev.fit-connect.fitko.dev" },
@@ -75,21 +72,4 @@ public class FitConnectEnvironment {
     public string RoutingUrl { get; }
 
     public bool VerifiedKeysAreMandatory { get; private init; } = true;
-
-    /// <summary>
-    ///     Creates the endpoints for the given environment.
-    /// </summary>
-    /// <param name="fitConnectEnvironment">Environment to get endpoints for</param>
-    /// <returns></returns>
-    /// <exception cref="ArgumentException">Not all environments are ready to use</exception>
-    // public static FitConnectEnvironment Create(FitConnectEnvironment fitConnectEnvironment) {
-    //     return fitConnectEnvironment switch {
-    //         FitConnectEnvironment.Development => DevEnvironment,
-    //         FitConnectEnvironment.Testing => throw new ArgumentException(
-    //             "Not approved for online testing"),
-    //         FitConnectEnvironment.Production => throw new ArgumentException("NOT PRODUCTION READY"),
-    //         _ => throw new ArgumentOutOfRangeException(nameof(fitConnectEnvironment),
-    //             fitConnectEnvironment, null)
-    //     };
-    // }
 }