diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotification.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotification.java
index 99c4340ef..0a9b3580e 100644
--- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotification.java
+++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotification.java
@@ -6,7 +6,6 @@ import java.util.Set;
  * Notification event that dependent tables have been modified.
  * <p>
  * This is sent to other interested servers (in the cluster).
- * </p>
  */
 public class ServerCacheNotification {
 
diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java
index ae0c9f852..a783cf8e8 100644
--- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java
+++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheNotifyPlugin.java
@@ -6,7 +6,6 @@ import io.ebean.config.DatabaseConfig;
  * Plugin that provides a ServerCacheNotify implementation.
  * <p>
  * Is supplied this will be used to send the ServerCacheNotification event to other cluster members.
- * </p>
  */
 public interface ServerCacheNotifyPlugin {
 
diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index 0a1bb0472..b03be0956 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -32,13 +32,11 @@ import java.util.function.Function;
  * <p>
  * Used to programmatically construct an Database and optionally register it
  * with the DB singleton.
- * </p>
  * <p>
  * If you just use DB thout this programmatic configuration Ebean will read
  * the application.properties file and take the configuration from there. This usually
  * includes searching the class path and automatically registering any entity
  * classes and listeners etc.
- * </p>
  * <pre>{@code
  *
  * DatabaseConfig config = new DatabaseConfig();
@@ -58,7 +56,6 @@ import java.util.function.Function;
  * <p>
  * Note that DatabaseConfigProvider provides a standard Java ServiceLoader mechanism that can
  * be used to apply configuration to the DatabaseConfig.
- * </p>
  *
  * @author emcgreal
  * @author rbygrave
@@ -632,13 +629,8 @@ public class DatabaseConfig {
    * <ul>
    *   <li>DataSourceAlertFactory (e.g. add different alert factories for different ebean instances)</li>
    *   <li>DocStoreFactory</li>
-   *   <li>XmapService</li>
-   *   <li>SpiLoggerFactory (e.g. add custom logger for a certain ebean instance)</li>
-   *   <li>AutoTuneServiceProvider</li>
-   *   <li>SpiProfileHandler</li>
    *   <li>SlowQueryListener (e.g. add custom query listener for a certain ebean instance)</li>
    *   <li>ServerCacheNotifyPlugin</li>
-   *   <li>SpiDdlGenneratorProvider</li>
    * </ul>
    */
   public <T> void putServiceObject(Class<T> iface, T configObject) {