diff --git a/pom.xml b/pom.xml
index 065d249..41fbdf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,6 @@
     <properties>
         <spring-boot.version>2.0.0.RELEASE</spring-boot.version>
         <spring-data-ebean.version>1.3.2.RELEASE</spring-data-ebean.version>
-        <ebean-agent.version>11.10.1</ebean-agent.version>
     </properties>
 
     <profiles>
@@ -133,16 +132,6 @@
                 <artifactId>spring-boot-starter-data-ebean</artifactId>
                 <version>1.3.0.RELEASE</version>
             </dependency>
-            <dependency>
-                <groupId>io.ebean</groupId>
-                <artifactId>ebean-agent</artifactId>
-                <version>${ebean-agent.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.avaje</groupId>
-                <artifactId>avaje-agentloader</artifactId>
-                <version>2.1.2</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/spring-boot-autoconfigure-data-ebean/pom.xml b/spring-boot-autoconfigure-data-ebean/pom.xml
index 7d3a14c..87ddc31 100644
--- a/spring-boot-autoconfigure-data-ebean/pom.xml
+++ b/spring-boot-autoconfigure-data-ebean/pom.xml
@@ -25,16 +25,6 @@
             <artifactId>spring-data-ebean</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>io.ebean</groupId>
-            <artifactId>ebean-agent</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.avaje</groupId>
-            <artifactId>avaje-agentloader</artifactId>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-autoconfigure-data-ebean/src/main/java/org/springframework/boot/autoconfigure/data/ebean/EbeanAgentAutoConfiguration.java b/spring-boot-autoconfigure-data-ebean/src/main/java/org/springframework/boot/autoconfigure/data/ebean/EbeanAgentAutoConfiguration.java
deleted file mode 100644
index b399255..0000000
--- a/spring-boot-autoconfigure-data-ebean/src/main/java/org/springframework/boot/autoconfigure/data/ebean/EbeanAgentAutoConfiguration.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.springframework.boot.autoconfigure.data.ebean;
-
-import org.avaje.agentloader.AgentLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureOrder;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
-import org.springframework.core.PriorityOrdered;
-
-/**
- * @author Xuegui Yuan
- */
-@Configuration
-@AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE)
-@ConditionalOnClass(AgentLoader.class)
-public class EbeanAgentAutoConfiguration implements BeanFactoryPostProcessor, PriorityOrdered {
-  private static final Logger log = LoggerFactory.getLogger(EbeanAgentAutoConfiguration.class);
-
-  public EbeanAgentAutoConfiguration() {
-    load(); // Spring has already evaluated the @ConditionalOnClass
-  }
-
-  private static void load() {
-    if (!AgentLoader.loadAgentFromClasspath("ebean-agent", "debug=1")) {
-      log.debug("ebean-agent not loaded");
-    }
-  }
-
-  /**
-   * Loads the Ebean agent if the agent-loader and the agent itself are present
-   * on the classpath, or does nothing otherwise.
-   * <p>
-   * Do not call this method from a static initializer as this can lead to a JVM
-   * deadlock (the agent attach thread will attempt to acquire the class loader
-   * lock, which is held during static initialization).
-   */
-  public static void enable() {
-    try {
-      load();
-    } catch (NoClassDefFoundError e) {
-      /* ignored */
-    }
-  }
-
-  public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-    // We're not actually doing anything with the BeanFactory, but implementing
-    // BeanFactoryPostProcessor ensures we get instantiated early, ideally
-    // before anybody has a chance to load any entity classes we want to
-    // enhance.
-  }
-
-  public int getOrder() {
-    return Ordered.HIGHEST_PRECEDENCE;
-  }
-}
diff --git a/spring-boot-autoconfigure-data-ebean/src/main/resources/META-INF/spring.factories b/spring-boot-autoconfigure-data-ebean/src/main/resources/META-INF/spring.factories
index d0a7dda..65c3a84 100644
--- a/spring-boot-autoconfigure-data-ebean/src/main/resources/META-INF/spring.factories
+++ b/spring-boot-autoconfigure-data-ebean/src/main/resources/META-INF/spring.factories
@@ -1,4 +1,3 @@
 # Auto Configure
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.boot.autoconfigure.data.ebean.EbeanRepositoriesAutoConfiguration,\
-org.springframework.boot.autoconfigure.data.ebean.EbeanAgentAutoConfiguration
\ No newline at end of file
+org.springframework.boot.autoconfigure.data.ebean.EbeanRepositoriesAutoConfiguration
\ No newline at end of file
diff --git a/spring-boot-starter-data-ebean/pom.xml b/spring-boot-starter-data-ebean/pom.xml
index 8bbf095..92e8c05 100644
--- a/spring-boot-starter-data-ebean/pom.xml
+++ b/spring-boot-starter-data-ebean/pom.xml
@@ -19,15 +19,6 @@
             <groupId>io.github.hexagonframework.data</groupId>
             <artifactId>spring-data-ebean</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.ebean</groupId>
-            <artifactId>ebean-agent</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.avaje</groupId>
-            <artifactId>avaje-agentloader</artifactId>
-            <version>2.1.2</version>
-        </dependency>
         <dependency>
             <groupId>io.github.hexagonframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure-data-ebean</artifactId>