diff --git a/src/net/sourceforge/plantuml/servlet/ImgServlet.java b/src/net/sourceforge/plantuml/servlet/ImgServlet.java
index c5dea84..72ad151 100644
--- a/src/net/sourceforge/plantuml/servlet/ImgServlet.java
+++ b/src/net/sourceforge/plantuml/servlet/ImgServlet.java
@@ -43,7 +43,7 @@ public class ImgServlet extends UmlDiagramService {
     }
 
     @Override
-    FileFormat getOutputFormat() {
+    public FileFormat getOutputFormat() {
         return FileFormat.PNG;
     }
 
diff --git a/src/net/sourceforge/plantuml/servlet/PlantUmlServlet.java b/src/net/sourceforge/plantuml/servlet/PlantUmlServlet.java
index 9334dae..7942df7 100644
--- a/src/net/sourceforge/plantuml/servlet/PlantUmlServlet.java
+++ b/src/net/sourceforge/plantuml/servlet/PlantUmlServlet.java
@@ -60,7 +60,6 @@ import HTTPClient.ParseException;
 public class PlantUmlServlet extends HttpServlet {
 
 	private static final Pattern startumlPattern = Pattern.compile("/\\w+/start/(.*)");
-	private static final Pattern imagePattern = Pattern.compile("/\\w+/img/(.*)");
 	private static final Pattern proxyPattern = Pattern.compile("/\\w+/proxy/((\\d+)/)?(http://.*)");
 	private static final Pattern oldStartumlPattern = Pattern.compile("/\\w+/uml/startuml/(.*)");
 	private static final Pattern oldImagePattern = Pattern.compile("/\\w+/uml/image/(.*)");
@@ -72,7 +71,6 @@ public class PlantUmlServlet extends HttpServlet {
 
 		final String uri = request.getRequestURI();
 		Matcher startumlMatcher = startumlPattern.matcher(uri);
-		Matcher imageMatcher = imagePattern.matcher(uri);
 		Matcher proxyMatcher = proxyPattern.matcher(uri);
 		Matcher oldStartumlMatcher = oldStartumlPattern.matcher(uri);
 		Matcher oldImageMatcher = oldImagePattern.matcher(uri);
@@ -80,9 +78,6 @@ public class PlantUmlServlet extends HttpServlet {
 		if (startumlMatcher.matches()) {
 			String source = startumlMatcher.group(1);
 			handleImage(response, source, uri);
-		} else if (imageMatcher.matches()) {
-			String source = imageMatcher.group(1);
-			handleImageDecompress(response, source, uri);
 		} else if (proxyMatcher.matches()) {
 			String num = proxyMatcher.group(2);
 			String source = proxyMatcher.group(3);
diff --git a/src/net/sourceforge/plantuml/servlet/SvgServlet.java b/src/net/sourceforge/plantuml/servlet/SvgServlet.java
index 044d4f4..45b0b7f 100644
--- a/src/net/sourceforge/plantuml/servlet/SvgServlet.java
+++ b/src/net/sourceforge/plantuml/servlet/SvgServlet.java
@@ -27,7 +27,7 @@ import net.sourceforge.plantuml.FileFormat;
 
 /* 
  * SVG servlet of the webapp.
- * TODO.
+ * This servlet produces the UML diagram in SVG format.
  */
 @SuppressWarnings("serial")
 public class SvgServlet extends UmlDiagramService {
@@ -43,7 +43,7 @@ public class SvgServlet extends UmlDiagramService {
     }
 
     @Override
-    FileFormat getOutputFormat() {
+    public FileFormat getOutputFormat() {
         return FileFormat.SVG;
     }
 
diff --git a/src/net/sourceforge/plantuml/servlet/UmlDiagramService.java b/src/net/sourceforge/plantuml/servlet/UmlDiagramService.java
index 9f5d182..5051aaa 100644
--- a/src/net/sourceforge/plantuml/servlet/UmlDiagramService.java
+++ b/src/net/sourceforge/plantuml/servlet/UmlDiagramService.java
@@ -36,7 +36,8 @@ import net.sourceforge.plantuml.code.Transcoder;
 import net.sourceforge.plantuml.code.TranscoderUtil;
 
 /**
- * Common service servlet to produce diagram from compressed UML source.
+ * Common service servlet to produce diagram from compressed UML source
+ * contained in the end part of the requested URI.
  */
 @SuppressWarnings("serial")
 public abstract class UmlDiagramService extends HttpServlet {
@@ -45,7 +46,7 @@ public abstract class UmlDiagramService extends HttpServlet {
     public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws IOException, ServletException {
 
-        // build the uml source from the compressed request parameter
+        // build the UML source from the compressed request parameter
         String text = URLDecoder.decode( getSource( request.getRequestURI()), "UTF-8");
         Transcoder transcoder = getTranscoder();
         text = transcoder.decode(text);
@@ -76,7 +77,7 @@ public abstract class UmlDiagramService extends HttpServlet {
      * This value is used by the DiagramResponse class. 
      * @return the format
      */
-    abstract FileFormat getOutputFormat();
+    abstract public FileFormat getOutputFormat();
     
     private Transcoder getTranscoder() {
         return TranscoderUtil.getDefaultTranscoder();