diff --git a/source/java/org/alfresco/repo/template/TemplateContent.java b/source/java/org/alfresco/repo/template/TemplateContent.java
index d2c72f4a9a..920594f70b 100644
--- a/source/java/org/alfresco/repo/template/TemplateContent.java
+++ b/source/java/org/alfresco/repo/template/TemplateContent.java
@@ -24,14 +24,6 @@
  */
 package org.alfresco.repo.template;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.text.MessageFormat;
-
-import org.alfresco.service.cmr.repository.TemplateException;
-import org.springframework.util.StringUtils;
-
-
 /**
  * Contract for Template API objects that support content on the 'cm:content' default property.
  * 
diff --git a/source/java/org/alfresco/repo/template/TemplateNode.java b/source/java/org/alfresco/repo/template/TemplateNode.java
index 2ab825d6f8..e595ca716e 100644
--- a/source/java/org/alfresco/repo/template/TemplateNode.java
+++ b/source/java/org/alfresco/repo/template/TemplateNode.java
@@ -26,9 +26,6 @@ package org.alfresco.repo.template;
 
 import java.io.Serializable;
 import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -43,7 +40,6 @@ import org.alfresco.service.cmr.repository.AssociationRef;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.TemplateException;
 import org.alfresco.service.cmr.repository.TemplateImageResolver;
 import org.alfresco.service.cmr.version.Version;
 import org.alfresco.service.cmr.version.VersionHistory;
@@ -52,7 +48,6 @@ import org.alfresco.service.namespace.QNameMap;
 import org.alfresco.service.namespace.RegexQNamePattern;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.util.StringUtils;
 import org.xml.sax.InputSource;
 
 import freemarker.ext.dom.NodeModel;
diff --git a/source/java/org/alfresco/repo/template/VersionHistoryNode.java b/source/java/org/alfresco/repo/template/VersionHistoryNode.java
index a127a98d82..00e9f1208c 100644
--- a/source/java/org/alfresco/repo/template/VersionHistoryNode.java
+++ b/source/java/org/alfresco/repo/template/VersionHistoryNode.java
@@ -25,7 +25,6 @@
 package org.alfresco.repo.template;
 
 import java.io.Serializable;
-import java.net.URLEncoder;
 import java.text.MessageFormat;
 import java.util.Date;
 import java.util.List;
@@ -40,6 +39,7 @@ import org.alfresco.service.cmr.version.Version;
 import org.alfresco.service.cmr.version.VersionType;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.QNameMap;
+import org.alfresco.util.URLEncoder;
 
 /**
  * Template Node wrapper representing a record in the version history of a node.