diff --git a/src/main/java/org/dynmap/DynmapPlugin.java b/src/main/java/org/dynmap/DynmapPlugin.java
index 2e2c0a4c..0d660e96 100644
--- a/src/main/java/org/dynmap/DynmapPlugin.java
+++ b/src/main/java/org/dynmap/DynmapPlugin.java
@@ -424,21 +424,18 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         final boolean allow_symlinks = configuration.getBoolean("allow-symlinks", false);
         int maxconnections = configuration.getInteger("max-sessions", 30);
         if(maxconnections < 2) maxconnections = 2;
-        final ContextHandler context = new ContextHandler() {{
-            this.setContextPath("/");
-            this.setClassLoader(Thread.currentThread().getContextClassLoader());
-            this.setHandler(router = new HandlerRouter() {{
-                this.addHandler("/", new ResourceHandler() {{
-                    this.setAliases(allow_symlinks);
-                    this.setWelcomeFiles(new String[] { "index.html" });
-                    this.setDirectoriesListed(true);
-                    this.setBaseResource(createFileResource(getFile(getWebPath()).getAbsolutePath()));
-                }});
-                this.addHandler("/tiles/", new ResourceHandler() {{
-                    this.setAliases(allow_symlinks);
-                    this.setDirectoriesListed(true);
-                    this.setBaseResource(createFileResource(tilesDirectory.toString()));
-                }});
+        router = new HandlerRouter() {{
+            this.addHandler("/", new ResourceHandler() {{
+                this.setAliases(allow_symlinks);
+                this.setWelcomeFiles(new String[] { "index.html" });
+                this.setDirectoriesListed(true);
+                this.setBaseResource(createFileResource(getFile(getWebPath()).getAbsolutePath()));
+            }});
+            this.addHandler("/tiles/", new ResourceHandler() {{
+                this.setAliases(allow_symlinks);
+                this.setWelcomeFiles(new String[] { });
+                this.setDirectoriesListed(true);
+                this.setBaseResource(createFileResource(tilesDirectory.toString()));
             }});
         }};
 
@@ -458,7 +455,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         /* Load customized response headers, if any */
         filters.add(new CustomHeaderFilter(configuration.getNode("http-response-headers")));
 
-        webServer.setHandler(/*new FilterHandler(*/context/*, filters)*/);
+        webServer.setHandler(new FilterHandler(router, filters));
 
         addServlet("/up/configuration", new org.dynmap.servlet.ClientConfigurationServlet(this));
 
diff --git a/src/main/java/org/dynmap/web/FilterHandler.java b/src/main/java/org/dynmap/web/FilterHandler.java
index dcd6e911..ffa32355 100644
--- a/src/main/java/org/dynmap/web/FilterHandler.java
+++ b/src/main/java/org/dynmap/web/FilterHandler.java
@@ -49,7 +49,6 @@ public class FilterHandler extends AbstractHandler {
     public void handle(final String target, final Request baseRequest, final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException {
         final Handler handler = this.getHandler();
         final Iterator<FilterHolder> iterator = getFilters().iterator();
-        Log.info("Filtering..." + request.getPathInfo());
         final FilterChain chain = new FilterChain() {
             @Override
             public void doFilter(ServletRequest re, ServletResponse rs) throws IOException, ServletException {
@@ -57,7 +56,6 @@ public class FilterHandler extends AbstractHandler {
                     Filter f = iterator.next().getFilter();
                     f.doFilter(request, response, this);
                 } else {
-                    Log.info("Handling...");
                     handler.handle(target, baseRequest, request, response);
                 }
             }