diff --git a/templates/juno/ml2_conf.ini b/templates/juno/ml2_conf.ini
deleted file mode 100644
index fd1f80d2..00000000
--- a/templates/juno/ml2_conf.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-# icehouse
-###############################################################################
-# [ WARNING ]
-# Configuration file maintained by Juju. Local changes may be overwritten.  
-###############################################################################
-[ml2]
-type_drivers = gre,vxlan,vlan,flat
-tenant_network_types = gre,vxlan,vlan,flat
-mechanism_drivers = openvswitch,hyperv,l2population
-
-[ml2_type_gre]
-tunnel_id_ranges = 1:1000
-
-[ml2_type_vxlan]
-vni_ranges = 1001:2000
-
-[ml2_type_vlan]
-network_vlan_ranges = physnet1:1000:2000
-
-[ml2_type_flat]
-flat_networks = physnet1
-
-[ovs]
-enable_tunneling = True
-local_ip = {{ local_ip }}
-
-[agent]
-tunnel_types = {{ overlay_network_type }}
-
-[securitygroup]
-{% if neutron_security_groups -%}
-enable_security_group = True
-firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
-{% else -%}
-enable_security_group = False
-{% endif -%}
diff --git a/templates/juno/neutron-server b/templates/juno/neutron-server
deleted file mode 100644
index cbbc435c..00000000
--- a/templates/juno/neutron-server
+++ /dev/null
@@ -1,6 +0,0 @@
-# havana
-###############################################################################
-# [ WARNING ]
-# Configuration file maintained by Juju. Local changes may be overwritten.
-###############################################################################
-NEUTRON_PLUGIN_CONFIG="{{ config }}"
\ No newline at end of file
diff --git a/templates/juno/nsx.ini b/templates/juno/nsx.ini
deleted file mode 100644
index ffcaec2c..00000000
--- a/templates/juno/nsx.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-# icehouse
-###############################################################################
-# [ WARNING ]
-# Configuration file maintained by Juju. Local changes may be overwritten.
-###############################################################################
-[DEFAULT]
-nsx_user = {{ nsx_username }}
-nsx_password = {{ nsx_password }}
-nsx_controllers = {{ nsx_controllers }}
-default_tz_uuid = {{ nsx_tz_uuid }}
-default_l3_gw_service_uuid = {{ nsx_l3_uuid }}