diff --git a/add/data/prefs/edirom-prefs.xml b/add/data/prefs/edirom-prefs.xml
index 7a5f4492a..4e4a5df70 100644
--- a/add/data/prefs/edirom-prefs.xml
+++ b/add/data/prefs/edirom-prefs.xml
@@ -25,8 +25,6 @@
         <entry key="application_language" value="de"/>
         <entry key="annotation_layout" value="EdiromOnline.view.window.annotationLayouts.AnnotationLayout1"/>
         <entry key="image_prefix" value="../../../digilib/Scaler/"/>
-        <!--<entry key="leaflet_prefix" value="/exist/rest/db/contents/leafletImages/"/>
-        <entry key="image_server" value="leaflet"/>-->
         <entry key="image_server" value="digilib"/>
         <entry key="edition_path" value="/db/apps/contents"/>
         <entry key="start_documents_uri" value=""/>
diff --git a/add/data/xql/edirom_printPreview.xql b/add/data/xql/edirom_printPreview.xql
index 8de79e80b..855ce5bf6 100644
--- a/add/data/xql/edirom_printPreview.xql
+++ b/add/data/xql/edirom_printPreview.xql
@@ -33,11 +33,7 @@ declare variable $lang := 'en';
 declare variable $base := concat('file:', replace(system:get-module-load-path(), '\\', '/'), '/../xslt/');
 declare variable $edition := request:get-parameter('edition', '');
 declare variable $imageserver := eutil:getPreference('image_server', $edition);
-declare variable $facsBasePath := if ($imageserver = 'leaflet')
-then
-    (eutil:getPreference('leaflet_prefix', $edition))
-else
-    (eutil:getPreference('image_prefix', $edition));
+declare variable $facsBasePath := eutil:getPreference('image_prefix', $edition);
 
 declare variable $printResolution := 150;
 declare variable $facsAreaWidth := 6.5; (: in inch :)
diff --git a/add/data/xql/getAnnotation.xql b/add/data/xql/getAnnotation.xql
index 6bfd4a659..dbe78ffc6 100644
--- a/add/data/xql/getAnnotation.xql
+++ b/add/data/xql/getAnnotation.xql
@@ -33,11 +33,7 @@ declare variable $edition := request:get-parameter('edition', '');
 
 declare variable $imageserver := eutil:getPreference('image_server', $edition);
 
-declare variable $imageBasePath :=
-    if ($imageserver = 'leaflet') then
-        (eutil:getPreference('leaflet_prefix', $edition))
-    else
-        (eutil:getPreference('image_prefix', $edition));
+declare variable $imageBasePath := eutil:getPreference('image_prefix', $edition);
 
 declare variable $lang := request:get-parameter('lang', '');
 
diff --git a/add/data/xql/getAnnotationPreviews.xql b/add/data/xql/getAnnotationPreviews.xql
index 1c6944c6d..7096f9a05 100644
--- a/add/data/xql/getAnnotationPreviews.xql
+++ b/add/data/xql/getAnnotationPreviews.xql
@@ -33,10 +33,7 @@ declare variable $lang := request:get-parameter('lang', '');
 declare variable $edition := request:get-parameter('edition', '');
 declare variable $imageserver := eutil:getPreference('image_server', $edition);
 declare variable $uri := request:get-parameter('uri', '');
-declare variable $imageBasePath := if ($imageserver = 'leaflet') then
-    (eutil:getPreference('leaflet_prefix', $edition))
-else
-    (eutil:getPreference('image_prefix', $edition));
+declare variable $imageBasePath := eutil:getPreference('image_prefix', $edition);
 
 (: FUNCTION DECLARATIONS =================================================== :)
 
