diff --git a/greenstand/app.js b/greenstand/app.js
index 6967407732..66d84424ea 100644
--- a/greenstand/app.js
+++ b/greenstand/app.js
@@ -1,5 +1,8 @@
 const express = require("express");
 const mapnik = require("../lib/mapnik");
+mapnik.register_default_fonts();
+mapnik.register_default_input_plugins();
+const mercator = require('./sphericalmercator')
 const path = require("path");
 const log = require("loglevel");
 const cors = require("cors");
@@ -15,13 +18,9 @@ app.use(cors());
 
 app.get("/:z/:x/:y.png", async (req, res) => {
   const {x,y,z} = req.params;
-  const mercator = require('./sphericalmercator')
-  mapnik.register_default_fonts();
-  mapnik.register_default_input_plugins();
   const map = await new Promise(async (res, rej) => {
     const mapInstance = new mapnik.Map(256, 256);
     mapInstance.registerFonts(path.join(__dirname, '../test/data/map-a/'), {recurse:true});
-    const define = path.join(__dirname, '../test/postgis.prod.xml');
     
     const xmlString = await getXMLString(z);
 
@@ -49,13 +48,15 @@ app.get("/:z/:x/:y.png", async (req, res) => {
   console.log("bbox:", bbox);
   //map.zoomAll();
   map.extent = bbox;
-        console.log("map:", map);
-        console.log("map extent:", map.extent);
-        console.log("map.zoomAll:", map.zoomAll);
-        console.log("map.zoomToBox:", map.zoomToBox);
-        console.log("map.load:", map.load);
-        console.log("map.sacle:", map.scale());
-        console.log("map.scaleDenominator:", map.scaleDenominator());
+  
+  console.log("map:", map);
+  console.log("map extent:", map.extent);
+  console.log("map.zoomAll:", map.zoomAll);
+  console.log("map.zoomToBox:", map.zoomToBox);
+  console.log("map.load:", map.load);
+  console.log("map.sacle:", map.scale());
+  console.log("map.scaleDenominator:", map.scaleDenominator());
+  
   const im = new mapnik.Image(256, 256);
   const buffer = await new Promise((res, rej) => {
     map.render(im, function(err, im) {
@@ -63,11 +64,6 @@ app.get("/:z/:x/:y.png", async (req, res) => {
       im.encode('png', function(err,buffer) {
         if (err) throw err;
         res(buffer);
-//        fs.writeFile('/tmp/test/tile.png',buffer, function(err) {
-//          if (err) throw err;
-//          console.log('saved map image to map.png');
-//          res();
-//        });
       });
     });
   });
@@ -78,14 +74,8 @@ app.get("/:z/:x/:y.png", async (req, res) => {
 
 app.get("/:z/:x/:y.grid.json", async (req, res) => {
   const {x,y,z} = req.params;
-  const mercator = require('./sphericalmercator')
-  mapnik.register_default_fonts();
-  mapnik.register_default_input_plugins();
   const map = await new Promise(async (res, rej) => {
     const mapInstance = new mapnik.Map(256, 256);
-    const define = path.join(__dirname, '../test/postgis.prod.xml');
-    //    const define = path.join(__dirname, 'stylesheet.xml');
-    console.log("path:", define);
     const xmlString = await getXMLString(z);
     mapInstance.fromString(xmlString, {
       strict: true,
@@ -118,21 +108,6 @@ app.get("/:z/:x/:y.grid.json", async (req, res) => {
   console.log("map.load:", map.load);
   console.log("map.sacle:", map.scale());
   console.log("map.scaleDenominator:", map.scaleDenominator());
-  const im = new mapnik.Image(256, 256);
-  //  const buffer = await new Promise((res, rej) => {
-  //    map.render(im, function(err, im) {
-  //      if(err) throw err;
-  //      im.encode('png', function(err,buffer) {
-  //        if (err) throw err;
-  //        res(buffer);
-  ////        fs.writeFile('/tmp/test/tile.png',buffer, function(err) {
-  ////          if (err) throw err;
-  ////          console.log('saved map image to map.png');
-  ////          res();
-  ////        });
-  //      });
-  //    });
-  //  });
 
   var grid = new mapnik.Grid(256, 256);
   const json = await new Promise((res, _rej) => {
@@ -150,13 +125,9 @@ app.get("/:z/:x/:y.grid.json", async (req, res) => {
 //freetown
 app.get("/freetown/:z/:x/:y.png", async (req, res) => {
   const {x,y,z} = req.params;
-  const mercator = require('./sphericalmercator')
-  mapnik.register_default_fonts();
-  mapnik.register_default_input_plugins();
   const map = await new Promise((res, rej) => {
     const mapInstance = new mapnik.Map(256, 256);
     const define = path.join(__dirname, '../test/postgis.freetown.prod.xml');
-//    const define = path.join(__dirname, 'stylesheet.xml');
     console.log("path:", define);
     mapInstance.load(define, {strict: true},function(err,_map) {
       if(err){
@@ -179,13 +150,15 @@ app.get("/freetown/:z/:x/:y.png", async (req, res) => {
   console.log("bbox:", bbox);
   //map.zoomAll();
   map.extent = bbox;
-        console.log("map:", map);
-        console.log("map extent:", map.extent);
-        console.log("map.zoomAll:", map.zoomAll);
-        console.log("map.zoomToBox:", map.zoomToBox);
-        console.log("map.load:", map.load);
-        console.log("map.sacle:", map.scale());
-        console.log("map.scaleDenominator:", map.scaleDenominator());
+
+  console.log("map:", map);
+  console.log("map extent:", map.extent);
+  console.log("map.zoomAll:", map.zoomAll);
+  console.log("map.zoomToBox:", map.zoomToBox);
+  console.log("map.load:", map.load);
+  console.log("map.sacle:", map.scale());
+  console.log("map.scaleDenominator:", map.scaleDenominator());
+  
   const im = new mapnik.Image(256, 256);
   const buffer = await new Promise((res, rej) => {
     map.render(im, function(err, im) {
@@ -193,11 +166,6 @@ app.get("/freetown/:z/:x/:y.png", async (req, res) => {
       im.encode('png', function(err,buffer) {
         if (err) throw err;
         res(buffer);
-//        fs.writeFile('/tmp/test/tile.png',buffer, function(err) {
-//          if (err) throw err;
-//          console.log('saved map image to map.png');
-//          res();
-//        });
       });
     });
   });
@@ -208,13 +176,9 @@ app.get("/freetown/:z/:x/:y.png", async (req, res) => {
 
 app.get("/freetown/:z/:x/:y.grid.json", async (req, res) => {
   const {x,y,z} = req.params;
-  const mercator = require('./sphericalmercator')
-  mapnik.register_default_fonts();
-  mapnik.register_default_input_plugins();
   const map = await new Promise((res, rej) => {
     const mapInstance = new mapnik.Map(256, 256);
     const define = path.join(__dirname, '../test/postgis.freetown.prod.xml');
-    //    const define = path.join(__dirname, 'stylesheet.xml');
     console.log("path:", define);
     mapInstance.load(define, {strict: true},function(err,_map) {
       if(err){
@@ -244,21 +208,6 @@ app.get("/freetown/:z/:x/:y.grid.json", async (req, res) => {
   console.log("map.load:", map.load);
   console.log("map.sacle:", map.scale());
   console.log("map.scaleDenominator:", map.scaleDenominator());
-  const im = new mapnik.Image(256, 256);
-  //  const buffer = await new Promise((res, rej) => {
-  //    map.render(im, function(err, im) {
-  //      if(err) throw err;
-  //      im.encode('png', function(err,buffer) {
-  //        if (err) throw err;
-  //        res(buffer);
-  ////        fs.writeFile('/tmp/test/tile.png',buffer, function(err) {
-  ////          if (err) throw err;
-  ////          console.log('saved map image to map.png');
-  ////          res();
-  ////        });
-  //      });
-  //    });
-  //  });
 
   var grid = new mapnik.Grid(256, 256);
   const json = await new Promise((res, _rej) => {
@@ -283,34 +232,5 @@ app.use('/viewer', express.static(viewer));
 app.use("*", (_, res) => {
   res.status(200).send("Welcome to Greenstand tile server");
 });
-//app.use(async (_req, res) => {
-//  // register fonts and datasource plugins
-//  mapnik.register_default_fonts();
-//  mapnik.register_default_input_plugins();
-//
-//  var map = new mapnik.Map(256*5, 256*5);
-//  const buffer = await new Promise((resolve, _rej) => {
-//    map.load('./test/postgis.xml', function(err,map) {
-//      if (err) throw err;
-//      //        expect(map).toHaveProperty("srs", "+init=epsg:3857");
-//      map.zoomAll();
-//      var im = new mapnik.Image(256*5, 256*5);
-//      map.render(im, function(err,im) {
-//        if (err) throw err;
-//        im.encode('png', function(err,buffer) {
-//          if (err) throw err;
-//          resolve(buffer);
-//          //              fs.writeFile('/tmp/test/tree.png',buffer, function(err) {
-//          //                if (err) throw err;
-//          //                console.log('saved map image to map.png');
-//          //                res();
-//          //              });
-//        });
-//      });
-//    });
-//  });
-//  res.set({'Content-Type': 'image/png'});
-//  res.end(buffer);
-//});
 
 module.exports = app;