diff --git a/src/AuthenticationStatus.php b/src/AuthenticationStatus.php
index 95b1a3f06d692619f20189f6789368ade5459b93..1f2aeea2fe60386236eb3a835d258f2ccbf3761b 100644
--- a/src/AuthenticationStatus.php
+++ b/src/AuthenticationStatus.php
@@ -12,8 +12,6 @@
  * limitations under the License.
  */
 
-//namespace PrivacyIDEA\PHPClient;
-
 abstract class AuthenticationStatus
 {
     const CHALLENGE = "CHALLENGE";
diff --git a/src/Client-Autoloader.php b/src/Client-Autoloader.php
deleted file mode 100644
index 6e674efbb6d2ef2c89e578967d7a9526ac0dde58..0000000000000000000000000000000000000000
--- a/src/Client-Autoloader.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/*
- * Copyright 2024 NetKnights GmbH - lukas.matusiewicz@netknights.it
- * <p>
- * Licensed under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3;
- * you may not use this file except in compliance with the License.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-spl_autoload_register('autoLoader');
-
-/**
- * This autoloader includes the privacyIDEA-PHP-Client files to the project.
- */
-function autoLoader($className): bool
-{
-    $fullPath = dirname(__FILE__) . "/" . $className . ".php";
-    if (file_exists($fullPath))
-    {
-        require_once $fullPath;
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/PIBadRequestException.php b/src/PIBadRequestException.php
index 6b15404942a113f97eaf4f6da02ae76ce3517d79..cc70302afcf1bdec1582ed2689063bec4b0d7f56 100644
--- a/src/PIBadRequestException.php
+++ b/src/PIBadRequestException.php
@@ -12,8 +12,6 @@
  * limitations under the License.
  */
 
-//namespace PrivacyIDEA\PHPClient;
-
 class PIBadRequestException extends Exception
 {
-}
+}
\ No newline at end of file
diff --git a/src/PIChallenge.php b/src/PIChallenge.php
index a5c8eff681465d81c288b8ed0c8c34b99dba3ba1..b11fd412bac9c6578502fd66ae6cbfbd7295dea9 100644
--- a/src/PIChallenge.php
+++ b/src/PIChallenge.php
@@ -12,8 +12,6 @@
  * limitations under the License.
  */
 
-//namespace PrivacyIDEA\PHPClient;
-
 class PIChallenge
 {
     /* @var string Type of token this challenge is for. */
diff --git a/src/PILog.php b/src/PILog.php
index df37d6f9d012477cf3564cc2314aea1e53f3ba9e..7945d849d664cb4b7b11fd84e6ae0bc3e59049ec 100644
--- a/src/PILog.php
+++ b/src/PILog.php
@@ -12,8 +12,6 @@
  * limitations under the License.
  */
 
-//namespace PrivacyIDEA\PHPClient;
-
 /**
  * Logging interface. This is used to relay the log
  * messages of the PHP-Client to the logger
diff --git a/src/PIResponse.php b/src/PIResponse.php
index cacc8814dcbe01a3dbad179cac13a7b5a748c454..4ac9e1354ab460792c8d8fc19ad0627761e4b96d 100644
--- a/src/PIResponse.php
+++ b/src/PIResponse.php
@@ -12,8 +12,6 @@
  * limitations under the License.
  */
 
-//namespace PrivacyIDEA\PHPClient;
-
 class PIResponse
 {
     /* @var string Combined messages of all triggered token. */
diff --git a/src/PrivacyIDEA.php b/src/PrivacyIDEA.php
index 6b860a8a953d8b9fc8ded8890ebbd221e4654963..7dbc74aeb2a46aa381abde116873b56df47c5253 100644
--- a/src/PrivacyIDEA.php
+++ b/src/PrivacyIDEA.php
@@ -12,8 +12,6 @@
  * limitations under the License.
  */
 
-//namespace PrivacyIDEA\PHPClient;
-
 const AUTHENTICATORDATA = "authenticatordata";
 const CLIENTDATA = "clientdata";
 const SIGNATUREDATA = "signaturedata";