diff --git a/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java b/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java
index 5adb516a2..4818bcb45 100644
--- a/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java
+++ b/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java
@@ -289,7 +289,6 @@ public final class WaterfallPlugin extends OptionHandler {
 				public boolean pulse() {
 					player.getPacketDispatch().sendMessage("You are washed downstream but feel lucky to be alive.");
 					player.teleport(new Location(2527, 3413));
-					player.logoutListeners.remove("waterfall");
 					return true;
 				}
 			});
diff --git a/Server/src/main/kotlin/rs09/plugin/ClassScanner.kt b/Server/src/main/kotlin/rs09/plugin/ClassScanner.kt
index 9e9dcb2fe..69db21b83 100644
--- a/Server/src/main/kotlin/rs09/plugin/ClassScanner.kt
+++ b/Server/src/main/kotlin/rs09/plugin/ClassScanner.kt
@@ -19,6 +19,7 @@ import rs09.game.node.entity.player.info.login.PlayerSaveParser
 import rs09.game.node.entity.player.info.login.PlayerSaver
 import rs09.game.node.entity.skill.magic.SpellListener
 import rs09.game.system.SystemLogger
+import rs09.game.system.command.Command
 import rs09.game.world.GameWorld
 import java.util.*
 import java.util.function.Consumer