diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformInterceptor.java b/engines/base/src/main/java/org/alfresco/transform/base/TransformInterceptor.java
index 9d00b470..2529d96c 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/TransformInterceptor.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/TransformInterceptor.java
@@ -36,9 +36,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 /**
- * TransformInterceptor
- * <br/>
- * Handles ThreadLocal Log entries for each request.
+ * Cleans up temporary files in transform requests that upload the content and download the result.
  */
 public class TransformInterceptor extends HandlerInterceptorAdapter
 {
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java b/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java
index cc454874..ab549f49 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java
@@ -44,8 +44,8 @@ import javax.jms.Message;
 import javax.jms.Session;
 
 /**
- * TODO: Duplicated from the Router
- * Custom wrapper over MappingJackson2MessageConverter for T-Request/T-Reply objects.
+ * Copied from the t-router. We would need to create a common dependency between t-engine base and t-router that
+ * knows about jms to remove this duplication.
  *
  * @author Cezar Leahu
  */
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformReplySender.java b/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformReplySender.java
index b448eb98..c3a37ee8 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformReplySender.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformReplySender.java
@@ -36,10 +36,8 @@ import org.springframework.jms.core.JmsTemplate;
 import org.springframework.stereotype.Component;
 
 /**
- * TODO: Duplicated from the Router
- * TransformReplySender Bean
- * <p/>
- * JMS message sender/publisher
+ * Copied from the t-router. We would need to create a common dependency between t-engine base and t-router that
+ * knows about jms to remove this duplication.
  *
  * @author Cezar Leahu
  */
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java b/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java
index d42d2e55..0323ef9a 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java
@@ -225,11 +225,6 @@ public abstract class AbstractMetadataExtractorEmbedder implements CustomTransfo
         return Collections.unmodifiableMap(extractMapping.get());
     }
 
-    public Map<String, Set<String>> getEmbedMapping()
-    {
-        return Collections.unmodifiableMap(embedMapping);
-    }
-
     /**
      * Based on AbstractMappingMetadataExtracter#getDefaultMapping.
      *