diff --git a/engine/src/main/java/org/apache/hop/core/gui/AreaOwner.java b/engine/src/main/java/org/apache/hop/core/gui/AreaOwner.java
index cc776dcdc3d..156703c6fd2 100644
--- a/engine/src/main/java/org/apache/hop/core/gui/AreaOwner.java
+++ b/engine/src/main/java/org/apache/hop/core/gui/AreaOwner.java
@@ -58,17 +58,6 @@ public enum AreaType {
     TRANSFORM_OUTPUT_DATA(true),
     /** The pipeline hop decoration */
     TRANSFORM_TARGET_HOP_ICON(true),
-    /** TODO: ? */
-    TRANSFORM_TARGET_HOP_ICON_OPTION(false),
-
-    @Deprecated
-    TRANSFORM_INFO_HOP_ICON(false),
-    @Deprecated
-    TRANSFORM_ERROR_HOP_ICON(false),
-    @Deprecated
-    TRANSFORM_INPUT_HOP_ICON(false),
-    @Deprecated
-    TRANSFORM_OUTPUT_HOP_ICON(false),
 
     /** The pipeline hop decoration copy icon that indicate that all rows. */
     HOP_COPY_ICON(true),
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
index 55892b1a98b..07a1ba4741a 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
@@ -667,27 +667,6 @@ public void mouseDown(MouseEvent e) {
     //
     if (areaOwner != null && areaOwner.getAreaType() != null) {
       switch (areaOwner.getAreaType()) {
-        case TRANSFORM_OUTPUT_HOP_ICON:
-          // Click on the output icon means: start of drag
-          // Action: We show the input icons on the other transforms...
-          //
-          selectedTransform = null;
-          startHopTransform = (TransformMeta) areaOwner.getParent();
-          candidateHopType = null;
-          startErrorHopTransform = false;
-          break;
-
-        case TRANSFORM_INPUT_HOP_ICON:
-          // Click on the input icon means: start to a new hop
-          // In this case, we set the end hop transform...
-          //
-          selectedTransform = null;
-          startHopTransform = null;
-          endHopTransform = (TransformMeta) areaOwner.getParent();
-          candidateHopType = null;
-          startErrorHopTransform = false;
-          break;
-
         case TRANSFORM_INFO_ICON:
           // Click on the transform info icon means: Edit transformation description
           //
@@ -718,10 +697,6 @@ public void mouseDown(MouseEvent e) {
           pipelineTransformDelegate.editTransformErrorHandling(pipelineMeta, transformMeta);
           break;
 
-        case TRANSFORM_TARGET_HOP_ICON_OPTION:
-          // Below, see showTransformTargetOptions()
-          break;
-
         case TRANSFORM_ICON:
           if (shift && control) {
             openReferencedObject();
@@ -3012,22 +2987,7 @@ private AreaOwner setToolTip(int x, int y, int screenX, int screenY) {
                   Const.CR));
           tipImage = GuiResource.getInstance().getImageError();
           break;
-        case TRANSFORM_INPUT_HOP_ICON:
-          tip.append(BaseMessages.getString(PKG, "PipelineGraph.TransformInputConnector.Tooltip"));
-          tipImage = GuiResource.getInstance().getImageInput();
-          break;
-        case TRANSFORM_OUTPUT_HOP_ICON:
-          tip.append(BaseMessages.getString(PKG, "PipelineGraph.TransformOutputConnector.Tooltip"));
-          tipImage = GuiResource.getInstance().getImageOutput();
-          break;
-        case TRANSFORM_INFO_HOP_ICON:
-          ITransformIOMeta ioMeta = (ITransformIOMeta) areaOwner.getOwner();
-          tip.append(
-              BaseMessages.getString(PKG, "PipelineGraph.TransformMetaConnector.Tooltip")
-                  + Const.CR
-                  + ioMeta.toString());
-          tipImage = GuiResource.getInstance().getImageInfo();
-          break;
+
         case TRANSFORM_TARGET_HOP_ICON:
           IStream stream = (IStream) areaOwner.getOwner();
           tip.append(stream.getDescription());
@@ -3040,19 +3000,6 @@ private AreaOwner setToolTip(int x, int y, int screenX, int screenY) {
             tipImage = GuiResource.getInstance().getImageTarget();
           }
           break;
-        case TRANSFORM_ERROR_HOP_ICON:
-          TransformMeta transformMeta = (TransformMeta) areaOwner.getParent();
-          if (transformMeta.supportsErrorHandling()) {
-            tip.append(
-                BaseMessages.getString(
-                    PKG, "PipelineGraph.TransformSupportsErrorHandling.Tooltip"));
-          } else {
-            tip.append(
-                BaseMessages.getString(
-                    PKG, "PipelineGraph.TransformDoesNotSupportsErrorHandling.Tooltip"));
-          }
-          tipImage = GuiResource.getInstance().getImageError();
-          break;
 
         case TRANSFORM_INFO_ICON, TRANSFORM_ICON:
           TransformMeta iconTransformMeta = (TransformMeta) areaOwner.getOwner();