diff --git a/templates/icehouse/ml2_conf.ini b/templates/icehouse/ml2_conf.ini
deleted file mode 100644
index d99ce6d..0000000
--- a/templates/icehouse/ml2_conf.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# icehouse
-###############################################################################
-# [ WARNING ]
-# Configuration file maintained by Juju. Local changes may be overwritten.
-###############################################################################
-[ml2]
-type_drivers = {{ overlay_network_type }},local,flat,vlan,gre
-tenant_network_types = {{ overlay_network_type }}
-mechanism_drivers = opendaylight
-
-[ml2_type_flat]
-# Provider nets only
-
-[ml2_type_vlan]
-# Provider nets only
-
-[ml2_type_gre]
-tunnel_id_ranges = 1:1000
-
-[ml2_type_vxlan]
-vni_ranges = 1001:2000
-
-[ml2_odl]
-url = http://{{ odl_ip }}:{{ odl_port }}/controller/nb/v2/neutron
-username = {{ odl_username }}
-password = {{ odl_password }}
-
-[securitygroup]
-{% if security_groups -%}
-enable_security_group = True
-{% else -%}
-enable_security_group = False
-{% endif -%}
\ No newline at end of file
diff --git a/templates/kilo/ml2_conf.ini b/templates/ml2_conf.ini
similarity index 99%
rename from templates/kilo/ml2_conf.ini
rename to templates/ml2_conf.ini
index 90e5030..8986056 100644
--- a/templates/kilo/ml2_conf.ini
+++ b/templates/ml2_conf.ini
@@ -1,4 +1,3 @@
-# kilo
 ###############################################################################
 # [ WARNING ]
 # Configuration file maintained by Juju. Local changes may be overwritten.
diff --git a/templates/odl_registration b/templates/odl_registration
deleted file mode 100644
index ed49d53..0000000
--- a/templates/odl_registration
+++ /dev/null
@@ -1,29 +0,0 @@
-<module xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-  <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">prefix:sal-netconf-connector</type>
-  <name>{{ vpp_host }}</name>
-  <address xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">{{ vpp_ip }}</address>
-  <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">2022</port>
-  <username xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">{{ vpp_username }}</username>
-  <password xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">{{ vpp_password }}</password>
-  <tcp-only xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">false</tcp-only>
-  <event-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
-    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netty">prefix:netty-event-executor</type>
-    <name>global-event-executor</name>
-  </event-executor>
-  <binding-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
-    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">prefix:binding-broker-osgi-registry</type>
-    <name>binding-osgi-broker</name>
-  </binding-registry>
-  <dom-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
-    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">prefix:dom-broker-osgi-registry</type>
-    <name>dom-broker</name>
-  </dom-registry>
-  <client-dispatcher xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
-    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf">prefix:netconf-client-dispatcher</type>
-    <name>global-netconf-dispatcher</name>
-  </client-dispatcher>
-  <processing-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
-    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:threadpool">prefix:threadpool</type>
-    <name>global-netconf-processing-executor</name>
-  </processing-executor>
-</module>