diff --git a/bt5/erp5_wendelin/PathTemplateItem/portal_categories/elementary_type/array.xml b/bt5/erp5_wendelin/PathTemplateItem/portal_categories/elementary_type/array.xml
deleted file mode 100644
index adbe3129115bb4dfd89f0e75eaffd4af736b7c3c..0000000000000000000000000000000000000000
--- a/bt5/erp5_wendelin/PathTemplateItem/portal_categories/elementary_type/array.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Category" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_Add_portal_content_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Assignor</string>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>_Add_portal_folders_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Assignor</string>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>_Copy_or_Move_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Assignor</string>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>_Delete_objects_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Assignor</string>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>_Modify_portal_content_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Assignee</string>
-                <string>Assignor</string>
-                <string>Manager</string>
-                <string>Owner</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>elementary_type/array</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>array</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Category</string> </value>
-        </item>
-        <item>
-            <key> <string>short_title</string> </key>
-            <value> <string>Array</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>array</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_wendelin/PropertySheetTemplateItem/portal_property_sheets/DataArray/array_property.xml b/bt5/erp5_wendelin/PropertySheetTemplateItem/portal_property_sheets/DataArray/array_property.xml
index a16c14de1e8711b38decb9ca1944c867fc1c8b3e..ebec53bffa3ff614e6dd2a00dcd5e4ab9ff5e46f 100644
--- a/bt5/erp5_wendelin/PropertySheetTemplateItem/portal_property_sheets/DataArray/array_property.xml
+++ b/bt5/erp5_wendelin/PropertySheetTemplateItem/portal_property_sheets/DataArray/array_property.xml
@@ -27,7 +27,7 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>elementary_type/data</string>
+                <string>elementary_type/object</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_readChunkListAndTransform.xml b/bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_readChunkListAndTransform.xml
index 11e1733cb18ef0bc325d83160b79bc0427ff7650..f153b85b630247056e24da7b147143ad2836241a 100644
--- a/bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_readChunkListAndTransform.xml
+++ b/bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_readChunkListAndTransform.xml
@@ -55,7 +55,7 @@
 """\n
   Simply a wrapper to real method.\n
 """\n
-data_stream = context.restrictedTraverse(data_stream_relative_url)\n
+data_stream = context\n
 total_stream_length = data_stream.getSize()\n
 \n
 if start > total_stream_length:\n
@@ -88,7 +88,6 @@ if end > total_stream_length:\n
 \n
 # some bytes left ...\n
 data_stream.activate().DataStream_readChunkListAndTransform( \\\n
-    data_stream.getRelativeUrl(), \\\n
     start, \\\n
     end, \\\n
     chunk_length, \\\n
@@ -100,7 +99,7 @@ data_stream.activate().DataStream_readChunkListAndTransform( \\\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>data_stream_relative_url, start, end, chunk_length, transform_script_id=None, data_array_reference=None</string> </value>
+            <value> <string>start, end, chunk_length, transform_script_id=None, data_array_reference=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_transform.xml b/bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_transform.xml
index 3b749e10348d5567758f7db9183b4012b19d5fef..005d569b01f8b788cf86f687e90120a4a062d01f 100644
--- a/bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_transform.xml
+++ b/bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_transform.xml
@@ -62,7 +62,6 @@ data_length = context.getSize()\n
 start = 0\n
 end  = chunk_length\n
 context.activate().DataStream_readChunkListAndTransform( \\\n
-  context.getRelativeUrl(), \\\n
   start, \\\n
   end, \\\n
   chunk_length, \\\n
diff --git a/bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/ERP5Site_handleDefaultFluentdIngestion.xml b/bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/ERP5Site_handleDefaultFluentdIngestion.xml
index 35f889877cd6b2eb50f4a5cc0e860ff401a197bb..7a76ac3aad87c3bda4e321f8e7582d215a2e84d4 100644
--- a/bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/ERP5Site_handleDefaultFluentdIngestion.xml
+++ b/bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/ERP5Site_handleDefaultFluentdIngestion.xml
@@ -81,7 +81,7 @@ if data_chunk is not None and reference is not None:\n
 \n
   #context.log(data_supply)\n
   # we can have multiple lines for each sensor and we filter out by reference\n
-  # XXX: in future we will use Predicates to find already generate \n
+  # XXX: in future we will use Predicates to find already generated\n
   # Data Ingestion (Movements)\n
   if data_supply is not None:\n
     for data_supply_line in data_supply.objectValues():\n
@@ -112,8 +112,8 @@ if data_chunk is not None and reference is not None:\n
       # each chunk of data by default should be added with a new line character\n
       data = \'\\n%s\' %data\n
       data_stream.appendData(data)\n
-      context.log("Appended %s bytes to %s (%s, %s, %s)"   \n
-                    %(len(data), reference, data_supply, sensor, data_stream))\n
+      #context.log("Appended %s bytes to %s (%s, %s, %s)"   \n
+      #              %(len(data), reference, data_supply, sensor, data_stream))\n
       # XXX: open question -> we do not store the act of ingestion.\n
       # one way is to have a business process for who\'s "ingestion" \n
       # trade_phase / state we generate simulation movements and respective \n
diff --git a/bt5/erp5_wendelin/bt/template_path_list b/bt5/erp5_wendelin/bt/template_path_list
deleted file mode 100644
index f6b5591749c40c1b36bd427b27fb92407899cf61..0000000000000000000000000000000000000000
--- a/bt5/erp5_wendelin/bt/template_path_list
+++ /dev/null
@@ -1 +0,0 @@
-portal_categories/elementary_type/array
\ No newline at end of file