diff --git a/src/edu/cornell/mannlib/vitro/webapp/servlet/ProcessTerminologyController.java b/src/edu/cornell/mannlib/vitro/webapp/servlet/ProcessTerminologyController.java
index bd0a545f..865905d3 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/servlet/ProcessTerminologyController.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/servlet/ProcessTerminologyController.java
@@ -2,30 +2,27 @@
 
 package edu.cornell.mannlib.vitro.webapp.servlet; 
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
 import java.util.ArrayList;
-import javax.servlet.ServletOutputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import freemarker.ext.beans.BeansWrapper;
-import freemarker.template.DefaultObjectWrapper;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.Field;
-import javax.servlet.RequestDispatcher;
+
 import com.hp.hpl.jena.vocabulary.XSD;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.Field;
+import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
 public class ProcessTerminologyController extends VitroHttpServlet {
     
     private static final long serialVersionUID = 1L;
diff --git a/src/edu/cornell/mannlib/vitro/webapp/servlet/UMLSTerminologyAnnotation.java b/src/edu/cornell/mannlib/vitro/webapp/servlet/UMLSTerminologyAnnotation.java
index 57cd899d..7c4ab30b 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/servlet/UMLSTerminologyAnnotation.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/servlet/UMLSTerminologyAnnotation.java
@@ -6,27 +6,18 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URL;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Map;
-import javax.servlet.ServletOutputStream;
+
 import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualController;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModel;
-import freemarker.ext.beans.BeansWrapper;
-import freemarker.template.DefaultObjectWrapper;
+import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
 
 public class UMLSTerminologyAnnotation extends VitroHttpServlet {
     
@@ -48,7 +39,6 @@ public class UMLSTerminologyAnnotation extends VitroHttpServlet {
           //Get parameter
         	String entryText = vreq.getParameter("searchTerm");
         	log.debug("Executing UMLS term retrieval using " + entryText);
-        	//TODO: Find a non-deprecated mechanism to do so
         	String dataUrl = submissionUrl + "textToProcess=" + URLEncoder.encode(entryText) + "&format=json";
         	try{
 	            ServletOutputStream sos = resp.getOutputStream();