diff --git a/embedded/src/main/java/cloud/piranha/embedded/EmbeddedPiranha.java b/embedded/src/main/java/cloud/piranha/embedded/EmbeddedPiranha.java
index 74eaa01ad1..6a436c77bd 100644
--- a/embedded/src/main/java/cloud/piranha/embedded/EmbeddedPiranha.java
+++ b/embedded/src/main/java/cloud/piranha/embedded/EmbeddedPiranha.java
@@ -90,9 +90,7 @@ public PiranhaConfiguration getConfiguration() {
     }
 
     /**
-     * {
-     *
-     * @return the web application}
+     * {@return the web application}
      */
     public WebApplication getWebApplication() {
         return webApplication;
diff --git a/single/src/main/java/cloud/piranha/single/SingleExtension.java b/single/src/main/java/cloud/piranha/single/SingleExtension.java
index 41e8e321d2..08037085f0 100644
--- a/single/src/main/java/cloud/piranha/single/SingleExtension.java
+++ b/single/src/main/java/cloud/piranha/single/SingleExtension.java
@@ -27,19 +27,12 @@
  */
 package cloud.piranha.single;
 
-import cloud.piranha.core.api.WebApplication;
 import cloud.piranha.core.api.WebApplicationExtension;
 
 /**
- * The "Solo" WebApplicationExtension.
+ * The "Single" WebApplicationExtension.
  * 
  * @author Manfred Riem (mriem@manorrock.com)
  */
 public class SingleExtension implements WebApplicationExtension {
-
-    @Override
-    public void configure(WebApplication webApplication) {
-        webApplication.addServlet("Solo", SingleServlet.class);
-        webApplication.addServletMapping("Solo", "/*");
-    }
 }
diff --git a/single/src/main/java/cloud/piranha/single/SinglePiranha.java b/single/src/main/java/cloud/piranha/single/SinglePiranha.java
index 2452958a65..1701a3cc76 100644
--- a/single/src/main/java/cloud/piranha/single/SinglePiranha.java
+++ b/single/src/main/java/cloud/piranha/single/SinglePiranha.java
@@ -49,13 +49,13 @@
 import java.lang.reflect.InvocationTargetException;
 
 /**
- * The Solo version of Piranha.
+ * The Single version of Piranha.
  *
  * <p>
  * This version of Piranha supports the following:
  * </p>
  * <ol>
- * <li>Enabling use of Project CRaC</li>
+ * <li>Enabling Project CRaC</li>
  * <li>Running with Java modules</li>
  * <li>Exiting on stop</li>
  * <li>Exposing a HTTP endpoint</li>
diff --git a/single/src/main/java/cloud/piranha/single/SinglePiranhaBuilder.java b/single/src/main/java/cloud/piranha/single/SinglePiranhaBuilder.java
index 2a67eca2f2..2de3fd1fce 100644
--- a/single/src/main/java/cloud/piranha/single/SinglePiranhaBuilder.java
+++ b/single/src/main/java/cloud/piranha/single/SinglePiranhaBuilder.java
@@ -34,7 +34,7 @@
 import static java.lang.System.Logger.Level.WARNING;
 
 /**
- * The Solo version of PiranhaBuilder.
+ * The Single version of PiranhaBuilder.
  * 
  * @author Manfred Riem (mriem@manorrock.com)
  */
@@ -48,7 +48,7 @@ public class SinglePiranhaBuilder implements PiranhaBuilder<SinglePiranha> {
     /**
      * Stores the SinglePiranha instance.
      */
-    private SinglePiranha piranha;
+    private final SinglePiranha piranha;
     
     /**
      * Stores the verbose flag.
diff --git a/single/src/main/java/cloud/piranha/single/SingleServlet.java b/single/src/main/java/cloud/piranha/single/SingleServlet.java
deleted file mode 100644
index f018b0132a..0000000000
--- a/single/src/main/java/cloud/piranha/single/SingleServlet.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2002-2024 Manorrock.com. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice,
- *      this list of conditions and the following disclaimer.
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *   3. Neither the name of the copyright holder nor the names of its
- *      contributors may be used to endorse or promote products derived from
- *      this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package cloud.piranha.single;
-
-import jakarta.servlet.http.HttpServlet;
-
-/**
- * The "Solo" HttpServlet.
- * 
- * @author Manfred Riem (mriem@manorrock.com)
- */
-public class SingleServlet extends HttpServlet {
-}