diff --git a/src/fitnesse/authentication/PasswordFile.java b/src/fitnesse/authentication/PasswordFile.java
index db271be458..350e537063 100644
--- a/src/fitnesse/authentication/PasswordFile.java
+++ b/src/fitnesse/authentication/PasswordFile.java
@@ -6,7 +6,6 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -14,7 +13,7 @@
 import util.FileUtil;
 
 public class PasswordFile {
-  private File passwordFile;
+  private final File passwordFile;
   private Map<String, String> passwordMap = new HashMap<String, String>();
   private PasswordCipher cipher = new TransparentCipher();
 
@@ -52,8 +51,7 @@ private void loadFile() throws IOException {
   }
 
   private void loadPasswords(LinkedList<String> lines) {
-    for (Iterator<String> iterator = lines.iterator(); iterator.hasNext();) {
-      String line = iterator.next();
+    for (String line : lines) {
       if (!"".equals(line)) {
         String[] tokens = line.split(":");
         passwordMap.put(tokens[0], tokens[1]);
@@ -85,7 +83,7 @@ private void savePasswords() throws FileNotFoundException {
     List<String> lines = new LinkedList<String>();
     lines.add("!" + cipher.getClass().getName());
     for (String user : passwordMap.keySet()) {
-      Object password = passwordMap.get(user);
+      String password = passwordMap.get(user);
       lines.add(user + ":" + password);
     }
     FileUtil.writeLinesToFile(passwordFile, lines);
diff --git a/src/fitnesse/fixtures/PageDriver.java b/src/fitnesse/fixtures/PageDriver.java
index a1e6ce1c41..b4a97d6527 100644
--- a/src/fitnesse/fixtures/PageDriver.java
+++ b/src/fitnesse/fixtures/PageDriver.java
@@ -4,7 +4,6 @@
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Map;
 
 import org.htmlparser.Node;
 import org.htmlparser.NodeFilter;
diff --git a/src/fitnesse/junit/JUnitHelper.java b/src/fitnesse/junit/JUnitHelper.java
index bb2207e396..22f4daf3c2 100644
--- a/src/fitnesse/junit/JUnitHelper.java
+++ b/src/fitnesse/junit/JUnitHelper.java
@@ -72,7 +72,7 @@ public void assertPasses(String pageName, String pageType, String suiteFilter) t
   }
 
   public void assertPasses(String pageName, String pageType, String suiteFilter, String excludeSuiteFilter) throws Exception {
-    FitNesseContext context = FitNesseSuite.initContext(new File(ContextConfigurator.DEFAULT_CONFIG_FILE), fitNesseRootPath, ContextConfigurator.DEFAULT_ROOT, port);
+    FitNesseContext context = FitNesseRunner.initContext(new File(ContextConfigurator.DEFAULT_CONFIG_FILE), fitNesseRootPath, ContextConfigurator.DEFAULT_ROOT, port);
 
     JavaFormatter testFormatter = new JavaFormatter(pageName);
     testFormatter.setResultsRepository(new JavaFormatter.FolderResultsRepository(outputDir));
diff --git a/src/fitnesse/reporting/InteractiveFormatter.java b/src/fitnesse/reporting/InteractiveFormatter.java
index d8e84eb50d..880b602d3e 100644
--- a/src/fitnesse/reporting/InteractiveFormatter.java
+++ b/src/fitnesse/reporting/InteractiveFormatter.java
@@ -5,7 +5,6 @@
 
 import fitnesse.testrunner.TestsRunnerListener;
 import fitnesse.testrunner.WikiTestPage;
-import fitnesse.FitNesseContext;
 import fitnesse.html.HtmlTag;
 import fitnesse.html.HtmlUtil;
 import fitnesse.html.RawHtml;
diff --git a/src/fitnesse/reporting/SuiteHtmlFormatter.java b/src/fitnesse/reporting/SuiteHtmlFormatter.java
index bee82d26bb..28450ec4bb 100644
--- a/src/fitnesse/reporting/SuiteHtmlFormatter.java
+++ b/src/fitnesse/reporting/SuiteHtmlFormatter.java
@@ -11,7 +11,6 @@
 import fitnesse.testrunner.WikiTestPage;
 import fitnesse.testsystems.*;
 import fitnesse.util.TimeMeasurement;
-import fitnesse.FitNesseContext;
 import fitnesse.html.HtmlTag;
 import fitnesse.html.HtmlUtil;
 import fitnesse.wiki.PathParser;
diff --git a/src/fitnesse/reporting/history/HistoryPurger.java b/src/fitnesse/reporting/history/HistoryPurger.java
index d041441855..3708d706d4 100644
--- a/src/fitnesse/reporting/history/HistoryPurger.java
+++ b/src/fitnesse/reporting/history/HistoryPurger.java
@@ -8,7 +8,6 @@
 import java.util.logging.Logger;
 
 import fitnesse.util.Clock;
-import fitnesse.wiki.WikiPage;
 import fitnesse.wiki.WikiPagePath;
 import util.FileUtil;
 
diff --git a/src/fitnesse/responders/run/TestResponder.java b/src/fitnesse/responders/run/TestResponder.java
index 5c813295f3..774714f853 100644
--- a/src/fitnesse/responders/run/TestResponder.java
+++ b/src/fitnesse/responders/run/TestResponder.java
@@ -6,7 +6,6 @@
 
 import fitnesse.FitNesseContext;
 import fitnesse.reporting.BaseFormatter;
-import fitnesse.reporting.history.SuiteXmlReformatter;
 import fitnesse.reporting.history.TestXmlFormatter;
 import fitnesse.testrunner.MultipleTestsRunner;
 import fitnesse.testsystems.TestSummary;
diff --git a/src/fitnesse/responders/testHistory/ExecutionLogResponder.java b/src/fitnesse/responders/testHistory/ExecutionLogResponder.java
index 68db75976d..00a42b867c 100644
--- a/src/fitnesse/responders/testHistory/ExecutionLogResponder.java
+++ b/src/fitnesse/responders/testHistory/ExecutionLogResponder.java
@@ -20,7 +20,6 @@
 import fitnesse.reporting.history.TestHistory;
 import fitnesse.reporting.history.TestResultRecord;
 import fitnesse.responders.ErrorResponder;
-import fitnesse.responders.run.SuiteResponder;
 import fitnesse.wiki.PathParser;
 import util.FileUtil;
 
diff --git a/src/fitnesse/responders/testHistory/PurgeHistoryResponder.java b/src/fitnesse/responders/testHistory/PurgeHistoryResponder.java
index 3b1f6e86d2..82151b0fbd 100644
--- a/src/fitnesse/responders/testHistory/PurgeHistoryResponder.java
+++ b/src/fitnesse/responders/testHistory/PurgeHistoryResponder.java
@@ -1,9 +1,6 @@
 package fitnesse.responders.testHistory;
 
 import java.io.File;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 
 import fitnesse.FitNesseContext;
 import fitnesse.authentication.AlwaysSecureOperation;
@@ -14,9 +11,6 @@
 import fitnesse.http.SimpleResponse;
 import fitnesse.reporting.history.HistoryPurger;
 import fitnesse.responders.ErrorResponder;
-import fitnesse.responders.run.SuiteResponder;
-import fitnesse.util.Clock;
-import util.FileUtil;
 
 public class PurgeHistoryResponder implements SecureResponder {
   private File resultsDirectory;
diff --git a/src/fitnesse/slim/StackTraceEnricher.java b/src/fitnesse/slim/StackTraceEnricher.java
index 55db9d8d5e..3c2ba23cf8 100644
--- a/src/fitnesse/slim/StackTraceEnricher.java
+++ b/src/fitnesse/slim/StackTraceEnricher.java
@@ -215,7 +215,7 @@ private static String removeParentDirectories(String path) {
 
     private static String removeParentDirectories(String path, String separator) {
       String parsedPath = path;
-      if (path.indexOf(separator) > -1 && !path.endsWith(separator) || (path.indexOf(separator) < path.lastIndexOf
+      if (path.contains(separator) && !path.endsWith(separator) || (path.indexOf(separator) < path.lastIndexOf
           (separator))) {
         parsedPath = parsedPath.substring(parsedPath.indexOf(separator) + 1);
         parsedPath = removeParentDirectories(parsedPath, separator);
diff --git a/src/fitnesse/testsystems/slim/tables/SlimTable.java b/src/fitnesse/testsystems/slim/tables/SlimTable.java
index 7ff2feb0aa..b951e81868 100644
--- a/src/fitnesse/testsystems/slim/tables/SlimTable.java
+++ b/src/fitnesse/testsystems/slim/tables/SlimTable.java
@@ -341,10 +341,12 @@ public SlimExceptionResult evaluateException(SlimExceptionResult exceptionResult
       return exceptionResult;
     }
 
+    @Override
     public int getCol() {
       return col;
     }
 
+    @Override
     public int getRow() {
       return row;
     }
diff --git a/src/fitnesse/wiki/fs/FileSystemPage.java b/src/fitnesse/wiki/fs/FileSystemPage.java
index 63e12c17cb..28502d56cb 100644
--- a/src/fitnesse/wiki/fs/FileSystemPage.java
+++ b/src/fitnesse/wiki/fs/FileSystemPage.java
@@ -14,7 +14,6 @@
 import fitnesse.wiki.BaseWikiPage;
 import fitnesse.wiki.PageData;
 import fitnesse.wiki.PageType;
-import fitnesse.wiki.WikiPagePath;
 import fitnesse.wiki.VersionInfo;
 import fitnesse.wiki.WikiPage;
 import fitnesse.wiki.WikiPageProperties;
diff --git a/src/fitnesse/wiki/fs/VersionsControllerFixture.java b/src/fitnesse/wiki/fs/VersionsControllerFixture.java
index 863ff9a18c..a65f5d1f89 100644
--- a/src/fitnesse/wiki/fs/VersionsControllerFixture.java
+++ b/src/fitnesse/wiki/fs/VersionsControllerFixture.java
@@ -60,12 +60,12 @@ public int historySize() {
   }
 
   public String getVersionInfos() {
-	String result = "";
-	Collection<VersionInfo> versions = lastUsedPage.getVersions();
-	for (VersionInfo version : versions){
-		result = result  + version.getName() +"-" + version.getAuthor() + "-" + version.getCreationTime() + "\n";
-	}
-	return result;
+    String result = "";
+    Collection<VersionInfo> versions = lastUsedPage.getVersions();
+    for (VersionInfo version : versions){
+      result = result  + version.getName() +"-" + version.getAuthor() + "-" + version.getCreationTime() + "\n";
+    }
+    return result;
   }
 
   public String contentForRevision(int n) {
@@ -75,17 +75,17 @@ public String contentForRevision(int n) {
   }
 
   public String contentForRevisionFromPage(int n, String pageName) {
-	    final PageCrawler pageCrawler = rootPage.getPageCrawler();
-	    lastUsedPage = pageCrawler.getPage(PathParser.parse(pageName));
-	    if (lastUsedPage == null) return "[Error: Page doesn't exists]";
-	    else return contentForRevision(n);
+    final PageCrawler pageCrawler = rootPage.getPageCrawler();
+    lastUsedPage = pageCrawler.getPage(PathParser.parse(pageName));
+    if (lastUsedPage == null) return "[Error: Page doesn't exists]";
+    else return contentForRevision(n);
   }
 
   public String contentFromPage(String pageName) {
-	    final PageCrawler pageCrawler = rootPage.getPageCrawler();
-	    lastUsedPage = pageCrawler.getPage(PathParser.parse(pageName));
-	    if (lastUsedPage == null) return "[Error: Page doesn't exists]";
-	    else return lastUsedPage.getData().getContent();
+    final PageCrawler pageCrawler = rootPage.getPageCrawler();
+    lastUsedPage = pageCrawler.getPage(PathParser.parse(pageName));
+    if (lastUsedPage == null) return "[Error: Page doesn't exists]";
+    else return lastUsedPage.getData().getContent();
 }
 
   public boolean initialiseGitRepository() throws GitAPIException {
diff --git a/src/util/CommandLine.java b/src/util/CommandLine.java
index 537fa43d3e..abee2fe5b1 100644
--- a/src/util/CommandLine.java
+++ b/src/util/CommandLine.java
@@ -115,6 +115,6 @@ protected String[] split(String value) {
       if (!token.isEmpty())
         usableTokens.add(token);
     }
-    return usableTokens.toArray(new String[]{});
+    return usableTokens.toArray(new String[usableTokens.size()]);
   }
 }
\ No newline at end of file
diff --git a/test/fitnesse/plugins/DummyPluginFeatureFactory.java b/test/fitnesse/plugins/DummyPluginFeatureFactory.java
index 7434a26f27..baf5703370 100644
--- a/test/fitnesse/plugins/DummyPluginFeatureFactory.java
+++ b/test/fitnesse/plugins/DummyPluginFeatureFactory.java
@@ -1,14 +1,9 @@
 package fitnesse.plugins;
 
-import java.util.Arrays;
 import java.util.Calendar;
-import java.util.List;
-import java.util.Map;
 
-import fitnesse.testsystems.slim.tables.SlimTable;
 import fitnesse.testsystems.slim.tables.SlimTableFactory;
 import fitnesse.wikitext.parser.SymbolProvider;
-import fitnesse.wikitext.parser.SymbolType;
 import fitnesse.wikitext.parser.Today;
 
 public class DummyPluginFeatureFactory extends PluginFeatureFactoryBase {
diff --git a/test/fitnesse/plugins/PluginsLoaderTest.java b/test/fitnesse/plugins/PluginsLoaderTest.java
index 2d5163e599..4aa7ba61c3 100644
--- a/test/fitnesse/plugins/PluginsLoaderTest.java
+++ b/test/fitnesse/plugins/PluginsLoaderTest.java
@@ -55,8 +55,6 @@
 import org.junit.Test;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
 public class PluginsLoaderTest {
diff --git a/test/fitnesse/reporting/SuiteHtmlFormatterTest.java b/test/fitnesse/reporting/SuiteHtmlFormatterTest.java
index 2b993548b1..d65757bf5d 100644
--- a/test/fitnesse/reporting/SuiteHtmlFormatterTest.java
+++ b/test/fitnesse/reporting/SuiteHtmlFormatterTest.java
@@ -12,11 +12,9 @@
 import static util.RegexTestCase.assertHasRegexp;
 import static util.RegexTestCase.assertSubString;
 
-import fitnesse.FitNesseContext;
 import fitnesse.testrunner.WikiTestPage;
 import fitnesse.testsystems.TestSummary;
 import fitnesse.testsystems.TestSystem;
-import fitnesse.testutil.FitNesseUtil;
 import fitnesse.wiki.WikiPage;
 import fitnesse.wiki.WikiPageDummy;
 import fitnesse.wiki.fs.InMemoryPage;
diff --git a/test/fitnesse/reporting/history/HistoryPurgerTest.java b/test/fitnesse/reporting/history/HistoryPurgerTest.java
index 62900dc258..0d192c6712 100644
--- a/test/fitnesse/reporting/history/HistoryPurgerTest.java
+++ b/test/fitnesse/reporting/history/HistoryPurgerTest.java
@@ -15,7 +15,6 @@
 import util.FileUtil;
 
 import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
 
 public class HistoryPurgerTest {
 
diff --git a/test/fitnesse/reporting/history/SuiteHistoryFormatterTest.java b/test/fitnesse/reporting/history/SuiteHistoryFormatterTest.java
index 3d74d00ad4..edf6fe1574 100644
--- a/test/fitnesse/reporting/history/SuiteHistoryFormatterTest.java
+++ b/test/fitnesse/reporting/history/SuiteHistoryFormatterTest.java
@@ -20,7 +20,6 @@
 import fitnesse.util.DateAlteringClock;
 import fitnesse.util.DateTimeUtil;
 import fitnesse.util.XmlUtil;
-import org.xml.sax.SAXException;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/test/fitnesse/responders/run/SuiteResponderTest.java b/test/fitnesse/responders/run/SuiteResponderTest.java
index c5d06cf03b..bba8ea7881 100644
--- a/test/fitnesse/responders/run/SuiteResponderTest.java
+++ b/test/fitnesse/responders/run/SuiteResponderTest.java
@@ -14,7 +14,6 @@
 import fitnesse.wiki.PageData;
 import fitnesse.wiki.PathParser;
 import fitnesse.wiki.WikiPage;
-import fitnesse.wiki.WikiPagePath;
 import fitnesse.wiki.WikiPageUtil;
 import org.junit.After;
 import org.junit.Before;
diff --git a/test/fitnesse/responders/testHistory/PurgeHistoryResponderTest.java b/test/fitnesse/responders/testHistory/PurgeHistoryResponderTest.java
index 9c670f81b7..7a39b46516 100644
--- a/test/fitnesse/responders/testHistory/PurgeHistoryResponderTest.java
+++ b/test/fitnesse/responders/testHistory/PurgeHistoryResponderTest.java
@@ -4,12 +4,8 @@
 import fitnesse.http.MockRequest;
 import fitnesse.http.Response;
 import fitnesse.http.SimpleResponse;
-import fitnesse.reporting.history.PageHistory;
-import fitnesse.reporting.history.TestHistory;
-import fitnesse.responders.run.SuiteResponder;
 import fitnesse.testutil.FitNesseUtil;
 
-import fitnesse.util.DateAlteringClock;
 import org.junit.After;
 import static org.junit.Assert.*;
 import org.junit.Before;
@@ -17,10 +13,6 @@
 import util.FileUtil;
 
 import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 
 public class PurgeHistoryResponderTest {
   private File resultsDirectory;
diff --git a/test/fitnesse/slim/ListExecutorTestBase.java b/test/fitnesse/slim/ListExecutorTestBase.java
index 050f8dcb06..2e85ed524c 100644
--- a/test/fitnesse/slim/ListExecutorTestBase.java
+++ b/test/fitnesse/slim/ListExecutorTestBase.java
@@ -68,8 +68,7 @@ public void malformedStatement() throws Exception {
   private void assertExceptionReturned(String message, String returnTag) {
     Map<String, Object> results = SlimCommandRunningClient.resultToMap(executor.execute(statements));
     SlimException result = (SlimException) results.get(returnTag);
-    assertTrue(result.getMessage(), result.toString().contains(SlimServer.EXCEPTION_TAG) && result.toString().indexOf
-        (message) != -1);
+    assertTrue(result.getMessage(), result.toString().contains(SlimServer.EXCEPTION_TAG) && result.toString().contains(message));
   }
 
   @Test
diff --git a/test/fitnesse/wiki/RecentChangesWikiPageTest.java b/test/fitnesse/wiki/RecentChangesWikiPageTest.java
index ae0113bfae..1f8b89ba11 100644
--- a/test/fitnesse/wiki/RecentChangesWikiPageTest.java
+++ b/test/fitnesse/wiki/RecentChangesWikiPageTest.java
@@ -80,7 +80,7 @@ public void testUsernameColumnWithoutUser() throws Exception {
     recentChangesWikiPage.updateRecentChanges(page1);
     WikiPage recentChanges = rootPage.getChildPage("RecentChanges");
     List<String> lines = recentChangesWikiPage.getRecentChangesLines(recentChanges.getData());
-    String line = lines.get(0).toString();
+    String line = lines.get(0);
     assertSubString("|PageOne||", line);
   }
 
@@ -93,7 +93,7 @@ public void testUsernameColumnWithUser() throws Exception {
     recentChangesWikiPage.updateRecentChanges(page1);
     WikiPage recentChanges = rootPage.getChildPage("RecentChanges");
     List<String> lines = recentChangesWikiPage.getRecentChangesLines(recentChanges.getData());
-    String line = lines.get(0).toString();
+    String line = lines.get(0);
     assertSubString("|PageOne|Aladdin|", line);
   }
 }