diff --git a/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DangerousEval.java b/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DangerousEval.java
index 4eef387c4..6e06af542 100644
--- a/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DangerousEval.java
+++ b/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DangerousEval.java
@@ -4,6 +4,7 @@ package org.owasp.webgoat.lessons;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
+
 import org.apache.ecs.Element;
 import org.apache.ecs.ElementContainer;
 import org.apache.ecs.html.A;
@@ -18,7 +19,6 @@ import org.apache.ecs.html.TH;
 import org.apache.ecs.html.TR;
 import org.apache.ecs.html.Table;
 import org.owasp.webgoat.session.WebSession;
-import org.owasp.webgoat.util.HtmlEncoder;
 
 
 /***************************************************************************************************
diff --git a/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/PasswordStrength.java b/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/PasswordStrength.java
index e405792f0..009463461 100644
--- a/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/PasswordStrength.java
+++ b/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/PasswordStrength.java
@@ -49,7 +49,6 @@ import org.owasp.webgoat.session.WebSession;
 
 public class PasswordStrength extends LessonAdapter
 {
-	private final static String USER = "user";
 
 	/**
 	 * Description of the Method
@@ -62,7 +61,6 @@ public class PasswordStrength extends LessonAdapter
 	{
 		ElementContainer ec = new ElementContainer();
 
-		StringBuffer person = null;
 		try
 		{
 
diff --git a/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SameOriginPolicyProtection.java b/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SameOriginPolicyProtection.java
index 709228153..70f720b96 100644
--- a/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SameOriginPolicyProtection.java
+++ b/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SameOriginPolicyProtection.java
@@ -3,20 +3,19 @@ package org.owasp.webgoat.lessons;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.ecs.Element;
 import org.apache.ecs.ElementContainer;
 import org.apache.ecs.StringElement;
 import org.apache.ecs.html.A;
 import org.apache.ecs.html.BR;
-import org.apache.ecs.html.H2;
 import org.apache.ecs.html.H3;
 import org.apache.ecs.html.IMG;
 import org.apache.ecs.html.Input;
 import org.apache.ecs.html.Script;
 import org.apache.ecs.html.TextArea;
 import org.apache.ecs.xhtml.button;
-import org.apache.ecs.xhtml.link;
-import org.owasp.webgoat.session.*;
+import org.owasp.webgoat.session.WebSession;
 
 
 public class SameOriginPolicyProtection extends LessonAdapter
diff --git a/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SessionFixation.java b/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SessionFixation.java
index 3e8d9e9e0..75ab86aff 100644
--- a/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SessionFixation.java
+++ b/webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SessionFixation.java
@@ -7,6 +7,7 @@ import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+
 import org.apache.ecs.Element;
 import org.apache.ecs.ElementContainer;
 import org.apache.ecs.StringElement;
@@ -140,10 +141,6 @@ public class SessionFixation extends SequentialLessonAdapter
 				getLessonTracker(s).setStage(3);
 				s.setMessage("You completed stage 2!");
 			}
-//			else
-//			{
-//				createStage2Content(s);
-//			}
 		}
 
 		String mailContent = s.getParser().getRawParameter(MAILCONTENTNAME, "");
@@ -442,22 +439,6 @@ public class SessionFixation extends SequentialLessonAdapter
 		return ec;
 	}
 
-	/**
-	 * See if the user has logged in correctly
-	 * 
-	 * @param s
-	 * @return true if loggedIn
-	 */
-	private boolean loggedIn(WebSession s)
-	{
-		try
-		{
-			return s.get(LOGGEDIN).equals("true");
-		} catch (Exception e)
-		{
-			return false;
-		}
-	}
 
 	/**
 	 * See if the password and corresponding user is valid