diff --git a/demo/data/COPYRIGHT.txt b/demo/data/COPYRIGHT.txt
index 2249ca64d..4758477d6 100644
--- a/demo/data/COPYRIGHT.txt
+++ b/demo/data/COPYRIGHT.txt
@@ -1,3 +1,3 @@
-© 2003. Government of Canada with permission from Natural Resources Canada
-
-Original License: http://geogratis.cgdi.gc.ca/geogratis/en/licence.jsp
+© 2003. Government of Canada with permission from Natural Resources Canada
+
+Original License: http://geogratis.cgdi.gc.ca/geogratis/en/licence.jsp
diff --git a/demo/data/boundaries.shp.xml b/demo/data/boundaries.shp.xml
deleted file mode 100644
index 0973dedee..000000000
--- a/demo/data/boundaries.shp.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<!--<!DOCTYPE metadata SYSTEM "http://www.esri.com/metadata/esriprof80.dtd">-->
-<metadata xml:lang="en"><Esri><CreaDate>20060405</CreaDate><CreaTime>20435800</CreaTime><SyncOnce>TRUE</SyncOnce><DataProperties><lineage><Process Name="Project_1" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Project" Date="20060405" Time="202939">Project Z:\mapnik-trunk\demo\data\boundaries.shp Z:\mapnik-trunk\demo\data\boundaries_Project.shp PROJCS['Canada_Lambert_Conformal_Conic',GEOGCS['GCS_North_American_1983',DATUM['D_North_American_1983',SPHEROID['GRS_1980',6378137.0,298.257222101]],PRIMEM['Greenwich',0.0],UNIT['Degree',0.0174532925199433]],PROJECTION['Lambert_Conformal_Conic'],PARAMETER['False_Easting',0.0],PARAMETER['False_Northing',0.0],PARAMETER['Central_Meridian',-96.0],PARAMETER['Standard_Parallel_1',50.0],PARAMETER['Standard_Parallel_2',70.0],PARAMETER['Latitude_Of_Origin',40.0],UNIT['Meter',1.0]] #</Process><Process Name="Rename_3" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="203122">Rename Z:\mapnik-trunk\demo\data\boundaries_Project.shp Z:\mapnik-trunk\demo\data\boundaries.shp ShapeFile</Process><Process Name="Rename_27" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="204652">Rename Z:\mapnik-trunk\demo\data\boundaries_shp.shp Z:\mapnik-trunk\demo\data\boundaries.shp ShapeFile</Process></lineage></DataProperties><MetaID>{11E7D7C0-9F4D-4BB6-BFF8-F3FE77C30F38}</MetaID></Esri><idinfo><citation><citeinfo><onlink Sync="TRUE"></onlink></citeinfo></citation></idinfo><distInfo><distributor><distorTran><onLineSrc><linkage Sync="TRUE">file://</linkage><protocol Sync="TRUE">Local Area Network</protocol></onLineSrc></distorTran></distributor></distInfo><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"></srcused><date Sync="TRUE">20060405</date><time Sync="TRUE">20435800</time></procstep></lineage></dataqual></metadata>
diff --git a/demo/data/boundaries_l.shp.xml b/demo/data/boundaries_l.shp.xml
deleted file mode 100644
index 26d85186f..000000000
--- a/demo/data/boundaries_l.shp.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<!--<!DOCTYPE metadata SYSTEM "http://www.esri.com/metadata/esriprof80.dtd">-->
-<metadata xml:lang="en"><Esri><CreaDate>20060405</CreaDate><CreaTime>20435900</CreaTime><SyncOnce>TRUE</SyncOnce><DataProperties><lineage><Process Name="Project_4" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Project" Date="20060405" Time="203244">Project Z:\mapnik-trunk\demo\data\boundaries_l.shp Z:\mapnik-trunk\demo\data\boundaries_l_Project.shp PROJCS['Canada_Lambert_Conformal_Conic',GEOGCS['GCS_North_American_1983',DATUM['D_North_American_1983',SPHEROID['GRS_1980',6378137.0,298.257222101]],PRIMEM['Greenwich',0.0],UNIT['Degree',0.0174532925199433]],PROJECTION['Lambert_Conformal_Conic'],PARAMETER['False_Easting',0.0],PARAMETER['False_Northing',0.0],PARAMETER['Central_Meridian',-96.0],PARAMETER['Standard_Parallel_1',50.0],PARAMETER['Standard_Parallel_2',70.0],PARAMETER['Latitude_Of_Origin',40.0],UNIT['Meter',1.0]] #</Process><Process Name="Rename_6" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="203309">Rename Z:\mapnik-trunk\demo\data\boundaries_l_Project.shp Z:\mapnik-trunk\demo\data\boundaries_l.shp ShapeFile</Process><Process Name="Rename_26" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="204641">Rename Z:\mapnik-trunk\demo\data\boundaries_l_shp.shp Z:\mapnik-trunk\demo\data\boundaries_l.shp ShapeFile</Process></lineage></DataProperties><MetaID>{6498D899-968E-419C-96BC-4A6039E0D319}</MetaID></Esri><idinfo><citation><citeinfo><onlink Sync="TRUE"></onlink></citeinfo></citation></idinfo><distInfo><distributor><distorTran><onLineSrc><linkage Sync="TRUE">file://</linkage><protocol Sync="TRUE">Local Area Network</protocol></onLineSrc></distorTran></distributor></distInfo><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"></srcused><date Sync="TRUE">20060405</date><time Sync="TRUE">20435900</time></procstep></lineage></dataqual></metadata>
diff --git a/demo/data/ontdrainage.shp.xml b/demo/data/ontdrainage.shp.xml
deleted file mode 100644
index f763c88b6..000000000
--- a/demo/data/ontdrainage.shp.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<!--<!DOCTYPE metadata SYSTEM "http://www.esri.com/metadata/esriprof80.dtd">-->
-<metadata xml:lang="en"><Esri><CreaDate>20060405</CreaDate><CreaTime>20440100</CreaTime><SyncOnce>TRUE</SyncOnce><DataProperties><lineage><Process Name="Project_7" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Project" Date="20060405" Time="203436">Project Z:\mapnik-trunk\demo\data\ontdrainage.shp Z:\mapnik-trunk\demo\data\ontdrainage_Project.shp PROJCS['Canada_Lambert_Conformal_Conic',GEOGCS['GCS_North_American_1983',DATUM['D_North_American_1983',SPHEROID['GRS_1980',6378137.0,298.257222101]],PRIMEM['Greenwich',0.0],UNIT['Degree',0.0174532925199433]],PROJECTION['Lambert_Conformal_Conic'],PARAMETER['False_Easting',0.0],PARAMETER['False_Northing',0.0],PARAMETER['Central_Meridian',-96.0],PARAMETER['Standard_Parallel_1',50.0],PARAMETER['Standard_Parallel_2',70.0],PARAMETER['Latitude_Of_Origin',40.0],UNIT['Meter',1.0]] #</Process><Process Name="Rename_9" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="203518">Rename Z:\mapnik-trunk\demo\data\ontdrainage_Project.shp Z:\mapnik-trunk\demo\data\ontdrainage.shp ShapeFile</Process><Process Name="Rename_28" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="204707">Rename Z:\mapnik-trunk\demo\data\ontdrainage_shp.shp Z:\mapnik-trunk\demo\data\ontdrainage.shp ShapeFile</Process></lineage></DataProperties><MetaID>{FB3824F8-C9DD-41CD-950D-7CDE493F1C80}</MetaID></Esri><idinfo><citation><citeinfo><onlink Sync="TRUE"></onlink></citeinfo></citation></idinfo><distInfo><distributor><distorTran><onLineSrc><linkage Sync="TRUE">file://</linkage><protocol Sync="TRUE">Local Area Network</protocol></onLineSrc></distorTran></distributor></distInfo><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"></srcused><date Sync="TRUE">20060405</date><time Sync="TRUE">20440100</time></procstep></lineage></dataqual></metadata>
diff --git a/demo/data/popplaces.shp.xml b/demo/data/popplaces.shp.xml
deleted file mode 100644
index 5d2180039..000000000
--- a/demo/data/popplaces.shp.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<!--<!DOCTYPE metadata SYSTEM "http://www.esri.com/metadata/esriprof80.dtd">-->
-<metadata xml:lang="en"><Esri><CreaDate>20060405</CreaDate><CreaTime>20440200</CreaTime><SyncOnce>TRUE</SyncOnce><DataProperties><lineage><Process Name="Project_10" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Project" Date="20060405" Time="203711">Project Z:\mapnik-trunk\demo\data\popplaces.shp Z:\mapnik-trunk\demo\data\popplaces_Project.shp PROJCS['Canada_Lambert_Conformal_Conic',GEOGCS['GCS_North_American_1983',DATUM['D_North_American_1983',SPHEROID['GRS_1980',6378137.0,298.257222101]],PRIMEM['Greenwich',0.0],UNIT['Degree',0.0174532925199433]],PROJECTION['Lambert_Conformal_Conic'],PARAMETER['False_Easting',0.0],PARAMETER['False_Northing',0.0],PARAMETER['Central_Meridian',-96.0],PARAMETER['Standard_Parallel_1',50.0],PARAMETER['Standard_Parallel_2',70.0],PARAMETER['Latitude_Of_Origin',40.0],UNIT['Meter',1.0]] #</Process><Process Name="Rename_12" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="203732">Rename Z:\mapnik-trunk\demo\data\popplaces_Project.shp Z:\mapnik-trunk\demo\data\popplaces.shp ShapeFile</Process><Process Name="Rename_29" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="204718">Rename Z:\mapnik-trunk\demo\data\popplaces_shp.shp Z:\mapnik-trunk\demo\data\popplaces.shp ShapeFile</Process></lineage></DataProperties><MetaID>{976BB2B2-C17F-4944-BE7B-C454E656918D}</MetaID></Esri><idinfo><citation><citeinfo><onlink Sync="TRUE"></onlink></citeinfo></citation></idinfo><distInfo><distributor><distorTran><onLineSrc><linkage Sync="TRUE">file://</linkage><protocol Sync="TRUE">Local Area Network</protocol></onLineSrc></distorTran></distributor></distInfo><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"></srcused><date Sync="TRUE">20060405</date><time Sync="TRUE">20440200</time></procstep></lineage></dataqual></metadata>
diff --git a/demo/data/qcdrainage.shp.xml b/demo/data/qcdrainage.shp.xml
deleted file mode 100644
index 5f88a561b..000000000
--- a/demo/data/qcdrainage.shp.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<!--<!DOCTYPE metadata SYSTEM "http://www.esri.com/metadata/esriprof80.dtd">-->
-<metadata xml:lang="en"><Esri><CreaDate>20060405</CreaDate><CreaTime>20440300</CreaTime><SyncOnce>TRUE</SyncOnce><DataProperties><lineage><Process Name="Project_13" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Project" Date="20060405" Time="203819">Project Z:\mapnik-trunk\demo\data\qcdrainage.shp Z:\mapnik-trunk\demo\data\qcdrainage_Project.shp PROJCS['Canada_Lambert_Conformal_Conic',GEOGCS['GCS_North_American_1983',DATUM['D_North_American_1983',SPHEROID['GRS_1980',6378137.0,298.257222101]],PRIMEM['Greenwich',0.0],UNIT['Degree',0.0174532925199433]],PROJECTION['Lambert_Conformal_Conic'],PARAMETER['False_Easting',0.0],PARAMETER['False_Northing',0.0],PARAMETER['Central_Meridian',-96.0],PARAMETER['Standard_Parallel_1',50.0],PARAMETER['Standard_Parallel_2',70.0],PARAMETER['Latitude_Of_Origin',40.0],UNIT['Meter',1.0]] #</Process><Process Name="Rename_15" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="203837">Rename Z:\mapnik-trunk\demo\data\qcdrainage_Project.shp Z:\mapnik-trunk\demo\data\qcdrainage.shp ShapeFile</Process><Process Name="Rename_30" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="204729">Rename Z:\mapnik-trunk\demo\data\qcdrainage_shp.shp Z:\mapnik-trunk\demo\data\qcdrainage.shp ShapeFile</Process></lineage></DataProperties><MetaID>{4C6B0852-DD15-4FB1-828C-E3FE1F5083FB}</MetaID></Esri><idinfo><citation><citeinfo><onlink Sync="TRUE"></onlink></citeinfo></citation></idinfo><distInfo><distributor><distorTran><onLineSrc><linkage Sync="TRUE">file://</linkage><protocol Sync="TRUE">Local Area Network</protocol></onLineSrc></distorTran></distributor></distInfo><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"></srcused><date Sync="TRUE">20060405</date><time Sync="TRUE">20440300</time></procstep></lineage></dataqual></metadata>
diff --git a/demo/data/roads.shp.xml b/demo/data/roads.shp.xml
deleted file mode 100644
index 132f21521..000000000
--- a/demo/data/roads.shp.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<!--<!DOCTYPE metadata SYSTEM "http://www.esri.com/metadata/esriprof80.dtd">-->
-<metadata xml:lang="en"><Esri><CreaDate>20060405</CreaDate><CreaTime>20440600</CreaTime><SyncOnce>TRUE</SyncOnce><DataProperties><lineage><Process Name="Project_16" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Project" Date="20060405" Time="203859">Project Z:\mapnik-trunk\demo\data\roads.shp Z:\mapnik-trunk\demo\data\roads_Project.shp PROJCS['Canada_Lambert_Conformal_Conic',GEOGCS['GCS_North_American_1983',DATUM['D_North_American_1983',SPHEROID['GRS_1980',6378137.0,298.257222101]],PRIMEM['Greenwich',0.0],UNIT['Degree',0.0174532925199433]],PROJECTION['Lambert_Conformal_Conic'],PARAMETER['False_Easting',0.0],PARAMETER['False_Northing',0.0],PARAMETER['Central_Meridian',-96.0],PARAMETER['Standard_Parallel_1',50.0],PARAMETER['Standard_Parallel_2',70.0],PARAMETER['Latitude_Of_Origin',40.0],UNIT['Meter',1.0]] #</Process><Process Name="Rename_18" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="203920">Rename Z:\mapnik-trunk\demo\data\roads_Project.shp Z:\mapnik-trunk\demo\data\roads.shp ShapeFile</Process><Process Name="Rename_31" ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Rename" Date="20060405" Time="204740">Rename Z:\mapnik-trunk\demo\data\roads_shp.shp Z:\mapnik-trunk\demo\data\roads.shp ShapeFile</Process></lineage></DataProperties><MetaID>{8D5C6277-B191-49E2-BF58-09F1C9803B91}</MetaID></Esri><idinfo><citation><citeinfo><onlink Sync="TRUE"></onlink></citeinfo></citation></idinfo><distInfo><distributor><distorTran><onLineSrc><linkage Sync="TRUE">file://</linkage><protocol Sync="TRUE">Local Area Network</protocol></onLineSrc></distorTran></distributor></distInfo><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE"></srcused><date Sync="TRUE">20060405</date><time Sync="TRUE">20440600</time></procstep></lineage></dataqual></metadata>