diff --git a/config/alfresco/rendition-services-context.xml b/config/alfresco/rendition-services-context.xml
index ce6cb81787..5b4a93789f 100644
--- a/config/alfresco/rendition-services-context.xml
+++ b/config/alfresco/rendition-services-context.xml
@@ -133,9 +133,7 @@
 
    <bean id="htmlRenderingEngine"
       class="org.alfresco.repo.rendition.executer.HTMLRenderingEngine"
-      parent="baseRenderingAction">
-      <property name="dictionaryService" ref="DictionaryService" />
-   </bean>
+      parent="baseRenderingAction" />
 
    <bean id="compositeRenderingEngine"
       class="org.alfresco.repo.rendition.executer.CompositeRenderingEngine"
diff --git a/source/java/org/alfresco/repo/content/transform/TikaPoweredContentTransformer.java b/source/java/org/alfresco/repo/content/transform/TikaPoweredContentTransformer.java
index 2ef2c4992c..814a595fd9 100644
--- a/source/java/org/alfresco/repo/content/transform/TikaPoweredContentTransformer.java
+++ b/source/java/org/alfresco/repo/content/transform/TikaPoweredContentTransformer.java
@@ -97,6 +97,7 @@ public abstract class TikaPoweredContentTransformer extends AbstractContentTrans
        
        if(MimetypeMap.MIMETYPE_TEXT_PLAIN.equals(targetMimetype) ||
              MimetypeMap.MIMETYPE_HTML.equals(targetMimetype) ||
+             MimetypeMap.MIMETYPE_XHTML.equals(targetMimetype) ||
              MimetypeMap.MIMETYPE_XML.equals(targetMimetype))
        {
           // We can output to this
@@ -134,7 +135,8 @@ public abstract class TikaPoweredContentTransformer extends AbstractContentTrans
        {
           handler.getTransformer().setOutputProperty(OutputKeys.METHOD, "html");
        }
-       else if(MimetypeMap.MIMETYPE_XML.equals(targetMimeType))
+       else if(MimetypeMap.MIMETYPE_XHTML.equals(targetMimeType) ||
+               MimetypeMap.MIMETYPE_XML.equals(targetMimeType))
        {
           handler.getTransformer().setOutputProperty(OutputKeys.METHOD, "xml");
        }
diff --git a/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java b/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java
index 29f8068166..adbec70793 100644
--- a/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java
+++ b/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngine.java
@@ -93,17 +93,6 @@ public class HTMLRenderingEngine extends AbstractRenderingEngine
      */
     public static final String NAME = "htmlRenderingEngine";
     
-    protected static final QName PRIMARY_IMAGE = QName.createQName(
-          "http://www.alfresco.org/model/website/1.0", "primaryImage");
-    protected static final QName SECONDARY_IMAGE = QName.createQName(
-          "http://www.alfresco.org/model/website/1.0", "secondaryImage");
-
-    private DictionaryService dictionaryService;
-    
-    public void setDictionaryService(DictionaryService dictionaryService) {
-       this.dictionaryService = dictionaryService;
-    }
-    
     
     @Override
     protected Collection<ParameterDefinition> getParameterDefinitions() {
@@ -219,19 +208,9 @@ public class HTMLRenderingEngine extends AbstractRenderingEngine
           ).getChildRef();
        }
        
-       // If we can, associate it with the rendered HTML, so
-       //  that they're properly linked
-       QName assocType = SECONDARY_IMAGE;
-       if(primary)
-       {
-          assocType = PRIMARY_IMAGE;
-       }
-       if(dictionaryService.getAssociation(assocType) != null)
-       {
-          nodeService.createAssociation(
-                context.getDestinationNode(), img, assocType
-          );
-       }
+       // TODO Once composite content is properly supported,
+       //  at this point we'll associate the new image with
+       //  the rendered HTML node so the dependency is tracked.
        
        // Put the image into the node
        ContentWriter writer = contentService.getWriter(
diff --git a/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java b/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java
index 9de9deb0cd..a3fc29bb01 100644
--- a/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java
+++ b/source/java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java
@@ -284,10 +284,11 @@ public class HTMLRenderingEngineTest extends BaseAlfrescoSpringTest
           // Check we didn't get any images
           for(ChildAssociationRef ref : nodeService.getChildAssocs(htmlNode))
           {
-             if(ref.getTypeQName().equals(HTMLRenderingEngine.PRIMARY_IMAGE))
-                fail("Found unexpected primary image of rendered html");
-             if(ref.getTypeQName().equals(HTMLRenderingEngine.SECONDARY_IMAGE))
-                fail("Found unexpected secondary image of rendered html");
+             // TODO Check against composite content associations when present 
+//             if(ref.getTypeQName().equals(HTMLRenderingEngine.PRIMARY_IMAGE))
+//                fail("Found unexpected primary image of rendered html");
+//             if(ref.getTypeQName().equals(HTMLRenderingEngine.SECONDARY_IMAGE))
+//                fail("Found unexpected secondary image of rendered html");
           }
           
           // All done
@@ -376,21 +377,22 @@ public class HTMLRenderingEngineTest extends BaseAlfrescoSpringTest
           assertEquals(1, nodeService.getChildAssocs(imgFolder).size());
           
           
+          // TODO Check against composite content associations when present 
           // Check the associations if supported
-          if(dictionaryService.getAssociation(HTMLRenderingEngine.PRIMARY_IMAGE) != null)
-          {
-             boolean hasPrimary = false;
-             boolean hasSecondary = false;
-             for(ChildAssociationRef ref : nodeService.getChildAssocs(htmlNode))
-             {
-                if(ref.getTypeQName().equals(HTMLRenderingEngine.PRIMARY_IMAGE))
-                   hasPrimary = true;
-                if(ref.getTypeQName().equals(HTMLRenderingEngine.SECONDARY_IMAGE))
-                   hasSecondary = true;
-             }
-             assertEquals(true, hasPrimary);
-             assertEquals(false, hasSecondary);
-          }
+//          if(dictionaryService.getAssociation(HTMLRenderingEngine.PRIMARY_IMAGE) != null)
+//          {
+//             boolean hasPrimary = false;
+//             boolean hasSecondary = false;
+//             for(ChildAssociationRef ref : nodeService.getChildAssocs(htmlNode))
+//             {
+//                if(ref.getTypeQName().equals(HTMLRenderingEngine.PRIMARY_IMAGE))
+//                   hasPrimary = true;
+//                if(ref.getTypeQName().equals(HTMLRenderingEngine.SECONDARY_IMAGE))
+//                   hasSecondary = true;
+//             }
+//             assertEquals(true, hasPrimary);
+//             assertEquals(false, hasSecondary);
+//          }
           
           // All done
           tidyUpSourceDoc();