Index: ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/dwr/table/FormDefinitionTableManager.java
===================================================================
diff -u -r16052 -r21964
--- ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/dwr/table/FormDefinitionTableManager.java	(.../FormDefinitionTableManager.java)	(revision 16052)
+++ ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/dwr/table/FormDefinitionTableManager.java	(.../FormDefinitionTableManager.java)	(revision 21964)
@@ -3,8 +3,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
-
 import com.forgon.component.grid.GridManager;
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.customform.formdefinition.service.FormDefinitionManager;
Index: ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/forminstance/service/FormInstanceManager.java
===================================================================
diff -u -r16052 -r21964
--- ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/forminstance/service/FormInstanceManager.java	(.../FormInstanceManager.java)	(revision 16052)
+++ ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/forminstance/service/FormInstanceManager.java	(.../FormInstanceManager.java)	(revision 21964)
@@ -2,8 +2,6 @@
 
 import java.util.Map;
 
-import net.sf.json.JSONArray;
-
 import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstance;
 
 /**
Index: ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManager.java
===================================================================
diff -u -r20215 -r21964
--- ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManager.java	(.../FormDefinitionManager.java)	(revision 20215)
+++ ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManager.java	(.../FormDefinitionManager.java)	(revision 21964)
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition;
 import net.sf.json.JSONArray;
 
 import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition;
Index: ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/forminstance/action/FormInstanceAction.java
===================================================================
diff -u -r16052 -r21964
--- ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/forminstance/action/FormInstanceAction.java	(.../FormInstanceAction.java)	(revision 16052)
+++ ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/forminstance/action/FormInstanceAction.java	(.../FormInstanceAction.java)	(revision 21964)
@@ -12,7 +12,6 @@
 
 import com.forgon.disinfectsystem.customform.forminstance.service.FormInstanceManager;
 import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstance;
-import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.db.DatabaseUtil;
Index: ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/action/FormDefinitionAction.java
===================================================================
diff -u -r20215 -r21964
--- ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/action/FormDefinitionAction.java	(.../FormDefinitionAction.java)	(revision 20215)
+++ ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/action/FormDefinitionAction.java	(.../FormDefinitionAction.java)	(revision 21964)
@@ -6,24 +6,21 @@
 import java.util.List;
 import java.util.Map;
 
-import com.forgon.disinfectsystem.customform.forminstance.service.FormInstanceManager;
-import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinitionItem;
-import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinitionItemOption;
-import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstance;
-import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstanceItem;
-import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstanceOptionValue;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
 
 import com.forgon.disinfectsystem.customform.formdefinition.service.FormDefinitionManager;
+import com.forgon.disinfectsystem.customform.forminstance.service.FormInstanceManager;
 import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition;
+import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinitionItem;
+import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinitionItemOption;
+import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstance;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.db.DatabaseUtil;