@@ -344,19 +341,13 @@ declare function local:getImageAreaPath($basePath as xs:string, $graphic as elem
     let $imgHeight := number($graphic/@height)
     let $isAbsolute := starts-with($imagePath, 'http')
 
-    let $fields :=
-        if ($imageserver = 'leaflet') then
-            (substring-before($imagePath, '.'))
-        else
-            ()
+    let $fields := ()
 
     return
         if ($isAbsolute) then
             $imagePath
         else
             switch ($imageserver)
-                case 'leaflet'
-                    return concat($basePath, $fields)
                 case 'openseadragon'
                     return concat($basePath, translate($imagePath, '/', '!'))
                 default
diff --git a/add/data/xql/getReducedDocument.xql b/add/data/xql/getReducedDocument.xql
index 84ec9f593..cf9f1ff18 100644
--- a/add/data/xql/getReducedDocument.xql
+++ b/add/data/xql/getReducedDocument.xql
@@ -27,11 +27,7 @@ declare option output:omit-xml-declaration "yes";
 declare variable $edition := request:get-parameter('edition', '');
 declare variable $imageserver := eutil:getPreference('image_server', $edition);
 
-declare variable $imagePrefix :=
-    if ($imageserver = 'leaflet') then
-        (eutil:getPreference('leaflet_prefix', $edition))
-    else
-        (eutil:getPreference('image_prefix', $edition));
+declare variable $imagePrefix := eutil:getPreference('image_prefix', $edition);
 
 (: QUERY BODY ============================================================== :)
 
diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index d0515f3e6..db3a69c7b 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -486,36 +486,13 @@ declare function local:getTextSummary($doc, $facsBasePath) {
 declare function local:getImagePath($server, $edition) {
     (:let $server :=  eutil:getPreference('image_server', request:get-parameter('edition', '')) :)
     
-    let $i_path := if ($server = 'leaflet') then
-        (eutil:getPreference('leaflet_prefix', $edition))
-    else
-        (eutil:getPreference('image_prefix', $edition))
+    let $i_path := eutil:getPreference('image_prefix', $edition)
     
     return
         $i_path
 
 };
 
-declare function local:getImagePathLeaflet($doc) {
-    if ($doc//mei:source//mei:titlePage/@facs) then
-        (
-        let $tile_path := $doc//mei:source//mei:titlePage[1]/@facs
-        return
-            $tile_path
-        )
-    else
-        if ($doc//mei:facsimile/mei:surface/mei:graphic) then
-            (
-            let $tile_path := $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@target
-            let $width := $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@width
-            let $height := $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@height
-            return
-                concat($tile_path, '§', $width, '§', $height)
-            
-            )
-        else
-            ()
-};
 
 declare function local:getOutput($doc, $imagePrefix, $server, $imagePath, $type, $docUri) {
     let $test := <div>
@@ -542,22 +519,14 @@ let $edition := request:get-parameter('edition', '')
 let $server := eutil:getPreference('image_server', $edition)
 let $imagePrefix := local:getImagePath($server, $edition)
 (:eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
-let $imagePath := local:getImagePathLeaflet($doc)
 (:$doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@target:)
-(:local:getImagePathLeaflet($imagePrefix, $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@target):)
 
 return
     if ($type = 'work') then (
-        if ($server = 'leaflet') then
-            (local:getOutput($doc, $imagePrefix, $server, $imagePath, $type, $docUri))
-        else
-            (local:getWorkSummary($doc, $docUri))
+        local:getWorkSummary($doc, $docUri)
         
     ) else if ($type = 'source') then (
-            if ($server = 'leaflet') then
-                (local:getOutput($doc, $imagePrefix, $server, $imagePath, $type, $docUri))
-            else
-                (local:getSourceSummary($doc, $imagePrefix, $server))
+            local:getSourceSummary($doc, $imagePrefix, $server)
     ) else if ($type = 'text') then
         (local:getTextSummary($doc, $imagePrefix))
     else
diff --git a/add/data/xql/getText.xql b/add/data/xql/getText.xql
index 942c650c3..5109eb70d 100644
--- a/add/data/xql/getText.xql
+++ b/add/data/xql/getText.xql
@@ -80,11 +80,7 @@ let $base := replace(system:get-module-load-path(), 'embedded-eXist-server', '')
 let $edition := request:get-parameter('edition', '')
 let $imageserver := eutil:getPreference('image_server', $edition)
 
-let $imagePrefix :=
-    if ($imageserver = 'leaflet') then
-    (eutil:getPreference('leaflet_prefix', $edition))
-    else
-        (eutil:getPreference('image_prefix', $edition))
+let $imagePrefix := eutil:getPreference('image_prefix', $edition)
 
 let $xsl :=
     if ($xslInstruction) then
diff --git a/add/data/xqm/annotation.xqm b/add/data/xqm/annotation.xqm
index 9d6b85ace..5ebe09e05 100644
--- a/add/data/xqm/annotation.xqm
+++ b/add/data/xqm/annotation.xqm
@@ -157,11 +157,7 @@ declare function annotation:getContent($anno as element(), $idPrefix as xs:strin
     
     let $edition := request:get-parameter('edition', '')
     let $imageserver :=  eutil:getPreference('image_server', $edition)
-    let $imageBasePath :=
-        if($imageserver = 'leaflet') then
-            (eutil:getPreference('leaflet_prefix', $edition))
-        else
-            (eutil:getPreference('image_prefix', $edition))
+    let $imageBasePath := eutil:getPreference('image_prefix', $edition)
     
     let $language := eutil:getLanguage($edition)
     
diff --git a/add/index.xql b/add/index.xql
index 10b4cdfed..0bd642f81 100755
--- a/add/index.xql
+++ b/add/index.xql
@@ -61,13 +61,6 @@ let $eoIndexPage :=  <html>
                             <!-- **Raphael JS** -->
                             <script type="text/javascript" src="resources/js/raphael-min.js"/>
                             
-                            <!-- **Leaflet** -->
-                            <link rel="stylesheet" href="resources/leaflet-0.7.3/leaflet.css"/>
-                            <link rel="stylesheet" href="resources/Leaflet.tooltip-master/dist/leaflet.tooltip.css"/>
-                            <script type="text/javascript" src="resources/leaflet-0.7.3/leaflet.js"/>
-                            <script type="text/javascript" src="resources/facsimileLayer/FacsimileLayer.js"/>
-                            <script src="resources/Leaflet.tooltip-master/dist/leaflet.tooltip.js"/>
-                            
                             <!-- **Open Sea Dragon** -->
                             <script type="text/javascript" src="resources/js/openseadragon.min.js"/>
                             
diff --git a/bootstrap.js b/bootstrap.js
index b87714de9..fd59f4dd2 100644
--- a/bootstrap.js
+++ b/bootstrap.js
@@ -85,11 +85,8 @@ Ext.ClassManager.addNameAlternateMappings({
   "EdiromOnline.view.window.audio.AudioView": [],
   "EdiromOnline.view.window.concordanceNavigator.ConcordanceNavigator": [],
   "EdiromOnline.view.window.iFrameView": [],
-  "EdiromOnline.view.window.image.ImageLeafletContainer": [],
-  "EdiromOnline.view.window.image.ImageLeafletDetails": [],
   "EdiromOnline.view.window.image.ImageLoader": [],
   "EdiromOnline.view.window.image.ImageViewer": [],
-  "EdiromOnline.view.window.image.LeafletFacsimile": [],
   "EdiromOnline.view.window.image.OpenSeaDragonViewer": [],
   "EdiromOnline.view.window.image.VerovioImage": [],
   "EdiromOnline.view.window.search.SearchWindow": [],
@@ -1032,17 +1029,8 @@ Ext.ClassManager.addNameAliasMappings({
   "EdiromOnline.view.window.iFrameView": [
     "widget.iFrameView"
   ],
-  "EdiromOnline.view.window.image.ImageLeafletContainer": [
-    "widget.layout-horizontal-box"
-  ],
-  "EdiromOnline.view.window.image.ImageLeafletDetails": [
-    "widget.layout-vertical-box"
-  ],
   "EdiromOnline.view.window.image.ImageLoader": [],
   "EdiromOnline.view.window.image.ImageViewer": [],
-  "EdiromOnline.view.window.image.LeafletFacsimile": [
-    "widget.leafletmapview"
-  ],
   "EdiromOnline.view.window.image.OpenSeaDragonViewer": [],
   "EdiromOnline.view.window.image.VerovioImage": [],
   "EdiromOnline.view.window.search.SearchWindow": [
diff --git a/resources/facsimileLayer/FacsimileLayer.js b/resources/facsimileLayer/FacsimileLayer.js
index 96e707a0b..8f7df561a 100644
--- a/resources/facsimileLayer/FacsimileLayer.js
+++ b/resources/facsimileLayer/FacsimileLayer.js
@@ -309,7 +309,6 @@ L.TileLayer.FacsimileLayer = L.TileLayer.extend({
 		this.bounds = L.latLngBounds(latLngLeft, latLngRight);
 		
 		// create rectangle
-		// console.log(Ext.getCmp('leafletfacsimile').getMap());
 		this.rectangle = L.rectangle(this.bounds, {
 			color: 'black', weight: 1, opacity: 0.8
 		}).addTo(this._map);