diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
index bcf3f099..a85c9e6e 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
@@ -38,7 +38,6 @@ import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;
 import lombok.AllArgsConstructor;
-import lombok.NonNull;
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.HoverEvent;
@@ -298,33 +297,16 @@ public class TraceCommand extends SWCommand {
     }
 
     @Register({"show"})
-    public void showCommand(Player p) {
+    public void showCommand(Player p, @OptionalValue("entity") ShowModeType showModeType, ShowModeParameterType... showModeParameterTypes) {
         if (!permissionCheck(p)) return;
-        TraceShowManager.show(p, new TraceEntityShowMode(p, new ShowModeParameter()));
+        ShowModeParameter showModeParameter = new ShowModeParameter();
+        for (ShowModeParameterType showModeParameterType : showModeParameterTypes) {
+            showModeParameterType.getShowModeParameterConsumer().accept(showModeParameter);
+        }
+        TraceShowManager.show(p, showModeType.showModeBiFunction.apply(p, showModeParameter));
         BauSystem.MESSAGE.send("TRACE_MESSAGE_SHOW", p);
     }
 
-    @Register({"show"})
-    @Register({"show", "entity"})
-    public void showEntityCommand(Player p, ShowModeParameterType... showModeParameterTypes) {
-        internalShow(p, ShowModeType.ENTITY, showModeParameterTypes);
-    }
-
-    @Register({"show", "block"})
-    public void showBlockCommand(Player p, ShowModeParameterType... showModeParameterTypes) {
-        internalShow(p, ShowModeType.BLOCK, showModeParameterTypes);
-    }
-
-    @Register({"show", "particle"})
-    public void showParticleCommand(Player p, ShowModeParameterType... showModeParameterTypes) {
-        internalShow(p, ShowModeType.PARTICLE, showModeParameterTypes);
-    }
-
-    @Register({"show", "raw"})
-    public void rawShowEntityCommand(Player p, ShowModeParameterType... showModeParameterTypes) {
-        internalShow(p, ShowModeType.RAW, showModeParameterTypes);
-    }
-
     @AllArgsConstructor
     private enum ShowModeType {
         ENTITY(TraceEntityShowMode::new),
@@ -335,16 +317,6 @@ public class TraceCommand extends SWCommand {
         private BiFunction<Player, ShowModeParameter, ShowMode<TNTPosition>> showModeBiFunction;
     }
 
-    private void internalShow(Player p, @NonNull ShowModeType showModeType, ShowModeParameterType... showModeParameterTypes) {
-        if (!permissionCheck(p)) return;
-        ShowModeParameter showModeParameter = new ShowModeParameter();
-        for (ShowModeParameterType showModeParameterType : showModeParameterTypes) {
-            showModeParameterType.getShowModeParameterConsumer().accept(showModeParameter);
-        }
-        TraceShowManager.show(p, showModeType.showModeBiFunction.apply(p, showModeParameter));
-        BauSystem.MESSAGE.send("TRACE_MESSAGE_SHOW", p);
-    }
-
     @Register({"show", "gui"})
     public void showGuiCommand(Player p) {
         if (!permissionCheck(p)) return;