diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java
index 90a102d2c..1747a5ff0 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java	
@@ -113,11 +113,11 @@ public class SummaryReportCardScreen extends LessonAdapter
 	}
 	t.addElement(makeUserSummaryHeader());
 
-	for (Iterator userIter = UserTracker.instance().getAllUsers(
+	for (Iterator<String> userIter = UserTracker.instance().getAllUsers(
 		WebSession.WEBGOAT_USER).iterator(); userIter.hasNext();)
 	{
 
-	    String user = (String) userIter.next();
+	    String user = userIter.next();
 	    t.addElement(makeUserSummaryRow(s, user));
 	}
 
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/DatabaseUtilities.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/DatabaseUtilities.java
index 624d872ca..f34e5608f 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/DatabaseUtilities.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/DatabaseUtilities.java	
@@ -1,6 +1,5 @@
 package org.owasp.webgoat.session;
 
-import java.io.File;
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ECSFactory.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ECSFactory.java
index d6e39c4ee..dd0249001 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ECSFactory.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/ECSFactory.java	
@@ -442,12 +442,12 @@ public class ECSFactory
      * @return          Description of the Return Value
      */
 
-    public static Element makePulldown(String name, List options)
+    public static Element makePulldown(String name, List<String> options)
     {
 
 	Select s = new Select(name);
 
-	s.addElement((String[]) options.toArray(new String[options.size()]));
+	s.addElement(options.toArray(new String[options.size()]));
 
 	return (s);
     }
@@ -542,7 +542,7 @@ public class ECSFactory
      */
 
     public static Element makeSelect(boolean diffNames, Select select,
-	    String name, Vector options, String[] list, String selected)
+	    String name, Vector<Option> options, String[] list, String selected)
     {
 
 	return makeSelect(diffNames, select, name, options, list, selected, 1);
@@ -563,7 +563,7 @@ public class ECSFactory
      */
 
     public static Select makeSelect(boolean diffNames, Select select,
-	    String name, Vector options, String[] list, String selected,
+	    String name, Vector<Option> options, String[] list, String selected,
 	    int rowsShowing)
     {
 
@@ -582,8 +582,7 @@ public class ECSFactory
 
 		    String label = list[loop + 1];
 
-		    org.apache.ecs.html.Option o = new org.apache.ecs.html.Option(
-			    value);
+		    Option o = new Option(value);
 
 		    if (loop == 0)
 		    {
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UserTracker.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UserTracker.java
index 86b043209..225498db2 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UserTracker.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/UserTracker.java	
@@ -106,11 +106,11 @@ public class UserTracker
     }
 
 
-    public Collection getAllUsers(String roleName)
+    public Collection<String> getAllUsers(String roleName)
     {
 	synchronized (usersDB)
 	{
-	    Collection allUsers = new ArrayList();
+	    Collection<String> allUsers = new ArrayList<String>();
 	    try
 	    {
 		usersDB.open();
diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java
index eb85b84aa..76c52b388 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java	
@@ -17,7 +17,6 @@ import java.util.Vector;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;