diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c911530..50f4f8a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
 ### Added
 
 ### Fixed
-
+* [ALFREDAPI-587](https://xenitsupport.jira.com/browse/ALFREDAPI-587): Remove non-existant Swagger endpoints from documentation.
 
 ## 6.1.2 (2025-11-06)
 
diff --git a/alfred-api-rest/src/main/java/eu/xenit/alfred/api/rest/v1/RestV1Config.java b/alfred-api-rest/src/main/java/eu/xenit/alfred/api/rest/v1/RestV1Config.java
deleted file mode 100644
index 2f6f9574..00000000
--- a/alfred-api-rest/src/main/java/eu/xenit/alfred/api/rest/v1/RestV1Config.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package eu.xenit.alfred.api.rest.v1;
-
-/**
- * Created by Michiel Huygen on 09/03/2016.
- */
-public class RestV1Config {
-
-    public static final String BaseUrl = "/apix/v1";
-    public static final String AlfredApiUrl = "/apix";
-    public static final String Family = "Api-X v1";
-}
diff --git a/alfred-api-rest/src/main/java/eu/xenit/alfred/api/rest/v1/workingcopies/WorkingcopiesWebscript1.java b/alfred-api-rest/src/main/java/eu/xenit/alfred/api/rest/v1/workingcopies/WorkingcopiesWebscript1.java
index d91ad61b..d280ef5a 100644
--- a/alfred-api-rest/src/main/java/eu/xenit/alfred/api/rest/v1/workingcopies/WorkingcopiesWebscript1.java
+++ b/alfred-api-rest/src/main/java/eu/xenit/alfred/api/rest/v1/workingcopies/WorkingcopiesWebscript1.java
@@ -74,12 +74,10 @@ public ResponseEntity<?> getWorkingCopySource(@PathVariable final String space,
             NodeRef originalRef = nodeService.getWorkingCopySource(workingCopyRef);
             return writeJsonResponse(new NoderefResult(originalRef));
         }
-
         return respondDoesNotExist(workingCopyRef);
     }
 
     private ResponseEntity<?> respondDoesNotExist(NodeRef nodeRef) {
-        return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                .body(String.format(String.format("%s does not exist.", nodeRef)));
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(String.format("%s does not exist.", nodeRef));
     }
-}
\ No newline at end of file
+}
diff --git a/alfred-api-rest/src/main/java/eu/xenit/alfred/api/rest/v2/RestV2Config.java b/alfred-api-rest/src/main/java/eu/xenit/alfred/api/rest/v2/RestV2Config.java
deleted file mode 100644
index 1246aa64..00000000
--- a/alfred-api-rest/src/main/java/eu/xenit/alfred/api/rest/v2/RestV2Config.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package eu.xenit.alfred.api.rest.v2;
-
-/**
- * Created by jasper on 16/02/17.
- */
-public class RestV2Config {
-
-    public static final String BaseUrl = "/apix/v2";
-    public static final String Family = "Api-X v2";
-
-}
diff --git a/docs/swagger-ui/swagger.json b/docs/swagger-ui/swagger.json
index 81d68b8f..2b3f2415 100644
--- a/docs/swagger-ui/swagger.json
+++ b/docs/swagger-ui/swagger.json
@@ -3,7 +3,7 @@
   "info": {
     "description": "This is the swagger specification for Alfred REST API\n\nExamples can be found at: https://docs.xenit.eu/alfred-api",
     "version": "6.1.3",
-    "title": "Alfred REST Api",
+    "title": "Alfred REST API",
     "contact": {
       "name": "XeniT",
       "url": "http://www.xenit.eu",
@@ -36,10 +36,6 @@
       "name": "Dictionary",
       "description": "Retrieves Dictionary information"
     },
-    {
-      "name": "Documentation",
-      "description": "Access API Documentation"
-    },
     {
       "name": "General",
       "description": "General API operations"
@@ -496,39 +492,6 @@
         }
       }
     },
-    "/v1/docs/swagger.json": {
-      "get": {
-        "tags": [
-          "Documentation"
-        ],
-        "summary": "The Swagger Spec for Alfred API",
-        "description": "",
-        "operationId": "v1.getDocumentation",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "Success"
-          }
-        }
-      }
-    },
-    "/v1/docs/ui": {
-      "get": {
-        "tags": [
-          "Documentation"
-        ],
-        "summary": "Shows this swagger spec in a user interface",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "Swagger UI interface",
-            "schema": {
-              "type": "file"
-            }
-          }
-        }
-      }
-    },
     "/v1/nodes": {
       "post": {
         "tags": [