diff --git a/src/main/java/net/marvk/fs/vatsim/map/App.java b/src/main/java/net/marvk/fs/vatsim/map/App.java
index a1584b0b..53520517 100644
--- a/src/main/java/net/marvk/fs/vatsim/map/App.java
+++ b/src/main/java/net/marvk/fs/vatsim/map/App.java
@@ -162,7 +162,6 @@ private Image loadIcon(final String name) {
     @Override
     public void initGuiceModules(final List<Module> modules) {
         modules.add(new AppModule());
-        modules.add(new AopModule());
         modules.add(new JfxModule());
         modules.add(new PathsModule());
         modules.add(new MetarModule());
diff --git a/src/main/java/net/marvk/fs/vatsim/map/aop/LifecycleLogger.java b/src/main/java/net/marvk/fs/vatsim/map/aop/LifecycleLogger.java
deleted file mode 100644
index 425e2f5b..00000000
--- a/src/main/java/net/marvk/fs/vatsim/map/aop/LifecycleLogger.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package net.marvk.fs.vatsim.map.aop;
-
-import lombok.extern.log4j.Log4j2;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-import java.time.Duration;
-import java.time.LocalDateTime;
-
-@Log4j2
-public class LifecycleLogger implements MethodInterceptor {
-    @Override
-    public Object invoke(final MethodInvocation methodInvocation) throws Throwable {
-        final String className = methodInvocation.getThis().getClass().getSimpleName().replaceFirst("\\$\\$.*$", "");
-        final String methodName = methodInvocation.getMethod().getName();
-
-        final LogLifecycle logLifecycle = methodInvocation.getMethod().getAnnotation(LogLifecycle.class);
-
-        final String identifier = className + "." + methodName;
-
-        final LocalDateTime start = LocalDateTime.now();
-        if (logLifecycle.logStart()) {
-            log.info("Starting " + identifier);
-        }
-        try {
-            final Object result = methodInvocation.proceed();
-            if (logLifecycle.logCompleted()) {
-                log.info("Completed " + identifier + " in " + duration(start));
-            }
-            return result;
-        } catch (final Throwable t) {
-            if (logLifecycle.logFailed()) {
-                log.error("Failed " + identifier + " in " + duration(start));
-            }
-            throw t;
-        }
-    }
-
-    private static Duration duration(final LocalDateTime start) {
-        return Duration.between(start, LocalDateTime.now());
-    }
-}
diff --git a/src/main/java/net/marvk/fs/vatsim/map/aop/LogLifecycle.java b/src/main/java/net/marvk/fs/vatsim/map/aop/LogLifecycle.java
deleted file mode 100644
index 3d0fed5d..00000000
--- a/src/main/java/net/marvk/fs/vatsim/map/aop/LogLifecycle.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package net.marvk.fs.vatsim.map.aop;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface LogLifecycle {
-    boolean logStart() default true;
-
-    boolean logCompleted() default true;
-
-    boolean logFailed() default true;
-}
diff --git a/src/main/java/net/marvk/fs/vatsim/map/configuration/AopModule.java b/src/main/java/net/marvk/fs/vatsim/map/configuration/AopModule.java
deleted file mode 100644
index 1b35275a..00000000
--- a/src/main/java/net/marvk/fs/vatsim/map/configuration/AopModule.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package net.marvk.fs.vatsim.map.configuration;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.matcher.Matchers;
-import net.marvk.fs.vatsim.map.aop.LifecycleLogger;
-import net.marvk.fs.vatsim.map.aop.LogLifecycle;
-
-public class AopModule extends AbstractModule {
-    @Override
-    protected void configure() {
-        bindInterceptor(
-                Matchers.any(),
-                Matchers.annotatedWith(LogLifecycle.class),
-                new LifecycleLogger()
-        );
-    }
-}