diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/util/XMLUtils.java b/api/src/main/java/edu/cornell/mannlib/semservices/util/XMLUtils.java
index 4a2cb0ef3..86a043c9a 100644
--- a/api/src/main/java/edu/cornell/mannlib/semservices/util/XMLUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/semservices/util/XMLUtils.java
@@ -134,10 +134,7 @@ public class XMLUtils {
        Transformer transformer = null;
       try {
          transformer = TransformerFactory.newInstance().newTransformer();
-      } catch (TransformerConfigurationException e) {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      } catch (TransformerFactoryConfigurationError e) {
+      } catch (TransformerConfigurationException | TransformerFactoryConfigurationError e) {
          // TODO Auto-generated catch block
          e.printStackTrace();
       }
@@ -164,10 +161,7 @@ public class XMLUtils {
        Transformer transformer = null;
       try {
          transformer = TransformerFactory.newInstance().newTransformer();
-      } catch (TransformerConfigurationException e) {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      } catch (TransformerFactoryConfigurationError e) {
+      } catch (TransformerConfigurationException | TransformerFactoryConfigurationError e) {
          // TODO Auto-generated catch block
          e.printStackTrace();
       }
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/beans/DynamicField.java b/api/src/main/java/edu/cornell/mannlib/vedit/beans/DynamicField.java
index bf45c0103..ae2ebdb75 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/beans/DynamicField.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/beans/DynamicField.java
@@ -3,7 +3,6 @@
 package edu.cornell.mannlib.vedit.beans;
 
 import java.util.List;
-import java.util.ArrayList;
 import java.util.HashMap;
 
 public class DynamicField {
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java b/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java
index 10eb262bd..aa755021e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java
@@ -32,7 +32,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.ReasoningOption;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
 public class BaseEditController extends VitroHttpServlet {
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java b/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java
index 6547be004..1d5b282f0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java
@@ -129,27 +129,31 @@ public class OperationController extends BaseEditController {
             notifyChangeListeners(epo, action);
 
             /* send the user somewhere */
-            if (action.equals("insert")){
-                // Object[] args = new Object[1];
-                // args[0] = result;
-                // epo.setNewBean(epo.getGetMethod().invoke(facade,args));
-                PageForwarder pipf = epo.getPostInsertPageForwarder();
-                if (pipf != null){
-                    pipf.doForward(request,response,epo);
-                    return;
-                }
-            } else if (action.equals("update")){
-                PageForwarder pupf = epo.getPostUpdatePageForwarder();
-                if (pupf != null) {
-                    pupf.doForward(request,response,epo);
-                    return;
-                }
-            } else if (action.equals("delete")){
-                PageForwarder pdpf = epo.getPostDeletePageForwarder();
-                if (pdpf != null) {
-                    pdpf.doForward(request,response,epo);
-                    return;
-                }
+            switch (action) {
+                case "insert":
+                    // Object[] args = new Object[1];
+                    // args[0] = result;
+                    // epo.setNewBean(epo.getGetMethod().invoke(facade,args));
+                    PageForwarder pipf = epo.getPostInsertPageForwarder();
+                    if (pipf != null) {
+                        pipf.doForward(request, response, epo);
+                        return;
+                    }
+                    break;
+                case "update":
+                    PageForwarder pupf = epo.getPostUpdatePageForwarder();
+                    if (pupf != null) {
+                        pupf.doForward(request, response, epo);
+                        return;
+                    }
+                    break;
+                case "delete":
+                    PageForwarder pdpf = epo.getPostDeletePageForwarder();
+                    if (pdpf != null) {
+                        pdpf.doForward(request, response, epo);
+                        return;
+                    }
+                    break;
             }
 
             //if no page forwarder was set, just go back to referring page:
@@ -170,7 +174,6 @@ public class OperationController extends BaseEditController {
        
             try {
             	retry(request, response, epo);
-            	return;
             } catch (IOException ioe) {
             	log.error(this.getClass().getName() + " IOError on redirect: ", ioe);
             }
@@ -198,7 +201,6 @@ public class OperationController extends BaseEditController {
         } else {
         	response.sendRedirect(getDefaultLandingPage(request));
         }
-        return;
     }
     
     private void runPreprocessors(EditProcessObject epo, Object newObj) {
@@ -256,14 +258,14 @@ public class OperationController extends BaseEditController {
                     List validatorList = (List) epo.getValidatorMap().get(currParam);
                     if (validatorList != null) {
                         Iterator valIt = validatorList.iterator();
-                        String errMsg = "";
+                        StringBuilder errMsg = new StringBuilder();
                         while (valIt.hasNext()){
                             Validator val = (Validator)valIt.next();
                             ValidationObject vo = val.validate(currValue);
                             if (!vo.getValid()){
                                 valid = false;
                                 fieldValid = false;
-                                errMsg += vo.getMessage() + " ";
+                                errMsg.append(vo.getMessage()).append(" ");
                                 epo.getBadValueMap().put(currParam,currValue);
                             } else {
                                 try {
@@ -273,7 +275,7 @@ public class OperationController extends BaseEditController {
                             }
                         }
                         if (errMsg.length()>0) {
-                            epo.getErrMsgMap().put(currParam,errMsg);
+                            epo.getErrMsgMap().put(currParam, errMsg.toString());
                             log.info("doPost() putting error message "+errMsg+" for "+currParam);
                         }
                     }
@@ -330,12 +332,17 @@ public class OperationController extends BaseEditController {
             Iterator<ChangeListener> changeIt = changeListeners.iterator();
             while (changeIt.hasNext()) {
                 ChangeListener cl = changeIt.next();
-                if (action.equals("insert"))
-                    cl.doInserted(epo.getNewBean(),epo);
-                else if (action.equals("update"))
-                    cl.doUpdated(epo.getOriginalBean(),epo.getNewBean(),epo);
-                else if (action.equals("delete"))
-                    cl.doDeleted(epo.getOriginalBean(),epo);
+                switch (action) {
+                    case "insert":
+                        cl.doInserted(epo.getNewBean(), epo);
+                        break;
+                    case "update":
+                        cl.doUpdated(epo.getOriginalBean(), epo.getNewBean(), epo);
+                        break;
+                    case "delete":
+                        cl.doDeleted(epo.getOriginalBean(), epo);
+                        break;
+                }
             }
         }
     }
@@ -499,8 +506,6 @@ public class OperationController extends BaseEditController {
                 } catch (InvocationTargetException f) {
                     log.error(f.getTargetException().getMessage());
                 }
-            } catch (NoSuchMethodException e) {
-                //log.error("doPost() could not find setId() method for "+partialClassName);
             } catch (Exception f) {
                 //log.error("doPost() could not set id of new bean.");
             }
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/forwarder/impl/UrlForwarder.java b/api/src/main/java/edu/cornell/mannlib/vedit/forwarder/impl/UrlForwarder.java
index adcb3c10b..5104fbc9e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/forwarder/impl/UrlForwarder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/forwarder/impl/UrlForwarder.java
@@ -4,11 +4,8 @@ package edu.cornell.mannlib.vedit.forwarder.impl;
 
 import java.io.IOException;
 
-import java.net.URLEncoder;
-
 import edu.cornell.mannlib.vedit.forwarder.PageForwarder;
 import edu.cornell.mannlib.vedit.beans.EditProcessObject;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/tags/DynamicFieldsTag.java b/api/src/main/java/edu/cornell/mannlib/vedit/tags/DynamicFieldsTag.java
index a7da820c4..927a4ba0d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/tags/DynamicFieldsTag.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/tags/DynamicFieldsTag.java
@@ -8,7 +8,6 @@ import java.util.List;
 import java.util.Iterator;
 
 import java.io.File;
-import java.io.BufferedOutputStream;
 import java.io.InputStream;
 import java.io.FileInputStream;
 import java.io.BufferedInputStream;
@@ -16,18 +15,14 @@ import java.io.InputStreamReader;
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 
 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
 import javax.servlet.jsp.JspWriter;
-import javax.servlet.ServletException;
+
 import edu.cornell.mannlib.vedit.beans.FormObject;
 import edu.cornell.mannlib.vedit.beans.DynamicField;
 import edu.cornell.mannlib.vedit.beans.DynamicFieldRow;
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang3.StringEscapeUtils;
 import edu.cornell.mannlib.vedit.tags.EditTag;
 
 public class DynamicFieldsTag extends EditTag {
@@ -63,7 +58,7 @@ public class DynamicFieldsTag extends EditTag {
             int templateStart = -1;
             int postStart = -1;
 
-            InputStream fis = new FileInputStream (pageContext.getServletContext().getRealPath(new String())+PATH_SEP+MARKUP_FILE_PATH+usePage);
+            InputStream fis = new FileInputStream (pageContext.getServletContext().getRealPath("")+PATH_SEP+MARKUP_FILE_PATH+usePage);
             InputStream bis = new BufferedInputStream(fis);
             BufferedReader in = new BufferedReader(new InputStreamReader(bis));
             List<String> lines = new ArrayList<String>();
@@ -83,9 +78,9 @@ public class DynamicFieldsTag extends EditTag {
             }
             in.close();
 
-            StringBuffer preMarkupB = new StringBuffer();
-            StringBuffer postMarkupB = new StringBuffer();
-            StringBuffer templateMarkupB = new StringBuffer();
+            StringBuilder preMarkupB = new StringBuilder();
+            StringBuilder postMarkupB = new StringBuilder();
+            StringBuilder templateMarkupB = new StringBuilder();
 
             if (templateStart>preStart  && preStart>0) {
                 for (int i=preStart+1; i<templateStart; i++) {
@@ -119,16 +114,16 @@ public class DynamicFieldsTag extends EditTag {
             postMarkup = postMarkupB.toString();
 
         } catch (FileNotFoundException e) {
-            System.out.println("DynamicFieldsTag could not find markup file at "+pageContext.getServletContext().getRealPath(new String())+"\\"+MARKUP_FILE_PATH+usePage);
+            System.out.println("DynamicFieldsTag could not find markup file at "+pageContext.getServletContext().getRealPath("")+"\\"+MARKUP_FILE_PATH+usePage);
         } catch (IOException ioe) {
-            System.out.println("DynamicFieldsTag encountered IOException reading "+pageContext.getServletContext().getRealPath(new String())+"\\"+MARKUP_FILE_PATH+usePage);
+            System.out.println("DynamicFieldsTag encountered IOException reading "+pageContext.getServletContext().getRealPath("")+"\\"+MARKUP_FILE_PATH+usePage);
         }
 
     }
 
     public String strReplace(String input, String pattern, String replacement) {
         String[] piece = input.split(pattern);
-        StringBuffer output = new StringBuffer();
+        StringBuilder output = new StringBuilder();
         for (int i=0; i<piece.length; i++) {
             output.append(piece[i]);
             if (i<piece.length-1)
@@ -149,7 +144,7 @@ public class DynamicFieldsTag extends EditTag {
                 int i = 9899;
                 while (dynIt.hasNext()) {
                     DynamicField dynf = dynIt.next();
-                    StringBuffer genTaName = new StringBuffer().append("_").append(dynf.getTable()).append("_");
+                    StringBuilder genTaName = new StringBuilder().append("_").append(dynf.getTable()).append("_");
                     genTaName.append("-1").append("_");
                     Iterator pparamIt = dynf.getRowTemplate().getParameterMap().keySet().iterator();
                     while(pparamIt.hasNext()) {
@@ -160,7 +155,7 @@ public class DynamicFieldsTag extends EditTag {
                     }
 
 
-                    String preWithVars = new String(preMarkup);
+                    String preWithVars = preMarkup;
                     preWithVars = strReplace(preWithVars,type+"NN",Integer.toString(i));
                     preWithVars = strReplace(preWithVars,"\\$genTaName",genTaName.toString());
                     preWithVars = strReplace(preWithVars,"\\$fieldName",dynf.getName());
@@ -174,7 +169,7 @@ public class DynamicFieldsTag extends EditTag {
                         if (row.getValue()==null)
                             row.setValue("");
                         if (row.getValue().length()>0) {
-                            StringBuffer taName = new StringBuffer().append("_").append(dynf.getTable()).append("_");
+                            StringBuilder taName = new StringBuilder().append("_").append(dynf.getTable()).append("_");
                             taName.append(row.getId()).append("_");
                             Iterator paramIt = row.getParameterMap().keySet().iterator();
                             while(paramIt.hasNext()) {
@@ -184,7 +179,7 @@ public class DynamicFieldsTag extends EditTag {
                                 taName.append(key).append(":").append(new String(valueInBase64)).append(";");
                             }
                             if (row.getValue().length()>0) {
-                                String templateWithVars = new String(templateMarkup);
+                                String templateWithVars = templateMarkup;
                                 templateWithVars = strReplace(templateWithVars,type+"NN",Integer.toString(i));
                                 templateWithVars = strReplace(templateWithVars,"\\$taName",taName.toString());
                                 templateWithVars = strReplace(templateWithVars,"\\$\\$",row.getValue());
@@ -199,14 +194,14 @@ public class DynamicFieldsTag extends EditTag {
                 // output the row template for the javascript to clone
 
                 out.println("<!-- row template inserted by DynamicFieldsTag  -->");
-                String hiddenTemplatePreMarkup = new String(preMarkup);
+                String hiddenTemplatePreMarkup = preMarkup;
                 // bit of a hack to hide the template from the user:
                 hiddenTemplatePreMarkup = strReplace(hiddenTemplatePreMarkup,"display\\:none\\;","");
                 hiddenTemplatePreMarkup = strReplace(hiddenTemplatePreMarkup,"display\\:block\\;","");
                 hiddenTemplatePreMarkup = strReplace(hiddenTemplatePreMarkup,"display\\:inline\\;","");
                 hiddenTemplatePreMarkup = strReplace(hiddenTemplatePreMarkup,"style\\=\\\"","style=\"display:none;");
                 out.print(hiddenTemplatePreMarkup);
-                String hiddenTemplateTemplateMarkup = new String(templateMarkup);
+                String hiddenTemplateTemplateMarkup = templateMarkup;
                 hiddenTemplateTemplateMarkup = strReplace(hiddenTemplateTemplateMarkup, "\\$\\$", "");
                 out.print(hiddenTemplateTemplateMarkup);
                 out.print(postMarkup);
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/tags/EditTag.java b/api/src/main/java/edu/cornell/mannlib/vedit/tags/EditTag.java
index 95b713dd9..e20a8de83 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/tags/EditTag.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/tags/EditTag.java
@@ -5,13 +5,10 @@ package edu.cornell.mannlib.vedit.tags;
 import java.util.HashMap;
 
 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.JspWriter;
 
 import edu.cornell.mannlib.vedit.beans.EditProcessObject;
 import edu.cornell.mannlib.vedit.beans.FormObject;
-import org.apache.commons.lang3.StringEscapeUtils;
 
 public class EditTag extends TagSupport {
     private String name = null;
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/tags/ErrorTag.java b/api/src/main/java/edu/cornell/mannlib/vedit/tags/ErrorTag.java
index 2242b044a..482504b79 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/tags/ErrorTag.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/tags/ErrorTag.java
@@ -3,9 +3,8 @@
 package edu.cornell.mannlib.vedit.tags;
 
 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
 import javax.servlet.jsp.JspWriter;
-import edu.cornell.mannlib.vedit.beans.FormObject;
+
 import edu.cornell.mannlib.vedit.tags.EditTag;
 import org.apache.commons.lang3.StringEscapeUtils;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/tags/ValueTag.java b/api/src/main/java/edu/cornell/mannlib/vedit/tags/ValueTag.java
index 9efbb8522..650bfbf35 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/tags/ValueTag.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/tags/ValueTag.java
@@ -5,7 +5,6 @@ package edu.cornell.mannlib.vedit.tags;
 import java.util.HashMap;
 
 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
 import javax.servlet.jsp.JspWriter;
 import edu.cornell.mannlib.vedit.beans.FormObject;
 import org.apache.commons.lang3.StringEscapeUtils;
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java b/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java
index 20ef40006..ba9f8fcce 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java
@@ -226,7 +226,7 @@ public class FormUtils {
             Option sOpt = new Option();
             sOpt.setValue(selectedValue);
             if (selectedBody == null || selectedBody.length() == 0)
-                sOpt.setBody(selectedValue.toString());
+                sOpt.setBody(selectedValue);
             else
                 sOpt.setBody(selectedBody);
             sOpt.setSelected(true);
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/util/Stemmer.java b/api/src/main/java/edu/cornell/mannlib/vedit/util/Stemmer.java
index 753a0b791..5b84d7053 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/util/Stemmer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/util/Stemmer.java
@@ -71,7 +71,7 @@ class Stemmer
    public void add(char ch)
    {  if (i == b.length)
       {  char[] new_b = new char[i+INC];
-         for (int c = 0; c < i; c++) new_b[c] = b[c];
+          System.arraycopy(b, 0, new_b, 0, i);
          b = new_b;
       }
       b[i++] = ch;
@@ -86,7 +86,7 @@ class Stemmer
    public void add(char[] w, int wLen)
    {  if (i+wLen >= b.length)
       {  char[] new_b = new char[i+wLen+INC];
-         for (int c = 0; c < i; c++) new_b[c] = b[c];
+          System.arraycopy(b, 0, new_b, 0, i);
          b = new_b;
       }
       for (int c = 0; c < wLen; c++) b[i++] = w[c];
@@ -116,7 +116,7 @@ class Stemmer
    private final boolean cons(int i)
    {  switch (b[i])
       {  case 'a': case 'e': case 'i': case 'o': case 'u': return false;
-         case 'y': return (i==0) ? true : !cons(i-1);
+         case 'y': return (i == 0) || !cons(i - 1);
          default: return true;
       }
    }
@@ -368,7 +368,7 @@ class Stemmer
 
     public static String StemString( String inputStr, int maxLength )
     {
-        String outputStr="";
+        StringBuilder outputStr= new StringBuilder();
 
         int previousCh=0;
         char[] w = new char[maxLength];
@@ -396,19 +396,19 @@ class Stemmer
                             {
                             String u;
                             u = s.toString();
-                            outputStr += u;
+                            outputStr.append(u);
                             if ( ch == '-' ) { // replace - with space
-                                outputStr += " ";
+                                outputStr.append(" ");
                             } else if ( ch == '.' ) {
                                 if ( Character.isDigit( (char) previousCh )) {
-                                    outputStr += ".";
+                                    outputStr.append(".");
                                 } else {
-                                    outputStr += " ";
+                                    outputStr.append(" ");
                                     //previousCh = 32; // set to whitespace; extra spaces should be filtered out on next pass
                                 }
                             } else {
                                 Character Ch = new Character((char) ch);
-                                outputStr += Ch.toString();
+                                outputStr.append(Ch.toString());
                             }
                             stemmerInputBufferIndex=0; // to avoid repeats after )
                             }
@@ -422,7 +422,7 @@ class Stemmer
                 if ( !Character.isWhitespace((char) previousCh ) ) {
                     if ( previousCh != '.' ) {
                         Character Ch = new Character((char) ch);
-                        outputStr += Ch.toString();
+                        outputStr.append(Ch.toString());
                     }
                 }
             } else if ( ch == '(' ) { // open paren; copy all characters until close paren
@@ -449,21 +449,21 @@ class Stemmer
                 stemmerInputBufferIndex=0;
             } else if ( ch == ')' ) { // when is last character of input string
                 Character Ch = new Character((char) ch);
-                outputStr += Ch.toString();
+                outputStr.append(Ch.toString());
                 log.trace( Ch.toString() );
                 log.trace("found close paren at position: " + inputArrayIndex + " of input term " + inputStr );
             } else if ( ch == '-' ) { // replace - with space
-                outputStr += " ";
+                outputStr.append(" ");
             } else if ( ch == '.' ) {
                 if ( Character.isDigit( (char) previousCh )) {
-                    outputStr += ".";
+                    outputStr.append(".");
                 } else {
-                    outputStr += " ";
+                    outputStr.append(" ");
                     //previousCh = 32; // set to whitespace; extra spaces should be filtered out on next pass
                 }
             } else {
                 Character Ch = new Character((char) ch);
-                outputStr += Ch.toString();
+                outputStr.append(Ch.toString());
             }
             previousCh = ch;
             if (ch < 0) break;
@@ -477,10 +477,10 @@ class Stemmer
 
             String u;
             u = s.toString();
-            outputStr += u;
+            outputStr.append(u);
         }
 
-        return outputStr == null ? ( outputStr.equals("") ? null : outputStr.trim() ) : outputStr.trim();
+        return outputStr == null || outputStr.length() == 0 ? null : outputStr.toString().trim();
     }
 
 /*
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/validator/impl/EnumValuesValidator.java b/api/src/main/java/edu/cornell/mannlib/vedit/validator/impl/EnumValuesValidator.java
index 71e20112c..05b7ccacb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/validator/impl/EnumValuesValidator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/validator/impl/EnumValuesValidator.java
@@ -3,6 +3,8 @@
 package edu.cornell.mannlib.vedit.validator.impl;
 
 import edu.cornell.mannlib.vedit.validator.*;
+
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 
@@ -17,17 +19,17 @@ public class EnumValuesValidator implements Validator {
         } else {
             vo.setValid(false);
             if (legalValues.size()<7){
-                String msgString = "Please enter one of ";
+                StringBuilder msgString = new StringBuilder("Please enter one of ");
                 Iterator valuesIt = legalValues.iterator();
                 while (valuesIt.hasNext()) {
                     String legalValue = (String) valuesIt.next();
-                    msgString += "'"+legalValue+"'";
+                    msgString.append("'").append(legalValue).append("'");
                     if (valuesIt.hasNext())
-                        msgString += ", ";
+                        msgString.append(", ");
                     else
-                        msgString += ".";
+                        msgString.append(".");
                 }
-                vo.setMessage(msgString);
+                vo.setMessage(msgString.toString());
             }
             else {
                 vo.setMessage("Please enter a legal value.");
@@ -38,7 +40,6 @@ public class EnumValuesValidator implements Validator {
     }
 
     public EnumValuesValidator (String[] legalValues){
-        for (int i=0; i<legalValues.length; i++)
-            this.legalValues.add(legalValues[i]);
+        Collections.addAll(this.legalValues, legalValues);
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/validator/impl/UrlValidator.java b/api/src/main/java/edu/cornell/mannlib/vedit/validator/impl/UrlValidator.java
index 63d91012d..edaa7743e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/validator/impl/UrlValidator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/validator/impl/UrlValidator.java
@@ -24,10 +24,10 @@ public class UrlValidator implements Validator {
         IRIFactory factory = IRIFactory.jenaImplementation();
         IRI iri = factory.create((String) obj);
         if (iri.hasViolation(false) ) {
-            String errorStr = "";
+            StringBuilder errorStr = new StringBuilder();
             Iterator<Violation> violIt = iri.violations(false);
             while(violIt.hasNext()) {
-                errorStr += violIt.next().getShortMessage() + "  ";
+                errorStr.append(violIt.next().getShortMessage()).append("  ");
             }
             vo.setValid(false);
             vo.setMessage("Please enter a valid URL.  " + errorStr);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java
index 7b1ad8788..06513cdfb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java
@@ -159,8 +159,8 @@ public class VitroHomeDirectory {
 						VHD_BUILD_PROPERTY);
 				throw new IllegalStateException(message);
 			} else if (foundLocations.size() > 1) {
-				String message = String.format("Found multiple values for the "
-						+ "Vitro home directory: " + foundLocations);
+				String message = "Found multiple values for the "
+						+ "Vitro home directory: " + foundLocations;
 				log.warn(message);
 			}
 		}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java
index 5fed6daf3..0ddbb5ee7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java
@@ -145,11 +145,8 @@ public class PropertyRestrictionBeanImpl extends PropertyRestrictionBean {
 		if (resourceUri == null || userRole == null) {
 			return false;
 		}
-		if (prohibitedNamespaces.contains(namespace(resourceUri))
-				&& !permittedExceptions.contains(resourceUri)) {
-			return false;
-		}
-		return true;
+		return !prohibitedNamespaces.contains(namespace(resourceUri))
+				|| permittedExceptions.contains(resourceUri);
 	}
 
 	@Override
@@ -241,9 +238,7 @@ public class PropertyRestrictionBeanImpl extends PropertyRestrictionBean {
 
 		StringBuilder buffer = new StringBuilder();
 		for (FullPropertyKey key : keys) {
-			buffer.append(key + " " + thresholdMap.get(key).getLevel(DISPLAY)
-					+ " " + thresholdMap.get(key).getLevel(MODIFY) + " "
-					+ thresholdMap.get(key).getLevel(PUBLISH) + "\n");
+			buffer.append(key).append(" ").append(thresholdMap.get(key).getLevel(DISPLAY)).append(" ").append(thresholdMap.get(key).getLevel(MODIFY)).append(" ").append(thresholdMap.get(key).getLevel(PUBLISH)).append("\n");
 		}
 		return buffer.toString();
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/publish/PublishObjectPropertyStatement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/publish/PublishObjectPropertyStatement.java
index bd5fcbbe0..cf593284f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/publish/PublishObjectPropertyStatement.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/publish/PublishObjectPropertyStatement.java
@@ -6,7 +6,6 @@ import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAct
 
 import org.apache.jena.ontology.OntModel;
 
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractObjectPropertyStatementAction;
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java
index 5e6c100df..c3d51788c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java
@@ -7,8 +7,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.ServletContext;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java
index fa285934c..642ee49d8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java
@@ -51,7 +51,7 @@ public class DataPropertyComparator implements Comparator<Individual> {
             if (XSD.xint.toString().equals(datatype)) {
                 int i1 = Integer.valueOf(dps1.getData());
                 int i2 = Integer.valueOf(dps2.getData());
-                result = ((Integer) i1).compareTo(i2);
+                result = Integer.compare(i1, i2);
             }
             else if (XSD.xstring.toString().equals(datatype)) {
                 result = dps1.getData().compareTo(dps2.getData());            
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java
index c8fcb499b..4e1e95b70 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java
@@ -2,10 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.beans;
 
-import java.util.Date;
-
-import org.apache.jena.rdf.model.Property;
-
 /**
  * a class representing a particular instance of a data property
  *
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java
index 2ede77d2b..98768ea56 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java
@@ -2,8 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.beans;
 
-import java.util.Date;
-
 /**
  * a class representing an particular instance of a data property
  *
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
index c1f1649d4..ffc42cf14 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
@@ -576,16 +576,16 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
      * @return Readable text identifying this property's attributes
      */
     public String toString(){
-        String list = "null";
+        StringBuilder list = new StringBuilder("null");
         if( getObjectPropertyStatements() != null ){
             Iterator it = getObjectPropertyStatements().iterator();
-            if( !it.hasNext() ) list = " none";
+            if( !it.hasNext() ) list = new StringBuilder(" none");
             while(it.hasNext()){
                 Object obj = it.next();
                 if( obj != null && obj instanceof ObjectPropertyStatement){
-                    list += "\n\t\t" + ((ObjectPropertyStatement)obj).toString();
+                    list.append("\n\t\t").append(((ObjectPropertyStatement) obj).toString());
                 }else{
-                    list += "\n\t\t" + obj.toString();
+                    list.append("\n\t\t").append(obj.toString());
                 }
             }
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatement.java
index 62663f93b..ea381929f 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatement.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatement.java
@@ -1,7 +1,6 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 package edu.cornell.mannlib.vitro.webapp.beans;
-import java.util.Date;
 
 public interface ObjectPropertyStatement {
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java
index 2a3ecf3b0..c13ebeb4b 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java
@@ -3,7 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.beans;
 
 import java.util.Comparator;
-import java.util.Date;
 
 /**
  * a class representing a particular instance of an object property
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PermissionSet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PermissionSet.java
index ea315edc4..386e13a51 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PermissionSet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PermissionSet.java
@@ -45,8 +45,7 @@ public class PermissionSet {
 	}
 
 	public void setForNewUsers(Boolean forNewUsers) {
-		this.forNewUsers = (forNewUsers == null) ? false
-				: forNewUsers.booleanValue();
+		this.forNewUsers = (forNewUsers != null) && forNewUsers.booleanValue();
 	}
 
 	public boolean isForPublic() {
@@ -54,8 +53,7 @@ public class PermissionSet {
 	}
 
 	public void setForPublic(Boolean forPublic) {
-		this.forPublic = (forPublic == null) ? false
-				: forPublic.booleanValue();
+		this.forPublic = (forPublic != null) && forPublic.booleanValue();
 	}
 
 	public Set<String> getPermissionUris() {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java
index 2b02301ce..61b0600e3 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java
@@ -2,8 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.beans;
 
-import java.util.Date;
-
 /**
    Represents a Vitro object property instance.  It includes values
    from the entities, object property statements, properties, and ent2relationships tables
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstanceIface.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstanceIface.java
index 603c2523c..19e53d2e8 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstanceIface.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstanceIface.java
@@ -2,8 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.beans;
 
-import java.util.Date;
-
 public interface PropertyInstanceIface {
 //needed for PropertyInstance
 //object property statements
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSmokeTests.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSmokeTests.java
index dfaef633f..e5d92aeeb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSmokeTests.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSmokeTests.java
@@ -2,7 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.config;
 
-import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java
index 612dc6203..9163f571f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java
@@ -104,30 +104,30 @@ public class MailUsersServlet extends VitroHttpServlet {
        comments=comments.trim();
         //Removed spam filtering code
 
-        StringBuffer msgBuf = new StringBuffer(); // contains the intro copy for the body of the email message
+        StringBuilder msgBuf = new StringBuilder(); // contains the intro copy for the body of the email message
         String lineSeparator = System.getProperty("line.separator"); // \r\n on windows, \n on unix
         // from MyLibrary
         msgBuf.setLength(0);
         //msgBuf.append("Content-Type: text/html; charset='us-ascii'" + lineSeparator);
-        msgBuf.append("<html>" + lineSeparator );
-        msgBuf.append("<head>" + lineSeparator );
-        msgBuf.append("<style>a {text-decoration: none}</style>" + lineSeparator );
-        msgBuf.append("<title>" + deliveryfrom + "</title>" + lineSeparator );
-        msgBuf.append("</head>" + lineSeparator );
-        msgBuf.append("<body>" + lineSeparator );
-        msgBuf.append("<h4>" + deliveryfrom + "</h4>" + lineSeparator );
-        msgBuf.append("<h4>From: "+webusername +" (" + webuseremail + ")"+" at IP address "+request.getRemoteAddr()+"</h4>"+lineSeparator);
+        msgBuf.append("<html>").append(lineSeparator);
+        msgBuf.append("<head>").append(lineSeparator);
+        msgBuf.append("<style>a {text-decoration: none}</style>").append(lineSeparator);
+        msgBuf.append("<title>").append(deliveryfrom).append("</title>").append(lineSeparator);
+        msgBuf.append("</head>").append(lineSeparator);
+        msgBuf.append("<body>").append(lineSeparator);
+        msgBuf.append("<h4>").append(deliveryfrom).append("</h4>").append(lineSeparator);
+        msgBuf.append("<h4>From: ").append(webusername).append(" (").append(webuseremail).append(")").append(" at IP address ").append(request.getRemoteAddr()).append("</h4>").append(lineSeparator);
 
         //Don't need any 'likely viewing page' portion to be emailed out to the others
 
-        msgBuf.append(lineSeparator + "</i></p><h3>Comments:</h3>" + lineSeparator );
+        msgBuf.append(lineSeparator).append("</i></p><h3>Comments:</h3>").append(lineSeparator);
         if (comments==null || comments.equals("")) {
             msgBuf.append("<p>BLANK MESSAGE</p>");
         } else {
-            msgBuf.append("<p>"+comments+"</p>");
+            msgBuf.append("<p>").append(comments).append("</p>");
         }
-        msgBuf.append("</body>" + lineSeparator );
-        msgBuf.append("</html>" + lineSeparator );
+        msgBuf.append("</body>").append(lineSeparator);
+        msgBuf.append("</html>").append(lineSeparator);
 
         String msgText = msgBuf.toString();
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java
index ce3cd1c64..58b859a77 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java
@@ -58,8 +58,7 @@ public class OntologyController extends VitroHttpServlet{
    
        if( rdfFormat != null ){
         	doRdf(req, res, rdfFormat );
-        	return;
-        }         
+       }
 	}
 	
 	private static Pattern RDF_REQUEST = Pattern.compile("^/ontology/([^/]*)/([^/]*).rdf$");
@@ -159,8 +158,7 @@ public class OntologyController extends VitroHttpServlet{
         if( ! found ){
             //respond to HTTP outside of critical section
             doNotFound(req,res);
-            return;
-        } else {	
+        } else {
         	JenaOutputUtils.setNameSpacePrefixes(newModel,vreq.getWebappDaoFactory());
             res.setContentType(rdfFormat.getMediaType());
             String format = ""; 
@@ -171,8 +169,7 @@ public class OntologyController extends VitroHttpServlet{
             else if ( TTL_MIMETYPE.equals(rdfFormat.getMediaType()))
                 format ="TTL";
 		
-            newModel.write( res.getOutputStream(), format );		
-            return;
+            newModel.write( res.getOutputStream(), format );
         }
 	}
 	
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java
index acf738b3d..89b60a12b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java
@@ -87,7 +87,6 @@ public class SparqlQueryBuilderServlet extends BaseEditController {
         }
 
         doHelp(request,response);
-        return;
     }
     
     private void doNoModelInContext(HttpServletRequest request, HttpServletResponse res){
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPage.java
index 840e690ac..42dd4102d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPage.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPage.java
@@ -127,8 +127,7 @@ public class UserAccountsEditPage extends UserAccountsPage {
 						+ "but is not authorized to do so. Logged in as: "
 						+ LoginStatusBean.getCurrentUser(vreq));
 				bogusMessage = getBogusStandardMessage(vreq);
-				return;
-			}
+            }
 		}
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPage.java
index 4503947dc..55e860670 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPage.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPage.java
@@ -126,8 +126,7 @@ public class UserAccountsFirstTimeExternalPage extends UserAccountsPage {
 		}
 		if (!Authenticator.getInstance(vreq).isUserPermittedToLogin(null)) {
 			bogusMessage = i18n.text("logins_disabled_for_maintenance");
-			return;
-		}
+        }
 	}
 
 	public boolean isBogus() {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsPasswordBasePage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsPasswordBasePage.java
index 9a471b4bb..3923c17b2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsPasswordBasePage.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsPasswordBasePage.java
@@ -121,8 +121,7 @@ public abstract class UserAccountsPasswordBasePage extends UserAccountsPage {
 						+ "' when already logged in as '" + currentUserEmail
 						+ "'");
 				bogusMessage = alreadyLoggedInMessage(currentUserEmail);
-				return;
-			}
+            }
 		}
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
index 03fbc4f5a..93a8ff861 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
@@ -61,8 +61,7 @@ public class SparqlQueryAjaxController extends VitroAjaxController {
 			String queryParam = locateQueryParam(vreq);
 			Query query = SparqlUtils.createQuery(queryParam);
 			SparqlUtils.executeQuery(response, query, model);
-			return;
-		} catch (AjaxControllerException e) {
+        } catch (AjaxControllerException e) {
 			log.error(e.getMessage());
 			response.sendError(e.getStatusCode());
 		}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java
index 682d73281..528217e95 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java
@@ -9,7 +9,6 @@ import static javax.servlet.http.HttpServletResponse.SC_OK;
 
 import java.io.IOException;
 
-import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServletRequest;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiRdfProducer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiRdfProducer.java
index 1a24e5020..0168294d8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiRdfProducer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiRdfProducer.java
@@ -5,7 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.controller.api.sparqlquery;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 import java.util.Collection;
 
 import org.apache.commons.io.IOUtils;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/Authenticator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/Authenticator.java
index bf5aae3e5..76bc3bc20 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/Authenticator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/Authenticator.java
@@ -197,11 +197,7 @@ public abstract class Authenticator {
 
 			// InternetAddress permits a localname without hostname.
 			// Guard against that.
-			if (emailAddress.indexOf('@') == -1) {
-				return false;
-			}
-
-			return true;
+			return emailAddress.indexOf('@') != -1;
 		} catch (AddressException e) {
 			return false;
 		}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java
index 1db8c4c16..153520974 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java
@@ -104,14 +104,12 @@ public class LoginExternalAuthReturn extends BaseLoginServlet {
 			getAuthenticator(req).recordLoginAgainstUserAccount(userAccount,
 					AuthenticationSource.EXTERNAL);
 			new LoginRedirector(req, afterLoginUrl).redirectLoggedInUser(resp);
-			return;
-		} catch (LoginNotPermitted e) {
+        } catch (LoginNotPermitted e) {
 			// should have been caught by isUserPermittedToLogin()
 			log.debug("Logins disabled for " + userAccount);
 			complainAndReturnToReferrer(req, resp, ATTRIBUTE_REFERRER,
 					messageLoginDisabled(req));
-			return;
-		}
+        }
 	}
 
 	@Override
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java
index 1c775f1a0..d6f1c15d4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java
@@ -144,8 +144,7 @@ public class ProgramLogin extends HttpServlet {
 				}
 				recordLoginWithPasswordChange();
 				sendSuccess(MESSAGE_SUCCESS_FIRST_TIME);
-				return;
-			}
+            }
 
 		}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java
index 45fabe992..6b1ef67f6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java
@@ -3,7 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.controller.datatools.dumprestore;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -22,7 +21,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServ
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 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.rdfservice.RDFService.ResultFormat;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 
 /**
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/NQuadLineSplitter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/NQuadLineSplitter.java
index 580cd2635..7bff579c0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/NQuadLineSplitter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/NQuadLineSplitter.java
@@ -95,11 +95,7 @@ class NQuadLineSplitter {
 		while (!atEnd() && isWhiteSpace()) {
 			i++;
 		}
-		if (atEnd()) {
-			return;
-		} else if (line.charAt(i) == '#') {
-			return;
-		} else {
+		if (!atEnd() && line.charAt(i) != '#') {
 			throw new BadNodeException(
 					"Period was not followed by end of line: '" + line + "'");
 		}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
index da38df6a4..c1752f327 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
@@ -351,8 +351,7 @@ public class Authenticate extends VitroHttpServlet {
 				// This should have been caught by isUserPermittedToLogin()
 				bean.setMessage(request, ERROR,
 						"logins_disabled_for_maintenance");
-				return;
-			}
+            }
 		}
 	}
 
@@ -413,8 +412,7 @@ public class Authenticate extends VitroHttpServlet {
 		} catch (LoginNotPermitted e) {
 			// This should have been caught by isUserPermittedToLogin()
 			bean.setMessage(request, ERROR, "logins_disabled_for_maintenance");
-			return;
-		}
+        }
 	}
 
 	/**
@@ -497,8 +495,7 @@ public class Authenticate extends VitroHttpServlet {
 		String loginProcessPage = LoginProcessBean.getBean(vreq)
 				.getLoginPageUrl();
 		response.sendRedirect(loginProcessPage);
-		return;
-	}
+    }
 
 	/**
 	 * Exit: user has completed the login. Redirect appropriately and clear the
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java
index 7f8310d4e..026a55476 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java
@@ -73,16 +73,20 @@ public class Classes2ClassesOperationController extends BaseEditController {
 	                    String superclassURIstr = request.getParameter("SuperclassURI");
 	                    if (superclassURIstr != null) {
 	                        for (int i=0; i<subclassURIstrs.length; i++) {
-	                        	if (modeStr.equals("disjointWith")) {
-	                        		vcDao.removeDisjointWithClass(superclassURIstr, subclassURIstrs[i]);
-	                        	} else if (modeStr.equals("equivalentClass")) {
-	                        		vcDao.removeEquivalentClass(superclassURIstr, subclassURIstrs[i]);
-	                        	} else {
-		                            Classes2Classes c2c = new Classes2Classes();
-		                            c2c.setSubclassURI(subclassURIstrs[i]);
-		                            c2c.setSuperclassURI(superclassURIstr);
-		                            vcDao.deleteClasses2Classes(c2c);
-	                        	}
+                                switch (modeStr) {
+                                    case "disjointWith":
+                                        vcDao.removeDisjointWithClass(superclassURIstr, subclassURIstrs[i]);
+                                        break;
+                                    case "equivalentClass":
+                                        vcDao.removeEquivalentClass(superclassURIstr, subclassURIstrs[i]);
+                                        break;
+                                    default:
+                                        Classes2Classes c2c = new Classes2Classes();
+                                        c2c.setSubclassURI(subclassURIstrs[i]);
+                                        c2c.setSuperclassURI(superclassURIstr);
+                                        vcDao.deleteClasses2Classes(c2c);
+                                        break;
+                                }
 	                        }
 	                    }
 	                } else {
@@ -90,30 +94,38 @@ public class Classes2ClassesOperationController extends BaseEditController {
 	                    String[] superclassURIstrs = request.getParameterValues("SuperclassURI");
 	                    if (superclassURIstrs != null) {
 	                        for (int i=0; i<superclassURIstrs.length; i++) {
-	                        	if (modeStr.equals("disjointWith")) {
-	                        		vcDao.removeDisjointWithClass(superclassURIstrs[i],subclassURIstr);
-		                        } else if (modeStr.equals("equivalentClass")) {
-		                        	vcDao.removeEquivalentClass(subclassURIstr,superclassURIstrs[i]);
-		                        } else {
-		                            Classes2Classes c2c = new Classes2Classes();
-		                            c2c.setSuperclassURI(superclassURIstrs[i]);
-		                            c2c.setSubclassURI(subclassURIstr);
-		                            vcDao.deleteClasses2Classes(c2c);
-	                        	}
+                                switch (modeStr) {
+                                    case "disjointWith":
+                                        vcDao.removeDisjointWithClass(superclassURIstrs[i], subclassURIstr);
+                                        break;
+                                    case "equivalentClass":
+                                        vcDao.removeEquivalentClass(subclassURIstr, superclassURIstrs[i]);
+                                        break;
+                                    default:
+                                        Classes2Classes c2c = new Classes2Classes();
+                                        c2c.setSuperclassURI(superclassURIstrs[i]);
+                                        c2c.setSubclassURI(subclassURIstr);
+                                        vcDao.deleteClasses2Classes(c2c);
+                                        break;
+                                }
 	                        }
 	                    }
 	                }
 	            } else if (request.getParameter("operation").equals("add")) {
-	            	if (modeStr.equals("disjointWith")) {
-	            		vcDao.addDisjointWithClass(request.getParameter("SuperclassURI"), request.getParameter("SubclassURI"));
-	            	} else if (modeStr.equals("equivalentClass")) {
-	            		vcDao.addEquivalentClass(request.getParameter("SuperclassURI"), request.getParameter("SubclassURI"));
-	            	} else {
-		            	Classes2Classes c2c = new Classes2Classes();
-		                c2c.setSuperclassURI(request.getParameter("SuperclassURI"));
-		                c2c.setSubclassURI(request.getParameter("SubclassURI"));
-		                vcDao.insertNewClasses2Classes(c2c);
-	            	}
+                    switch (modeStr) {
+                        case "disjointWith":
+                            vcDao.addDisjointWithClass(request.getParameter("SuperclassURI"), request.getParameter("SubclassURI"));
+                            break;
+                        case "equivalentClass":
+                            vcDao.addEquivalentClass(request.getParameter("SuperclassURI"), request.getParameter("SubclassURI"));
+                            break;
+                        default:
+                            Classes2Classes c2c = new Classes2Classes();
+                            c2c.setSuperclassURI(request.getParameter("SuperclassURI"));
+                            c2c.setSubclassURI(request.getParameter("SubclassURI"));
+                            vcDao.insertNewClasses2Classes(c2c);
+                            break;
+                    }
 	            }
 	        } catch (Exception e) {
 	            log.error(e, e);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java
index b82ff5075..d74aa1fd3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java
@@ -68,7 +68,7 @@ public class ClassgroupRetryController extends BaseEditController {
                 }
                 if (vclassGroupForEditing == null) {                    
                     //UTF-8 expected due to URIEncoding on Connector in server.xml
-                    String uriToFind = new String(request.getParameter("uri"));
+                    String uriToFind = request.getParameter("uri");
                     vclassGroupForEditing = (VClassGroup)cgDao.getGroupByURI(uriToFind);
                 }
             } else {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java
index 6f39b35e1..9b7b6f521 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java
@@ -95,7 +95,7 @@ public class EntityEditController extends BaseEditController {
         }
         results.add(rName);
         
-        String classStr = "";
+        StringBuilder classStr = new StringBuilder();
         List<VClass> classList = inferredEnt.getVClasses(false);
         sortForPickList(classList, vreq);
         if (classList != null) {
@@ -109,13 +109,13 @@ public class EntityEditController extends BaseEditController {
 	            } catch (Exception e) {
 	                rClassName = vc.getLocalNameWithPrefix();
 	            }
-	            classStr += rClassName;
+	            classStr.append(rClassName);
 	            if (classIt.hasNext()) {
-	            	classStr += ", ";
+	            	classStr.append(", ");
 	            }
 	        }
         }
-        results.add(classStr);
+        results.add(classStr.toString());
                 
 		results.add(ent.getHiddenFromDisplayBelowRoleLevel() == null ? "unspecified"
 				: ent.getHiddenFromDisplayBelowRoleLevel().getDisplayLabel());
@@ -147,7 +147,7 @@ public class EntityEditController extends BaseEditController {
                 Iterator<DataPropertyStatement> externalIdIt = ent.getExternalIds().iterator();
                 while (externalIdIt.hasNext()) {
                     DataPropertyStatement eid = externalIdIt.next();
-                    String multiplexedString = new String ("DatapropURI:" + new String(Base64.encodeBase64(eid.getDatapropURI().getBytes())) + ";" + "Data:" + new String(Base64.encodeBase64(eid.getData().getBytes())));
+                    String multiplexedString = "DatapropURI:" + new String(Base64.encodeBase64(eid.getDatapropURI().getBytes())) + ";" + "Data:" + new String(Base64.encodeBase64(eid.getData().getBytes()));
                     externalIdOptionList.add(new Option(multiplexedString, eid.getData()));
                 }
             }
@@ -172,7 +172,7 @@ public class EntityEditController extends BaseEditController {
             Iterator<PropertyInstance> epiIt = epiColl.iterator();
             while (epiIt.hasNext()) {
                 PropertyInstance pi = epiIt.next();
-                String multiplexedString = new String ("PropertyURI:" + new String(Base64.encodeBase64(pi.getPropertyURI().getBytes())) + ";" + "ObjectEntURI:" + new String(Base64.encodeBase64(pi.getObjectEntURI().getBytes())));
+                String multiplexedString = "PropertyURI:" + new String(Base64.encodeBase64(pi.getPropertyURI().getBytes())) + ";" + "ObjectEntURI:" + new String(Base64.encodeBase64(pi.getObjectEntURI().getBytes()));
                 epiOptionList.add(new Option(multiplexedString, pi.getDomainPublic()+" "+pi.getObjectName()));
             }
             OptionMap.put("ExistingPropertyInstances", epiOptionList);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java
index 166a89b4e..93fd5723a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java
@@ -102,14 +102,11 @@ public class Properties2PropertiesOperationController extends
 		        }
 		    }
 
-	    } catch (RuntimeException e) {
+	    } catch (RuntimeException | Error e) {
 	        log.error("Unable to perform edit operation: ", e);
 	        throw e;
-	    } catch (Error err) {
-	    	log.error("Unable to perform edit operation: ", err);
-	    	throw err;
 	    }
-        
+
     }
     
     public void doGet(HttpServletRequest request, HttpServletResponse response) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java
index bd89deab9..d12316fe5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java
@@ -67,7 +67,7 @@ public class PropertyGroupRetryController extends BaseEditController {
                 }
                 if (propertyGroupForEditing == null) {
                     // UTF-8 expected due to URIEncoding on Connector element in server.xml
-                    String uriToFind = new String(request.getParameter("uri"));
+                    String uriToFind = request.getParameter("uri");
                     propertyGroupForEditing = (PropertyGroup)pgDao.getGroupByURI(uriToFind);
                 }
             } else {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java
index c8b212faf..a4e1f97bb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java
@@ -492,14 +492,18 @@ public class RefactorOperationController extends BaseEditController {
         
         if (vreq.getParameter("_cancel") == null) {
 	        if (modeStr != null) {
-	        	
-	        	if (modeStr.equals("renameResource")) {
-	        		redirectStr = doRenameResource(vreq, response, epo);
-	        	} else if (modeStr.equals("movePropertyStatements")) {
-	        		doMovePropertyStatements(vreq, response, epo);
-	        	} else if (modeStr.equals("moveInstances")) {
-	        		doMoveInstances(vreq, response, epo);
-	        	} 
+
+				switch (modeStr) {
+					case "renameResource":
+						redirectStr = doRenameResource(vreq, response, epo);
+						break;
+					case "movePropertyStatements":
+						doMovePropertyStatements(vreq, response, epo);
+						break;
+					case "moveInstances":
+						doMoveInstances(vreq, response, epo);
+						break;
+				}
 	        }
         }
         
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java
index 391ba55f4..8fb612d77 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java
@@ -108,13 +108,17 @@ public class RefactorRetryController extends BaseEditController {
 	    String modeStr = request.getParameter("mode");
 
 	    if (modeStr != null) {
-	    	if (modeStr.equals("renameResource")) {
-	    		doRenameResource(vreq, response, epo);
-	    	} else if (modeStr.equals("movePropertyStatements")) {
-	    		doMovePropertyStatements(vreq, response, epo);
-	    	} else if (modeStr.equals("moveInstances")) {
-	    		doMoveInstances(vreq, response, epo);
-	    	}
+			switch (modeStr) {
+				case "renameResource":
+					doRenameResource(vreq, response, epo);
+					break;
+				case "movePropertyStatements":
+					doMovePropertyStatements(vreq, response, epo);
+					break;
+				case "moveInstances":
+					doMoveInstances(vreq, response, epo);
+					break;
+			}
 	    }
 
         setRequestAttributes(request,epo);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java
index f9c51db71..1fbefad91 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java
@@ -83,8 +83,7 @@ public class RestrictionOperationController extends BaseEditController {
 	    	log.error(e, e);
 	    	try {
 	    		response.sendRedirect(defaultLandingPage);
-	    		return;
-	    	} catch (Exception f) {
+            } catch (Exception f) {
                 log.error(f, f);
                 throw new RuntimeException(f);
 	    	}
@@ -176,47 +175,54 @@ public class RestrictionOperationController extends BaseEditController {
         if (cardinalityStr != null) {
             cardinality = Integer.decode(cardinalityStr); 
         }
-        
-        if (restrictionTypeStr.equals("allValuesFrom")) {
-            rest = ontModel.createAllValuesFromRestriction(null,onProperty,roleFiller);
-        } else if (restrictionTypeStr.equals("someValuesFrom")) {
-            rest = ontModel.createSomeValuesFromRestriction(null,onProperty,roleFiller);
-        } else if (restrictionTypeStr.equals("hasValue")) {
-            String valueURI = request.getParameter("ValueIndividual");
-            if (valueURI != null) {
-                Resource valueRes = ontModel.getResource(valueURI);
-                if (valueRes != null) {
-                    rest = ontModel.createHasValueRestriction(null, onProperty, valueRes);
-                }
-            } else {
-                String valueLexicalForm = request.getParameter("ValueLexicalForm");
-                if (valueLexicalForm != null) {
-                    String valueDatatype = request.getParameter("ValueDatatype");
-                    Literal value = null;
-                    if (valueDatatype != null && valueDatatype.length() > 0) {
-                        RDFDatatype dtype = null;
-                        try {
-                            dtype = TypeMapper.getInstance().getSafeTypeByName(valueDatatype);
-                        } catch (Exception e) {
-                            log.warn ("Unable to get safe type " + valueDatatype + " using TypeMapper");
-                        }
-                        if (dtype != null) {
-                            value = ontModel.createTypedLiteral(valueLexicalForm, dtype);
+
+        switch (restrictionTypeStr) {
+            case "allValuesFrom":
+                rest = ontModel.createAllValuesFromRestriction(null, onProperty, roleFiller);
+                break;
+            case "someValuesFrom":
+                rest = ontModel.createSomeValuesFromRestriction(null, onProperty, roleFiller);
+                break;
+            case "hasValue":
+                String valueURI = request.getParameter("ValueIndividual");
+                if (valueURI != null) {
+                    Resource valueRes = ontModel.getResource(valueURI);
+                    if (valueRes != null) {
+                        rest = ontModel.createHasValueRestriction(null, onProperty, valueRes);
+                    }
+                } else {
+                    String valueLexicalForm = request.getParameter("ValueLexicalForm");
+                    if (valueLexicalForm != null) {
+                        String valueDatatype = request.getParameter("ValueDatatype");
+                        Literal value = null;
+                        if (valueDatatype != null && valueDatatype.length() > 0) {
+                            RDFDatatype dtype = null;
+                            try {
+                                dtype = TypeMapper.getInstance().getSafeTypeByName(valueDatatype);
+                            } catch (Exception e) {
+                                log.warn("Unable to get safe type " + valueDatatype + " using TypeMapper");
+                            }
+                            if (dtype != null) {
+                                value = ontModel.createTypedLiteral(valueLexicalForm, dtype);
+                            } else {
+                                value = ontModel.createLiteral(valueLexicalForm);
+                            }
                         } else {
                             value = ontModel.createLiteral(valueLexicalForm);
                         }
-                    } else {
-                        value = ontModel.createLiteral(valueLexicalForm);
+                        rest = ontModel.createHasValueRestriction(null, onProperty, value);
                     }
-                    rest = ontModel.createHasValueRestriction(null, onProperty, value);
                 }
-            }
-        } else if (restrictionTypeStr.equals("minCardinality")) {
-            rest = ontModel.createMinCardinalityRestriction(null,onProperty,cardinality);
-        } else if (restrictionTypeStr.equals("maxCardinality")) {
-            rest = ontModel.createMaxCardinalityRestriction(null,onProperty,cardinality);
-        } else if (restrictionTypeStr.equals("cardinality")) {
-            rest = ontModel.createCardinalityRestriction(null,onProperty,cardinality);
+                break;
+            case "minCardinality":
+                rest = ontModel.createMinCardinalityRestriction(null, onProperty, cardinality);
+                break;
+            case "maxCardinality":
+                rest = ontModel.createMaxCardinalityRestriction(null, onProperty, cardinality);
+                break;
+            case "cardinality":
+                rest = ontModel.createCardinalityRestriction(null, onProperty, cardinality);
+                break;
         }
         
         if (conditionTypeStr.equals("necessary")) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java
index 79438c49b..ec6d6e6ba 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java
@@ -66,29 +66,38 @@ public class RestrictionRetryController extends BaseEditController {
 					
 			epo.setFormObject(new FormObject());
 			epo.getFormObject().getOptionLists().put("onProperty", onPropertyList);
-			
-			if (restrictionTypeStr.equals("someValuesFrom")) {
-				request.setAttribute("specificRestrictionForm","someValuesFromRestriction_retry.jsp");
-				List<Option> optionList = (propertyType == OBJECT) 
-					? getValueClassOptionList(request)
-					: getValueDatatypeOptionList(request) ;
-				epo.getFormObject().getOptionLists().put("ValueClass",optionList);
-			} else if (restrictionTypeStr.equals("allValuesFrom")) {
-				request.setAttribute("specificRestrictionForm","allValuesFromRestriction_retry.jsp");
-				List<Option> optionList = (propertyType == OBJECT) 
-					? getValueClassOptionList(request)
-				    : getValueDatatypeOptionList(request) ;
-				epo.getFormObject().getOptionLists().put("ValueClass",optionList);
-			} else if (restrictionTypeStr.equals("hasValue")) {
-				request.setAttribute("specificRestrictionForm", "hasValueRestriction_retry.jsp");
-				if (propertyType == OBJECT) {
-					request.setAttribute("propertyType", "object");	
-				} else {
-					request.setAttribute("propertyType", "data");
-				}	
-			} else if (restrictionTypeStr.equals("minCardinality") || restrictionTypeStr.equals("maxCardinality") || restrictionTypeStr.equals("cardinality")) {
-				request.setAttribute("specificRestrictionForm", "cardinalityRestriction_retry.jsp");
-			} 
+
+			switch (restrictionTypeStr) {
+				case "someValuesFrom": {
+					request.setAttribute("specificRestrictionForm", "someValuesFromRestriction_retry.jsp");
+					List<Option> optionList = (propertyType == OBJECT)
+							? getValueClassOptionList(request)
+							: getValueDatatypeOptionList(request);
+					epo.getFormObject().getOptionLists().put("ValueClass", optionList);
+					break;
+				}
+				case "allValuesFrom": {
+					request.setAttribute("specificRestrictionForm", "allValuesFromRestriction_retry.jsp");
+					List<Option> optionList = (propertyType == OBJECT)
+							? getValueClassOptionList(request)
+							: getValueDatatypeOptionList(request);
+					epo.getFormObject().getOptionLists().put("ValueClass", optionList);
+					break;
+				}
+				case "hasValue":
+					request.setAttribute("specificRestrictionForm", "hasValueRestriction_retry.jsp");
+					if (propertyType == OBJECT) {
+						request.setAttribute("propertyType", "object");
+					} else {
+						request.setAttribute("propertyType", "data");
+					}
+					break;
+				case "minCardinality":
+				case "maxCardinality":
+				case "cardinality":
+					request.setAttribute("specificRestrictionForm", "cardinalityRestriction_retry.jsp");
+					break;
+			}
 			
 	        request.setAttribute("formJsp","/templates/edit/specific/restriction_retry.jsp");
 	        request.setAttribute("scripts","/templates/edit/formBasic.js");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java
index 9e5c682be..f509aae17 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java
@@ -179,7 +179,7 @@ public class VclassEditController extends BaseEditController {
         foo.setOptionLists(OptionMap);
         epo.setFormObject(foo);
 
-        boolean instantiable = (vcl.getURI().equals(OWL.Nothing.getURI())) ? false : true;
+        boolean instantiable = !vcl.getURI().equals(OWL.Nothing.getURI());
         
         request.setAttribute("epoKey",epo.getKey());
         request.setAttribute("vclassWebapp", vcl);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ListingControllerWebUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ListingControllerWebUtils.java
index c71e94f23..42571a31a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ListingControllerWebUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ListingControllerWebUtils.java
@@ -29,17 +29,17 @@ public class ListingControllerWebUtils {
 	}
 	
 	public static synchronized String formatVClassLinks(List<VClass> vList) {
-	    String linksStr="";
+	    StringBuilder linksStr= new StringBuilder();
 	    if (vList!=null) {
 	        int count=0;
 	        for (Object obj : vList) {
 	        	try {
-	                if (count>0) linksStr += " | ";
+	                if (count>0) linksStr.append(" | ");
 		            VClass vclass = (VClass) obj;
 		            try {
-		                linksStr += "<a href=\"vclassEdit?uri="+URLEncoder.encode(vclass.getURI(),"UTF-8")+"\">"+vclass.getName()+"</a>";
+		                linksStr.append("<a href=\"vclassEdit?uri=").append(URLEncoder.encode(vclass.getURI(), "UTF-8")).append("\">").append(vclass.getName()).append("</a>");
 		            } catch (UnsupportedEncodingException e) {
-		                linksStr += vclass.getName();
+		                linksStr.append(vclass.getName());
 		            }
 	                ++count;
 	        	} catch (Exception e) {
@@ -49,7 +49,7 @@ public class ListingControllerWebUtils {
 	        	}
 	        }
 	    }
-	    return linksStr;
+	    return linksStr.toString();
 	}
 	
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java
index 0d6b6fd90..f499a325b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java
@@ -2,14 +2,10 @@
 
 package edu.cornell.mannlib.vitro.webapp.controller.edit.utils;
 
-import java.util.LinkedList;
 import java.util.List;
-import java.util.ArrayList;
 import java.util.HashMap;
-import edu.cornell.mannlib.vedit.beans.Option;
+
 import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
-import edu.cornell.mannlib.vitro.webapp.beans.ResourceBean;
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DumpTestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DumpTestController.java
index ba0313b90..953a0549e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DumpTestController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DumpTestController.java
@@ -6,6 +6,7 @@ import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -172,9 +173,7 @@ public class DumpTestController extends FreemarkerHttpServlet {
         }
          
         public void setFavoriteColors(String...colors) {
-            for (String color : colors) {
-                favoriteColors.add(color);
-            }
+            Collections.addAll(favoriteColors, colors);
         }
 
         float getSalary() {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
index b6a7f3aca..765d5cabd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
@@ -250,8 +250,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
 		// This method does a redirect if the required authorizations are 
 		// not met (and they won't be), so just return.
 		isAuthorizedToDisplayPage(vreq, response, values.getUnauthorizedAction());
-		return;
-	}
+    }
 
 	protected void doTemplate(VitroRequest vreq, HttpServletResponse response, 
             ResponseValues values) throws TemplateProcessingException {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java
index c89e9b0f4..ea2ebc13d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java
@@ -164,9 +164,6 @@ public class ImageUploadHelper {
 					fileInfo);
 
 			return fileInfo;
-		} catch (FileAlreadyExistsException e) {
-			throw new IllegalStateException("Can't create the new image file.",
-					e);
 		} catch (IOException e) {
 			throw new IllegalStateException("Can't create the new image file.",
 					e);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java
index d4275b280..a06b88709 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java
@@ -50,60 +50,60 @@ public class ListClassGroupsController extends FreemarkerHttpServlet {
 
             List<VClassGroup> groups = dao.getPublicGroupsWithVClasses(); 
 
-            String json = new String();
+            StringBuilder json = new StringBuilder();
             int counter = 0;
 
             if (groups != null) {
             	for(VClassGroup vcg: groups) {
                     if ( counter > 0 ) {
-                        json += ", ";
+                        json.append(", ");
                     }
                     String publicName = vcg.getPublicName();
                     if ( StringUtils.isBlank(publicName) ) {
                         publicName = "(unnamed group)";
                     }           
                     try {
-                        json += "{ \"name\": " + JacksonUtils.quote("<a href='./editForm?uri="+URLEncoder.encode(vcg.getURI())+"&amp;controller=Classgroup'>"+publicName+"</a>") + ", ";
+                        json.append("{ \"name\": ").append(JacksonUtils.quote("<a href='./editForm?uri=" + URLEncoder.encode(vcg.getURI()) + "&amp;controller=Classgroup'>" + publicName + "</a>")).append(", ");
                     } catch (Exception e) {
-                        json += "{ \"name\": " + JacksonUtils.quote(publicName) + ", ";
+                        json.append("{ \"name\": ").append(JacksonUtils.quote(publicName)).append(", ");
                     }
                     Integer t;
                     
-                    json += "\"data\": { \"displayRank\": \"" + (((t = Integer.valueOf(vcg.getDisplayRank())) != -1) ? t.toString() : "") + "\"}, ";
+                    json.append("\"data\": { \"displayRank\": \"").append(((t = Integer.valueOf(vcg.getDisplayRank())) != -1) ? t.toString() : "").append("\"}, ");
                     
                     List<VClass> classList = vcg.getVitroClassList();
                     if (classList != null && classList.size()>0) {
-                        json += "\"children\": [";
+                        json.append("\"children\": [");
                         Iterator<VClass> classIt = classList.iterator();
                         while (classIt.hasNext()) {
                             VClass vcw = classIt.next();
                             if (vcw.getName() != null && vcw.getURI() != null) {
                                 try {
-                                    json += "{ \"name\": " + JacksonUtils.quote("<a href='vclassEdit?uri="+URLEncoder.encode(vcw.getURI())+"'>"+vcw.getName()+"</a>") + ", ";
+                                    json.append("{ \"name\": ").append(JacksonUtils.quote("<a href='vclassEdit?uri=" + URLEncoder.encode(vcw.getURI()) + "'>" + vcw.getName() + "</a>")).append(", ");
                                 } catch (Exception e) {
-                                    json += "" + JacksonUtils.quote(vcw.getName()) + ", ";
+                                    json.append("").append(JacksonUtils.quote(vcw.getName())).append(", ");
                                 }
                             } else {
-                                json += "\"\", ";
+                                json.append("\"\", ");
                             }
 
                             String shortDefStr = (vcw.getShortDef() == null) ? "" : vcw.getShortDef();
-                            json += "\"data\": { \"shortDef\": " + JacksonUtils.quote(shortDefStr) + "}, \"children\": [] ";
+                            json.append("\"data\": { \"shortDef\": ").append(JacksonUtils.quote(shortDefStr)).append("}, \"children\": [] ");
                             if (classIt.hasNext())
-                                json += "} , ";
+                                json.append("} , ");
                             else 
-                                json += "}] ";
+                                json.append("}] ");
                         }
                     }
                     else {
-                        json += "\"children\": [] ";
+                        json.append("\"children\": [] ");
                     }
-                    json += "} ";
+                    json.append("} ");
                     counter += 1;
                 }
             }
 
-            body.put("jsonTree",json);
+            body.put("jsonTree", json.toString());
 
         } catch (Throwable t) {
                 t.printStackTrace();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java
index a85f68224..7efc567f2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java
@@ -100,27 +100,27 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet {
         	    sortForPickList(props, vreq);
             }
 
-            String json = new String();
+            StringBuilder json = new StringBuilder();
             int counter = 0;
 
             if (props != null) {
                 if (props.size()==0) {
-                    json = "{ \"name\": \"" + noResultsMsgStr + "\" }";
+                    json = new StringBuilder("{ \"name\": \"" + noResultsMsgStr + "\" }");
                 } else {
             	    for (DataProperty prop: props) {
                         if ( counter > 0 ) {
-                            json += ", ";
+                            json.append(", ");
                         }
                         
                         String nameStr = prop.getPickListName()==null ? prop.getName()==null ? prop.getURI()==null ? "(no name)" : prop.getURI() : prop.getName() : prop.getPickListName();
 
                         try {
-                            json += "{ \"name\": " + JacksonUtils.quote("<a href='datapropEdit?uri="+ URLEncoder.encode(prop.getURI())+"'>" + nameStr + "</a>") + ", "; 
+                            json.append("{ \"name\": ").append(JacksonUtils.quote("<a href='datapropEdit?uri=" + URLEncoder.encode(prop.getURI()) + "'>" + nameStr + "</a>")).append(", ");
                         } catch (Exception e) {
-                            json += "{ \"name\": " + JacksonUtils.quote(nameStr) + ", ";
+                            json.append("{ \"name\": ").append(JacksonUtils.quote(nameStr)).append(", ");
                         }
                         
-                        json += "\"data\": { \"internalName\": " + JacksonUtils.quote(prop.getPickListName()) + ", ";
+                        json.append("\"data\": { \"internalName\": ").append(JacksonUtils.quote(prop.getPickListName())).append(", ");
                         
 /*                        VClass vc = null;
                         String domainStr="";
@@ -140,22 +140,22 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet {
                             dpLangNeut = prop;
                         }
                         String domainStr = getVClassNameFromURI(dpLangNeut.getDomainVClassURI(), vcDao, vcDaoLangNeut); 
-                        json += "\"domainVClass\": " + JacksonUtils.quote(domainStr) + ", " ;
+                        json.append("\"domainVClass\": ").append(JacksonUtils.quote(domainStr)).append(", ");
 
                         Datatype rangeDatatype = dDao.getDatatypeByURI(prop.getRangeDatatypeURI());
                         String rangeDatatypeStr = (rangeDatatype==null)?prop.getRangeDatatypeURI():rangeDatatype.getName();
-                        json += "\"rangeVClass\": " + JacksonUtils.quote(rangeDatatypeStr) + ", " ; 
+                        json.append("\"rangeVClass\": ").append(JacksonUtils.quote(rangeDatatypeStr)).append(", ");
 
                         if (prop.getGroupURI() != null) {
                             PropertyGroup pGroup = pgDao.getGroupByURI(prop.getGroupURI());
-                            json += "\"group\": " + JacksonUtils.quote((pGroup == null) ? "unknown group" : pGroup.getName()) + " } } " ; 
+                            json.append("\"group\": ").append(JacksonUtils.quote((pGroup == null) ? "unknown group" : pGroup.getName())).append(" } } ");
                         } else {
-                             json += "\"group\": \"unspecified\" } }" ;
+                             json.append("\"group\": \"unspecified\" } }");
                         }
                         counter += 1;
                     }
                 }
-                body.put("jsonTree",json);
+                body.put("jsonTree", json.toString());
             }
         } catch (Throwable t) {
             t.printStackTrace();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java
index a522829cd..e9ce65a74 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java
@@ -51,30 +51,30 @@ public class ListPropertyGroupsController extends FreemarkerHttpServlet {
             PropertyGroupDao dao = vreq.getUnfilteredWebappDaoFactory().getPropertyGroupDao();
 
             List<PropertyGroup> groups = dao.getPublicGroups(WITH_PROPERTIES);
-                String json = new String();
+                StringBuilder json = new StringBuilder();
                 int counter = 0;
 
                 if (groups != null) {
                 	for(PropertyGroup pg: groups) {
                         if ( counter > 0 ) {
-                            json += ", ";
+                            json.append(", ");
                         }
                         String publicName = pg.getName();
                         if ( StringUtils.isBlank(publicName) ) {
                             publicName = "(unnamed group)";
                         }           
                         try {
-                            json += "{ \"name\": " + JacksonUtils.quote("<a href='./editForm?uri="+URLEncoder.encode(pg.getURI(),"UTF-8")+"&amp;controller=PropertyGroup'>" + publicName + "</a>") + ", ";
+                            json.append("{ \"name\": ").append(JacksonUtils.quote("<a href='./editForm?uri=" + URLEncoder.encode(pg.getURI(), "UTF-8") + "&amp;controller=PropertyGroup'>" + publicName + "</a>")).append(", ");
                         } catch (Exception e) {
-                            json += "{ \"name\": " + JacksonUtils.quote(publicName) + ", ";
+                            json.append("{ \"name\": ").append(JacksonUtils.quote(publicName)).append(", ");
                         }
                         Integer t;
 
-                        json += "\"data\": { \"displayRank\": \"" + (((t = Integer.valueOf(pg.getDisplayRank())) != -1) ? t.toString() : "") + "\"}, ";
+                        json.append("\"data\": { \"displayRank\": \"").append(((t = Integer.valueOf(pg.getDisplayRank())) != -1) ? t.toString() : "").append("\"}, ");
 
                         List<Property> propertyList = pg.getPropertyList();
                         if (propertyList != null && propertyList.size()>0) {
-                            json += "\"children\": [";
+                            json.append("\"children\": [");
                             Iterator<Property> propIt = propertyList.iterator();
                             while (propIt.hasNext()) {
                                 Property prop = propIt.next();
@@ -91,31 +91,31 @@ public class ListPropertyGroupsController extends FreemarkerHttpServlet {
                                 }
                                 if (prop.getURI() != null) {
                                     try {
-                                        json += "{ \"name\": " + JacksonUtils.quote("<a href='" + controllerStr 
-                                             + "?uri="+URLEncoder.encode(prop.getURI(),"UTF-8")+"'>"+ nameStr +"</a>") + ", ";
+                                        json.append("{ \"name\": ").append(JacksonUtils.quote("<a href='" + controllerStr
+                                                + "?uri=" + URLEncoder.encode(prop.getURI(), "UTF-8") + "'>" + nameStr + "</a>")).append(", ");
                                     } catch (Exception e) {
-                                        json += JacksonUtils.quote(nameStr) + ", ";
+                                        json.append(JacksonUtils.quote(nameStr)).append(", ");
                                     }
                                 } else {
-                                    json += "\"\", ";
+                                    json.append("\"\", ");
                                 }
 
-                                json += "\"data\": { \"shortDef\": \"\"}, \"children\": [] ";
+                                json.append("\"data\": { \"shortDef\": \"\"}, \"children\": [] ");
                                 if (propIt.hasNext())
-                                    json += "} , ";
+                                    json.append("} , ");
                                 else 
-                                    json += "}] ";
+                                    json.append("}] ");
                             }
                         }
                         else {
-                            json += "\"children\": [] ";
+                            json.append("\"children\": [] ");
                         }
-                        json += "} ";
+                        json.append("} ");
                         counter += 1;
                     }
                 }
 
-                body.put("jsonTree",json);
+                body.put("jsonTree", json.toString());
                 log.debug("json = " + json);
             } catch (Throwable t) {
                     t.printStackTrace();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java
index a60e16ac2..0289a108d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java
@@ -139,51 +139,51 @@ public class ListPropertyWebappsController extends FreemarkerHttpServlet {
         	    sortForPickList(props, vreq);
             }
 
-            String json = new String();
+            StringBuilder json = new StringBuilder();
             int counter = 0;
 
             if (props != null) {
                 if (props.size()==0) {
-                    json = "{ \"name\": \"" + noResultsMsgStr + "\" }";
+                    json = new StringBuilder("{ \"name\": \"" + noResultsMsgStr + "\" }");
                 } else {
                     Iterator<ObjectProperty> propsIt = props.iterator();
                     while (propsIt.hasNext()) {
                         if ( counter > 0 ) {
-                            json += ", ";
+                            json.append(", ");
                         }
                         ObjectProperty prop = propsIt.next();
                     
                         String propNameStr = ShowObjectPropertyHierarchyController.getDisplayLabel(prop);
 
                         try {
-                            json += "{ \"name\": " + JacksonUtils.quote("<a href='./propertyEdit?uri="+URLEncoder.encode(prop.getURI())+"'>" 
-                                 + propNameStr + "</a>") + ", "; 
+                            json.append("{ \"name\": ").append(JacksonUtils.quote("<a href='./propertyEdit?uri=" + URLEncoder.encode(prop.getURI()) + "'>"
+                                    + propNameStr + "</a>")).append(", ");
                          } catch (Exception e) {
-                             json += "{ \"name\": \"" + propNameStr + "\", "; 
+                             json.append("{ \"name\": \"").append(propNameStr).append("\", ");
                          }
                     
-                         json += "\"data\": { \"internalName\": " + JacksonUtils.quote(prop.getLocalNameWithPrefix()) + ", "; 
+                         json.append("\"data\": { \"internalName\": ").append(JacksonUtils.quote(prop.getLocalNameWithPrefix())).append(", ");
                     
                          ObjectProperty opLangNeut = opDaoLangNeut.getObjectPropertyByURI(prop.getURI());
                          if(opLangNeut == null) {
                              opLangNeut = prop;
                          }
                          String domainStr = getVClassNameFromURI(opLangNeut.getDomainVClassURI(), vcDao, vcDaoLangNeut); 
-                         json += "\"domainVClass\": " + JacksonUtils.quote(domainStr) + ", " ;
+                         json.append("\"domainVClass\": ").append(JacksonUtils.quote(domainStr)).append(", ");
                     
                          String rangeStr = getVClassNameFromURI(opLangNeut.getRangeVClassURI(), vcDao, vcDaoLangNeut);
-                         json += "\"rangeVClass\": " + JacksonUtils.quote(rangeStr) + ", " ; 
+                         json.append("\"rangeVClass\": ").append(JacksonUtils.quote(rangeStr)).append(", ");
                     
                          if (prop.getGroupURI() != null) {
                              PropertyGroup pGroup = pgDao.getGroupByURI(prop.getGroupURI());
-                             json += "\"group\": " + JacksonUtils.quote((pGroup == null) ? "unknown group" : pGroup.getName()) + " } } " ; 
+                             json.append("\"group\": ").append(JacksonUtils.quote((pGroup == null) ? "unknown group" : pGroup.getName())).append(" } } ");
                          } else {
-                             json += "\"group\": \"unspecified\" } }" ;
+                             json.append("\"group\": \"unspecified\" } }");
                          }
                          counter += 1;
                      }
                  }
-                 body.put("jsonTree",json);
+                 body.put("jsonTree", json.toString());
              }
 
         } catch (Throwable t) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java
index 465c43b65..011ab887a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java
@@ -76,7 +76,7 @@ public class ListVClassWebappsController extends FreemarkerHttpServlet {
         	}
 
         }
-        String json = new String();
+        StringBuilder json = new StringBuilder();
         int counter = 0;
 
         String ontologyURI = vreq.getParameter("ontologyUri");
@@ -86,21 +86,21 @@ public class ListVClassWebappsController extends FreemarkerHttpServlet {
             Iterator<VClass> classesIt = classes.iterator();
             while (classesIt.hasNext()) {
                 if ( counter > 0 ) {
-                    json += ", ";
+                    json.append(", ");
                 }
                 VClass cls = (VClass) classesIt.next();
                 if ( (ontologyURI==null) || ( (ontologyURI != null) && (cls.getNamespace()!=null) && (ontologyURI.equals(cls.getNamespace())) ) ) {
 	                if (cls.getName() != null)
 	                    try {
-	                        json += "{ \"name\": " + JacksonUtils.quote("<a href='./vclassEdit?uri="+URLEncoder.encode(cls.getURI(),"UTF-8")+"'>"+cls.getPickListName()+"</a>") + ", ";
+	                        json.append("{ \"name\": ").append(JacksonUtils.quote("<a href='./vclassEdit?uri=" + URLEncoder.encode(cls.getURI(), "UTF-8") + "'>" + cls.getPickListName() + "</a>")).append(", ");
 	                    } catch (Exception e) {
-	                        json += "{ \"name\": " + JacksonUtils.quote(cls.getPickListName()) + ", ";
+	                        json.append("{ \"name\": ").append(JacksonUtils.quote(cls.getPickListName())).append(", ");
 	                    }
 	                else
-	                    json += "{ \"name\": \"\"";
+	                    json.append("{ \"name\": \"\"");
 	                String shortDef = (cls.getShortDef() == null) ? "" : cls.getShortDef();
 	                
-	                json += "\"data\": { \"shortDef\": " + JacksonUtils.quote(shortDef) + ", ";
+	                json.append("\"data\": { \"shortDef\": ").append(JacksonUtils.quote(shortDef)).append(", ");
 
 	                // get group name
 	                WebappDaoFactory wadf = vreq.getUnfilteredWebappDaoFactory();
@@ -115,7 +115,7 @@ public class ListVClassWebappsController extends FreemarkerHttpServlet {
 	                	}
 	                }
                     
-                    json += "\"classGroup\": " + JacksonUtils.quote(groupName) + ", ";
+                    json.append("\"classGroup\": ").append(JacksonUtils.quote(groupName)).append(", ");
 
 	                // get ontology name
 	                OntologyDao ontDao = wadf.getOntologyDao();
@@ -124,13 +124,13 @@ public class ListVClassWebappsController extends FreemarkerHttpServlet {
 	                if (ont != null && ont.getName() != null) {
 	                    ontName = ont.getName();
 	                }
-	                json += "\"ontology\": " + JacksonUtils.quote(ontName) + "} }";
+	                json.append("\"ontology\": ").append(JacksonUtils.quote(ontName)).append("} }");
 	                
 	                counter++;
 
                }
             }
-            body.put("jsonTree",json);
+            body.put("jsonTree", json.toString());
         }      
         
         return new TemplateResponseValues(TEMPLATE_NAME, body);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java
index f66163b7e..d00600d18 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java
@@ -76,7 +76,7 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
         } else {
         	vcDao = vreq.getUnfilteredWebappDaoFactory().getVClassDao();
         }
-        String json = new String();
+        StringBuilder json = new StringBuilder();
 
         String ontologyUri = vreq.getParameter("ontologyUri");
         String startClassUri = vreq.getParameter("vclassUri");
@@ -104,22 +104,22 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
         if (!rootIt.hasNext()) {
             VClass vcw = new VClass();
             vcw.setName("<strong>No classes found.</strong>");
-            json += addVClassDataToResultsList(vreq.getUnfilteredWebappDaoFactory(), vcw,0,ontologyUri,counter);
+            json.append(addVClassDataToResultsList(vreq.getUnfilteredWebappDaoFactory(), vcw, 0, ontologyUri, counter));
         } else {
             while (rootIt.hasNext()) {
                 VClass root = (VClass) rootIt.next();
 	            if (root != null) {
-	                json += addChildren(vreq.getUnfilteredWebappDaoFactory(), 
-	                        root, 0, ontologyUri, counter, vreq);
+	                json.append(addChildren(vreq.getUnfilteredWebappDaoFactory(),
+                            root, 0, ontologyUri, counter, vreq));
 	                counter += 1;
                 }
             }
             int length = json.length();
             if ( length > 0 ) {
-                json += " }"; 
+                json.append(" }");
             }
         }
-        body.put("jsonTree",json);
+        body.put("jsonTree", json.toString());
         
         return new TemplateResponseValues(TEMPLATE_NAME, body);
     }
@@ -129,8 +129,8 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
         String rowElts = addVClassDataToResultsList(wadf, parent, position, ontologyUri, counter);
     	int childShift = (rowElts.length() > 0) ? 1 : 0;  // if addVClassDataToResultsList filtered out the result, don't shift the children over 
         int length = rowElts.length();
-        String leaves = "";
-        leaves += rowElts;
+        StringBuilder leaves = new StringBuilder();
+        leaves.append(rowElts);
         List<String> childURIstrs = vcDao.getSubClassURIs(parent.getURI());
         if ((childURIstrs.size()>0) && position<MAXDEPTH) {
             List<VClass> childClasses = new ArrayList<VClass>();
@@ -148,22 +148,24 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
             Iterator<VClass> childClassIt = childClasses.iterator();
             while (childClassIt.hasNext()) {
                 VClass child = (VClass) childClassIt.next();
-                leaves += addChildren(wadf, child, position + childShift, ontologyUri, counter, vreq);
+                leaves.append(addChildren(wadf, child, position + childShift, ontologyUri, counter, vreq));
                 if (!childClassIt.hasNext()) {
                     if ( ontologyUri == null ) {
-                        leaves += " }] ";
+                        leaves.append(" }] ");
                     }
                     else if ( ontologyUri != null && length > 0 ) {
                         // need this for when we show the classes associated with an ontology
                         String ending = leaves.substring(leaves.length() - 2, leaves.length());
-                        if ( ending.equals("] ") ) {
-                            leaves += "}]";
-                        }
-                        else if  ( ending.equals(" [") ){
-                            leaves += "] ";
-                        }
-                        else {
-                            leaves += "}]";
+                        switch (ending) {
+                            case "] ":
+                                leaves.append("}]");
+                                break;
+                            case " [":
+                                leaves.append("] ");
+                                break;
+                            default:
+                                leaves.append("}]");
+                                break;
                         }
                     }
                 }
@@ -171,13 +173,13 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
         }
         else {
             if ( ontologyUri == null ) {
-                 leaves += "] ";
+                 leaves.append("] ");
             }
             else if ( ontologyUri != null && length > 0 ) {
-                 leaves += "] ";
+                 leaves.append("] ");
             }
         }
-        return leaves;
+        return leaves.toString();
     }
 
     private String addVClassDataToResultsList(WebappDaoFactory wadf, VClass vcw, int position, String ontologyUri, int counter) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java
index 5aaa0479f..75c073e45 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java
@@ -84,7 +84,7 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
             pgDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getPropertyGroupDao();
             dDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getDatatypeDao();
 
-            String json = new String();
+            StringBuilder json = new StringBuilder();
 
             String ontologyUri = vreq.getParameter("ontologyUri");
             String startPropertyUri = vreq.getParameter("propertyUri");
@@ -111,23 +111,23 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
                     String notFoundMessage = "<strong>No data properties found.</strong>"; 
                     dp.setName(notFoundMessage);
                     dp.setName(notFoundMessage);
-                    json += addDataPropertyDataToResultsList(dp, 0, ontologyUri, counter);
+                    json.append(addDataPropertyDataToResultsList(dp, 0, ontologyUri, counter));
                 } else {
                     while (rootIt.hasNext()) {
                         DataProperty root = rootIt.next();
                         if ( (ontologyUri==null) || ( (ontologyUri!=null) && (root.getNamespace()!=null) && (ontologyUri.equals(root.getNamespace())) ) ) {
-                    	    json += addChildren(root, 0, ontologyUri, counter, vreq);
+                    	    json.append(addChildren(root, 0, ontologyUri, counter, vreq));
                     	    counter += 1;
                 	    }
                     }	
                     int length = json.length();
                     if ( length > 0 ) {
-                        json += " }"; 
+                        json.append(" }");
                     }
                 }
             }
 
-            body.put("jsonTree",json);
+            body.put("jsonTree", json.toString());
         
         } catch (Throwable t) {
             t.printStackTrace();
@@ -142,8 +142,8 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
     	}
         String details = addDataPropertyDataToResultsList(parent, position, ontologyUri, counter);
         int length = details.length();
-        String leaves = "";
-        leaves += details;
+        StringBuilder leaves = new StringBuilder();
+        leaves.append(details);
         List<String> childURIstrs = dpDao.getSubPropertyURIs(parent.getURI());
         if ( (childURIstrs.size() > 0) && (position < MAXDEPTH) ) {
             List<DataProperty> childProps = new ArrayList<DataProperty>();
@@ -157,22 +157,24 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
             Iterator<DataProperty> childPropIt = childProps.iterator();
             while (childPropIt.hasNext()) {
                 DataProperty child = childPropIt.next();
-                leaves += addChildren(child, position+1, ontologyUri, counter, vreq);
+                leaves.append(addChildren(child, position + 1, ontologyUri, counter, vreq));
                 if (!childPropIt.hasNext()) {
                     if ( ontologyUri == null ) {
-                        leaves += " }] ";
+                        leaves.append(" }] ");
                     }
                     else if ( ontologyUri != null && length > 0 ) {
                         // need this for when we show the classes associated with an ontology
                         String ending = leaves.substring(leaves.length() - 2, leaves.length());
-                        if ( ending.equals("] ") ) {
-                            leaves += "}]";
-                        }
-                        else if  ( ending.equals(" [") ){
-                            leaves += "] ";
-                        }
-                        else {
-                            leaves += "}]";
+                        switch (ending) {
+                            case "] ":
+                                leaves.append("}]");
+                                break;
+                            case " [":
+                                leaves.append("] ");
+                                break;
+                            default:
+                                leaves.append("}]");
+                                break;
                         }
                     }
                 }
@@ -180,13 +182,13 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
         }
         else {
             if ( ontologyUri == null ) {
-                 leaves += "] ";
+                 leaves.append("] ");
             }
             else if ( ontologyUri != null && length > 0 ) {
-                 leaves += "] ";
+                 leaves.append("] ");
             }
         }
-        return leaves;
+        return leaves.toString();
     }
 
     private String addDataPropertyDataToResultsList(DataProperty dp, int position, String ontologyUri, int counter) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java
index 8dc204dc0..2f4b1ce56 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java
@@ -84,7 +84,7 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
             vcDaoLangNeut = vreq.getLanguageNeutralWebappDaoFactory().getVClassDao();
             pgDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getPropertyGroupDao();
 
-            String json = new String();
+            StringBuilder json = new StringBuilder();
 
             String ontologyUri = vreq.getParameter("ontologyUri");
             String startPropertyUri = vreq.getParameter("propertyUri");
@@ -115,7 +115,7 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
                     op.setURI(ontologyUri+"fake");
                     String notFoundMessage = "<strong>No object properties found.</strong>"; 
                     op.setDomainPublic(notFoundMessage);
-                    json += addObjectPropertyDataToResultsList(op, 0, ontologyUri, counter);
+                    json.append(addObjectPropertyDataToResultsList(op, 0, ontologyUri, counter));
                 } else {
                     while (rootIt.hasNext()) {
                         ObjectProperty root = rootIt.next();
@@ -123,18 +123,18 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
                     		    ( (ontologyUri != null) 
                     		    && (root.getNamespace() != null) 
                     		    && (ontologyUri.equals(root.getNamespace())) ) ) {
-                    	            json += addChildren(root, 0, ontologyUri, counter);
+                    	            json.append(addChildren(root, 0, ontologyUri, counter));
                     	            counter += 1;
                 	    }
                     }	
                     int length = json.length();
                     if ( length > 0 ) {
-                        json += " }"; 
+                        json.append(" }");
                     }
                 }
             }
 
-            body.put("jsonTree",json);
+            body.put("jsonTree", json.toString());
                     
         } catch (Throwable t) {
             t.printStackTrace();
@@ -146,8 +146,8 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
     private String addChildren(ObjectProperty parent, int position, String ontologyUri, int counter) {
         String details = addObjectPropertyDataToResultsList(parent, position, ontologyUri, counter);
         int length = details.length();
-        String leaves = "";
-        leaves += details;
+        StringBuilder leaves = new StringBuilder();
+        leaves.append(details);
         List<String> childURIstrs = opDao.getSubPropertyURIs(parent.getURI());
         if ( (childURIstrs.size() > 0) && (position < MAXDEPTH) ) {
             List<ObjectProperty> childProps = new ArrayList<ObjectProperty>();
@@ -161,22 +161,24 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
             Iterator<ObjectProperty> childPropIt = childProps.iterator();
             while (childPropIt.hasNext()) {
                 ObjectProperty child = childPropIt.next();
-                leaves += addChildren(child, position+1, ontologyUri, counter);
+                leaves.append(addChildren(child, position + 1, ontologyUri, counter));
                 if (!childPropIt.hasNext()) {
                     if ( ontologyUri == null ) {
-                        leaves += " }] ";
+                        leaves.append(" }] ");
                     }
                     else if ( ontologyUri != null && length > 0 ) {
                         // need this for when we show the classes associated with an ontology
                         String ending = leaves.substring(leaves.length() - 2, leaves.length());
-                        if ( ending.equals("] ") ) {
-                            leaves += "}]";
-                        }
-                        else if  ( ending.equals(" [") ){
-                            leaves += "] ";
-                        }
-                        else {
-                            leaves += "}]";
+                        switch (ending) {
+                            case "] ":
+                                leaves.append("}]");
+                                break;
+                            case " [":
+                                leaves.append("] ");
+                                break;
+                            default:
+                                leaves.append("}]");
+                                break;
                         }
                     }
                 }
@@ -184,13 +186,13 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
         }
         else {
             if ( ontologyUri == null ) {
-                 leaves += "] ";
+                 leaves.append("] ");
             }
             else if ( ontologyUri != null && length > 0 ) {
-                 leaves += "] ";
+                 leaves.append("] ");
             }
         }
-        return leaves;
+        return leaves.toString();
     }
 
     private String addObjectPropertyDataToResultsList(ObjectProperty op, int position, String ontologyUri, int counter) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java
index ef583e7af..7fac3f684 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java
@@ -7,7 +7,6 @@ import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java
index d1eadbfe8..e8a39da48 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java
@@ -2,7 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -13,10 +12,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
 
-import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * Freemarker controller and template sandbox.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
index bb4d151e0..a0cea3a10 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
@@ -208,19 +208,24 @@ public class UrlBuilder {
     }
     
     private static String addParams(String url, ParamMap params, String glue) {
-        for (String key: params.keySet()) {
-            String value = params.get(key);
-            // rjy7 Some users might require nulls to be converted to empty
-            // string, others to eliminate params with null values.
-            // Here we convert to empty string to prevent an exception
-            // from UrlEncoder.encode() when passed a null. Callers are advised
-            // to remove null values or convert to empty strings, whichever
-            // is desired in the particular instance.
-            value = (value == null) ? "" : urlEncode(value);
-            url += glue + key + "=" + value;
-            glue = "&";
+        if (params.size() > 0) {
+            StringBuilder sb = new StringBuilder(url);
+            for (String key: params.keySet()) {
+                String value = params.get(key);
+                // rjy7 Some users might require nulls to be converted to empty
+                // string, others to eliminate params with null values.
+                // Here we convert to empty string to prevent an exception
+                // from UrlEncoder.encode() when passed a null. Callers are advised
+                // to remove null values or convert to empty strings, whichever
+                // is desired in the particular instance.
+                value = (value == null) ? "" : urlEncode(value);
+                sb.append(glue).append(key).append("=").append(value);
+                glue = "&";
+            }
+            url = sb.toString();
         }
-        return url;        
+
+        return url;
     }
     
     public static String addParams(String url, ParamMap params) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java
index 2f573188c..f58960c80 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java
@@ -23,19 +23,15 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.vocabulary.RDFS;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.Property;
 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.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.dao.jena.QueryUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DataPropertyStatementTemplateModel;
 
 
 /*Servlet to view all labels in various languages for individual*/
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java
index f4446fc26..7f7f0daf9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java
@@ -19,11 +19,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import edu.cornell.mannlib.vitro.webapp.utils.json.JacksonUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java
index fbee457f8..57d8f01f3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java
@@ -91,7 +91,7 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 
 						ArrayList<DataProperty> vcProps = (ArrayList<DataProperty>)classPropertiesMap.get(vc);
 						for (DataProperty prop: vcProps) {
-							String nameStr = prop.getPublicName()==null ? prop.getName()==null ? null : prop.getName() : prop.getPublicName();
+							String nameStr = prop.getPublicName()==null ? prop.getName() : prop.getPublicName();
 								//System.out.println("--- uri: " + prop.getURI());
 								//System.out.println("--- name: " + nameStr);
 					        	// top level
@@ -152,7 +152,7 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 							VClass vc = (VClass) iter.next();
 							ArrayList<DataProperty> vcProps = (ArrayList<DataProperty>)lvl2ClassPropertiesMap.get(vc);
 							for (DataProperty prop: vcProps) {
-								String nameStr = prop.getPublicName()==null ? prop.getName()==null ? null : prop.getName() : prop.getPublicName();
+								String nameStr = prop.getPublicName()==null ? prop.getName() : prop.getPublicName();
 						        	// top level
 									ObjectNode propertiesItemJson = JsonNodeFactory.instance.objectNode();
 									
@@ -222,7 +222,7 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 
         	Collections.sort(props);
         	for (DataProperty prop: props) {
-        		String nameStr = prop.getPublicName()==null ? prop.getName()==null ? null : prop.getName() : prop.getPublicName();
+        		String nameStr = prop.getPublicName()==null ? prop.getName() : prop.getPublicName();
 				if (nameStr != null) {
             		if (prop.getDomainClassURI() != null) {
             			VClass vc = vcDao.getVClassByURI(prop.getDomainClassURI());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java
index 5aeeb440f..ad175f1f2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java
@@ -198,10 +198,10 @@ public class JSONReconcileServlet extends VitroHttpServlet {
 			json.put("schemaSpace", defaultNamespace);
 		}
 		ObjectNode viewJson = JsonNodeFactory.instance.objectNode();
-		StringBuffer urlBuf = new StringBuffer();
-		urlBuf.append("http://" + serverName);
+		StringBuilder urlBuf = new StringBuilder();
+		urlBuf.append("http://").append(serverName);
 		if (serverPort == 8080) {
-			urlBuf.append(":" + serverPort);
+			urlBuf.append(":").append(serverPort);
 		}
 		if (req.getContextPath() != null) {
 			urlBuf.append(req.getContextPath());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java
index 6cc9096fc..8133f6bb8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java
@@ -265,18 +265,18 @@ class IndividualResponseBuilder {
                - Much simpler is to just create an anchor element. This has the added advantage that the
                  browser doesn't ask to resend the form data when reloading the page.
              */
-            String url = vreq.getRequestURI() + "?verbose=" + !verboseValue;
+            StringBuilder url = new StringBuilder(vreq.getRequestURI() + "?verbose=" + !verboseValue);
             // Append request query string, except for current verbose value, to url
             String queryString = vreq.getQueryString();
             if (queryString != null) {
                 String[] params = queryString.split("&");
                 for (String param : params) {
                     if (! param.startsWith("verbose=")) {
-                        url += "&" + param;
+                        url.append("&").append(param);
                     }
                 }
             }
-            map.put("url", url);            
+            map.put("url", url.toString());
         } else {
             vreq.getSession().setAttribute("verbosePropertyDisplay", false);
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java
index 314506cb3..2b3d6eaec 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java
@@ -5,7 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.controller.individuallist;
 import java.util.Collection;
 import java.util.Map;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualListResultsUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualListResultsUtils.java
index b25e95e66..35f52f35b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualListResultsUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualListResultsUtils.java
@@ -8,7 +8,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
index 3273ed93f..126ac767d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
@@ -163,7 +163,7 @@ public class JenaAdminActions extends BaseEditController {
     }
     
 	private String testWriteXML() {
-		StringBuffer output = new StringBuffer();
+		StringBuilder output = new StringBuilder();
 		output.append("<html><head><title>Test Write XML</title></head><body><pre>\n");
 		OntModel model = ModelAccess.on(getServletContext()).getOntModel();
 		Model tmp = ModelFactory.createDefaultModel();
@@ -177,10 +177,10 @@ public class JenaAdminActions extends BaseEditController {
 					valid = false;
 					output.append("-----\n");
 					output.append("Unable to write statement as RDF/XML:\n");
-					output.append("Subject : \n"+stmt.getSubject().getURI());
-					output.append("Subject : \n"+stmt.getPredicate().getURI());
+					output.append("Subject : \n").append(stmt.getSubject().getURI());
+					output.append("Subject : \n").append(stmt.getPredicate().getURI());
 					String objectStr = (stmt.getObject().isLiteral()) ? ((Literal)stmt.getObject()).getLexicalForm() : ((Resource)stmt.getObject()).getURI();
-					output.append("Subject : \n"+objectStr);
+					output.append("Subject : \n").append(objectStr);
 					output.append("Exception: \n");
 					e.printStackTrace();
 				}
@@ -250,16 +250,20 @@ public class JenaAdminActions extends BaseEditController {
         VitroRequest request = new VitroRequest(req);
         String actionStr = request.getParameter("action");
 
-        if (actionStr.equals("printRestrictions")) {
-        	printRestrictions();
-        } else if (actionStr.equals("outputTbox")) {
-        	outputTbox(response);
-        } else if (actionStr.equals("testWriteXML")) {
-        	try {
-        		response.getWriter().write(testWriteXML());
-        	} catch ( IOException ioe ) {
-        		throw new RuntimeException( ioe );
-        	}
+		switch (actionStr) {
+			case "printRestrictions":
+				printRestrictions();
+				break;
+			case "outputTbox":
+				outputTbox(response);
+				break;
+			case "testWriteXML":
+				try {
+					response.getWriter().write(testWriteXML());
+				} catch (IOException ioe) {
+					throw new RuntimeException(ioe);
+				}
+				break;
 		}
         
         if (actionStr.equals("checkURIs")) { 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java
index d8a1f9099..2b7a8b6d3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java
@@ -139,7 +139,6 @@ public class JenaCsv2RdfController extends JenaIngestController {
             log.error(e1);
             throw new ServletException(e1);
         }
-        return;
     }
 
 	 public Model doExecuteCsv2Rdf(VitroRequest vreq, FileItem fileStream, String filePath) throws Exception {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java
index 0edc02bbd..d132585fe 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java
@@ -106,7 +106,7 @@ public class JenaExportController extends BaseEditController {
 		String formatParam = vreq.getParameter("format");
 		String subgraphParam = vreq.getParameter("subgraph");
 		String assertedOrInferredParam = vreq.getParameter("assertedOrInferred");
-		String ontologyURI = vreq.getParameter("ontologyURI");
+		StringBuilder ontologyURI = new StringBuilder(vreq.getParameter("ontologyURI"));
 		
 		Model model = null;
 		OntModel ontModel = ModelFactory.createOntologyModel();
@@ -114,12 +114,13 @@ public class JenaExportController extends BaseEditController {
 		if(!subgraphParam.equalsIgnoreCase("tbox") 
 				&& !subgraphParam.equalsIgnoreCase("abox") 
 				&& !subgraphParam.equalsIgnoreCase("full")){
-			ontologyURI = subgraphParam;
+			ontologyURI = new StringBuilder(subgraphParam);
 			subgraphParam = "tbox";
-			char[] uri =  ontologyURI.toCharArray();
-			ontologyURI="";
-			for(int i =0; i < uri.length-1;i++)
-				ontologyURI = ontologyURI + uri[i];
+			char[] uri =  ontologyURI.toString().toCharArray();
+			ontologyURI = new StringBuilder();
+			for(int i =0; i < uri.length-1;i++) {
+				ontologyURI.append(uri[i]);
+			}
 		}
 	
 		if( "abox".equals(subgraphParam)){
@@ -141,7 +142,7 @@ public class JenaExportController extends BaseEditController {
 		        // only those statements that are in the inferred graph
 		        Model tempModel = xutil.extractTBox(
 		        		ModelAccess.on(getServletContext()).getOntModel(TBOX_UNION),
-		                ontologyURI);
+						ontologyURI.toString());
 		        Model inferenceModel = ModelAccess.on(getServletContext()).getOntModel(TBOX_INFERENCES);
 		        inferenceModel.enterCriticalSection(Lock.READ);
 		        try {
@@ -152,17 +153,17 @@ public class JenaExportController extends BaseEditController {
 		    } else if ("full".equals(assertedOrInferredParam)) {
                 model = xutil.extractTBox(
                 		ModelAccess.on(getServletContext()).getOntModel(TBOX_UNION),
-                        ontologyURI);		        
+						ontologyURI.toString());
 		    } else {
                 model = xutil.extractTBox(
-                        ModelAccess.on(getServletContext()).getOntModel(TBOX_ASSERTIONS), ontologyURI);              		        
+                        ModelAccess.on(getServletContext()).getOntModel(TBOX_ASSERTIONS), ontologyURI.toString());
 		    }
 			
 		}
 		else if("full".equals(subgraphParam)){
 			if("inferred".equals(assertedOrInferredParam)){
 				ontModel = xutil.extractTBox(
-						dataset, ontologyURI, ABOX_INFERENCES);
+						dataset, ontologyURI.toString(), ABOX_INFERENCES);
 				ontModel.addSubModel(ModelAccess.on(getServletContext()).getOntModel(ABOX_INFERENCES));
 				ontModel.addSubModel(ModelAccess.on(getServletContext()).getOntModel(TBOX_INFERENCES));
 			}
@@ -214,23 +215,31 @@ public class JenaExportController extends BaseEditController {
 	}
 	
 	private void setHeaders(HttpServletResponse response, String formatParam) {
-	       if ( formatParam == null ) {
-	            formatParam = "RDF/XML-ABBREV";  // default
-	        }
-	        String mime = formatToMimetype.get( formatParam );
-	        if ( mime == null ) {
-	            throw new RuntimeException( "Unsupported RDF format " + formatParam);
-	        }
-	        
-	        response.setContentType( mime );
-	        if(mime.equals("application/rdf+xml"))
-	            response.setHeader("content-disposition", "attachment; filename=" + "export.rdf");
-	        else if(mime.equals("text/n3"))
-	            response.setHeader("content-disposition", "attachment; filename=" + "export.n3");
-	        else if(mime.equals("text/plain"))
-	            response.setHeader("content-disposition", "attachment; filename=" + "export.txt");
-	        else if(mime.equals("application/x-turtle"))
-	            response.setHeader("content-disposition", "attachment; filename=" + "export.ttl");
+		if ( formatParam == null ) {
+			formatParam = "RDF/XML-ABBREV";  // default
+		}
+
+		String mime = formatToMimetype.get( formatParam );
+		if ( mime == null ) {
+			throw new RuntimeException( "Unsupported RDF format " + formatParam);
+		}
+
+		response.setContentType( mime );
+
+		switch (mime) {
+			case "application/rdf+xml":
+				response.setHeader("content-disposition", "attachment; filename=" + "export.rdf");
+				break;
+			case "text/n3":
+				response.setHeader("content-disposition", "attachment; filename=" + "export.n3");
+				break;
+			case "text/plain":
+				response.setHeader("content-disposition", "attachment; filename=" + "export.txt");
+				break;
+			case "application/x-turtle":
+				response.setHeader("content-disposition", "attachment; filename=" + "export.ttl");
+				break;
+		}
 	}
 	
 	private void outputSparqlConstruct(String queryStr, String formatParam, 
@@ -248,10 +257,8 @@ public class JenaExportController extends BaseEditController {
 	        IOUtils.copy(in, out);
 	        out.flush();
 	        out.close();
-	    } catch (RDFServiceException e) {
+	    } catch (RDFServiceException | IOException e) {
 	        throw new RuntimeException(e);
-	    } catch (IOException ioe) {
-	        throw new RuntimeException(ioe);
 	    } finally {
 	        rdfService.close();
 	    }	    
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
index e5dfac058..e615ba866 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
@@ -303,11 +303,11 @@ public class JenaIngestController extends BaseEditController {
         } catch (org.apache.jena.shared.CannotEncodeCharacterException cece) {
             // there's got to be a better way to do this
             byte[] badCharBytes = String.valueOf(cece.getBadChar()).getBytes();
-            String errorMsg = "Cannot encode character with byte values: (decimal) ";
+            StringBuilder errorMsg = new StringBuilder("Cannot encode character with byte values: (decimal) ");
             for (int i=0; i<badCharBytes.length; i++) {
-                errorMsg += badCharBytes[i];
+                errorMsg.append(badCharBytes[i]);
             }
-            throw new RuntimeException(errorMsg, cece);
+            throw new RuntimeException(errorMsg.toString(), cece);
         } catch (Exception e) {
             log.error(e, e);
         } finally {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
index 748e4a248..7a3b9d31e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
@@ -453,8 +453,7 @@ public class RDFUploadController extends JenaIngestController {
          } catch (IOException e1) {
              log.error(e1);
              throw new ServletException(e1);
-         }            
-         return;
+         }
      }
      
      private OntModel getABoxModel(ServletContext ctx) {   
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetAllVClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetAllVClasses.java
index 02ea45bd6..0814eeef9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetAllVClasses.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetAllVClasses.java
@@ -6,7 +6,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java
index c21fb3a88..80c98910f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java
@@ -18,7 +18,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
 import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewService;
 import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewService.ShortViewContext;
 import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewServiceSetup;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModel;
 
 /**
  * Does a Solr search for individuals, and uses the short view to render each of
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRenderedSearchIndividualsByVClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRenderedSearchIndividualsByVClass.java
index 1befb3448..60ac4b7b7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRenderedSearchIndividualsByVClass.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRenderedSearchIndividualsByVClass.java
@@ -18,7 +18,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
 import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewService;
 import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewService.ShortViewContext;
 import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewServiceSetup;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModel;
 
 /**
  * Does a search for individuals, and uses the short view to render each of
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClass.java
index 8dd55b20f..ec37344c6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClass.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClass.java
@@ -2,7 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.controller.json;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetVClassesForVClassGroup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetVClassesForVClassGroup.java
index 1af8cfb4f..ef9e58760 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetVClassesForVClassGroup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetVClassesForVClassGroup.java
@@ -2,8 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.controller.json;
 
-import java.util.ArrayList;
-
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonObjectProducer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonObjectProducer.java
index bece7fad8..efe3b4dac 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonObjectProducer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonObjectProducer.java
@@ -8,8 +8,6 @@ import java.io.Writer;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletResponse;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.commons.logging.Log;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitro.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitro.java
index 0d6190a9d..977f83bab 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitro.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitro.java
@@ -10,7 +10,6 @@ import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.IndividualDaoJena;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.NewURIMaker;
 
 public class NewURIMakerVitro implements NewURIMaker {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDao.java
index 6485b9d30..da03eeadb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDao.java
@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.dao;
 
 import java.util.List;
 
-import edu.cornell.mannlib.vitro.webapp.beans.Property;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
 
 public interface PropertyGroupDao {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java
index 5bd9fec9c..0a3aff295 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java
@@ -3,9 +3,7 @@
 package edu.cornell.mannlib.vitro.webapp.dao;
 
 import java.util.Collection;
-import java.util.Iterator;
 
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstanceIface;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementFiltering.java
index eff599a09..27500d74c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementFiltering.java
@@ -1,12 +1,9 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 package edu.cornell.mannlib.vitro.webapp.dao.filtering;
-import java.util.Date;
 
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 
 public class DataPropertyStatementFiltering implements DataPropertyStatement {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FilteringPropertyInstanceDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FilteringPropertyInstanceDao.java
index 3f75b1d8c..7a7b5b2ce 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FilteringPropertyInstanceDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FilteringPropertyInstanceDao.java
@@ -3,7 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.dao.filtering;
 
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.LinkedList;
 
 import net.sf.jga.algorithms.Filter;
@@ -67,16 +66,13 @@ public class FilteringPropertyInstanceDao implements PropertyInstanceDao {
                 //Filter based on subject, property and object.  This could be changed
                 //to filter on the subject's and object's class.
                 Individual sub = individualDao.getIndividualByURI(inst.getSubjectEntURI());
-                if( filters.getIndividualFilter().fn(sub) == false )
+                if(!filters.getIndividualFilter().fn(sub))
                     return false;
                 Individual obj = individualDao.getIndividualByURI(inst.getObjectEntURI());
-                if( filters.getIndividualFilter().fn(obj) == false)
+                if(!filters.getIndividualFilter().fn(obj))
                     return false;
                 ObjectProperty prop = objectPropDao.getObjectPropertyByURI(inst.getPropertyURI());
-                if( filters.getObjectPropertyFilter().fn(prop) == false)
-                    return false;
-                else 
-                    return true;                                
+                return filters.getObjectPropertyFilter().fn(prop);
             }            
         };
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java
index 5d4849def..09d2398d9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java
@@ -155,8 +155,10 @@ public class IndividualFiltering implements Individual {
         // predicate + range class combination is allowed even if the predicate is
         // hidden on its own.
         
+        return _innerIndividual.getPopulatedObjectPropertyList();
+
         // Will revisit filtering at this level if it turns out to be truly necessary.
-        
+/*
         List<ObjectProperty> outOProps = new ArrayList<ObjectProperty>();
         List<ObjectProperty> oProps = _innerIndividual.getPopulatedObjectPropertyList();
 		for (ObjectProperty op: oProps) {
@@ -166,6 +168,7 @@ public class IndividualFiltering implements Individual {
 			}
         }
         return outOProps;
+*/
     }
 
     /* ********************* methods that need delegated filtering *************** */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementFiltering.java
index 57e1bc717..c1ddeb680 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementFiltering.java
@@ -1,7 +1,6 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 package edu.cornell.mannlib.vitro.webapp.dao.filtering;
-import java.util.Date;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java
index 1cc60a71f..c01b1847a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java
@@ -2,17 +2,13 @@
 
 package edu.cornell.mannlib.vitro.webapp.dao.filtering;
 
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
-import net.sf.jga.algorithms.Filter;
-
 import org.apache.jena.ontology.DatatypeProperty;
 
 import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
@@ -70,8 +66,7 @@ public class PropertyGroupDaoFiltering implements PropertyGroupDao {
         }
         
         grp.setPropertyList(filteredProps); //side effect 
-        return ;	    
-	}
+    }
 	
 	public List<PropertyGroup> getPublicGroups(boolean withProperties) {
 		List<PropertyGroup> groups =  innerDao.getPublicGroups(withProperties);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java
index 3a1adeb9d..dfe50cf6d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java
@@ -223,7 +223,6 @@ public class VClassDaoFiltering extends BaseFiltering implements VClassDao{
         if( out != null )
             vclass.setEntityCount(out.size());
         System.out.println(vclass.getURI() + " count: " + vclass.getEntityCount());
-        return;
     }
 
     private List<VClass> correctVClassCounts(List<VClass> vclasses){
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java
index 08d4e9fef..5c2193cc4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java
@@ -4,12 +4,10 @@ package edu.cornell.mannlib.vitro.webapp.dao.filtering.filters;
 
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import net.sf.jga.fn.UnaryFunctor;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersImpl.java
index 4658086e6..376707416 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersImpl.java
@@ -12,7 +12,6 @@ import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
 import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.User;
 
 /**
  * A object to hold all the filters commonly used by the vitro webapp.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java
index 7df2c09df..d9ecce8a1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java
@@ -104,7 +104,7 @@ public class DisplayModelDaoJena implements DisplayModelDao {
         if( text == null ){       
             //text of file is not yet in model
             File oldMenuFile = new File(context.getRealPath(MENU_N3_FILE));
-            StringBuffer str = new StringBuffer(2000);
+            StringBuilder str = new StringBuilder(2000);
             BufferedReader reader = new BufferedReader(new FileReader(oldMenuFile));
             char[] buf = new char[1024];
             int numRead=0;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
index 1c50aa665..c1acf746a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
@@ -219,12 +219,12 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
         ontModel.enterCriticalSection(Lock.WRITE);
         try {
          
-            entURI = new String(preferredURI);          
+            entURI = preferredURI;
             org.apache.jena.ontology.Individual test = ontModel.getIndividual(entURI);
             int count = 0;
             while (test != null) {
                 ++count;
-                entURI = new String(preferredURI) + count;
+                entURI = preferredURI + count;
                 test = ontModel.getIndividual(entURI);
             }
             
@@ -677,7 +677,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
 		
 		int attempts = 0;
 		
-		while( uriIsGood == false && attempts < 30 ){	
+		while(!uriIsGood && attempts < 30 ){
 			log.debug("While loop: Uri is good false, attempt=" + attempts);
 			String localName = "n" + random.nextInt( Math.min(Integer.MAX_VALUE,(int)Math.pow(2,attempts + 13)) );
 			uri = namespace + localName;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
index 35c01ef77..cd186f019 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
@@ -2,7 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -28,7 +27,6 @@ import org.apache.jena.query.QueryExecutionFactory;
 import org.apache.jena.query.QueryFactory;
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
-import org.apache.jena.query.ResultSetFactory;
 import org.apache.jena.rdf.model.AnonId;
 import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Property;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
index 18918ebd0..5cc27bd07 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
 import static edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactorySDB.SDBDatasetMode.ASSERTIONS_ONLY;
 
-import java.io.InputStream;
 import java.sql.Timestamp;
 import java.text.Collator;
 import java.util.ArrayList;
@@ -17,7 +16,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.jena.graph.NodeFactory;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -27,14 +25,11 @@ import org.apache.jena.ontology.OntModel;
 import org.apache.jena.ontology.OntModelSpec;
 import org.apache.jena.ontology.OntResource;
 import org.apache.jena.query.Dataset;
-import org.apache.jena.query.Query;
 import org.apache.jena.query.QueryExecution;
 import org.apache.jena.query.QueryExecutionFactory;
 import org.apache.jena.query.QueryFactory;
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
-import org.apache.jena.query.ResultSetFactory;
-import org.apache.jena.query.Syntax;
 import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
@@ -62,9 +57,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactorySDB.SDBDatasetM
 import edu.cornell.mannlib.vitro.webapp.filestorage.model.ImageInfo;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
-
-import javax.xml.soap.Node;
 
 public class IndividualSDB extends IndividualImpl implements Individual {
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
index 1e914b258..760eef349 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
@@ -32,7 +32,6 @@ import org.apache.jena.query.QueryExecution;
 import org.apache.jena.query.QueryExecutionFactory;
 import org.apache.jena.query.QueryFactory;
 import org.apache.jena.query.Syntax;
-import org.apache.jena.rdf.model.AnonId;
 import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
@@ -217,12 +216,12 @@ public class JenaBaseDao extends JenaBaseDaoCon {
                 }
             }
             if ( (existingValue!=null && value == null) || (existingValue!=null && value != null && !(existingValue.equals(value)))
-                    || (existingValue!=null && existingValue == false && keepOnlyIfTrue)) {
+                    || (existingValue!=null && !existingValue && keepOnlyIfTrue)) {
                 model.removeAll(res, dataprop, null);
             }
             if ( (existingValue==null && value != null) || (existingValue!=null && value != null && !(existingValue.equals(value)) ) ) {
                 if (keepOnlyIfTrue) {
-                    if (value==true) {
+                    if (value) {
                         model.add(res, dataprop, model.createTypedLiteral(value));
                     }
                 } else {
@@ -970,7 +969,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     		if (vitroURIStr.indexOf(PSEUDO_BNODE_NS)==0) {
     			String idStr = vitroURIStr.split("#")[1];
     			log.debug("Trying to get bnode " + idStr);
-    			RDFNode rdfNode = ontModel.getRDFNode(NodeFactory.createAnon(idStr));
+    			RDFNode rdfNode = ontModel.getRDFNode(NodeFactory.createBlankNode(idStr));
     			if ( (rdfNode != null) && (rdfNode.canAs(OntClass.class)) ) {
     			    log.debug("found it");
     				cls = rdfNode.as(OntClass.class);
@@ -998,7 +997,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
 
     protected Node makeNodeForURI(String vitroURIStr) {
     	if (vitroURIStr.indexOf(PSEUDO_BNODE_NS)==0) {
-			return NodeFactory.createAnon(vitroURIStr.split("#")[1]);
+			return NodeFactory.createBlankNode(vitroURIStr.split("#")[1]);
     	} else {
     		return NodeFactory.createURI(vitroURIStr);
     	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java
index 93df98244..d0f7bea6e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java
@@ -261,14 +261,13 @@ public class JenaModelUtils {
                             Resource property) {
         dataset.getLock().enterCriticalSection(Lock.READ);
         try {
-            StringBuffer buff = new StringBuffer();
+            StringBuilder buff = new StringBuilder();
             buff.append("PREFIX afn: <http://jena.apache.org/ARQ/function#> \n")
-            .append("CONSTRUCT { \n")
-            .append("  ?res <" + property.getURI() + "> ?o } WHERE { \n");
+                    .append("CONSTRUCT { \n").append("  ?res <").append(property.getURI()).append("> ?o } WHERE { \n");
             if (graphURI != null) {
-                buff.append("    GRAPH " + graphURI + " { \n");
+                buff.append("    GRAPH ").append(graphURI).append(" { \n");
             }
-            buff.append("      ?res <" + property.getURI() + "> ?o \n");
+            buff.append("      ?res <").append(property.getURI()).append("> ?o \n");
             buff.append(getNamespaceFilter(namespace));
             if (graphURI != null) {
                 buff.append("    } \n");
@@ -292,13 +291,12 @@ public class JenaModelUtils {
         
     private String makeDescribeQueryStr( String typeURI, String namespace, String graphURI ) {
         
-        StringBuffer describeQueryStrBuff = new StringBuffer() 
+        StringBuilder describeQueryStrBuff = new StringBuilder()
             .append("PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n")
             .append("PREFIX afn: <http://jena.apache.org/ARQ/function#> \n")
             .append("DESCRIBE ?res WHERE { \n");
             if (graphURI != null) {
-                describeQueryStrBuff
-                .append("GRAPH " + graphURI + "{ \n");
+                describeQueryStrBuff.append("GRAPH ").append(graphURI).append("{ \n");
             }
             describeQueryStrBuff
             .append("    ?res rdf:type <").append(typeURI).append("> . \n");
@@ -320,7 +318,7 @@ public class JenaModelUtils {
     }
     
     private String getNamespaceFilter(String namespace) {
-        StringBuffer buff = new StringBuffer();
+        StringBuilder buff = new StringBuilder();
         if (namespace == null) {
             // exclude resources in the Vitro internal namespace or in the 
             // OWL namespace, but allow all others
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
index 48a96ada0..b9d06d028 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
@@ -7,7 +7,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
@@ -19,7 +18,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.jena.ontology.OntModel;
-import org.apache.jena.ontology.OntResource;
 import org.apache.jena.query.Dataset;
 import org.apache.jena.query.Query;
 import org.apache.jena.query.QueryExecution;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java
index d965b5cf1..e322d1fc7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java
@@ -3,8 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -28,7 +26,6 @@ import org.apache.jena.query.QueryExecutionFactory;
 import org.apache.jena.query.QueryFactory;
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
-import org.apache.jena.query.ResultSetFactory;
 import org.apache.jena.query.Syntax;
 import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.rdf.model.Resource;
@@ -68,11 +65,11 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
     
     protected static final String PREFIXES;
     static {
-        String prefixes = "";
+        StringBuilder prefixes = new StringBuilder();
         for (String key : NAMESPACES.keySet()) {
-            prefixes += "PREFIX " + key + ": <" + NAMESPACES.get(key) + ">\n";
+            prefixes.append("PREFIX ").append(key).append(": <").append(NAMESPACES.get(key)).append(">\n");
         }
-        PREFIXES = prefixes;
+        PREFIXES = prefixes.toString();
         log.debug("Query prefixes: " + PREFIXES);
     }
     
@@ -322,8 +319,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 		// DO NOT issue a removeAll() with a null (wildcard) in predicate position!
 		if (predicate == null) {
 			log.debug("Cannot remove ABox statements with a null predicate.");
-			return;
-		} else {
+        } else {
 			removeABoxStatementsWithPredicate(predicate.getURI());
 		}
 	}
@@ -902,32 +898,32 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
             return opList;
         }
         ObjectPropertyDao opDao = getWebappDaoFactory().getObjectPropertyDao();
-        String propQuery = "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" +
-                "PREFIX config: <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" +
-                "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> \n" +
-                "SELECT ?property ?domain ?range WHERE { \n" +
-                "    ?context config:configContextFor ?property . \n" +
-                "    ?context config:qualifiedByDomain ?domain . \n" +
-                "    ?context config:qualifiedBy ?range . \n";
+        StringBuilder propQuery = new StringBuilder("PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" +
+				"PREFIX config: <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" +
+				"PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> \n" +
+				"SELECT ?property ?domain ?range WHERE { \n" +
+				"    ?context config:configContextFor ?property . \n" +
+				"    ?context config:qualifiedByDomain ?domain . \n" +
+				"    ?context config:qualifiedBy ?range . \n");
         for(PropertyInstance propInst : propInsts) {
-            propQuery += "    FILTER (?property != <" + propInst.getPropertyURI() + "> ) \n";
+            propQuery.append("    FILTER (?property != <").append(propInst.getPropertyURI()).append("> ) \n");
         }
         Iterator<VClass> classIt = vclasses.iterator();
         if(classIt.hasNext()) {
-            propQuery += "    FILTER ( \n";
-            propQuery += "        (?domain = <" + OWL.Thing.getURI() + "> )\n";
+            propQuery.append("    FILTER ( \n");
+            propQuery.append("        (?domain = <").append(OWL.Thing.getURI()).append("> )\n");
             while (classIt.hasNext()) {
                 VClass vclass = classIt.next();
                 if(vclass.isAnonymous()) {
                     continue;
                 }
-                propQuery += "       || (?domain = <" + vclass.getURI() + "> ) \n";
+                propQuery.append("       || (?domain = <").append(vclass.getURI()).append("> ) \n");
             }
-            propQuery += ") \n";
+            propQuery.append(") \n");
         }
-        propQuery += "} \n";
-        log.debug(propQuery);
-        Query q = QueryFactory.create(propQuery);
+        propQuery.append("} \n");
+        log.debug(propQuery.toString());
+        Query q = QueryFactory.create(propQuery.toString());
         QueryExecution qe = QueryExecutionFactory.create(
                 q, getOntModelSelector().getDisplayModel());
         try {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java
index 0c0f8fa4f..c9e425f03 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java
@@ -3,7 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java
index 1fac3ba84..1c964ad4a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java
@@ -9,8 +9,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java
index 5898d1ff4..f481c4c9c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java
@@ -11,7 +11,6 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.jena.graph.Graph;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
-import org.apache.jena.graph.TransactionHandler;
 import org.apache.jena.query.Dataset;
 import org.apache.jena.query.LabelExistsException;
 import org.apache.jena.query.ReadWrite;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java
index 4c9892133..39008e572 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java
@@ -190,11 +190,11 @@ public class RDFServiceDatasetGraph implements DatasetGraph {
                 return WrappedIterator.create(Collections.<Quad>emptyIterator());
             }
         }
-        StringBuffer findQuery = new StringBuffer("SELECT * WHERE { \n");
+        StringBuilder findQuery = new StringBuilder("SELECT * WHERE { \n");
         String graphURI = !isVar(graph) ? graph.getURI() : null;
         findQuery.append("  GRAPH ");
         if (graphURI != null) {
-            findQuery.append("  <" + graphURI + ">");
+            findQuery.append("  <").append(graphURI).append(">");
         } else {
             findQuery.append("?g");
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java
index 666cfcf23..74c22528e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java
@@ -87,12 +87,11 @@ public class RDFServiceGraph implements GraphWithPerform {
         performAdd(arg0);
     }
     
-    private String serialize(Triple t) {
-        StringBuffer sb = new StringBuffer();
-        sb.append(sparqlNodeUpdate(t.getSubject(), "")).append(" ") 
+    private StringBuilder serialize(StringBuilder sb, Triple t) {
+        sb.append(sparqlNodeUpdate(t.getSubject(), "")).append(" ")
                .append(sparqlNodeUpdate(t.getPredicate(), "")).append(" ") 
                .append(sparqlNodeUpdate(t.getObject(), "")).append(" .");
-        return sb.toString();
+        return sb;
     }
         
     private synchronized void flush() {                                
@@ -117,12 +116,12 @@ public class RDFServiceGraph implements GraphWithPerform {
     }
     
     private synchronized String serializeGraph(Graph graph) {
-        String triples = "";
+        StringBuilder sb = new StringBuilder();
         Iterator<Triple> tripIt = graph.find(null, null, null);
         while(tripIt.hasNext()) {
-            triples += " \n" + serialize(tripIt.next());
+            serialize(sb.append(" \n"), tripIt.next());
         }
-        return triples;
+        return sb.toString();
     }
     
     @Override
@@ -132,7 +131,7 @@ public class RDFServiceGraph implements GraphWithPerform {
         } else {
             ChangeSet changeSet = rdfService.manufactureChangeSet();
             try {
-                changeSet.addAddition(RDFServiceUtils.toInputStream(serialize(t)),
+                changeSet.addAddition(RDFServiceUtils.toInputStream(serialize(new StringBuilder(), t).toString()),
                         RDFService.ModelSerializationFormat.N3, graphURI);
                 rdfService.changeSetUpdate(changeSet);
             } catch (RDFServiceException rdfse) {
@@ -156,7 +155,7 @@ public class RDFServiceGraph implements GraphWithPerform {
         } else {
             ChangeSet changeSet = rdfService.manufactureChangeSet();
             try {
-                changeSet.addRemoval(RDFServiceUtils.toInputStream(serialize(t)),
+                changeSet.addRemoval(RDFServiceUtils.toInputStream(serialize(new StringBuilder(), t).toString()),
                         RDFService.ModelSerializationFormat.N3, graphURI);
                 rdfService.changeSetUpdate(changeSet);
             } catch (RDFServiceException rdfse) {
@@ -221,9 +220,9 @@ public class RDFServiceGraph implements GraphWithPerform {
 				|| (object != null && object.isBlank())) {
             return false;
         }
-        StringBuffer containsQuery = new StringBuffer("SELECT * WHERE { \n");
+        StringBuilder containsQuery = new StringBuilder("SELECT * WHERE { \n");
         if (graphURI != null) {
-            containsQuery.append("  GRAPH <" + graphURI + "> { ");
+            containsQuery.append("  GRAPH <").append(graphURI).append("> { ");
         }
         containsQuery.append(sparqlNode(subject, "?s"))
         .append(" ")
@@ -283,7 +282,7 @@ public class RDFServiceGraph implements GraphWithPerform {
         } else if (node.isBlank()) {
             return "<fake:blank>"; // or throw exception?
         } else if (node.isURI()) {
-            StringBuffer uriBuff = new StringBuffer();
+            StringBuilder uriBuff = new StringBuilder();
             return uriBuff.append("<").append(node.getURI()).append(">").toString();
         } else if (node.isLiteral()) {
             StringBuffer literalBuff = new StringBuffer();
@@ -326,9 +325,9 @@ public class RDFServiceGraph implements GraphWithPerform {
                 return WrappedIterator.create(Collections.<Triple>emptyIterator());
             }
         }
-        StringBuffer findQuery = new StringBuffer("SELECT * WHERE { \n");
+        StringBuilder findQuery = new StringBuilder("SELECT * WHERE { \n");
         if (graphURI != null) {
-            findQuery.append("  GRAPH <" + graphURI + "> { ");
+            findQuery.append("  GRAPH <").append(graphURI).append("> { ");
         }
         findQuery.append(sparqlNode(subject, "?s"))
         .append(" ")
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java
index 1fa402632..16dfd10ec 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java
@@ -14,8 +14,6 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.conn.PoolingClientConnectionManager;
 import org.apache.http.message.BasicNameValuePair;
 
 import org.apache.jena.graph.Capabilities;
@@ -175,9 +173,9 @@ public class SparqlGraph implements GraphWithPerform {
 				|| (object != null && object.isBlank())) {
             return false;
         }
-        StringBuffer containsQuery = new StringBuffer("ASK { \n");
+        StringBuilder containsQuery = new StringBuilder("ASK { \n");
         if (graphURI != null) {
-            containsQuery.append("  GRAPH <" + graphURI + "> { ");
+            containsQuery.append("  GRAPH <").append(graphURI).append("> { ");
         }
         containsQuery.append(sparqlNode(subject, "?s"))
         .append(" ")
@@ -226,7 +224,7 @@ public class SparqlGraph implements GraphWithPerform {
         } else if (node.isBlank()) {
             return "<fake:blank>"; // or throw exception?
         } else if (node.isURI()) {
-            StringBuffer uriBuff = new StringBuffer();
+            StringBuilder uriBuff = new StringBuilder();
             return uriBuff.append("<").append(node.getURI()).append(">").toString();
         } else if (node.isLiteral()) {
             StringBuffer literalBuff = new StringBuffer();
@@ -269,9 +267,9 @@ public class SparqlGraph implements GraphWithPerform {
                 return WrappedIterator.create(Collections.<Triple>emptyIterator());
             }
         }
-        StringBuffer findQuery = new StringBuffer("SELECT * WHERE { \n");
+        StringBuilder findQuery = new StringBuilder("SELECT * WHERE { \n");
         if (graphURI != null) {
-            findQuery.append("  GRAPH <" + graphURI + "> { ");
+            findQuery.append("  GRAPH <").append(graphURI).append("> { ");
         }
         findQuery.append(sparqlNode(subject, "?s"))
         .append(" ")
@@ -415,11 +413,8 @@ public class SparqlGraph implements GraphWithPerform {
     
     private boolean execAsk(String queryStr) {
         Query askQuery = QueryFactory.create(queryStr);
-        QueryExecution qe = QueryExecutionFactory.sparqlService(endpointURI, askQuery);
-        try {
+        try (QueryExecution qe = QueryExecutionFactory.sparqlService(endpointURI, askQuery)) {
             return qe.execAsk();
-        } finally {
-            qe.close();
         }
     }
     
@@ -444,11 +439,8 @@ public class SparqlGraph implements GraphWithPerform {
 //        log.info((System.currentTimeMillis() - startTime1) + " to execute via sesame");
         
         Query askQuery = QueryFactory.create(queryStr);
-        QueryExecution qe = QueryExecutionFactory.sparqlService(endpointURI, askQuery);
-        try {
+        try (QueryExecution qe = QueryExecutionFactory.sparqlService(endpointURI, askQuery)) {
             return new ResultSetMem(qe.execSelect());
-        } finally {
-            qe.close();
         }
     }
     
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java
index ee2a644f0..bc8e927a8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java
@@ -90,69 +90,70 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                 if (cls.isRestriction()) {	    		
                     Restriction rest = cls.asRestriction();
                     OntProperty onProperty = rest.getOnProperty();
-                    String labelStr = "restriction on " + getLabelOrId(onProperty) + ": ";
+                    StringBuilder labelStr = new StringBuilder();
+                    labelStr.append("restriction on ").append(getLabelOrId(onProperty)).append(": ");
                     if (rest.isAllValuesFromRestriction() || rest.isSomeValuesFromRestriction()) {
                         Resource fillerRes = null;
                         if (rest.isAllValuesFromRestriction()) {
                             AllValuesFromRestriction avfRest = rest.asAllValuesFromRestriction();
                             fillerRes = avfRest.getAllValuesFrom();
-                            labelStr += "all values from ";
+                            labelStr.append("all values from ");
                         } else {
                             SomeValuesFromRestriction svfRest = rest.asSomeValuesFromRestriction();
                             fillerRes = svfRest.getSomeValuesFrom();
-                            labelStr += "some values from ";
+                            labelStr.append("some values from ");
                         }
                         if (fillerRes.canAs(OntClass.class)) { 
                             OntClass avf = fillerRes.as(OntClass.class);
-                            labelStr += getLabelForClass(avf,withPrefix,forPickList);
+                            labelStr.append(getLabelForClass(avf,withPrefix,forPickList));
                         } else {
                             try {
-                                labelStr += getLabelOrId(fillerRes.as(OntResource.class));
+                                labelStr.append(getLabelOrId(fillerRes.as(OntResource.class)));
                             } catch (Exception e) {
-                                labelStr += "???";
+                                labelStr.append("???");
                             }
                         }		    			
                     } else if (rest.isHasValueRestriction()) {
                         HasValueRestriction hvRest = rest.asHasValueRestriction();
-                        labelStr += "has value ";
+                        labelStr.append("has value ");
                         RDFNode fillerNode = hvRest.getHasValue();
                         try {
                             if (fillerNode.isResource()) {
-                                labelStr += getLabelOrId(fillerNode.as(OntResource.class));
+                                labelStr.append(getLabelOrId(fillerNode.as(OntResource.class)));
                             } else {
-                                labelStr += fillerNode.as(Literal.class).getLexicalForm(); 
+                                labelStr.append(fillerNode.as(Literal.class).getLexicalForm());
                             }
                         } catch (Exception e) {
-                            labelStr += "???";
+                            labelStr.append("???");
                         }
                     } else if (rest.isMinCardinalityRestriction()) {
                         MinCardinalityRestriction mcRest = rest.asMinCardinalityRestriction();
-                        labelStr += "minimum cardinality ";
-                        labelStr += mcRest.getMinCardinality();
+                        labelStr.append("minimum cardinality ");
+                        labelStr.append(mcRest.getMinCardinality());
                     } else if (rest.isMaxCardinalityRestriction()) {
                         MaxCardinalityRestriction mcRest = rest.asMaxCardinalityRestriction();
-                        labelStr += "maximum cardinality ";
-                        labelStr += mcRest.getMaxCardinality();
+                        labelStr.append("maximum cardinality ");
+                        labelStr.append(mcRest.getMaxCardinality());
                     } else if (rest.isCardinalityRestriction()) {
                         CardinalityRestriction cRest = rest.asCardinalityRestriction();
-                        labelStr += "cardinality ";
-                        labelStr += cRest.getCardinality();
+                        labelStr.append("cardinality ");
+                        labelStr.append(cRest.getCardinality());
                     }
-                    return labelStr;
+                    return labelStr.toString();
                 } else if (isBooleanClassExpression(cls)) {
-                    String labelStr = "(";
+                    StringBuilder labelStr = new StringBuilder("(");
                     if (cls.isComplementClass()) {
-                        labelStr += "not ";
+                        labelStr.append("not ");
                         ComplementClass ccls = cls.as(ComplementClass.class);
-                        labelStr += getLabelForClass(ccls.getOperand(),withPrefix,forPickList);		    			
+                        labelStr.append(getLabelForClass(ccls.getOperand(), withPrefix, forPickList));
                     } else if (cls.isIntersectionClass()) {
                         IntersectionClass icls = cls.as(IntersectionClass.class);
                         for (Iterator<? extends OntClass> operandIt = 
                                 icls.listOperands(); operandIt.hasNext();) {
                             OntClass operand = operandIt.next();
-                            labelStr += getLabelForClass(operand,withPrefix,forPickList);
+                            labelStr.append(getLabelForClass(operand, withPrefix, forPickList));
                             if (operandIt.hasNext()) {
-                                labelStr += " and ";
+                                labelStr.append(" and ");
                             }
                         }
                     } else if (cls.isUnionClass()) {
@@ -160,13 +161,13 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                         for (Iterator<? extends OntClass> operandIt = 
                                 icls.listOperands(); operandIt.hasNext();) {
                             OntClass operand = operandIt.next();
-                            labelStr += getLabelForClass(operand,withPrefix,forPickList);
+                            labelStr.append(getLabelForClass(operand, withPrefix, forPickList));
                             if (operandIt.hasNext()) {
-                                labelStr += " or ";
+                                labelStr.append(" or ");
                             }
                         }
                     }
-                    return labelStr+")";
+                    return labelStr.append(")").toString();
                 } else {
                     // BJL23 2009-02-19
                     // I'm putting the link markup in because I need it,
@@ -665,7 +666,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
         if (getOntModel().getProfile().NAMESPACE().equals(RDFS.getURI())) {
             top.setURI(RDF.getURI()+"Resource");
         } else {
-            top.setURI( (getOntModel().getProfile().THING().getURI()!=null) ? (getOntModel().getProfile().THING().getURI()): null);		
+            top.setURI((getOntModel().getProfile().THING().getURI()));
         }
         if (top.getURI() != null) {
             top.setName(top.getLocalName());
@@ -680,7 +681,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
         if (getOntModel().getProfile().NAMESPACE().equals(RDFS.getURI())) {
             return null;
         } else {
-            bottom.setURI( (getOntModel().getProfile().NOTHING().getURI()!=null) ? (getOntModel().getProfile().NOTHING().getURI()): null);		
+            bottom.setURI((getOntModel().getProfile().NOTHING().getURI()));
         }
         if (bottom.getURI() != null) {
             bottom.setName(bottom.getLocalName());
@@ -853,7 +854,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                                         }
                                         vcw.setEntityCount(count);
                                         classIsInstantiated = (count > 0);
-                                    } else if (includeUninstantiatedClasses == false) {
+                                    } else if (!includeUninstantiatedClasses) {
                                         // Note: to support SDB models, may want to do this with 
                                         // SPARQL and LIMIT 1 if SDB can take advantage of it
                                         Model aboxModel = getOntModelSelector().getABoxModel();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
index d8917246e..317713b2a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
@@ -3,8 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
 
-import org.apache.jena.ontology.AnnotationProperty;
-import org.apache.jena.ontology.OntClass;
 import org.apache.jena.query.Dataset;
 import org.apache.jena.query.Query;
 import org.apache.jena.query.QueryExecution;
@@ -20,7 +18,6 @@ import org.apache.jena.rdf.model.ResourceFactory;
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.rdf.model.StmtIterator;
 import org.apache.jena.shared.Lock;
-import org.apache.jena.util.iterator.ClosableIterator;
 import org.apache.jena.vocabulary.RDF;
 
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
@@ -88,7 +85,7 @@ public class VClassDaoSDB extends VClassDaoJena {
                                 		}
                                     	vcw.setEntityCount(count);
                                     	classIsInstantiated = (count > 0);
-                                    } else if (includeUninstantiatedClasses == false) {
+                                    } else if (!includeUninstantiatedClasses) {
                                         // Note: to support SDB models, may want to do this with 
                                         // SPARQL and LIMIT 1 if SDB can take advantage of it
                                     	Model aboxModel = getOntModelSelector().getABoxModel();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java
index a383b7c12..ca77a08fa 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java
@@ -21,7 +21,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
-import edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup;
 
 public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
 	 
@@ -115,7 +114,7 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
 	
 	public static String getFilterBlock(String[] graphVars, 
 	                                    SDBDatasetMode datasetMode) {
-	    StringBuffer filterBlock = new StringBuffer();
+	    StringBuilder filterBlock = new StringBuilder();
 	    for (int i = 0; i < graphVars.length; i++) {
 	        switch (datasetMode) {
 	            case ASSERTIONS_ONLY :  
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java
index bf333d002..d601fabed 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java
@@ -41,9 +41,7 @@ public abstract class BaseEditElementVTwo  implements EditElementVTwo {
         StringWriter writer = new StringWriter();
         try {
             template.process(map, writer);
-        } catch (TemplateException e) {
-            log.error(e,e);
-        } catch (IOException e) {
+        } catch (TemplateException | IOException e) {
             log.error(e,e);
         }
         return writer.toString();        
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java
index c3ef8ad3a..65338ca89 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java
@@ -57,18 +57,18 @@ public class BasicValidationVTwo {
             if( validations!= null){
                 for( String validationType : validations){
                 	//Appending validate message if same field has multiple values 
-                	String validateMsg = null;
+                	StringBuilder validateMsg = null;
                 	for(String value: values){
                 		String thisValidateMsg = validate(validationType,value);
                 		if(validateMsg != null && thisValidateMsg != null) {
-                			validateMsg += ", " + thisValidateMsg;
+                			validateMsg.append(", ").append(thisValidateMsg);
                 		} else {
-                			validateMsg = thisValidateMsg;
+                			validateMsg = new StringBuilder(thisValidateMsg);
 
                 		}
                 	}
                     if( validateMsg != null) {
-                        errors.put(name,validateMsg);
+                        errors.put(name, validateMsg.toString());
                     }    
                 }
             }
@@ -89,7 +89,7 @@ public class BasicValidationVTwo {
                 
                 for( String validationType : validations){
                     String value = null;
-                    String validateMsg = null;
+                    StringBuilder validateMsg = null;
                     //If no literals and this field was required, this is an error message
                     //and can return
                     if((literals == null || literals.size() == 0) && isRequiredField) {
@@ -118,15 +118,15 @@ public class BasicValidationVTwo {
 		                    }
 		                    String thisValidateMsg = validate(validationType,value);
 	                		if(validateMsg != null && thisValidateMsg != null) {
-	                			validateMsg += ", " + thisValidateMsg;
+	                			validateMsg.append(", ").append(thisValidateMsg);
 	                		} else {
-	                			validateMsg = thisValidateMsg;
+	                			validateMsg = new StringBuilder(thisValidateMsg);
 	
 	                		}
 	                    }
                     }
                     if( validateMsg != null) {
-                        errors.put(name,validateMsg);
+                        errors.put(name, validateMsg.toString());
                     }
                 }
             }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java
index b468c351b..8f525d2e1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java
@@ -576,13 +576,9 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
                 out = Integer.parseInt(vt[0]);
                 return true;
             }            
-        }catch(IndexOutOfBoundsException iex){
+        }catch(IndexOutOfBoundsException | NullPointerException | NumberFormatException iex){
             out =  null;
-        }catch(NumberFormatException nfe){
-            out =  null;
-        }catch(NullPointerException npe){
-            out = null;
-        }        
+        }
         return false;
     }
     
@@ -596,13 +592,9 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
                 out = null;
             else
                 out = Integer.parseInt(vt[0]);
-        }catch(IndexOutOfBoundsException iex){
+        }catch(IndexOutOfBoundsException | NullPointerException | NumberFormatException iex){
             out =  null;
-        }catch(NumberFormatException nfe){
-            out =  null;
-        }catch(NullPointerException npe){
-            out = null;
-        }        
+        }
         return out;
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
index a47f24013..cc85e5fdc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
@@ -297,7 +297,7 @@ public class EditConfigurationUtils {
     public static List<String> copy(List<String> list) {
         List<String> copyList = new ArrayList<String>();
         for(String l: list) {
-            copyList.add( new String (l) );
+            copyList.add(l);
         }
         return copyList;
    }        
@@ -307,9 +307,9 @@ public class EditConfigurationUtils {
         Set<String> keys = map.keySet();
         for(String key: keys) {            
             if( source.get(key) != null )
-                map.put(new String(key), new String( source.get(key)) );
+                map.put(key, source.get(key));
             else
-                map.put(new String(key),null);
+                map.put(key,null);
         }
         return map;
     }
@@ -319,7 +319,7 @@ public class EditConfigurationUtils {
         Set<String> keys = map.keySet();
         for(String key: keys) {
             List<String> vals = map.get(key);
-            map.put(new String(key), copy(vals));
+            map.put(key, copy(vals));
         }
         return map;
     }    
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java
index c95c827ab..069294bee 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java
@@ -618,9 +618,9 @@ public class EditConfigurationVTwo {
         Map<String, String> dest = new HashMap<String, String>();        
         for( String key : source.keySet()){
             if( source.get(key) != null )
-                dest.put(new String(key), source.get(key));
+                dest.put(key, source.get(key));
             else 
-                dest.put(new String(key), null);
+                dest.put(key, null);
         }
         return dest;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java
index 41f5853f1..fef6b2712 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java
@@ -4,8 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -16,7 +14,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.Model;
 import org.apache.jena.vocabulary.XSD;
 
 /**
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3EditUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3EditUtils.java
index 86438aed2..aa575b4cc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3EditUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3EditUtils.java
@@ -253,7 +253,7 @@ public class N3EditUtils {
         if (in == null) {
             return null;
         }
-        StringBuffer out = new StringBuffer();
+        StringBuilder out = new StringBuilder();
         for (int i = 0; i < in.length(); i++) {
             char c = in.charAt(i);
             if (!XMLChar.isInvalid(c)) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java
index 7e66585ee..1a857125a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java
@@ -5,12 +5,10 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -26,7 +24,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.DependentResourceDeleteJena;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfigurationConstants;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.ProcessRdfFormController.Utilities;
 
 /**
  * The goal of this class is to provide processing from 
@@ -295,9 +292,9 @@ public class ProcessRdfForm {
             }
         }
         
-        String errors = "";
+        StringBuilder errors = new StringBuilder();
         for( String errorMsg : errorMessages){
-            errors += errorMsg + '\n';
+            errors.append(errorMsg).append('\n');
         }
         
        if( !errorMessages.isEmpty() ){
@@ -311,7 +308,7 @@ public class ProcessRdfForm {
                     "remain unfilled out and then the optional N3 does not get values subsituted in from" +
                     "the form submission values.  It may also be the case that there are unintentional " +
                     "syntax errors the optional N3." );
-               log.debug( errors );                            
+               log.debug(errors.toString());
            }
        }
               
@@ -331,11 +328,11 @@ public class ProcessRdfForm {
     
     private void logSubstitueN3(String msg, List<String> n3, String label){
         if( n3 == null || n3.size() == 0) return;        
-        String out = label + ":\n";
+        StringBuilder out = new StringBuilder(label + ":\n");
         for( String str : n3 ){
-            out += "    " + str + "\n";
+            out.append("    ").append(str).append("\n");
         }                      
-        log.debug(out);
+        log.debug(out.toString());
     }
     
 	private static Map<String, String> getSubPedObjVarMap(
@@ -468,7 +465,7 @@ public class ProcessRdfForm {
 	   //TODO: Check how to handle multiple new resource values
 	   Iterator<String> keyIterator = urisFromForm.keySet().iterator();
 	   while(keyIterator.hasNext()) {
-		   String key = keyIterator.next().toString();
+		   String key = keyIterator.next();
 		   if(urisFromForm.get(key).contains(EditConfigurationConstants.NEW_URI_SENTINEL)) {
 			   String newUri = urisForNewResources.get(key);
 			   List<String> newUrisForKey = new ArrayList<String>();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java
index 0ddad8a43..3287f945b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java
@@ -1,7 +1,6 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields;
 
-import java.text.Collator;
 import java.util.Comparator;
 
 import org.apache.commons.logging.Log;
@@ -75,7 +74,7 @@ public class IndividualsViaObjectPropertyByRankOptions extends IndividualsViaObj
         	int displayRank1 = getDisplayRank(ind1);
         	int displayRank2 = getDisplayRank(ind2);
         	//Get display ranks 
-        	return (displayRank1 > displayRank2 ? 1: (displayRank1 == displayRank2? 0: -1));
+        	return (Integer.compare(displayRank1, displayRank2));
         	//TODO: Incorporate sparql query here to retrieve the ranks
         	//This qualifies as neither a data property or an object property so will need to access
         	//using sparql query
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropetyOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropetyOptions.java
index 155abc291..acd46c217 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropetyOptions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropetyOptions.java
@@ -7,14 +7,10 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -153,7 +149,7 @@ public class IndividualsViaObjectPropetyOptions implements FieldOptions {
     private HashSet<String> getApplicableVClassURIs(Individual subject, WebappDaoFactory wDaoFact) {
         HashSet<String> vclassesURIs = new HashSet<String>();
         if (!rangeTypes.isEmpty()) {
-            StringBuffer rangeBuff = new StringBuffer();
+            StringBuilder rangeBuff = new StringBuilder();
             for (VClass rangeType : rangeTypes) {
                 vclassesURIs.add(rangeType.getURI());
                 rangeBuff.append(rangeType.getURI()).append(", ");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java
index fbf5ed395..aa5e0afdd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java
@@ -76,11 +76,11 @@ public class IndividualsViaVClassOptions implements FieldOptions {
     
     
     private Map<? extends String, ? extends String> notFoundMsg() {
-        String msg = "No individuals found for "+ (vclassURIs.size() > 1?"types":"type");
+        StringBuilder msg = new StringBuilder("No individuals found for " + (vclassURIs.size() > 1 ? "types" : "type"));
         for( String uri : vclassURIs ){
-            msg += " " + uri;
+            msg.append(" ").append(uri);
         }
-        return Collections.singletonMap("", msg);
+        return Collections.singletonMap("", msg.toString());
     }
 
     protected Map<String,Individual> getIndividualsForClass(String vclassURI, WebappDaoFactory wDaoFact ){
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java
index 98c5b3649..1b7cf8cd4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java
@@ -14,7 +14,6 @@ import java.util.Map;
 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.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/EditConfigurationConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/EditConfigurationConstants.java
index 33ebfd202..37100f6dc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/EditConfigurationConstants.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/EditConfigurationConstants.java
@@ -8,8 +8,6 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.ProcessRdfForm;
-
 
 public class EditConfigurationConstants {
     /** Constants used by edit configuration */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java
index 5b642fef2..bfec0a78e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java
@@ -2,16 +2,10 @@
 
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 
 import javax.servlet.http.HttpSession;
 
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.vocabulary.XSD;
-
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
@@ -21,7 +15,6 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTw
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
 import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils;
 import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
-import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
 
 public class DateTimeIntervalFormGenerator extends
 		BaseEditConfigurationGenerator implements EditConfigurationGenerator {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java
index e7e56200c..25e448a30 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java
@@ -3,25 +3,11 @@
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
 import javax.servlet.http.HttpSession;
 
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.vocabulary.XSD;
-
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils;
-import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
-import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
 
 /**
  * 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeValueFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeValueFormGenerator.java
index 970b2a3db..85e9cbcf2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeValueFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeValueFormGenerator.java
@@ -2,16 +2,11 @@
 
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 
 import javax.servlet.http.HttpSession;
 
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.vocabulary.XSD;
-
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
@@ -20,7 +15,6 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTw
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
 import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils;
 import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
-import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
 
 
 public class DateTimeValueFormGenerator extends BaseEditConfigurationGenerator
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
index 59655782c..3fb637143 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
@@ -10,7 +10,6 @@ import java.util.Map;
 
 import javax.servlet.http.HttpSession;
 
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.searchresult.IndividualSearchResult;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -63,8 +62,8 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
 		if(objProp != null) {
 			return(objProp.getOfferCreateNewOption() && 
 					(
-							(command != null && command.equals(createCommand)) || 
-							objProp.getSelectFromExisting() == false
+							(command != null && command.equals(createCommand)) ||
+									!objProp.getSelectFromExisting()
 					)
 				);
 		}
@@ -434,7 +433,7 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
     	return (isEditOfExistingStmt 
     			&& "create".equals(command)) 
     	       && (objectProp != null)
-    	       && (objectProp.getOfferCreateNewOption() == true);                
+    	       && (objectProp.getOfferCreateNewOption());
     }
     
     private boolean isForwardToCreateButEdit(VitroRequest vreq) {
@@ -444,8 +443,8 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
     	return (isEditOfExistingStmt 
     			&& (! "create".equals(command))
     			&& (objectProp != null) 
-    	       && (objectProp.getOfferCreateNewOption() == true) 
-    	       && (objectProp.getSelectFromExisting() == false)
+    	       && (objectProp.getOfferCreateNewOption())
+    	       && (!objectProp.getSelectFromExisting())
     	     );
     }
     
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java
index 0654d8ed7..1436d1934 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java
@@ -340,8 +340,7 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
     		this.processObjectPropForm(vreq, editConfiguration);
     	} else {
     		log.debug("This is a data property: " + predicateUri);
-    		return;
-    	}
+        }
     }    
 
     
@@ -538,7 +537,7 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
         	types = new ArrayList<VClass>();
         }
 		
-        StringBuffer typesBuff = new StringBuffer();
+        StringBuilder typesBuff = new StringBuilder();
         for (VClass type : types) {
             if (type.getURI() != null) {
                 typesBuff.append(type.getURI()).append(",");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/InstitutionalInternalClassForm.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/InstitutionalInternalClassForm.java
index 62c2a9550..b02e32609 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/InstitutionalInternalClassForm.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/InstitutionalInternalClassForm.java
@@ -3,6 +3,7 @@
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
 import java.util.ArrayList;
+import java.util.Collections;
 
 import javax.servlet.http.HttpSession;
 
@@ -49,9 +50,7 @@ public class InstitutionalInternalClassForm extends BaseEditConfigurationGenerat
     public class StringList extends ArrayList<String>{
         public StringList( String ... strings){
             super();
-            for( String str: strings){
-                this.add(str);
-            }            
+            Collections.addAll(this, strings);
         }
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultDataPropEmptyField.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultDataPropEmptyField.java
index 4ad3ad99f..6424111da 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultDataPropEmptyField.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultDataPropEmptyField.java
@@ -14,7 +14,6 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUti
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditSubmissionUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.ProcessRdfFormController.Utilities;
 
 /**
  * Editors have gotten into the habit of clearing the text from the
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/FoafNameToRdfsLabelPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/FoafNameToRdfsLabelPreprocessor.java
index c4ead6fdf..04f4da2a7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/FoafNameToRdfsLabelPreprocessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/FoafNameToRdfsLabelPreprocessor.java
@@ -12,17 +12,12 @@ import org.apache.jena.query.QueryExecution;
 import org.apache.jena.query.QueryExecutionFactory;
 import org.apache.jena.query.QueryFactory;
 import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.QuerySolutionMap;
 import org.apache.jena.query.ResultSet;
-import org.apache.jena.query.Syntax;
 import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.ResIterator;
 import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.shared.Lock;
 
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForIndividualPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForIndividualPreprocessor.java
index 3ee2cb7e9..09c731b54 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForIndividualPreprocessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForIndividualPreprocessor.java
@@ -3,22 +3,12 @@
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.jena.ontology.OntModel;
 import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.ResIterator;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.Statement;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 /*
  * This preprocessor is used to set the language attribute on the label based on the user selection
  * on the manage labels page when adding a new label.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidation.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidation.java
index 5c929b670..7604abccc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidation.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidation.java
@@ -92,9 +92,7 @@ public class AntiXssValidation implements N3ValidatorVTwo{
             String error = null;
             try {
                 error = literalHasXSS( editSub.getLiteralsFromForm().get(fieldName) );
-            } catch (ScanException e) {
-                error = e.getMessage();
-            } catch (PolicyException e) {
+            } catch (ScanException | PolicyException e) {
                 error = e.getMessage();
             }
             if( error != null ){                        
@@ -109,9 +107,7 @@ public class AntiXssValidation implements N3ValidatorVTwo{
             String error;
             try {
                 error = uriHasXSS( editSub.getUrisFromForm().get(fieldName));
-            } catch (ScanException e) {
-                error = e.getMessage();
-            } catch (PolicyException e) {
+            } catch (ScanException | PolicyException e) {
                 error = e.getMessage();
             }
             if( error != null ){
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java
index 8759a42ec..971adc343 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java
@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java
index d1708939b..6587e42b8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java
@@ -84,14 +84,10 @@ public class EditRequestAJAXController extends VitroHttpServlet {
             Class classDefinition = Class.forName(editConfGeneratorName);
             object = classDefinition.newInstance();
             EditConfigurationVTwoGenerator = (EditConfigurationAJAXGenerator) object;
-        } catch (InstantiationException e) {
+        } catch (InstantiationException | ClassNotFoundException | IllegalAccessException e) {
             System.out.println(e);
-        } catch (IllegalAccessException e) {
-            System.out.println(e);
-        } catch (ClassNotFoundException e) {
-            System.out.println(e);
-        }    	
-        
+        }
+
         if(EditConfigurationVTwoGenerator == null){
         	throw new Error("Could not find EditConfigurationVTwoGenerator " + editConfGeneratorName);        	
         } else {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java
index f3f98dbd1..69bfba49b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java
@@ -335,15 +335,11 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
     	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
     	//TODO: Check if any error conditions are not met here
     	//At this point, if there is a form paramter, we don't require a predicate uri
-    	if(formParam == null 
-    			&& predicateUri != null 
-    			&& !EditConfigurationUtils.isObjectProperty(predicateUri, vreq) 
-    			&& !isVitroLabel(predicateUri)
-    			&& !EditConfigurationUtils.isDataProperty(predicateUri, vreq))
-    	{
-    		return true;
-    	}
-    	return false;
+        return formParam == null
+                && predicateUri != null
+                && !EditConfigurationUtils.isObjectProperty(predicateUri, vreq)
+                && !isVitroLabel(predicateUri)
+                && !EditConfigurationUtils.isDataProperty(predicateUri, vreq);
     }
     
     private String getErrorMessage(VitroRequest vreq) {
@@ -387,10 +383,7 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
     //TODO: Check how to integrate deletion
     private boolean isDeleteForm(VitroRequest vreq) {
     	String command = vreq.getParameter("cmd");
-        if ("delete".equals(command)) {
-       	 	return true;
-        }
-        return false;
+        return "delete".equals(command);
     }
     
        
@@ -404,14 +397,10 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
             Class classDefinition = Class.forName(editConfGeneratorName);
             object = classDefinition.newInstance();
             EditConfigurationVTwoGenerator = (EditConfigurationGenerator) object;
-        } catch (InstantiationException e) {
+        } catch (InstantiationException | ClassNotFoundException | IllegalAccessException e) {
             System.out.println(e);
-        } catch (IllegalAccessException e) {
-            System.out.println(e);
-        } catch (ClassNotFoundException e) {
-            System.out.println(e);
-        }    	
-        
+        }
+
         if(EditConfigurationVTwoGenerator == null){
         	throw new Error("Could not find EditConfigurationVTwoGenerator " + editConfGeneratorName);        	
         } else {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java
index 6998738fa..0b21f0586 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java
@@ -152,10 +152,7 @@ public class ProcessRdfFormController extends FreemarkerHttpServlet{
         DataProperty dp = wdf.getDataPropertyDao().getDataPropertyByURI(
                 editConfig.getPredicateUri());
         if (dp != null) {
-            if (dp.getDisplayLimit() == 1 /* || dp.isFunctional() */)
-                return false;
-            else
-                return true;
+			return dp.getDisplayLimit() != 1;
         }
         return false;
 
@@ -231,10 +228,7 @@ public class ProcessRdfFormController extends FreemarkerHttpServlet{
 	        	 Collections.sort(newValue);
 	         }
 	         if (orgValue != null && newValue != null) {
-	             if (orgValue.equals(newValue))
-	                 return false;
-	             else
-	                 return true;
+				 return !orgValue.equals(newValue);
 	         }
 
 	         List<Literal> orgLit = editConfig.getLiteralsInScope().get(fieldName);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailFactory.java
index 1c8499341..41c3404d3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailFactory.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailFactory.java
@@ -256,9 +256,7 @@ public class FreemarkerEmailFactory {
 								+ factory.getSmtpHost() + "'.");
 			} catch (NotConfiguredException e) {
 				ss.info(this, e.getMessage());
-			} catch (BadPropertyValueException e) {
-				ss.warning(this, e.getMessage());
-			} catch (InvalidSmtpHost e) {
+			} catch (BadPropertyValueException | InvalidSmtpHost e) {
 				ss.warning(this, e.getMessage());
 			} catch (Exception e) {
 				ss.warning(this,
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java
index e96f08f4c..6462f58af 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java
@@ -87,8 +87,7 @@ public class FreemarkerEmailMessage {
 		} catch (AddressException e) {
 			log.warn("invalid recipient address: " + type + ", '"
 					+ emailAddress + "'");
-			return;
-		}
+        }
 	}
 
 	public void addRecipient(RecipientType type, String emailAddress,
@@ -110,8 +109,7 @@ public class FreemarkerEmailMessage {
 		} catch (UnsupportedEncodingException e) {
 			log.warn("invalid recipient address: " + type + ", '"
 					+ emailAddress + "', personal name '" + personalName + "'");
-			return;
-		}
+        }
 	}
 
 	public void setSubject(String subject) {
@@ -144,12 +142,10 @@ public class FreemarkerEmailMessage {
 		try {
 			config.getTemplate(templateName).process(bodyMap,
 					new StringWriter());
-		} catch (TemplateException e) {
-			log.error(e, e);
-		} catch (IOException e) {
+		} catch (TemplateException | IOException e) {
 			log.error(e, e);
 		}
-	}
+    }
 
 	public boolean send() {
 		try {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/model/FileInfo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/model/FileInfo.java
index 494db041a..ae94abd90 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/model/FileInfo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/model/FileInfo.java
@@ -62,9 +62,9 @@ public class FileInfo {
 				.getObjectPropertyStatements(opStmt);
 
 		if (stmts.size() > 1) {
-			String uris = "";
+			StringBuilder uris = new StringBuilder();
 			for (ObjectPropertyStatement stmt : stmts) {
-				uris += "'" + stmt.getSubjectURI() + "' ";
+				uris.append("'").append(stmt.getSubjectURI()).append("' ");
 			}
 			log.warn("Found " + stmts.size() + " Individuals that claim '"
 					+ entity.getURI() + "' as its bytestream:" + uris);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestLoggerFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestLoggerFilter.java
index 4caa47704..52dc76aa2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestLoggerFilter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestLoggerFilter.java
@@ -34,7 +34,7 @@ public class RequestLoggerFilter implements Filter {
 		try {
 			if (request instanceof HttpServletRequest) {
 				HttpServletRequest theRequest = (HttpServletRequest) request;
-				StringBuffer requestedLocation = new StringBuffer();
+				StringBuilder requestedLocation = new StringBuilder();
 				requestedLocation.append(theRequest.getLocalName()).append(":");
 				requestedLocation.append(theRequest.getLocalPort());
 				requestedLocation.append(theRequest.getRequestURI());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURL.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURL.java
index 718c06287..5621215ab 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURL.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURL.java
@@ -7,6 +7,7 @@ import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -130,9 +131,7 @@ class VitroURL {
         }
         // TODO: rewrite the chunk above with lists in mind. 
         List<String> strList = new ArrayList<String>();
-        for (int i=0; i<splitStr.length; i++) {
-            strList.add(splitStr[i]);
-        }
+        Collections.addAll(strList, splitStr);
         return strList;
     }   
     
@@ -238,7 +237,7 @@ class VitroURL {
     }
     
     public String toString() {
-        StringBuffer out = new StringBuffer();
+        StringBuilder out = new StringBuilder();
             try {
             if (this.protocol != null) {
                 out.append(this.protocol);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
index f5e9506a3..bd108e255 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
@@ -4,6 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.freemarker.config;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -127,9 +128,7 @@ public class FreemarkerConfigurationImpl extends Configuration {
 
 	private String[] joinNames(Set<String> nameSet, String[] nameArray) {
 		Set<String> allNames = new HashSet<>(nameSet);
-		for (String n : nameArray) {
-			allNames.add(n);
-		}
+		Collections.addAll(allNames, nameArray);
 		return (String[]) allNames.toArray();
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/imageio/IIOImageProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/imageio/IIOImageProcessor.java
index 5d47f62b6..5e0ea8ec3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/imageio/IIOImageProcessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/imageio/IIOImageProcessor.java
@@ -15,7 +15,6 @@ import java.awt.geom.AffineTransform;
 import java.awt.image.AffineTransformOp;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorConvertOp;
-import java.awt.image.ColorModel;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/jai/JaiImageProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/jai/JaiImageProcessor.java
index b6d55a718..6cbabd146 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/jai/JaiImageProcessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/jai/JaiImageProcessor.java
@@ -5,7 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.imageprocessor.jai;
 import edu.cornell.mannlib.vitro.webapp.imageprocessor.imageio.IIOImageProcessor;
 import edu.cornell.mannlib.vitro.webapp.modules.Application;
 import edu.cornell.mannlib.vitro.webapp.modules.ComponentStartupStatus;
-import edu.cornell.mannlib.vitro.webapp.modules.imageProcessor.ImageProcessor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java
index 37024e1e8..c2b54656d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java
@@ -31,8 +31,6 @@ import org.apache.jena.vocabulary.RDF;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset;
 import edu.cornell.mannlib.vitro.webapp.ontology.update.AtomicOntologyChange.AtomicChangeType;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
 
 /**  
 * Performs knowledge base updates to the abox to align with a new ontology version
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java
index aa6240824..f975f1268 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java
@@ -171,7 +171,7 @@ public class KnowledgeBaseUpdater {
             if(sparqlFile.isDirectory()) {
                 continue;
             }
-            StringBuffer fileContents = new StringBuffer();
+            StringBuilder fileContents = new StringBuilder();
             try {
                 BufferedReader reader = new BufferedReader(new FileReader(sparqlFile));
                 String ln;
@@ -371,7 +371,7 @@ public class KnowledgeBaseUpdater {
 			throw new RuntimeException("SPARQL file not found at " + filePath);
 		}
 		BufferedReader reader = new BufferedReader(new FileReader(file));
-		StringBuffer fileContents = new StringBuffer();
+		StringBuilder fileContents = new StringBuilder();
 		String ln;		
 		while ((ln = reader.readLine()) != null) {
 			fileContents.append(ln).append('\n');
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyChangeParser.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyChangeParser.java
index c23ae7998..7c5e48d52 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyChangeParser.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyChangeParser.java
@@ -7,7 +7,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.StringTokenizer;
 
 import org.apache.commons.csv.CSVFormat;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java
index 045944281..93f445861 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java
@@ -13,7 +13,6 @@ import org.apache.commons.logging.LogFactory;
 
 import org.apache.jena.ontology.OntModel;
 import org.apache.jena.ontology.OntModelSpec;
-import org.apache.jena.query.Dataset;
 import org.apache.jena.query.Query;
 import org.apache.jena.query.QueryExecution;
 import org.apache.jena.query.QueryExecutionFactory;
@@ -33,8 +32,6 @@ import org.apache.jena.vocabulary.RDF;
 import org.apache.jena.vocabulary.RDFS;
 
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset;
-import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase;
 
 /**  
  * Performs knowledge base updates to the tbox to align with a new ontology version
@@ -398,7 +395,7 @@ public class TBoxUpdater {
         model.enterCriticalSection(Lock.READ);
 
         try {	   
-            return (model.contains((Resource) null, inClassGroupProp, theClassGroup) ? true : false);
+            return (model.contains((Resource) null, inClassGroupProp, theClassGroup));
         } finally {
             model.leaveCriticalSection();
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingModel.java
index e21b3e047..cce2808d4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingModel.java
@@ -4,25 +4,20 @@ package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters;
 
 import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceGraph;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.SparqlGraph;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.Triple;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.RDFReaderF;
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.rdf.model.StmtIterator;
 import org.apache.jena.rdf.model.impl.RDFReaderFImpl;
-import org.apache.jena.rdf.model.impl.StatementImpl;
 import org.apache.jena.shared.WrappedIOException;
 import org.apache.jena.sparql.graph.GraphFactory;
-import org.apache.jena.util.iterator.Map1;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.net.URL;
-import java.util.Iterator;
 import java.util.List;
 
 public class BulkUpdatingModel extends AbstractModelDecorator {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingOntModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingOntModel.java
index fae3259d4..9fb336c6d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingOntModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingOntModel.java
@@ -12,7 +12,6 @@ import org.apache.jena.rdf.model.RDFReaderF;
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.rdf.model.StmtIterator;
 import org.apache.jena.rdf.model.impl.RDFReaderFImpl;
-import org.apache.jena.rdf.model.impl.StatementImpl;
 import org.apache.jena.shared.WrappedIOException;
 import org.apache.jena.sparql.graph.GraphFactory;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/MemoryMappedModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/MemoryMappedModel.java
index 86b77bda6..6d8aacd4d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/MemoryMappedModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/MemoryMappedModel.java
@@ -5,14 +5,11 @@ package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters;
 import java.util.List;
 import java.util.Set;
 
-import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroModelSource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelChangedListener;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.rdf.model.StmtIterator;
 import org.apache.jena.rdf.model.impl.StmtIteratorImpl;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/RDFServiceBulkUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/RDFServiceBulkUpdater.java
index 1c09ce6da..6a8a72703 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/RDFServiceBulkUpdater.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/RDFServiceBulkUpdater.java
@@ -8,7 +8,6 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
 import org.apache.jena.graph.GraphEvents;
-import org.apache.jena.graph.Node;
 import org.apache.jena.rdf.model.Model;
 
 import java.io.ByteArrayInputStream;
@@ -57,11 +56,11 @@ public class RDFServiceBulkUpdater extends AbstractBulkUpdater {
 
         String findPattern = "?s ?p ?o";
 
-        StringBuffer findQuery = new StringBuffer("CONSTRUCT { ")
+        StringBuilder findQuery = new StringBuilder("CONSTRUCT { ")
                 .append(findPattern)
                 .append(" } WHERE { \n");
         if (graphURI != null) {
-            findQuery.append("  GRAPH <" + graphURI + "> { ");
+            findQuery.append("  GRAPH <").append(graphURI).append("> { ");
         }
         findQuery.append(findPattern);
         if (graphURI != null) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/SparqlBulkUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/SparqlBulkUpdater.java
index 89f241f19..bdd7b9568 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/SparqlBulkUpdater.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/SparqlBulkUpdater.java
@@ -42,11 +42,11 @@ public class SparqlBulkUpdater extends AbstractBulkUpdater {
                 if (count % testLimit == 0 || !stmtIt.hasNext()) {
                     StringWriter sw = new StringWriter();
                     m.write(sw, "N-TRIPLE");
-                    StringBuffer updateStringBuff = new StringBuffer();
+                    StringBuilder updateStringBuff = new StringBuilder();
                     String graphURI = graph.getGraphURI();
-                    updateStringBuff.append(verb + " DATA { " + ((graphURI != null) ? "GRAPH <" + graphURI + "> { " : "" ));
+                    updateStringBuff.append(verb).append(" DATA { ").append((graphURI != null) ? "GRAPH <" + graphURI + "> { " : "");
                     updateStringBuff.append(sw);
-                    updateStringBuff.append(((graphURI != null) ? " } " : "") + " }");
+                    updateStringBuff.append((graphURI != null) ? " } " : "").append(" }");
 
                     String updateString = updateStringBuff.toString();
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java
index f372b3926..85c5e6d34 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java
@@ -40,7 +40,6 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;
 import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
-import org.vivoweb.linkeddatafragments.datasource.rdfservice.RDFServiceBasedRequestProcessorForTPFs;
 
 public abstract class RDFServiceImpl implements RDFService {
 	
@@ -64,9 +63,9 @@ public abstract class RDFServiceImpl implements RDFService {
                               String individualTypeURI, 
                               String graphURI) throws RDFServiceException {
     
-       StringBuffer containsQuery = new StringBuffer("ASK { \n");
+       StringBuilder containsQuery = new StringBuilder("ASK { \n");
        if (graphURI != null) {
-           containsQuery.append("  GRAPH <" + graphURI + "> { ");
+           containsQuery.append("  GRAPH <").append(graphURI).append("> { ");
        }
        containsQuery.append("<");   
        containsQuery.append(individualURI);
@@ -229,7 +228,7 @@ public abstract class RDFServiceImpl implements RDFService {
     }
 
     protected static String sparqlTriple(Triple triple) {
-        StringBuffer serializedTriple = new StringBuffer();
+        StringBuilder serializedTriple = new StringBuilder();
         serializedTriple.append(sparqlNodeUpdate(triple.getSubject(), ""));
         serializedTriple.append(" ");
         serializedTriple.append(sparqlNodeUpdate(triple.getPredicate(), ""));
@@ -254,7 +253,7 @@ public abstract class RDFServiceImpl implements RDFService {
         } else if (node.isBlank()) {
             return "<fake:blank>"; // or throw exception?
         } else if (node.isURI()) {
-            StringBuffer uriBuff = new StringBuffer();
+            StringBuilder uriBuff = new StringBuilder();
             return uriBuff.append("<").append(node.getURI()).append(">").toString();
         } else if (node.isLiteral()) {
             StringBuffer literalBuff = new StringBuffer();
@@ -442,7 +441,7 @@ public abstract class RDFServiceImpl implements RDFService {
         if (node.isLiteral()) {
             builder.append(literalToString(node.asLiteral()));
         } else if (node.isURIResource()) {
-            builder.append('<' + node.asResource().getURI() + '>');
+            builder.append('<').append(node.asResource().getURI()).append('>');
         }
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java
index 5a37a42ab..634269099 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java
@@ -258,9 +258,9 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
     }
     
     private String makeDescribe(Resource s) {
-        StringBuffer query = new StringBuffer("DESCRIBE <") ;
+        StringBuilder query = new StringBuilder("DESCRIBE <") ;
         if (s.isAnon()) {
-            query.append("_:" + s.getId().toString());
+            query.append("_:").append(s.getId().toString());
         } else {
             query.append(s.getURI());
         }
@@ -283,7 +283,7 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
         addStatementPatterns(stmts, queryBuff, !WHERE_CLAUSE);
         queryBuff.append("} WHERE { \n");
         if (graphURI != null) {
-            queryBuff.append("    GRAPH <" + graphURI + "> { \n");
+            queryBuff.append("    GRAPH <").append(graphURI).append("> { \n");
         }
         stmtIt = model.listStatements();
         stmts = stmtIt.toList();
@@ -376,10 +376,10 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
             patternBuff.append(" .\n");
             if (whereClause) {
                 if (t.getSubject().isBlank()) {
-                    patternBuff.append("    FILTER(isBlank(" + SparqlGraph.sparqlNodeDelete(t.getSubject(), null)).append(")) \n");
+                    patternBuff.append("    FILTER(isBlank(").append(SparqlGraph.sparqlNodeDelete(t.getSubject(), null)).append(")) \n");
                 }
                 if (t.getObject().isBlank()) {
-                    patternBuff.append("    FILTER(isBlank(" + SparqlGraph.sparqlNodeDelete(t.getObject(), null)).append(")) \n");
+                    patternBuff.append("    FILTER(isBlank(").append(SparqlGraph.sparqlNodeDelete(t.getObject(), null)).append(")) \n");
                 }
             }
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceSDB.java
index 47cdd08f8..426c1ae34 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceSDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceSDB.java
@@ -36,8 +36,6 @@ import org.apache.jena.sdb.sql.SDBConnection;
 
 import edu.cornell.mannlib.vitro.webapp.dao.jena.DatasetWrapper;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.StaticDatasetFactory;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.event.BulkUpdateEvent;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
@@ -175,7 +173,7 @@ public class RDFServiceSDB extends RDFServiceJena implements RDFService {
                     Statement stmt = sdbConn.getSqlConnection().createStatement();
                     ResultSet rs = stmt.executeQuery("SELECT count(DISTINCT s,p,o) AS tcount FROM Quads" + (StringUtils.isEmpty(whereClause) ? "" : " WHERE " + whereClause));
                     try {
-                        while (rs.next()) {
+                        if (rs.next()) {
                             return rs.getLong("tcount");
                         }
                     } finally {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java
index dbd2b673e..4db1ea7e7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java
@@ -331,10 +331,8 @@ public class RDFServiceSparql extends RDFServiceImpl implements RDFService {
 			} finally {
 				EntityUtils.consume(response.getEntity());
 			}
-		} catch (IOException ioe) {
+		} catch (IOException | URISyntaxException ioe) {
 			throw new RuntimeException(ioe);
-		} catch (URISyntaxException e) {
-			throw new RuntimeException(e);
 		}
 	}
 
@@ -361,10 +359,8 @@ public class RDFServiceSparql extends RDFServiceImpl implements RDFService {
 			} finally {
 				EntityUtils.consume(response.getEntity());
 			}
-		} catch (IOException ioe) {
+		} catch (IOException | URISyntaxException ioe) {
 			throw new RuntimeException(ioe);
-		} catch (URISyntaxException e) {
-			throw new RuntimeException(e);
 		}
 	}
 
@@ -549,10 +545,10 @@ public class RDFServiceSparql extends RDFServiceImpl implements RDFService {
 				if (count % CHUNK_SIZE == 0 || !stmtIt.hasNext()) {
 					StringWriter sw = new StringWriter();
 					m.write(sw, "N-TRIPLE");
-					StringBuffer updateStringBuff = new StringBuffer();
-					updateStringBuff.append(verb + " DATA { " + ((graphURI != null) ? "GRAPH <" + graphURI + "> { " : "" ));
+					StringBuilder updateStringBuff = new StringBuilder();
+					updateStringBuff.append(verb).append(" DATA { ").append((graphURI != null) ? "GRAPH <" + graphURI + "> { " : "");
 					updateStringBuff.append(sw);
-					updateStringBuff.append(((graphURI != null) ? " } " : "") + " }");
+					updateStringBuff.append((graphURI != null) ? " } " : "").append(" }");
 
 					String updateString = updateStringBuff.toString();
 
@@ -762,7 +758,7 @@ public class RDFServiceSparql extends RDFServiceImpl implements RDFService {
 
 		StringBuffer queryBuff = new StringBuffer();
 		if (graphURI != null) {
-			queryBuff.append("WITH <" + graphURI + "> \n");
+			queryBuff.append("WITH <").append(graphURI).append("> \n");
 		}
 		queryBuff.append("DELETE { \n");
 		List<Statement> stmts = stmtIt.toList();
@@ -838,19 +834,19 @@ public class RDFServiceSparql extends RDFServiceImpl implements RDFService {
 			patternBuff.append(" .\n");
 			if (whereClause) {
 				if (t.getSubject().isBlank()) {
-					patternBuff.append("    FILTER(isBlank(" + SparqlGraph.sparqlNodeDelete(t.getSubject(), null)).append(")) \n");
+					patternBuff.append("    FILTER(isBlank(").append(SparqlGraph.sparqlNodeDelete(t.getSubject(), null)).append(")) \n");
 				}
 				if (t.getObject().isBlank()) {
-					patternBuff.append("    FILTER(isBlank(" + SparqlGraph.sparqlNodeDelete(t.getObject(), null)).append(")) \n");
+					patternBuff.append("    FILTER(isBlank(").append(SparqlGraph.sparqlNodeDelete(t.getObject(), null)).append(")) \n");
 				}
 			}
 		}
 	}
 
 	private String makeDescribe(org.apache.jena.rdf.model.Resource s) {
-		StringBuffer query = new StringBuffer("DESCRIBE <") ;
+		StringBuilder query = new StringBuilder("DESCRIBE <") ;
 		if (s.isAnon()) {
-			query.append("_:" + s.getId().toString());
+			query.append("_:").append(s.getId().toString());
 		} else {
 			query.append(s.getURI());
 		}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparqlHttp.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparqlHttp.java
index 627136669..8db031c24 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparqlHttp.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparqlHttp.java
@@ -6,8 +6,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.query.ResultSetFormatter;
 import org.apache.jena.rdf.model.Model;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java
index d502ace88..1a0eaa4ed 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java
@@ -6,7 +6,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java
index 45e96c745..9fd4cca96 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java
@@ -498,14 +498,12 @@ public class ABoxRecomputer {
     protected void addInferenceStatementsFor(String individualUri, Model addTo) throws RDFServiceException {
         StringBuilder builder = new StringBuilder();
         builder.append("CONSTRUCT\n")
-                .append("{\n")
-                .append("   <" + individualUri + "> ?p ?o .\n")
+                .append("{\n").append("   <").append(individualUri).append("> ?p ?o .\n")
                 .append("}\n")
                 .append("WHERE\n")
                 .append("{\n")
                 .append("   GRAPH <").append(ModelNames.ABOX_INFERENCES).append(">\n")
-                .append("   {\n")
-                .append("       <" + individualUri + "> ?p ?o .\n")
+                .append("   {\n").append("       <").append(individualUri).append("> ?p ?o .\n")
                 .append("   }\n")
                 .append("}\n");
 
@@ -563,10 +561,8 @@ public class ABoxRecomputer {
                     .append("   ?object\n")
                     .append("WHERE {\n")
                     .append("    GRAPH ?g { \n")
-                    .append("        {\n")
-                    .append("            <" + individualUri + "> <" + OWL.sameAs + "> ?object .\n")
-                    .append("        } UNION {\n")
-                    .append("            ?object <" + OWL.sameAs + "> <" + individualUri + "> .\n")
+                    .append("        {\n").append("            <").append(individualUri).append("> <").append(OWL.sameAs).append("> ?object .\n")
+                    .append("        } UNION {\n").append("            ?object <").append(OWL.sameAs).append("> <").append(individualUri).append("> .\n")
                     .append("        }\n")
                     .append("    } \n")
                     .append("    FILTER (?g != <" + ModelNames.ABOX_INFERENCES + ">)\n") 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java
index 67df12735..4c60103bb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java
@@ -24,10 +24,8 @@ import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelChangedListener;
 import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.NodeIterator;
 import org.apache.jena.rdf.model.Property;
 import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.ResIterator;
 import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.rdf.model.ResourceFactory;
 import org.apache.jena.rdf.model.Statement;
@@ -989,8 +987,7 @@ public class SimpleReasoner extends StatementListener
 		}
 	
 		setMostSpecificTypes(individual, typeURIs, inferenceModel);
-	    return;	
-	}
+    }
 	
 	protected void setMostSpecificTypes(Resource individual, HashSet<String> typeURIs, Model inferenceModel) {
 		
@@ -1027,10 +1024,9 @@ public class SimpleReasoner extends StatementListener
 			String typeURI = typeIter.next();
 			Statement mstStmt = ResourceFactory.createStatement(individual,mostSpecificType,ResourceFactory.createResource(typeURI));
 			addInference(mstStmt,inferenceModel,true);
-		}		
-		
-        return;
-	}
+		}
+
+    }
 	
 	protected List<Resource> getParents(Resource cls, OntModel tboxModel) {
 		
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/DisableSameAs.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/DisableSameAs.java
index e86a5f964..07c69a6ba 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/DisableSameAs.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/DisableSameAs.java
@@ -47,15 +47,13 @@ public class DisableSameAs implements ReasonerPlugin {
             Model aboxAssertionsModel, 
             Model aboxInferencesModel, 
             OntModel TBoxInferencesModel) {
-        return;
-	}
+    }
 	
 	
     public void removedABoxStatement(Statement stmt, 
             Model aboxAssertionsModel, 
             Model aboxInferencesModel, 
             OntModel TBoxInferencesModel) {
-        return;
     }
 	
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimpleBridgingRule.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimpleBridgingRule.java
index 8f8f23ccd..b822ccdb5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimpleBridgingRule.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimpleBridgingRule.java
@@ -100,7 +100,7 @@ public abstract class SimpleBridgingRule implements ReasonerPlugin {
 	}
 
 	private Query createQuery(String queryString, Statement stmt, Statement statement2) {
-       String queryStr = new String(queryString);
+       String queryStr = queryString;
         if (stmt.getPredicate().equals(assertedProp1)) {
             queryStr = queryStr.replace(
                     "?x", "<" + stmt.getSubject().getURI() + ">");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
index 5d3a48c1f..1b253da15 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
@@ -7,9 +7,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java
index b6596e7bf..bfb7c16d6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java
@@ -83,7 +83,6 @@ public class DataAutocompleteController extends VitroAjaxController {
             Model model = getModel(vreq);
             Query query = SparqlUtils.createQuery(sparqlQuery);
 			outputResults(response, query, model);
-			return;
         } catch(AjaxControllerException ex) {
         	log.error(ex, ex);
 			response.sendError(ex.getStatusCode());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
index 2edd8599c..1ee28176e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
@@ -452,12 +452,12 @@ public class PagedSearchController extends FreemarkerHttpServlet {
     
     private String getSnippet(SearchResultDocument doc, SearchResponse response) {
         String docId = doc.getStringValue(VitroSearchTermNames.DOCID);
-        StringBuffer text = new StringBuffer();
+        StringBuilder text = new StringBuilder();
         Map<String, Map<String, List<String>>> highlights = response.getHighlighting();
         if (highlights != null && highlights.get(docId) != null) {
             List<String> snippets = highlights.get(docId).get(VitroSearchTermNames.ALLTEXT);
             if (snippets != null && snippets.size() > 0) {
-                text.append("... " + snippets.get(0) + " ...");
+                text.append("... ").append(snippets.get(0)).append(" ...");
             }       
         }
         return text.toString();
@@ -649,11 +649,7 @@ public class PagedSearchController extends FreemarkerHttpServlet {
     protected boolean isRequestedFormatXml(VitroRequest req){
         if( req != null ){
             String param = req.getParameter(PARAM_XML_REQUEST);
-            if( param != null && "1".equals(param)){
-                return true;
-            }else{
-                return false;
-            }
+            return param != null && "1".equals(param);
         }else{
             return false;
         }
@@ -662,11 +658,7 @@ public class PagedSearchController extends FreemarkerHttpServlet {
     protected boolean isRequestedFormatCSV(VitroRequest req){
         if( req != null ){
             String param = req.getParameter(PARAM_CSV_REQUEST);
-            if( param != null && "1".equals(param)){
-                return true;
-            }else{
-                return false;
-            }
+            return param != null && "1".equals(param);
         }else{
             return false;
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java
index 2cfceb28e..54396b76c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java
@@ -1,34 +1,18 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 package edu.cornell.mannlib.vitro.webapp.search.controller;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Enumeration;
 
-import javax.servlet.RequestDispatcher;
 import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.datatypes.RDFDatatype ;
-
-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.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
 
 @WebServlet(name = "SearchHelpController", urlPatterns = {"/searchHelp"} )
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/solr/SolrConversionUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/solr/SolrConversionUtils.java
index a721d6ce3..0099bc44e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/solr/SolrConversionUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/solr/SolrConversionUtils.java
@@ -24,7 +24,6 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputField;
 import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchQuery;
 import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchQuery.Order;
 import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchResponse;
-import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
 import edu.cornell.mannlib.vitro.webapp.searchengine.base.BaseSearchFacetField;
 import edu.cornell.mannlib.vitro.webapp.searchengine.base.BaseSearchFacetField.BaseCount;
 import edu.cornell.mannlib.vitro.webapp.searchengine.base.BaseSearchResponse;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/IndexingChangeListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/IndexingChangeListener.java
index 6781c8762..0cd389526 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/IndexingChangeListener.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/IndexingChangeListener.java
@@ -6,7 +6,6 @@ import static edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndex
 import static edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexer.Event.Type.START_REBUILD;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -14,10 +13,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.jena.riot.tokens.Tokenizer;
-import org.apache.jena.riot.tokens.TokenizerFactory;
 
-import org.apache.jena.graph.Triple;
 import org.apache.jena.rdf.listeners.StatementListener;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelChangedListener;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifierListDeveloper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifierListDeveloper.java
index 562dc9d15..093e88ade 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifierListDeveloper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifierListDeveloper.java
@@ -61,19 +61,19 @@ public class DocumentModifierListDeveloper implements DocumentModifierList {
 	 */
 	@Override
 	public void stopIndexing() {
-		String message = String.format(
+		StringBuilder message = new StringBuilder(String.format(
 				"Timings for %d modifiers after %d calls:", timings.size(),
-				count.get());
+				count.get()));
 		for (ModifierTiming timing : timings) {
 			int totalMillis = timing.getTotal();
 			float totalSeconds = totalMillis / 1000.0F;
 			int average = (count.get() == 0) ? 0 : totalMillis / count.get();
-			message += String
+			message.append(String
 					.format("\n   count: %7d, total: %9.3fsec, average: %4dms-- %1.200s",
 							count.get(), totalSeconds, average,
-							timing.getModifier());
+							timing.getModifier()));
 		}
-		log.info(message);
+		log.info(message.toString());
 	}
 
 	private static class ModifierTiming {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.java
index cfabec6a1..f2f2e1f3f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.java
@@ -67,7 +67,7 @@ public class ThumbnailImageURL implements DocumentModifier, ContextModelsUser {
     }
 
 	protected String runQueryForThumbnailLocation(Individual individual) {
-		StringBuffer result = new StringBuffer();
+		StringBuilder result = new StringBuilder();
 
 		String uri = "<" + individual.getURI() + "> ";
 		String query = QUERY_TEMPLATE.replaceAll("\\?uri", uri);
@@ -81,7 +81,7 @@ public class ThumbnailImageURL implements DocumentModifier, ContextModelsUser {
 					String name = iter.next();
 					RDFNode node = soln.get( name );
 					if( node != null ){
-						result.append("" + node.toString());
+						result.append("").append(node.toString());
 					}else{
 						log.info(name + " is null");
 					}                        
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeNamespace.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeNamespace.java
index 3817bad72..f5c765830 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeNamespace.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeNamespace.java
@@ -27,12 +27,12 @@ public class ExcludeBasedOnTypeNamespace implements SearchIndexExcluder {
 	
 	@Validation
 	public void compileRegexPattern() {
-        String nsOrPattern = "";
+        StringBuilder nsOrPattern = new StringBuilder();
         for( int i=0; i<namespaces.size(); i++){
             String ns = namespaces.get(i);
-            nsOrPattern = nsOrPattern + (i!=0?"|":"") + Pattern.quote(ns) + "[^/#]*$";            
+            nsOrPattern.append(i != 0 ? "|" : "").append(Pattern.quote(ns)).append("[^/#]*$");
         }
-        this.nsRegexPattern = Pattern.compile(nsOrPattern);
+        this.nsRegexPattern = Pattern.compile(nsOrPattern.toString());
 	}
 
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluderListDeveloper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluderListDeveloper.java
index dfb92083a..a2afacffb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluderListDeveloper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluderListDeveloper.java
@@ -73,20 +73,20 @@ public class SearchIndexExcluderListDeveloper implements
 	 */
 	@Override
 	public void stopIndexing() {
-		String message = String.format(
+		StringBuilder message = new StringBuilder(String.format(
 				"Timings for %d excluders after %d calls:", timings.size(),
-				count.get());
+				count.get()));
 		for (ExcluderTiming timing : timings) {
 			int thisCount = timing.getCount();
 			int totalMillis = timing.getTotal();
 			float totalSeconds = totalMillis / 1000.0F;
 			int average = (thisCount == 0) ? 0 : totalMillis / thisCount;
-			message += String
+			message.append(String
 					.format("\n   count: %7d, total: %9.3fsec, average: %4dms-- %1.200s",
 							thisCount, totalSeconds, average,
-							timing.getExcluder());
+							timing.getExcluder()));
 		}
-		log.info(message);
+		log.info(message.toString());
 	}
 
 	private static class ExcluderTiming {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListDeveloper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListDeveloper.java
index 4803673b1..cef45ecff 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListDeveloper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListDeveloper.java
@@ -70,19 +70,19 @@ public class IndexingUriFinderListDeveloper implements IndexingUriFinderList {
 			timing.getFinder().endIndexing();
 		}
 
-		String message = String.format(
+		StringBuilder message = new StringBuilder(String.format(
 				"Timings for %d URI finders after %d calls:", timings.size(),
-				count.get());
+				count.get()));
 		for (FinderTiming timing : timings) {
 			int totalMillis = timing.getTotal();
 			float totalSeconds = totalMillis / 1000.0F;
 			int average = (count.get() == 0) ? 0 : totalMillis / count.get();
-			message += String
+			message.append(String
 					.format("\n   count: %7d, total: %9.3fsec, average: %4dms-- %1.200s",
 							count.get(), totalSeconds, average,
-							timing.getFinder());
+							timing.getFinder()));
 		}
-		log.info(message);
+		log.info(message.toString());
 
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
index 6709d5400..bbe7606de 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
@@ -4,12 +4,9 @@ package edu.cornell.mannlib.vitro.webapp.servlet.setup;
 
 import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.WhichService.CONTENT;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -40,7 +37,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService.ModelSerializationFormat;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
@@ -263,7 +259,6 @@ public class FileGraphSetup implements ServletContextListener {
             }            
         }
 
-        return;
     }
 
 	/*
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java
index d739ca417..30dda8842 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java
@@ -62,7 +62,7 @@ public class RunSparqlConstructs implements ServletContextListener {
 				File file = new File(ctx.getRealPath(path));			
 				try {
 					BufferedReader reader = new BufferedReader(new FileReader(file));
-					StringBuffer fileContents = new StringBuffer();
+					StringBuilder fileContents = new StringBuilder();
 					String ln;
 					try {
 						while ( (ln = reader.readLine()) != null) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SolrSmokeTest.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SolrSmokeTest.java
index 0c51c6f61..131a79821 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SolrSmokeTest.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SolrSmokeTest.java
@@ -20,7 +20,6 @@ import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
 
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
@@ -110,8 +109,7 @@ public class SolrSmokeTest implements ServletContextListener {
 				reportGoodPing();
 			} catch (SolrProblemException e) {
 				reportPingProblem(e);
-				return;
-			}
+            }
 		}
 
 		private void reportSuccess() {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java
index 9e5c2c7c1..cee5a099d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java
@@ -72,8 +72,8 @@ public class GetAllClasses extends BaseEditController {
 		response.setContentType("text/xml");
 		response.setCharacterEncoding("UTF-8");
 		PrintWriter out = response.getWriter();
-		String respo = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-		respo += "<options>";
+		StringBuilder respo = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+		respo.append("<options>");
 
 		while (classGroupIt.hasNext()) {
 			VClassGroup group = (VClassGroup) classGroupIt.next();
@@ -81,12 +81,10 @@ public class GetAllClasses extends BaseEditController {
 			Iterator classIt = classes.iterator();
 			while (classIt.hasNext()) {
 				VClass clazz = (VClass) classIt.next();
-				respo += "<option>" + "<key>" + clazz.getPickListName()
-						+ "</key>" + "<value>" + clazz.getURI() + "</value>"
-						+ "</option>";
+				respo.append("<option>" + "<key>").append(clazz.getPickListName()).append("</key>").append("<value>").append(clazz.getURI()).append("</value>").append("</option>");
 			}
 		}
-		respo += "</options>";
+		respo.append("</options>");
 		out.println(respo);
 		out.flush();
 		out.close();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java
index 6e3998b54..97d35abdb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java
@@ -69,15 +69,15 @@ public class GetAllPrefix extends BaseEditController {
 		response.setContentType("text/xml");
 		response.setCharacterEncoding("UTF-8");
 		PrintWriter out = response.getWriter();
-		String respo = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-		respo += "<options>";
+		StringBuilder respo = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+		respo.append("<options>");
 		List<String> prefixList = new ArrayList<String>();
 		prefixList.addAll(prefixMap.keySet());
 		Collections.sort(prefixList, vreq.getCollator());
 		for (String prefix : prefixList) {
-		    respo += makeOption(prefix, prefixMap.get(prefix));
+		    respo.append(makeOption(prefix, prefixMap.get(prefix)));
 		}
-		respo += "</options>";
+		respo.append("</options>");
 		out.println(respo);
 		out.flush();
 		out.close();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java
index ba27c6136..6019853a0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java
@@ -143,20 +143,17 @@ public class GetClazzAllProperties extends BaseEditController {
 				}
 			}
 		}
-		String respo = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-		respo += "<options>";
+		StringBuilder respo = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+		respo.append("<options>");
 		Object[] keys = hm.keySet().toArray();
 		Arrays.sort(keys);
 		for (int i = 0; i < keys.length; i++) {
 			String key = (String) keys[i];
 			String value = hm.get(key);
 
-			respo += "<option>" + "<key>" + key + "</key>" + "<value>"
-					+ value.substring(0, value.length() - 1) + "</value>"
-					+ "<type>" + value.charAt(value.length() - 1) + "</type>"
-					+ "</option>";
+			respo.append("<option>" + "<key>").append(key).append("</key>").append("<value>").append(value.substring(0, value.length() - 1)).append("</value>").append("<type>").append(value.charAt(value.length() - 1)).append("</type>").append("</option>");
 		}
-		respo += "</options>";
+		respo.append("</options>");
 		response.setContentType("text/xml");
 		response.setCharacterEncoding("UTF-8");
 		PrintWriter out = response.getWriter();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java
index fdd7a0458..00922ffd9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java
@@ -44,13 +44,11 @@ public class GetClazzDataProperties extends BaseEditController {
 			return;
 		}
 
-		String respo = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-		respo += "<options>";
+		StringBuilder respo = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+		respo.append("<options>");
 
 		// Add rdfs:label to the list
-		respo += "<option>" + "<key>" + "label" + "</key>" + "<value>"
-				+ "http://www.w3.org/2000/01/rdf-schema#label" + "</value>"
-				+ "</option>";
+		respo.append("<option>" + "<key>" + "label" + "</key>" + "<value>" + "http://www.w3.org/2000/01/rdf-schema#label" + "</value>" + "</option>");
 
 		DataPropertyDao ddao = vreq.getUnfilteredWebappDaoFactory()
 				.getDataPropertyDao();
@@ -66,13 +64,11 @@ public class GetClazzDataProperties extends BaseEditController {
 				DataProperty dprop = (DataProperty) ddao
 						.getDataPropertyByURI(dp.getURI());
 				if (dprop != null) {
-					respo += "<option>" + "<key>" + dprop.getLocalName()
-							+ "</key>" + "<value>" + dprop.getURI()
-							+ "</value>" + "</option>";
+					respo.append("<option>" + "<key>").append(dprop.getLocalName()).append("</key>").append("<value>").append(dprop.getURI()).append("</value>").append("</option>");
 				}
 			}
 		}
-		respo += "</options>";
+		respo.append("</options>");
 		response.setContentType("text/xml");
 		response.setCharacterEncoding("UTF-8");
 		PrintWriter out = response.getWriter();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java
index 9a8fa1497..75011f9ae 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java
@@ -51,8 +51,8 @@ public class GetClazzObjectProperties extends BaseEditController {
 			return;
 		}
 
-		String respo = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-		respo += "<options>";
+		StringBuilder respo = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+		respo.append("<options>");
 
 		ObjectPropertyDao odao = vreq.getUnfilteredWebappDaoFactory()
 				.getObjectPropertyDao();
@@ -90,13 +90,11 @@ public class GetClazzObjectProperties extends BaseEditController {
 				ObjectProperty oprop = (ObjectProperty) odao
 						.getObjectPropertyByURI(pi.getPropertyURI());
 				if (oprop != null) {
-					respo += "<option>" + "<key>" + oprop.getLocalName()
-							+ "</key>" + "<value>" + oprop.getURI()
-							+ "</value>" + "</option>";
+					respo.append("<option>" + "<key>").append(oprop.getLocalName()).append("</key>").append("<value>").append(oprop.getURI()).append("</value>").append("</option>");
 				}
 			}
 		}
-		respo += "</options>";
+		respo.append("</options>");
 		response.setContentType("text/xml");
 		response.setCharacterEncoding("UTF-8");
 		PrintWriter out = response.getWriter();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java
index db83a2f0a..19fb1dc15 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java
@@ -72,11 +72,10 @@ public class GetObjectClasses extends BaseEditController {
 		response.setContentType("text/xml");
 		response.setCharacterEncoding("UTF-8");
 		PrintWriter out = response.getWriter();
-		String respo = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-		respo += "<options>";
+		StringBuilder respo = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+		respo.append("<options>");
 		if (vClass != null) {
-			respo += "<option>" + "<key>" + vClass.getPickListName() + "</key>"
-					+ "<value>" + vClass.getURI() + "</value>" + "</option>";
+			respo.append("<option>" + "<key>").append(vClass.getPickListName()).append("</key>").append("<value>").append(vClass.getURI()).append("</value>").append("</option>");
 		} else {
 			List classGroups = vreq.getUnfilteredWebappDaoFactory()
 					.getVClassGroupDao().getPublicGroupsWithVClasses(true,
@@ -91,9 +90,7 @@ public class GetObjectClasses extends BaseEditController {
 				Iterator classIt = classes.iterator();
 				while (classIt.hasNext()) {
 					VClass clazz = (VClass) classIt.next();
-					respo += "<option>" + "<key>" + clazz.getPickListName()
-							+ "</key>" + "<value>" + clazz.getURI()
-							+ "</value>" + "</option>";
+					respo.append("<option>" + "<key>").append(clazz.getPickListName()).append("</key>").append("<value>").append(clazz.getURI()).append("</value>").append("</option>");
 				}
 			}
 		}
@@ -122,7 +119,7 @@ public class GetObjectClasses extends BaseEditController {
 		 * 
 		 * }
 		 */
-		respo += "</options>";
+		respo.append("</options>");
 		out.println(respo);
 		out.flush();
 		out.close();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/startup/StartupManager.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/startup/StartupManager.java
index 0d5307d31..494bc49dc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/startup/StartupManager.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/startup/StartupManager.java
@@ -156,16 +156,12 @@ public class StartupManager implements ServletContextListener {
 			ss.fatal(this, "Instance of '" + className
 					+ "' is not a ServletContextListener", e);
 			return null;
-		} catch (Exception e) {
-			ss.fatal(this, "Failed to instantiate listener: '" + className
-					+ "'", e);
-			return null;
-		} catch (ExceptionInInitializerError e) {
+		} catch (Exception | ExceptionInInitializerError e) {
 			ss.fatal(this, "Failed to instantiate listener: '" + className
 					+ "'", e);
 			return null;
 		}
-	}
+    }
 
 	/**
 	 * Call contextInitialized() on the listener.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java
index d9d88651b..3dde721f9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java
@@ -221,8 +221,7 @@ public class ConfiguredReasonerListener implements ModelChangedListener {
 
 		if (thereAreNoDrivingPatterns() || statementMatchesDrivingPattern(stmt)) {
 			addIt(stmt);
-			return;
-		}
+        }
 	}
 
 	public void tryRemove(Statement stmt) {
@@ -259,8 +258,7 @@ public class ConfiguredReasonerListener implements ModelChangedListener {
 
 		if (thereAreNoDrivingPatterns() || statementMatchesDrivingPattern(stmt)) {
 			removeIt(stmt);
-			return;
-		}
+        }
 	}
 
 	private boolean isDataProperty(Statement stmt) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasoner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasoner.java
index 85035ac36..c53e81ad7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasoner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasoner.java
@@ -29,7 +29,6 @@ import org.apache.jena.ontology.Restriction;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.rdf.model.ResourceFactory;
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.rdf.model.StmtIterator;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java
index 04d75bed6..159d78bbc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java
@@ -5,15 +5,11 @@ package edu.cornell.mannlib.vitro.webapp.utils;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.List;
 import java.util.Random;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
-import org.apache.jena.datatypes.xsd.XSDDatatype;
 import org.apache.jena.ontology.DatatypeProperty;
 import org.apache.jena.ontology.Individual;
 import org.apache.jena.ontology.OntClass;
@@ -24,7 +20,6 @@ import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.rdf.model.ResourceFactory;
 
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
 public class Csv2Rdf {
@@ -132,7 +127,7 @@ public class Csv2Rdf {
 			String uri = null;
 	        int attempts = 0;
 			if(namespace!=null && !namespace.isEmpty()){
-        		while( uriIsGood == false && attempts < 30 ){	
+        		while(!uriIsGood && attempts < 30 ){
         			uri = namespace+individualNameBase+random.nextInt( Math.min(Integer.MAX_VALUE,(int)Math.pow(2,attempts + 13)) );
         			String errMsg = wadf.checkURI(uri);
         			Resource res = ResourceFactory.createResource(uri);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FrontEndEditingUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FrontEndEditingUtils.java
index 5c3314431..4d79f7775 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FrontEndEditingUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FrontEndEditingUtils.java
@@ -2,7 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.utils;
 
-import java.util.Arrays;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -10,17 +9,8 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.Statement;
-import org.apache.jena.rdf.model.StmtIterator;
-import org.apache.jena.vocabulary.XSD;
-
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ObjectPropertyDaoJena;
 
 public class FrontEndEditingUtils {
  
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java
index caccca279..d2449a3ca 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java
@@ -126,7 +126,7 @@ public final class JsonToFmModel
     @SuppressWarnings("unchecked")
     private static StringBuffer toStringBuffer(Map<String, Object> unsortedMap, int indent)
     {      
-        StringBuffer tabs = new StringBuffer();
+        StringBuilder tabs = new StringBuilder();
         for (int i = 0; i < indent; i++)
         {
             tabs.append("\t");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Stemmer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Stemmer.java
index 131a74f26..315feefd4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Stemmer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Stemmer.java
@@ -70,7 +70,7 @@ public class Stemmer
    public void add(char ch)
    {  if (i == b.length)
       {  char[] new_b = new char[i+INC];
-         for (int c = 0; c < i; c++) new_b[c] = b[c];
+          System.arraycopy(b, 0, new_b, 0, i);
          b = new_b;
       }
       b[i++] = ch;
@@ -85,7 +85,7 @@ public class Stemmer
    public void add(char[] w, int wLen)
    {  if (i+wLen >= b.length)
       {  char[] new_b = new char[i+wLen+INC];
-         for (int c = 0; c < i; c++) new_b[c] = b[c];
+          System.arraycopy(b, 0, new_b, 0, i);
          b = new_b;
       }
       for (int c = 0; c < wLen; c++) b[i++] = w[c];
@@ -115,7 +115,7 @@ public class Stemmer
    private final boolean cons(int i)
    {  switch (b[i])
       {  case 'a': case 'e': case 'i': case 'o': case 'u': return false;
-         case 'y': return (i==0) ? true : !cons(i-1);
+         case 'y': return (i == 0) || !cons(i - 1);
          default: return true;
       }
    }
@@ -367,7 +367,7 @@ public class Stemmer
 
     public static String StemString( String inputStr, int maxLength )
     {
-        String outputStr="";
+        StringBuilder outputStr= new StringBuilder();
 
         int previousCh=0;
         char[] w = new char[maxLength];
@@ -395,19 +395,19 @@ public class Stemmer
                             {
                             String u;
                             u = s.toString();
-                            outputStr += u;
+                            outputStr.append(u);
                             if ( ch == '-' ) { // replace - with space
-                                outputStr += " ";
+                                outputStr.append(" ");
                             } else if ( ch == '.' ) {
                                 if ( Character.isDigit( (char) previousCh )) {
-                                    outputStr += ".";
+                                    outputStr.append(".");
                                 } else {
-                                    outputStr += " ";
+                                    outputStr.append(" ");
                                     //previousCh = 32; // set to whitespace; extra spaces should be filtered out on next pass
                                 }
                             } else {
                                 Character Ch = new Character((char) ch);
-                                outputStr += Ch.toString();
+                                outputStr.append(Ch.toString());
                             }
                             stemmerInputBufferIndex=0; // to avoid repeats after )
                             }
@@ -421,7 +421,7 @@ public class Stemmer
                 if ( !Character.isWhitespace((char) previousCh ) ) {
                     if ( previousCh != '.' ) {
                         Character Ch = new Character((char) ch);
-                        outputStr += Ch.toString();
+                        outputStr.append(Ch.toString());
                     }
                 }
             } else if ( ch == '(' ) { // open paren; copy all characters until close paren
@@ -448,21 +448,21 @@ public class Stemmer
                 stemmerInputBufferIndex=0;
             } else if ( ch == ')' ) { // when is last character of input string
                 Character Ch = new Character((char) ch);
-                outputStr += Ch.toString();
+                outputStr.append(Ch.toString());
                 log.trace( Ch.toString() );
                 log.trace("found close paren at position: " + inputArrayIndex + " of input term " + inputStr );
             } else if ( ch == '-' ) { // replace - with space
-                outputStr += " ";
+                outputStr.append(" ");
             } else if ( ch == '.' ) {
                 if ( Character.isDigit( (char) previousCh )) {
-                    outputStr += ".";
+                    outputStr.append(".");
                 } else {
-                    outputStr += " ";
+                    outputStr.append(" ");
                     //previousCh = 32; // set to whitespace; extra spaces should be filtered out on next pass
                 }
             } else {
                 Character Ch = new Character((char) ch);
-                outputStr += Ch.toString();
+                outputStr.append(Ch.toString());
             }
             previousCh = ch;
             if (ch < 0) break;
@@ -476,10 +476,10 @@ public class Stemmer
 
             String u;
             u = s.toString();
-            outputStr += u;
+            outputStr.append(u);
         }
 
-        return outputStr == null ? ( outputStr.equals("") ? null : outputStr.trim() ) : outputStr.trim();
+        return outputStr == null || outputStr.length() == 0? null : outputStr.toString().trim();
     }
 
 /*
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtils.java
index b290d3122..85d1ca55c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtils.java
@@ -35,12 +35,10 @@ import org.apache.jena.vocabulary.OWL;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController;
 import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupsForRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
-import edu.cornell.mannlib.vitro.webapp.utils.searchengine.SearchQueryUtils;
 
 
 public class DataGetterUtils {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java
index c5b119508..6723beb19 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java
@@ -1,11 +1,7 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 package edu.cornell.mannlib.vitro.webapp.utils.dataGetter;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.ServletContext;
@@ -22,8 +18,6 @@ import org.apache.jena.query.QuerySolutionMap;
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.rdf.model.ResourceFactory;
 import org.apache.jena.shared.Lock;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/ExtendedLinkedDataUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/ExtendedLinkedDataUtils.java
index 7f717724b..b22b00ed1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/ExtendedLinkedDataUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/ExtendedLinkedDataUtils.java
@@ -68,7 +68,7 @@ public class ExtendedLinkedDataUtils {
 		try {
 			try {
 				reader = new BufferedReader(new FileReader(sparqlFile));
-				StringBuffer fileContents = new StringBuffer();
+				StringBuilder fileContents = new StringBuilder();
 				String ln;
 			
 				while ( (ln = reader.readLine()) != null) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java
index 361c012a3..39184b998 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java
@@ -18,7 +18,6 @@ import java.util.regex.Pattern;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.jena.ontology.FunctionalProperty;
 import org.apache.jena.ontology.OntModel;
 import org.apache.jena.ontology.OntModelSpec;
 import org.apache.jena.rdf.model.Literal;
@@ -40,7 +39,6 @@ import org.apache.jena.vocabulary.RDF;
 import org.apache.jena.vocabulary.RDFS;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
 public class JenaIngestUtils {
@@ -262,7 +260,7 @@ public class JenaIngestUtils {
             } finally {
                 closeIt.close();
             }
-            if (duplicate == false) {
+            if (!duplicate) {
                 closeIt = model.listStatements((Resource)null, (Property)null, res);
                 try {
                     if (closeIt.hasNext()) {
@@ -808,7 +806,7 @@ public class JenaIngestUtils {
         boolean uriIsGood = false;
         int attempts = 0;
 
-        while( uriIsGood == false && attempts < 30 ){            
+        while(!uriIsGood && attempts < 30 ){
             uri = newNamespace + "n" + random.nextInt( Math.min(Integer.MAX_VALUE,(int)Math.pow(2,attempts + 13)) );            
             errMsg = wdf.checkURI(uri);
             if(  errMsg != null)
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaOutputUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaOutputUtils.java
index 8f00a29a7..ba682a604 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaOutputUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaOutputUtils.java
@@ -56,6 +56,5 @@ public class JenaOutputUtils {
 		}
 	    
 		model.setNsPrefixes(prefixes);
-		return;
-	}	
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedModel.java
index a6fce02e4..896b85494 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedModel.java
@@ -5,9 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection;
 import org.apache.jena.rdf.model.Model;
 
 import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.AbstractModelDecorator;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.StmtIterator;
 
 /**
  * A model that is easy to use in a try-with-resources code block. It can only
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/log/LogUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/log/LogUtils.java
index 67e6b33f9..37703ac75 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/log/LogUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/log/LogUtils.java
@@ -45,11 +45,11 @@ public class LogUtils {
 		@SuppressWarnings("unchecked")
 		Map<String, String[]> map = req.getParameterMap();
 
-		String s = req.getRequestURL().append('\n').toString();
+		StringBuilder s = new StringBuilder(req.getRequestURL().append('\n').toString());
 		for (String name : new TreeSet<String>(map.keySet())) {
-			s += "   " + name + " = " + Arrays.toString(map.get(name)) + '\n';
+			s.append("   ").append(name).append(" = ").append(Arrays.toString(map.get(name))).append('\n');
 		}
-		return s.trim();
+		return s.toString().trim();
 	}
 
 	private static boolean isLevelEnabled(Log log, String level) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ToString.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ToString.java
index 17b5356fc..d34be92b5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ToString.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ToString.java
@@ -127,7 +127,7 @@ public class ToString {
 	}
 
 	public static boolean isVitroClass(Object o) {
-		return (o == null) ? false : o.getClass().getName()
+		return (o != null) && o.getClass().getName()
 				.startsWith("edu.cornell");
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/Formatter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/Formatter.java
index 05f90c20f..34b633580 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/Formatter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/Formatter.java
@@ -21,11 +21,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchResultDocumen
 public class Formatter {
 	public static String format(SearchInputDocument doc) {
 		StringBuilder sb = new StringBuilder();
-		sb.append("SearchInputDocument: Name='"
-				+ getValueFromField(doc, "nameRaw") + "', URI='"
-				+ getValueFromField(doc, "URI") + "', boost='"
-				+ doc.getDocumentBoost() + "', " + doc.getFieldMap().size()
-				+ " fields \n");
+		sb.append("SearchInputDocument: Name='").append(getValueFromField(doc, "nameRaw")).append("', URI='").append(getValueFromField(doc, "URI")).append("', boost='").append(doc.getDocumentBoost()).append("', ").append(doc.getFieldMap().size()).append(" fields \n");
 
 		for (SearchInputField field : new TreeMap<>(doc.getFieldMap()).values()) {
 			sb.append(format(field, "   ").append('\n'));
@@ -51,10 +47,7 @@ public class Formatter {
 
 	private static StringBuilder format(SearchInputField field, String padding) {
 		StringBuilder sb = new StringBuilder();
-		sb.append(padding).append(
-				"SearchInputField: Name='" + field.getName() + "', boost='"
-						+ field.getBoost() + "', " + field.getValues().size()
-						+ " values \n");
+		sb.append(padding).append("SearchInputField: Name='").append(field.getName()).append("', boost='").append(field.getBoost()).append("', ").append(field.getValues().size()).append(" values \n");
 
 		for (Object value : field.getValues()) {
 			sb.append(padding).append("   '").append(String.valueOf(value))
@@ -88,10 +81,7 @@ public class Formatter {
 
 	public static String format(SearchResponse response) {
 		StringBuilder sb = new StringBuilder();
-		sb.append("SearchResponse: " + response.getResults().size()
-				+ " results, " + response.getFacetFields().size()
-				+ " facet fields, " + response.getHighlighting().size()
-				+ " highlights\n");
+		sb.append("SearchResponse: ").append(response.getResults().size()).append(" results, ").append(response.getFacetFields().size()).append(" facet fields, ").append(response.getHighlighting().size()).append(" highlights\n");
 		for (SearchFacetField facet : response.getFacetFields()) {
 			sb.append(format(facet, "      "));
 		}
@@ -115,17 +105,10 @@ public class Formatter {
 		for (Collection<Object> values : doc.getFieldValuesMap().values()) {
 			valuesCount += values.size();
 		}
-		sb.append("SearchResultDocument: Name='"
-				+ getValueFromField(doc, "nameRaw") + "', URI='"
-				+ getValueFromField(doc, "URI") + "', "
-				+ doc.getFieldNames().size() + " fields with " + valuesCount
-				+ " values \n");
+		sb.append("SearchResultDocument: Name='").append(getValueFromField(doc, "nameRaw")).append("', URI='").append(getValueFromField(doc, "URI")).append("', ").append(doc.getFieldNames().size()).append(" fields with ").append(valuesCount).append(" values \n");
 
 		for (String fieldName : new TreeMap<>(doc.getFieldValuesMap()).keySet()) {
-			sb.append(padding).append(
-					"Field: Name='" + fieldName + "', "
-							+ doc.getFieldValues(fieldName).size()
-							+ " values \n");
+			sb.append(padding).append("Field: Name='").append(fieldName).append("', ").append(doc.getFieldValues(fieldName).size()).append(" values \n");
 
 			for (Object value : doc.getFieldValues(fieldName)) {
 				sb.append(padding).append("   '").append(String.valueOf(value))
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/ResultSetIterators.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/ResultSetIterators.java
index c8963ed38..c469ce599 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/ResultSetIterators.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/ResultSetIterators.java
@@ -83,7 +83,7 @@ public class ResultSetIterators {
 		public static Node toNode(RDFNode rdfNode) {
 			if (rdfNode.isAnon()) {
 				Resource a = rdfNode.asResource();
-				return NodeFactory.createAnon();
+				return NodeFactory.createBlankNode();
 			}
 			if (rdfNode.isLiteral()) {
 				Literal l = rdfNode.asLiteral();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/AntiScript.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/AntiScript.java
index 80eaf19bc..e8f216d5b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/AntiScript.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/AntiScript.java
@@ -2,12 +2,9 @@
 
 package edu.cornell.mannlib.vitro.webapp.web;
 
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.owasp.validator.html.AntiSamy;
@@ -51,11 +48,9 @@ public class AntiScript {
         try {
             cr = as.scan(dirtyInput);
             return cr.getCleanHTML();
-        } catch (ScanException e) {
+        } catch (ScanException | PolicyException e) {
             log.error("Error while scanning HTML" ,e );
-        } catch (PolicyException e) {
-            log.error("Error while scanning HTML", e);
-        }        
+        }
         return "AntiScript: HTML caused scan error.";
     }
     
@@ -91,9 +86,6 @@ public class AntiScript {
                 newPolicy = Policy.getInstance( policyFile );                
                 log.debug("anti-script policy loaded successfully");
                 policy = newPolicy;
-            } catch (PolicyException e) {
-                log.error("Anti-Script policy not setup.", e);
-                return null;
             } catch (Throwable e) {
                 log.error("Anti-Script policy not setup.", e);
                 return null;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/ContentType.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/ContentType.java
index a46b6c38c..7e036cf92 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/ContentType.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/ContentType.java
@@ -614,7 +614,7 @@ public class ContentType implements Serializable {
  @Override
  public String toString() {
 
-   StringBuffer sb = new StringBuffer();
+   StringBuilder sb = new StringBuilder();
    sb.append(type);
    sb.append("/");
    sb.append(subType);
@@ -632,7 +632,7 @@ public class ContentType implements Serializable {
      if (tokenMatcher.matches()) {
        sb.append(value);
      } else {
-       sb.append("\"" + value + "\"");
+       sb.append("\"").append(value).append("\"");
      }
    }
    return sb.toString();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java
index 50cd3c8ab..b5024c273 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java
@@ -143,75 +143,63 @@ public class MiscWebUtils {
      * @param req Servlet Request
      */
     public static String getRequestAttributes( HttpServletRequest req){
-        String val = "<table>";
+        StringBuilder val = new StringBuilder("<table>");
         Enumeration names = req.getAttributeNames();
         while(names.hasMoreElements() ){
             String name = (String)names.nextElement();
-            val += "\n\t<tr><td>" + name + "</td><td><pre>";
+            val.append("\n\t<tr><td>").append(name).append("</td><td><pre>");
             String value = null;
             try{
                 Object obj = req.getAttribute(name);
                 value = (obj instanceof Model || obj instanceof ModelCom) ? "[Jena model object]" :
                 	(obj == null) ? "[null]" : 
                 		StringEscapeUtils.ESCAPE_HTML4.translate(obj.toString());
-            }catch(Exception ex){
-                value = "unable to get value" ;
-            }  catch (Error er){
-                value="unable to get value";
             } catch (Throwable th){
                 value = "unable to get value";
             }
-            val += value + "</pre></td></tr>\n";
+            val.append(value).append("</pre></td></tr>\n");
         }
-        return val + "</table>";
+        return val.append("</table>").toString();
     }
 
     public static String getRequestParam( HttpServletRequest req){
-        String val = "<table>";
+        StringBuilder val = new StringBuilder("<table>");
         Enumeration names = req.getParameterNames();
         while(names.hasMoreElements() ){
 
             String name = (String)names.nextElement();
-            val += "\n\t<tr><td><h3>" + name + "</h3><td><pre>";
+            val.append("\n\t<tr><td><h3>").append(name).append("</h3><td><pre>");
             String value = null;
             try{
                 Object obj = req.getParameter(name);
                 value = (obj == null) ? "[null]" : 
                 	StringEscapeUtils.ESCAPE_HTML4.translate(obj.toString());
-            }catch(Exception ex){
-                value = "unable to get value" ;
-            }  catch (Error er){
-                value="unable to get value";
             } catch (Throwable th){
                 value = "unable to get value";
             }
-            val += value + "</pre><td></tr>\n";
+            val.append(value).append("</pre><td></tr>\n");
         }
-        return val + "</table>";
+        return val.append("</table>").toString();
     }
 
     public static String getSessionAttributes(HttpServletRequest req){
-        String val = "<table>";
+        StringBuilder val = new StringBuilder("<table>");
         Enumeration names = req.getSession().getAttributeNames();
         while(names.hasMoreElements() ){
             String name = (String)names.nextElement();
-            val += "\n\t<tr><td><h3>" + name + "</h3><td><pre>";
+            val.append("\n\t<tr><td><h3>").append(name).append("</h3><td><pre>");
             String value = null;
             try{
                 Object obj = req.getSession().getAttribute(name);
                 value = (obj instanceof Model || obj instanceof ModelCom) ? "[Jena model object]" :
                 	(obj == null) ? "[null]" : 
                 		StringEscapeUtils.ESCAPE_HTML4.translate(obj.toString());
-            }catch(Exception ex){
-                value = "unable to get value" ;
-            }  catch (Error er){
-                value="unable to get value";
             } catch (Throwable th){
                 value = "unable to get value";
             }
-            val += value + "</pre></td></tr>\n";
+            val.append(value).append("</pre></td></tr>\n");
         }
-        return val + "</table>";
+        return val.append("</table>").toString();
     }
 
     public static String getReqInfo( HttpServletRequest req){
@@ -265,7 +253,7 @@ public class MiscWebUtils {
 	public static String escape(String s){
 		if(s==null)
 			return null;
-		StringBuffer sb=new StringBuffer();
+		StringBuilder sb=new StringBuilder();
 		for(int i=0;i<s.length();i++){
 			char ch=s.charAt(i);
 			switch(ch){
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/IndividualShortViewDirective.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/IndividualShortViewDirective.java
index 071151e11..9e02c1ff6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/IndividualShortViewDirective.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/IndividualShortViewDirective.java
@@ -121,9 +121,7 @@ public class IndividualShortViewDirective extends BaseTemplateDirectiveModel {
 	private void renderErrorMessage(Individual individual) {
 		Environment env = Environment.getCurrentEnvironment();
 		try {
-			env.getOut().append(
-					"<span>Can't process the custom short view for "
-							+ individual.getName() + "</span>");
+			env.getOut().append("<span>Can't process the custom short view for ").append(individual.getName()).append("</span>");
 		} catch (IOException e1) {
 			e1.printStackTrace();
 		}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/images/PlaceholderUtil.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/images/PlaceholderUtil.java
index dbff79497..0a8fe43c5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/images/PlaceholderUtil.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/images/PlaceholderUtil.java
@@ -12,7 +12,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.Map.Entry;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/JsonSet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/JsonSet.java
index 667c39c47..5724f7450 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/JsonSet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/JsonSet.java
@@ -33,7 +33,7 @@ public class JsonSet extends BodyTagSupport {
 	private String escape(String s){
 		if(s==null)
 			return null;
-		StringBuffer sb=new StringBuffer();
+		StringBuilder sb=new StringBuilder();
 		for(int i=0;i<s.length();i++){
 			char ch=s.charAt(i);
 			switch(ch){
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/OptionsForClassTag.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/OptionsForClassTag.java
index 7370d1803..810c721aa 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/OptionsForClassTag.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/OptionsForClassTag.java
@@ -3,8 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.web.jsptags;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
@@ -13,9 +11,7 @@ import org.apache.commons.lang3.StringEscapeUtils;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.tagext.TagSupport;
-import java.util.HashSet;
 import java.util.List;
-import java.util.ListIterator;
 
 /**
  * This tag will build an option list for individuals of a VClass.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/BaseTemplateMethodModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/BaseTemplateMethodModel.java
index a2ea196dd..734ecd483 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/BaseTemplateMethodModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/BaseTemplateMethodModel.java
@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.web.methods;
 
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModel.java
index 035c6d5c3..3714cff59 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModel.java
@@ -10,7 +10,6 @@ import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
-import edu.cornell.mannlib.vitro.webapp.web.AntiScript;
 
 public abstract class BaseTemplateModel {
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/Tags.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/Tags.java
index b964ef977..a51e0c541 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/Tags.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/Tags.java
@@ -2,7 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.web.templatemodels;
 
-import java.lang.reflect.Method;
 import java.util.LinkedHashSet;
 
 import freemarker.ext.beans.MethodAppearanceFineTuner;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/DataPropertyListConfig.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/DataPropertyListConfig.java
index 2ad3bb995..d7f95c660 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/DataPropertyListConfig.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/DataPropertyListConfig.java
@@ -5,7 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.lang.reflect.Constructor;
 import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
@@ -18,7 +17,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DataPropertyTemplateModel;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DataPropertyTemplateModel.ConfigError;
 import freemarker.cache.TemplateLoader;
-import freemarker.template.Configuration;
 
 public class DataPropertyListConfig {  
     private static final Log log = LogFactory.getLog(DataPropertyListConfig.class);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java
index f875dcff6..360484c92 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java
@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.edit;
 
 import java.util.Map;
 import java.util.List;
-import org.apache.jena.rdf.model.Literal;
 
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPostProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPostProcessor.java
index 4d86ecbfb..e90522ec4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPostProcessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPostProcessor.java
@@ -1,12 +1,8 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual;
 
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
index ec016c78f..3a99db2c3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
@@ -5,7 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -13,20 +12,15 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.ServletContext;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.Property;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview.InvalidConfigurationException;
 
 public class CollatedObjectPropertyTemplateModel extends
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
index 90f4ff780..d4ce25079 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
@@ -333,12 +333,9 @@ public class GroupedPropertyList extends BaseTemplateModel {
 								possibleOP.getURI(),
 								fudgeBlankNodeInRange(possibleOP.getRangeVClassURI())))) {
 			return true;
-		} else if (!(possibleOP instanceof FauxObjectPropertyWrapper) && 
-			         populatedOP.getURI().equals(possibleOP.getURI())) { // If not faux property, ignore range difference
-			return true;
-		} else {
-			return false;
-		}
+		} else // If not faux property, ignore range difference
+            return !(possibleOP instanceof FauxObjectPropertyWrapper) &&
+                    populatedOP.getURI().equals(possibleOP.getURI());
     }
 	
 	private String fudgeBlankNodeInDomain(String rawDomainUri) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModelBuilder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModelBuilder.java
index c8e2e6eb6..60a426ecf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModelBuilder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModelBuilder.java
@@ -2,7 +2,6 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual;
 
 public class IndividualTemplateModelBuilder {
     static IIndividualTemplateModelBuilder customBuilder = null;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java
index de5ade3a3..2d1c86060 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java
@@ -82,12 +82,9 @@ public class PropertyGroupTemplateModel extends BaseTemplateModel {
 	
 		RequestedAction dops = new DisplayObjectPropertyStatement(
 				subject.getURI(), op, SOME_URI);
-		if (PolicyHelper.isAuthorizedForActions(vreq, dops)) {
-			return true;
-		}
-		
-		return false;
-	}
+        return PolicyHelper.isAuthorizedForActions(vreq, dops);
+
+    }
 
 	/**
 	 * See if the property is permitted in its own right. If not, the property
@@ -103,12 +100,9 @@ public class PropertyGroupTemplateModel extends BaseTemplateModel {
 		DataPropertyStatementImpl dps = new DataPropertyStatementImpl(
 				subject.getURI(), dp.getURI(), SOME_LITERAL);
 		RequestedAction dops = new DisplayDataPropertyStatement(dps);
-		if (PolicyHelper.isAuthorizedForActions(vreq, dops)) {
-			return true;
-		}
-	
-		return false;
-	}
+        return PolicyHelper.isAuthorizedForActions(vreq, dops);
+
+    }
 
 	protected boolean isEmpty() {
         return properties.isEmpty();
@@ -121,14 +115,14 @@ public class PropertyGroupTemplateModel extends BaseTemplateModel {
 
     @Override
 	public String toString(){
-        String ptmStr ="";
+        StringBuilder ptmStr = new StringBuilder();
         for( int i=0; i < properties.size() ; i ++ ){
             PropertyTemplateModel ptm = properties.get(i);
             String spacer = "\n  ";
             if( ptm != null )
-                ptmStr = ptmStr + spacer + ptm.toString();
+                ptmStr.append(spacer).append(ptm.toString());
         }
-        return String.format("\nPropertyGroupTemplateModel %s[%s] ",name, ptmStr );
+        return String.format("\nPropertyGroupTemplateModel %s[%s] ",name, ptmStr.toString());
     }
     
     /* Accessor methods for templates */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
index 297d61430..3d74efe38 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
@@ -14,7 +14,6 @@ import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
 import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/SubclassTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/SubclassTemplateModel.java
index 749dfd625..9705443f9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/SubclassTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/SubclassTemplateModel.java
@@ -4,9 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual;
 
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
-
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
 
@@ -47,7 +44,7 @@ public class SubclassTemplateModel extends BaseTemplateModel implements Comparab
         } else if (rankOther < 1) {
             intCompare = -1;
         } else {           
-            intCompare = ((Integer)rank).compareTo(rankOther);
+            intCompare = Integer.compare(rank, rankOther);
         }
 
         if (intCompare != 0) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/Menu.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/Menu.java
index a4149a231..51ca29a0b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/Menu.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/Menu.java
@@ -8,7 +8,6 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
 
 public class Menu extends BaseTemplateModel {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java
index 6c3f9c5a5..40813410f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java
@@ -46,13 +46,7 @@ public class IndividualSearchResult extends BaseTemplateModel {
             try {
                 Constructor ctor = resultClass.getDeclaredConstructor(Individual.class, VitroRequest.class);
                 models.add((IndividualSearchResult)ctor.newInstance(individual, vreq));
-            } catch (NoSuchMethodException e) {
-                log.error("Unable to create IndividualSearchResult", e);
-            } catch (InstantiationException e) {
-                log.error("Unable to create IndividualSearchResult", e);
-            } catch (IllegalAccessException e) {
-                log.error("Unable to create IndividualSearchResult", e);
-            } catch (InvocationTargetException e) {
+            } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException | InstantiationException e) {
                 log.error("Unable to create IndividualSearchResult", e);
             }
         }
diff --git a/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetController.java b/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetController.java
index dd61dcb6b..d0155fb92 100644
--- a/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetController.java
+++ b/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetController.java
@@ -87,12 +87,12 @@ public class GadgetController extends FreemarkerHttpServlet {
         
         try {
 	        OpenSocialManager openSocialManager = new OpenSocialManager(vreq, "gadgetSandbox");
-	        String gadgetURLS = "";
+	        StringBuilder gadgetURLS = new StringBuilder();
 	        for (GadgetSpec gadget : openSocialManager.getAllDBGadgets(false).values())
 	        {
-	            gadgetURLS += gadget.getGadgetURL() + System.getProperty("line.separator");
+	            gadgetURLS.append(gadget.getGadgetURL()).append(System.getProperty("line.separator"));
 	        }
-	        body.put("gadgetURLS", gadgetURLS);
+	        body.put("gadgetURLS", gadgetURLS.toString());
 	        body.put(OpenSocialManager.TAG_NAME, openSocialManager);
         } catch (IOException e) {
             log.error("IOException in doTemplate()", e);
diff --git a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java
index a31393758..93b9d8fdc 100644
--- a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java
+++ b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java
@@ -263,12 +263,11 @@ public class OpenSocialManager {
 	}
 
 	public String getIdToUrlMapJavascript() {
-		String retval = "var idToUrlMap = {";
+		StringBuilder retval = new StringBuilder("var idToUrlMap = {");
 		for (PreparedGadget gadget : gadgets) {
 			// retval += gadget.GetAppId() + ":'" + gadget.GetGadgetURL() +
 			// "', ";
-			retval += "'remote_iframe_" + gadget.getAppId() + "':'"
-					+ gadget.getGadgetURL() + "', ";
+			retval.append("'remote_iframe_").append(gadget.getAppId()).append("':'").append(gadget.getGadgetURL()).append("', ");
 		}
 		return retval.substring(0, retval.length() - 2) + "};";
 	}
@@ -340,15 +339,15 @@ public class OpenSocialManager {
 
 		// Receive the encoded content.
 		int bytes = 0;
-		String page = "";
+		StringBuilder page = new StringBuilder();
 		byte[] bytesReceived = new byte[256];
 
 		// The following will block until the page is transmitted.
 		while ((bytes = s.getInputStream().read(bytesReceived)) > 0) {
-			page += new String(bytesReceived, 0, bytes);
+			page.append(new String(bytesReceived, 0, bytes));
 		};
 
-		return page;
+		return page.toString();
 	}
 	
 	public String getContainerJavascriptSrc() {
@@ -359,38 +358,29 @@ public class OpenSocialManager {
 
 	public String getGadgetJavascript() {
 		String lineSeparator = System.getProperty("line.separator");
-		String gadgetScriptText = "var my = {};" + lineSeparator
+		StringBuilder gadgetScriptText = new StringBuilder("var my = {};" + lineSeparator
 				+ "my.gadgetSpec = function(appId, name, url, secureToken, view, chrome_id, opt_params, visible_scope) {"
 				+ lineSeparator + "this.appId = appId;" + lineSeparator
 				+ "this.name = name;" + lineSeparator + "this.url = url;"
 				+ lineSeparator + "this.secureToken = secureToken;"
 				+ lineSeparator + "this.view = view || 'default';"
-				+ lineSeparator + "this.chrome_id = chrome_id;" 
+				+ lineSeparator + "this.chrome_id = chrome_id;"
 				+ lineSeparator + "this.opt_params = opt_params;" + lineSeparator
 				+ "this.visible_scope = visible_scope;" + lineSeparator + "};"
-				+ lineSeparator + "my.pubsubData = {};" + lineSeparator;
+				+ lineSeparator + "my.pubsubData = {};" + lineSeparator);
 		for (String key : getPubsubData().keySet()) {
-			gadgetScriptText += "my.pubsubData['" + key + "'] = '"
-					+ getPubsubData().get(key) + "';" + lineSeparator;
+			gadgetScriptText.append("my.pubsubData['").append(key).append("'] = '").append(getPubsubData().get(key)).append("';").append(lineSeparator);
 		}
-		gadgetScriptText += "my.openSocialURL = '"
-				+ configuration.getProperty(SHINDIG_URL_PROP) + "';"
-				+ lineSeparator + "my.debug = " + (isDebug() ? "1" : "0") + ";"
-				+ lineSeparator + "my.noCache = " + (noCache() ? "1" : "0")
-				+ ";" + lineSeparator + "my.gadgets = [";
+		gadgetScriptText.append("my.openSocialURL = '").append(configuration.getProperty(SHINDIG_URL_PROP)).append("';").append(lineSeparator).append("my.debug = ").append(isDebug() ? "1" : "0").append(";").append(lineSeparator).append("my.noCache = ").append(noCache() ? "1" : "0").append(";").append(lineSeparator).append("my.gadgets = [");
 		for (PreparedGadget gadget : getVisibleGadgets()) {
-			gadgetScriptText += "new my.gadgetSpec(" + gadget.getAppId() + ",'"
-					+ gadget.getName() + "','" + gadget.getGadgetURL() + "','"
-					+ gadget.getSecurityToken() + "','" + gadget.getView()
-					+ "','" + gadget.getChromeId() + "'," + gadget.getOptParams() + ",'"
-					+ gadget.getGadgetSpec().getVisibleScope() + "'), ";
+			gadgetScriptText.append("new my.gadgetSpec(").append(gadget.getAppId()).append(",'").append(gadget.getName()).append("','").append(gadget.getGadgetURL()).append("','").append(gadget.getSecurityToken()).append("','").append(gadget.getView()).append("','").append(gadget.getChromeId()).append("',").append(gadget.getOptParams()).append(",'").append(gadget.getGadgetSpec().getVisibleScope()).append("'), ");
 		}
-		gadgetScriptText = gadgetScriptText.substring(0,
+		gadgetScriptText = new StringBuilder(gadgetScriptText.substring(0,
 				gadgetScriptText.length() - 2)
 				+ "];"
-				+ lineSeparator;
+				+ lineSeparator);
 
-		return gadgetScriptText;
+		return gadgetScriptText.toString();
 	}
 	
 	Map<String, GadgetSpec> getAllDBGadgets(boolean useCache) throws SQLException 
diff --git a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialSmokeTests.java b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialSmokeTests.java
index bc56bc7a9..af4b36aa4 100644
--- a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialSmokeTests.java
+++ b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialSmokeTests.java
@@ -27,7 +27,6 @@ import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
 
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
@@ -337,7 +336,6 @@ public class OpenSocialSmokeTests implements ServletContextListener {
 				} else {
 					ss.warning(listener, message, cause);
 				}
-				return;
 			}
 		}
 	}
@@ -472,7 +470,6 @@ public class OpenSocialSmokeTests implements ServletContextListener {
 				} else {
 					ss.warning(listener, message, cause);
 				}
-				return;
 			}
 		}
 	}
diff --git a/api/src/main/java/freemarker/ext/beans/WrapperExtractor.java b/api/src/main/java/freemarker/ext/beans/WrapperExtractor.java
index 787ff5d4e..f35914141 100644
--- a/api/src/main/java/freemarker/ext/beans/WrapperExtractor.java
+++ b/api/src/main/java/freemarker/ext/beans/WrapperExtractor.java
@@ -2,8 +2,6 @@
 
 package freemarker.ext.beans;
 
-import java.util.Set;
-
 /**
  * Class to extract wrapper used to wrap an object into a template model object. 
  * Used as workaround to gap in Freemarker template model API (can't get wrapper
diff --git a/api/src/main/java/freemarker/ext/dump/BaseDumpDirective.java b/api/src/main/java/freemarker/ext/dump/BaseDumpDirective.java
index 2d6b53673..38b09dc13 100644
--- a/api/src/main/java/freemarker/ext/dump/BaseDumpDirective.java
+++ b/api/src/main/java/freemarker/ext/dump/BaseDumpDirective.java
@@ -28,7 +28,6 @@ import freemarker.ext.beans.CollectionModel;
 import freemarker.ext.beans.SimpleMethodModel;
 import freemarker.ext.beans.StringModel;
 import freemarker.ext.beans.WrapperExtractor;
-import freemarker.template.Configuration;
 import freemarker.template.ObjectWrapper;
 import freemarker.template.SimpleScalar;
 import freemarker.template.Template;
diff --git a/api/src/main/java/org/linkeddatafragments/util/MIMEParse.java b/api/src/main/java/org/linkeddatafragments/util/MIMEParse.java
index 1bc679071..a5fa7fcaa 100644
--- a/api/src/main/java/org/linkeddatafragments/util/MIMEParse.java
+++ b/api/src/main/java/org/linkeddatafragments/util/MIMEParse.java
@@ -57,10 +57,10 @@ public final class MIMEParse
         @Override
         public String toString()
         {
-            StringBuffer s = new StringBuffer("('" + type + "', '" + subType
+            StringBuilder s = new StringBuilder("('" + type + "', '" + subType
                     + "', {");
             for (String k : params.keySet())
-                s.append("'" + k + "':'" + params.get(k) + "',");
+                s.append("'").append(k).append("':'").append(params.get(k)).append("',");
             return s.append("})").toString();
         }
     }
diff --git a/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceBasedRequestProcessorForTPFs.java b/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceBasedRequestProcessorForTPFs.java
index 91daa8c61..bc74e3953 100644
--- a/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceBasedRequestProcessorForTPFs.java
+++ b/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceBasedRequestProcessorForTPFs.java
@@ -1,23 +1,11 @@
 package org.vivoweb.linkeddatafragments.datasource.rdfservice;
 
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;
 import org.apache.jena.atlas.io.StringWriterI;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
 import org.apache.jena.graph.Triple;
-import org.apache.jena.query.Dataset;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.QuerySolutionMap;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.query.Syntax;
 import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
@@ -26,15 +14,11 @@ import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.rdf.model.StmtIterator;
 import org.apache.jena.riot.out.NodeFormatter;
 import org.apache.jena.riot.out.NodeFormatterTTL;
-import org.apache.jena.tdb.TDBFactory;
 import org.linkeddatafragments.datasource.AbstractRequestProcessorForTriplePatterns;
-import org.linkeddatafragments.datasource.IFragmentRequestProcessor;
 import org.linkeddatafragments.fragments.ILinkedDataFragment;
 import org.linkeddatafragments.fragments.tpf.ITriplePatternElement;
 import org.linkeddatafragments.fragments.tpf.ITriplePatternFragmentRequest;
 
-import java.io.File;
-
 public class RDFServiceBasedRequestProcessorForTPFs
     extends AbstractRequestProcessorForTriplePatterns<RDFNode,String,String>
 {
@@ -68,7 +52,7 @@ public class RDFServiceBasedRequestProcessorForTPFs
             if (node.isLiteral()) {
                 builder.append(literalToString(node.asLiteral()));
             } else if (node.isURIResource()) {
-                builder.append('<' + node.asResource().getURI() + '>');
+                builder.append('<').append(node.asResource().getURI()).append('>');
             }
         }
 
diff --git a/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceDataSource.java b/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceDataSource.java
index 7511aad96..c54e810a3 100644
--- a/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceDataSource.java
+++ b/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceDataSource.java
@@ -5,8 +5,6 @@ import org.linkeddatafragments.datasource.IFragmentRequestProcessor;
 import org.linkeddatafragments.fragments.IFragmentRequestParser;
 import org.linkeddatafragments.fragments.tpf.TPFRequestParserForJenaBackends;
 
-import java.io.File;
-
 /**
  * Experimental Jena TDB-backed data source of Basic Linked Data Fragments.
  *
diff --git a/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceDataSourceType.java b/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceDataSourceType.java
index 417466dba..0e8323cdb 100644
--- a/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceDataSourceType.java
+++ b/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceDataSourceType.java
@@ -5,8 +5,6 @@ import org.linkeddatafragments.datasource.IDataSource;
 import org.linkeddatafragments.datasource.IDataSourceType;
 import org.linkeddatafragments.exceptions.DataSourceCreationException;
 
-import java.io.File;
-
 /**
  * The type of Triple Pattern Fragment data sources that are backed by
  * a Jena TDB instance.
diff --git a/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java b/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java
index e2bd34a14..2323436ee 100644
--- a/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java
+++ b/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java
@@ -23,18 +23,15 @@ import org.linkeddatafragments.views.ILinkedDataFragmentWriter;
 import org.vivoweb.linkeddatafragments.views.HtmlTriplePatternFragmentWriterImpl;
 import org.vivoweb.linkeddatafragments.views.LinkedDataFragmentWriterFactory;
 import org.vivoweb.linkeddatafragments.datasource.rdfservice.RDFServiceBasedRequestProcessorForTPFs;
-import org.vivoweb.linkeddatafragments.datasource.rdfservice.RDFServiceDataSource;
 import org.vivoweb.linkeddatafragments.datasource.rdfservice.RDFServiceDataSourceType;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
@@ -225,7 +222,7 @@ public class VitroLinkedDataFragmentServlet extends VitroHttpServlet {
         configJson.append("  \"title\": \"Linked Data Fragments server\",\n");
         configJson.append("\n");
         configJson.append("  \"datasourcetypes\": {\n");
-        configJson.append("    \"RDFServiceDatasource\": \"" + RDFServiceDataSourceType.class.getCanonicalName() + "\"\n");
+        configJson.append("    \"RDFServiceDatasource\": \"").append(RDFServiceDataSourceType.class.getCanonicalName()).append("\"\n");
         configJson.append("  },\n");
         configJson.append("\n");
         configJson.append("  \"datasources\": {\n");
diff --git a/api/src/main/java/org/vivoweb/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java b/api/src/main/java/org/vivoweb/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java
index f46a66b30..16a58e16a 100644
--- a/api/src/main/java/org/vivoweb/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java
+++ b/api/src/main/java/org/vivoweb/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java
@@ -177,7 +177,7 @@ public class HtmlTriplePatternFragmentWriterImpl extends TriplePatternFragmentWr
         if (node.isLiteral()) {
             builder.append(literalToString(node.asLiteral()));
         } else if (node.isURIResource()) {
-            builder.append('<' + node.asResource().getURI() + '>');
+            builder.append('<').append(node.asResource().getURI()).append('>');
         }
     }
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java b/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java
index d5eea4977..98412084f 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java
@@ -198,7 +198,7 @@ public abstract class AbstractTestClass {
 			file.listFiles(new FileFilter() {
 				@Override
 				public boolean accept(File pathname) {
-					message.append("   contains file '" + pathname + "'\n");
+					message.append("   contains file '").append(pathname).append("'\n");
 					return true;
 				}
 			});
@@ -421,16 +421,10 @@ public abstract class AbstractTestClass {
 			StringReader reader = new StringReader(docString);
 			Document doc = builder.parse(new InputSource(reader));
 			xformer.transform(new DOMSource(doc), new StreamResult(result));
-		} catch (ParserConfigurationException e) {
-			fail(e.toString());
-		} catch (SAXException e) {
-			fail(e.toString());
-		} catch (IOException e) {
-			fail(e.toString());
-		} catch (TransformerException e) {
+		} catch (ParserConfigurationException | TransformerException | IOException | SAXException e) {
 			fail(e.toString());
 		}
-		return result.toString().replaceAll(">\\s+<", "><");
+        return result.toString().replaceAll(">\\s+<", "><");
 	}
 
 	protected <T extends Comparable<T>> void assertEqualSets(String label,
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/HasPermissionFactoryTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/HasPermissionFactoryTest.java
index 3380e7da4..6d8e32016 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/HasPermissionFactoryTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/HasPermissionFactoryTest.java
@@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.identifier.factory;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -245,9 +246,7 @@ public class HasPermissionFactoryTest extends AbstractTestClass {
 
 	private <T> List<T> list(T... elements) {
 		List<T> l = new ArrayList<T>();
-		for (T element : elements) {
-			l.add(element);
-		}
+		Collections.addAll(l, elements);
 		return l;
 	}
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java
index e23484fcb..31cfb5433 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java
@@ -6,8 +6,6 @@ import static org.junit.Assert.*;
 
 import java.io.StringReader;
 
-import junit.framework.Assert;
-
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLoginTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLoginTest.java
index 10ac0f594..439afe951 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLoginTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLoginTest.java
@@ -189,14 +189,11 @@ public class ProgramLoginTest extends AbstractTestClass {
 
 		try {
 			servlet.doGet(request, response);
-		} catch (ServletException e) {
-			log.error(e, e);
-			fail(e.toString());
-		} catch (IOException e) {
+		} catch (ServletException | IOException e) {
 			log.error(e, e);
 			fail(e.toString());
 		}
-	}
+    }
 
 	private void assert403() {
 		assertEquals("status", 403, response.getStatus());
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/NQuadLineSplitterTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/NQuadLineSplitterTest.java
index 1084f0b49..d1b521f31 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/NQuadLineSplitterTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/NQuadLineSplitterTest.java
@@ -9,7 +9,6 @@ import java.io.InputStream;
 import java.util.List;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Level;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsControllerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsControllerTest.java
index 3e07c68d7..8521d5374 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsControllerTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsControllerTest.java
@@ -16,6 +16,8 @@ import stubs.edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryStub;
 import stubs.edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccessFactoryStub;
 import stubs.javax.servlet.http.HttpServletRequestStub;
 
+import java.util.Collections;
+
 /**
  * Not a well-formed set of unit tests. But it's a pretty good exercise of the
  * different possibilities in the output stage.
@@ -132,9 +134,7 @@ public class ListClassGroupsControllerTest extends ListControllerTestBase {
 	private VClassGroup vClassGroup(String uri, String name, int rank,
 			VClass... vClasses) {
 		VClassGroup group = new VClassGroup(uri, name, rank);
-		for (VClass vClass : vClasses) {
-			group.add(vClass);
-		}
+		Collections.addAll(group, vClasses);
 		return group;
 	}
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServletTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServletTest.java
index 4e2b9a88a..dbbc82ab2 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServletTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServletTest.java
@@ -11,7 +11,6 @@ import java.io.IOException;
 
 import javax.servlet.ServletException;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.log4j.Level;
@@ -214,8 +213,6 @@ public class JsonServletTest extends AbstractTestClass {
 			JsonNode result = mapper.readTree(resp.getOutput());
 			assertEquals("errorMessage", expected, getFieldValue(result, "errorMessage").asText());
 			assertEquals("status", SC_INTERNAL_SERVER_ERROR, resp.getStatus());
-		} catch (JsonProcessingException e) {
-			fail(e.toString());
 		} catch (IOException e) {
 			fail(e.toString());
 		}
@@ -233,8 +230,6 @@ public class JsonServletTest extends AbstractTestClass {
 			assertEquals("vclass uri", vclassId, getFieldValue(vclassObj, "URI").asText());
 
 			assertEquals("status", SC_OK, resp.getStatus());
-		} catch (JsonProcessingException e) {
-			fail(e.toString());
 		} catch (IOException e) {
 			fail(e.toString());
 		}
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java
index 85645942f..ac6a270fe 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java
@@ -785,11 +785,7 @@ public class IndividualFilteringByStatementTest extends AbstractTestClass {
 			@Override
 			public Boolean fn(ObjectPropertyStatement ops) {
 				if (PROPERTY_OBJECT_VISIBLE.equals(ops.getPropertyURI())) {
-					if (isFauxHidden(ops)) {
-						return false;
-					} else {
-						return true;
-					}
+					return !isFauxHidden(ops);
 				}
 				if (PROPERTY_OBJECT_MAYBE.equals(ops.getPropertyURI())
 						&& URI_INDIVIDUAL_SPECIAL.equals(ops.getSubjectURI())) {
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersFactoryTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersFactoryTest.java
index e2e1d14bd..39e24cff7 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersFactoryTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersFactoryTest.java
@@ -3,23 +3,14 @@
 package edu.cornell.mannlib.vitro.webapp.dao.filtering.filters;
 
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedList;
 import java.util.List;
 
-import net.sf.jga.algorithms.Summarize;
-
-import org.joda.time.DateTime;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatementImpl;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.BaseFiltering;
 
 public class VitroFiltersFactoryTest {
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJenaTest.java
index 307e1db0d..431c251b4 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJenaTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJenaTest.java
@@ -3,9 +3,7 @@
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
 
-import org.apache.log4j.Level;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 import org.apache.jena.ontology.DatatypeProperty;
@@ -13,7 +11,6 @@ import org.apache.jena.ontology.OntModel;
 import org.apache.jena.ontology.OntModelSpec;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler;
 import org.apache.jena.vocabulary.OWL;
 import org.apache.jena.vocabulary.RDF;
 import org.apache.jena.vocabulary.RDFS;
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJenaTest.java
index 36f6c074d..6ff573a27 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJenaTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJenaTest.java
@@ -2,16 +2,13 @@
 
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
-import org.apache.log4j.Level;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 import org.apache.jena.ontology.OntModel;
 import org.apache.jena.ontology.OntModelSpec;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler;
 import org.apache.jena.vocabulary.RDFS;
 
 import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java
index 1fa7fe9df..adbf484c5 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java
@@ -5,7 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 import java.io.StringReader;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.junit.Assert;
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtilsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtilsTest.java
index aa9e59e89..05416a540 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtilsTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtilsTest.java
@@ -3,8 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
 import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java
index 9de38f57b..3bf9604bf 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java
@@ -208,11 +208,11 @@ public class UserAccountsDaoJenaTest extends AbstractTestClass {
 		StmtIterator stmts = ontModel.listStatements(
 				ontModel.getResource(URI_USER1), null, (RDFNode) null);
 		if (stmts.hasNext()) {
-			String message = "Expecting no statements to remain in the model, but found:\n";
+			StringBuilder message = new StringBuilder("Expecting no statements to remain in the model, but found:\n");
 			while (stmts.hasNext()) {
-				message += "   " + formatStatement(stmts.next()) + "\n";
+				message.append("   ").append(formatStatement(stmts.next())).append("\n");
 			}
-			fail(message);
+			fail(message.toString());
 		}
 	}
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java
index e46952f2a..6883f667b 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java
@@ -320,27 +320,27 @@ public class VClassJenaTest {
 		    		}
 		    		return labelStr;
 		    	} else if (isBooleanClassExpression(cls)) {
-		    		String labelStr = "(";
+		    		StringBuilder labelStr = new StringBuilder("(");
 		    		if (cls.isComplementClass()) {
-		    			labelStr += "not ";
+		    			labelStr.append("not ");
 		    			ComplementClass ccls = (ComplementClass) cls.as(ComplementClass.class);
-		    			labelStr += getLabelForClass(ccls.getOperand(),withPrefix,forPickList,wadf);		    			
+		    			labelStr.append(getLabelForClass(ccls.getOperand(), withPrefix, forPickList, wadf));
 		    		} else if (cls.isIntersectionClass()) {
 		    			IntersectionClass icls = (IntersectionClass) cls.as(IntersectionClass.class);
 		    			for (Iterator operandIt = icls.listOperands(); operandIt.hasNext();) {
 		    				OntClass operand = (OntClass) operandIt.next();
-		    				labelStr += getLabelForClass(operand,withPrefix,forPickList,wadf);
+		    				labelStr.append(getLabelForClass(operand, withPrefix, forPickList, wadf));
 		    				if (operandIt.hasNext()) {
-		    					labelStr += " and ";
+		    					labelStr.append(" and ");
 		    				}
 		    			}
 		    		} else if (cls.isUnionClass()) {
 		    			UnionClass icls = (UnionClass) cls.as(UnionClass.class);
 		    			for (Iterator operandIt = icls.listOperands(); operandIt.hasNext();) {
 		    				OntClass operand = (OntClass) operandIt.next();
-		    				labelStr += getLabelForClass(operand,withPrefix,forPickList,wadf);
+		    				labelStr.append(getLabelForClass(operand, withPrefix, forPickList, wadf));
 		    				if (operandIt.hasNext()) {
-		    					labelStr += " or ";
+		    					labelStr.append(" or ");
 		    				}
 		    			}
 		    		}
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteralTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteralTest.java
index 0eddf1c50..2c65a9556 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteralTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteralTest.java
@@ -3,7 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.edit;
 
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 import org.apache.jena.rdf.model.Literal;
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/processEdit/RdfLiteralHashTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/processEdit/RdfLiteralHashTest.java
index cb4c2bbef..077f5b1c1 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/processEdit/RdfLiteralHashTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/processEdit/RdfLiteralHashTest.java
@@ -4,23 +4,12 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.processEdit;
 
 
 
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.junit.Assert;
 
 import org.junit.Test;
 
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.vocabulary.XSD;
-
 import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
 import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.RdfLiteralHash;
 
 public class RdfLiteralHashTest {
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponseTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponseTest.java
index 2d73976db..39403f4c6 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponseTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponseTest.java
@@ -5,8 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.filters;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.ServletResponse;
-
 import org.junit.Assert;
 
 import org.junit.Test;
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMakerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMakerTest.java
index 30ecab94d..75c490879 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMakerTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMakerTest.java
@@ -6,7 +6,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactoryTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactoryTest.java
index a5f7b1e84..e4b9b1c2e 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactoryTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactoryTest.java
@@ -599,9 +599,9 @@ public class VitroModelFactoryTest extends AbstractTestClass {
 	private void dumpMethodCalls(String message, Object proxy) {
 		System.out.println(message + " method calls:");
 		for (MethodCall call : ((MethodCallRecorder) proxy).getMethodCalls()) {
-			String formatted = "   " + call.getName();
+			StringBuilder formatted = new StringBuilder("   " + call.getName());
 			for (Object arg : call.getArgList()) {
-				formatted += "  " + arg.getClass();
+				formatted.append("  ").append(arg.getClass());
 			}
 			System.out.println(formatted);
 		}
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java
index 2cbc1c2a7..284af4c50 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java
@@ -16,7 +16,6 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.log4j.Level;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBaseTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBaseTest.java
index 28040514f..92e8d2ebd 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBaseTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBaseTest.java
@@ -2,21 +2,13 @@
 
 package edu.cornell.mannlib.vitro.webapp.servlet.setup;
 
-import java.io.StringReader;
-
-import org.junit.Assert;
-
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-
 import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
 
 public class UpdateKnowledgeBaseTest extends AbstractTestClass {
 	
 	@org.junit.Test
 	public void testMigrateDisplayModel14() {
-		
-      return;		
-	}
+
+    }
 	
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java
index 00445a2ea..17e9f2751 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java
@@ -22,11 +22,6 @@ import java.util.Set;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import stubs.edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccessFactoryStub;
-import stubs.javax.servlet.ServletContextStub;
-import stubs.javax.servlet.http.HttpServletRequestStub;
-import stubs.javax.servlet.http.HttpSessionStub;
-
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.Statement;
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/StringResultsMappingTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/StringResultsMappingTest.java
index 5bb4bbf5b..d765c72f9 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/StringResultsMappingTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/StringResultsMappingTest.java
@@ -109,9 +109,7 @@ public class StringResultsMappingTest extends AbstractTestClass {
 	@SafeVarargs
 	private static <T> List<T> list(T... items) {
 		List<T> l = new ArrayList<>();
-		for (T item : items) {
-			l.add(item);
-		}
+		Collections.addAll(l, items);
 		return l;
 	}
 
diff --git a/api/src/test/java/freemarker/ext/dump/DumpDirectiveTest.java b/api/src/test/java/freemarker/ext/dump/DumpDirectiveTest.java
index 14090d23d..b5948bdc8 100644
--- a/api/src/test/java/freemarker/ext/dump/DumpDirectiveTest.java
+++ b/api/src/test/java/freemarker/ext/dump/DumpDirectiveTest.java
@@ -1063,9 +1063,7 @@ public class DumpDirectiveTest {
         }
          
         public void setFavoriteColors(String...colors) {
-            for (String color : colors) {
-                favoriteColors.add(color);
-            }
+            Collections.addAll(favoriteColors, colors);
         }
         
 //        void setDegrees(Map<String, String> degrees) {
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccessStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccessStub.java
index 664937562..90b4d7c78 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccessStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccessStub.java
@@ -19,7 +19,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.ReasoningOption;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.WhichService;
-import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 
 /**
diff --git a/api/src/test/java/stubs/javax/servlet/http/HttpServletRequestStub.java b/api/src/test/java/stubs/javax/servlet/http/HttpServletRequestStub.java
index fb216bc60..27bb5e69f 100644
--- a/api/src/test/java/stubs/javax/servlet/http/HttpServletRequestStub.java
+++ b/api/src/test/java/stubs/javax/servlet/http/HttpServletRequestStub.java
@@ -210,10 +210,10 @@ public class HttpServletRequestStub implements HttpServletRequest {
 			return null;
 		}
 
-		String qs = "";
+		StringBuilder qs = new StringBuilder();
 		for (String key : parameters.keySet()) {
 			for (String value : parameters.get(key)) {
-				qs += "&" + key + "=" + URLEncoder.encode(value);
+				qs.append("&").append(key).append("=").append(URLEncoder.encode(value));
 			}
 		}
 		return "?" + qs.substring(1);
diff --git a/api/src/test/java/stubs/javax/servlet/http/HttpServletResponseStub.java b/api/src/test/java/stubs/javax/servlet/http/HttpServletResponseStub.java
index eeaaeeb5b..ae42e61a1 100644
--- a/api/src/test/java/stubs/javax/servlet/http/HttpServletResponseStub.java
+++ b/api/src/test/java/stubs/javax/servlet/http/HttpServletResponseStub.java
@@ -4,7 +4,6 @@ package stubs.javax.servlet.http;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Collection;
diff --git a/webapp/src/main/webapp/templates/edit/fetch/horizontal.jsp b/webapp/src/main/webapp/templates/edit/fetch/horizontal.jsp
index 3d7205ab4..a9c4c99c0 100644
--- a/webapp/src/main/webapp/templates/edit/fetch/horizontal.jsp
+++ b/webapp/src/main/webapp/templates/edit/fetch/horizontal.jsp
@@ -118,7 +118,7 @@ if (topButtons!=null) {
                 }
 %>
 
-<tr>
+<tr class="row">
     <td class="rownumheader">#</td>
      <%             if ( !("XX".equals(thisResult) )) {
 %>
diff --git a/webapp/src/main/webapp/templates/edit/specific/ents_edit_head.jsp b/webapp/src/main/webapp/templates/edit/specific/ents_edit_head.jsp
index 969aed096..23d65fce2 100644
--- a/webapp/src/main/webapp/templates/edit/specific/ents_edit_head.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/ents_edit_head.jsp
@@ -2,7 +2,7 @@
 
 <%
 
-request.setAttribute("dwrDisabled", new Boolean(false));
+request.setAttribute("dwrDisabled", Boolean.FALSE);
 String context = request.getContextPath();
 
 %>