diff --git a/collectd/files/conf.d/snmp.conf b/collectd/files/conf.d/network_metering.conf
similarity index 79%
rename from collectd/files/conf.d/snmp.conf
rename to collectd/files/conf.d/network_metering.conf
index 99770a4..7623c71 100644
--- a/collectd/files/conf.d/snmp.conf
+++ b/collectd/files/conf.d/network_metering.conf
@@ -1,4 +1,3 @@
-{%- if client.get('plugin', {}).network_metering is defined %}
 LoadPlugin snmp
 <Plugin snmp>
         <Data "std_traffic">
@@ -13,11 +12,16 @@
                 Instance "1.3.6.1.2.1.31.1.1.1.1"
                 Values "1.3.6.1.2.1.31.1.1.1.7" "1.3.6.1.2.1.31.1.1.1.11"
         </Data>
-{%- for device_name, device in client.network_device.iteritems() %}       
+{%- for plugin in pillar.collectd.client.plugins %}
+{%- if plugin_name == plugin.name %}
+{%- for device_name, device in plugin.network_device.iteritems() %}       
         <Host "{{ device_name }}">
                 Address "{{ device.address }}"
                 Version {{ device.version }}
                 Community "{{ device.community }}"
                 Collect "std_traffic" "std_rate"
         </Host>
+{%- endfor %}
+{%- endif %}
+{%- endfor %}
 </Plugin>
\ No newline at end of file
diff --git a/collectd/map.jinja b/collectd/map.jinja
index cad0288..7a84ba3 100644
--- a/collectd/map.jinja
+++ b/collectd/map.jinja
@@ -5,7 +5,6 @@
   'nginx.server',
   'nova.compute',
   'postgresql.server',
-  'network.collectd'
 ] %}
 
 {% set client = salt['grains.filter_by']({
diff --git a/metadata/service/client/network.yml b/metadata/service/client/network.yml
deleted file mode 100644
index f3ccfc3..0000000
--- a/metadata/service/client/network.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-parameters:
-  collectd:
-    client:
-      plugin:
-        network_metering:
-          enabled: true
\ No newline at end of file