diff --git a/templates/collectd.conf.j2 b/templates/collectd.conf.j2
index f4241af..e6e4765 100644
--- a/templates/collectd.conf.j2
+++ b/templates/collectd.conf.j2
@@ -11,41 +11,16 @@ Hostname    "{{ nodename }}"
 AutoLoadPlugin true
 Interval     {{ interval }}
 
-#LoadPlugin syslog
-#LoadPlugin cpu
-#LoadPlugin cpufreq
 {% if enable_cpufreq == true %}
-LoadPlugin cpusleep
+LoadPlugin cpufreq
 {% endif %}
-#LoadPlugin hugepages
 LoadPlugin interface
-#LoadPlugin ipmi
 {% if enable_memory == true %}
 LoadPlugin memory
 {% endif %}
-#LoadPlugin mysql
-#LoadPlugin netlink
-#LoadPlugin nfs
-#LoadPlugin nginx
-#LoadPlugin ntpd
-#LoadPlugin openvpn
-#LoadPlugin pcie_errors
-#LoadPlugin postgresql
-#LoadPlugin processes
-#LoadPlugin procevent
-#LoadPlugin rrdcached
-#LoadPlugin rrdtool
-#LoadPlugin sensors
-#LoadPlugin serial
-#LoadPlugin snmp
-#LoadPlugin snmp_agent
-#LoadPlugin statsd
-#LoadPlugin thermal
 {% if enable_uptime == true %}
 LoadPlugin uptime
 {% endif %}
-#LoadPlugin users
-#LoadPlugin virt
 
 {% if enable_apcups == true %}
 <Plugin apcups>
@@ -64,12 +39,6 @@ LoadPlugin uptime
 </Plugin>
 {% endif %}
 
-#<Plugin chrony>
-#	Host    "localhost"
-#	Port    "323"
-#	Timeout "2"
-#</Plugin>
-
 {% if enable_connectivity == true %}
 <Plugin connectivity>
   {% for interface in connectivity_interfaces %}
@@ -78,11 +47,6 @@ LoadPlugin uptime
 </Plugin>
 {% endif %}
 
-#<Plugin cgroups>
-#  CGroup "libvirt"
-#  IgnoreSelected false
-#</Plugin>
-
 {% if enable_cpu == true %}
 <Plugin cpu>
   ReportByCpu {{ cpu_report_by_cpu }}
@@ -97,9 +61,6 @@ LoadPlugin uptime
 {% for disk in df_disks %}
 	Device "{{ disk }}"
 {% endfor %}
-#	IgnoreSelected false
-#	ReportByDevice false
-#	ReportInodes false
 	ValuesAbsolute true
 	ValuesPercentage true
 </Plugin>
@@ -114,30 +75,6 @@ LoadPlugin uptime
 </Plugin>
 {% endfor %}
 {% endif %}
-
-#<Plugin ethstat>
-#	Interface "eth0"
-#	Map "rx_csum_offload_errors" "if_rx_errors" "checksum_offload"
-#	Map "multicast" "if_multicast"
-#	MappedOnly false
-#</Plugin>
-
-#<Plugin filecount>
-#	<Directory "/path/to/dir">
-#		#Plugin "foo"
-#		Instance "foodir"
-#		Name "*.conf"
-#		MTime "-5m"
-#		Size "+10k"
-#		Recursive true
-#		IncludeHidden false
-#		RegularOnly true
-#		#FilesSizeType "bytes"
-#		#FilesCountType "files"
-#		#TypeInstance "instance"
-#	</Directory>
-#</Plugin>
-
 {% if enable_hddtemp == true %}
 <Plugin hddtemp>
   Host "127.0.0.1"
@@ -146,21 +83,6 @@ LoadPlugin uptime
 </Plugin>
 {% endif %}
 
-#<Plugin hugepages>
-#    ReportPerNodeHP  true
-#    ReportRootHP     true
-#    ValuesPages      true
-#    ValuesBytes      false
-#    ValuesPercentage false
-#</Plugin>
-
-#<Plugin interface>
-#	Interface "eth0"
-#	IgnoreSelected false
-#	ReportInactive true
-#	UniqueName false
-#</Plugin>
-
 {% if enable_load == true %}
 <Plugin load>
         ReportRelative true
@@ -180,223 +102,12 @@ LoadPlugin uptime
 </Plugin>
 {% endif %}
 
-#<Plugin mysql>
-#	<Database db_name>
-#		Host "database.serv.er"
-#		User "db_user"
-#		Password "secret"
-#		Database "db_name"
-#		SSLKey "/path/to/key.pem"
-#		SSLCert "/path/to/cert.pem"
-#		SSLCA "/path/to/ca.pem"
-#		SSLCAPath "/path/to/cas/"
-#		SSLCipher "DHE-RSA-AES256-SHA"
-#		MasterStats true
-#		ConnectTimeout 10
-#		InnodbStats true
-#	</Database>
-#
-#	<Database db_name2>
-#		Alias "squeeze"
-#		Host "localhost"
-#		Socket "/var/run/mysql/mysqld.sock"
-#		SlaveStats true
-#		SlaveNotifications true
-#	</Database>
-#	<Database galera>
-#		Alias "galera"
-#		Host "localhost"
-#		Socket "/var/run/mysql/mysqld.sock"
-#		WsrepStats true
-#	</Database>
-#</Plugin>
-
-#<Plugin netlink>
-#	Interface "All"
-#	VerboseInterface "All"
-#	QDisc "eth0" "pfifo_fast-1:0"
-#	Class "ppp0" "htb-1:10"
-#	Filter "ppp0" "u32-1:0"
-#	IgnoreSelected false
-#</Plugin>
-
 {% if influx_host != "" %}
 <Plugin network>
 	Server "{{ influx_host }}" "{{ influx_port }}"
 </Plugin>
 {% endif %}
 
-#<Plugin nfs>
-#	ReportV2 false
-#	#ReportV3 false
-#	#ReportV4 false
-#</Plugin>
-
-#<Plugin nginx>
-#	URL "http://localhost/status?auto"
-#	User "www-user"
-#	Password "secret"
-#	CACert "/etc/ssl/ca.crt"
-#</Plugin>
-
-#<Plugin ntpd>
-#	Host "localhost"
-#	Port 123
-#	ReverseLookups false
-#	IncludeUnitID true
-#</Plugin>
-
-#<Plugin openldap>
-#  <Instance "localhost">
-#    URL "ldap://localhost:389"
-#    StartTLS false
-#    VerifyHost true
-#    CACert "/path/to/ca.crt"
-#    Timeout -1
-#    Version 3
-#  </Instance>
-#</Plugin>
-
-#<Plugin openvpn>
-#	StatusFile "/etc/openvpn/openvpn-status.log"
-#	ImprovedNamingSchema false
-#	CollectCompression true
-#	CollectIndividualUsers true
-#	CollectUserCount false
-#</Plugin>
-
-#<Plugin pcie_errors>
-#  Source "sysfs"
-#  ReportMasked false
-#  PersistentNotifications false
-#</Plugin>
-
-#<Plugin ping>
-#	Host "host.foo.bar"
-#	Interval 1.0
-#	Timeout 0.9
-#	TTL 255
-#	SourceAddress "1.2.3.4"
-#	AddressFamily "any"
-#	Device "eth0"
-#	MaxMissed -1
-#</Plugin>
-
-#<Plugin postgresql>
-#	<Query magic>
-#		Statement "SELECT magic FROM wizard WHERE host = $1;"
-#		Param hostname
-#		<Result>
-#			Type gauge
-#			InstancePrefix "magic"
-#			ValuesFrom magic
-#		</Result>
-#	</Query>
-#	<Query rt36_tickets>
-#		Statement "SELECT COUNT(type) AS count, type \
-#		                  FROM (SELECT CASE \
-#		                               WHEN resolved = 'epoch' THEN 'open' \
-#		                               ELSE 'resolved' END AS type \
-#		                               FROM tickets) type \
-#		                  GROUP BY type;"
-#		<Result>
-#			Type counter
-#			InstancePrefix "rt36_tickets"
-#			InstancesFrom "type"
-#			ValuesFrom "count"
-#		</Result>
-#	</Query>
-#	<Writer sqlstore>
-#		# See contrib/postgresql/collectd_insert.sql for details
-#		Statement "SELECT collectd_insert($1, $2, $3, $4, $5, $6, $7, $8, $9);"
-#		StoreRates true
-#	</Writer>
-#	<Database foo>
-#		#Plugin "kingdom"
-#		Host "hostname"
-#		Port "5432"
-#		User "username"
-#		Password "secret"
-#		SSLMode "prefer"
-#		KRBSrvName "kerberos_service_name"
-#		Query magic
-#	</Database>
-#	<Database bar>
-#		Interval 60
-#		Service "service_name"
-#		Query backends # predefined
-#		Query rt36_tickets
-#	</Database>
-#	<Database qux>
-#		Service "collectd_store"
-#		Writer sqlstore
-#		# see collectd.conf(5) for details
-#		CommitInterval 30
-#	</Database>
-#</Plugin>
-
-#<Plugin processes>
-#	CollectFileDescriptor true
-#	CollectContextSwitch true
-#	CollectMemoryMaps true
-#	CollectDelayAccounting false
-#	Process "name"
-#	ProcessMatch "name" "regex"
-#	<Process "collectd">
-#		CollectFileDescriptor false
-#		CollectContextSwitch false
-#		CollectDelayAccounting true
-#	</Process>
-#	<ProcessMatch "name" "regex">
-#		CollectFileDescriptor false
-#		CollectContextSwitch true
-#	</Process>
-#</Plugin>
-
-#<Plugin protocols>
-#	Value "/^Tcp:/"
-#	IgnoreSelected false
-#</Plugin>
-
-#<Plugin redis>
-#   <Node example>
-#      Host "redis.example.com"
-#      Port "6379"
-#      #Socket "/var/run/redis/redis.sock"
-#      Timeout 2000
-#      <Query "LLEN myqueue">
-#        #Database 0
-#        Type "queue_length"
-#        Instance "myqueue"
-#      <Query>
-#   </Node>
-#</Plugin>
-
-#<Plugin rrdcached>
-#	DaemonAddress "unix:/tmp/rrdcached.sock"
-#	DataDir "/var/lib/collectd/rrd"
-#	CreateFiles true
-#	CreateFilesAsync false
-#	CollectStatistics true
-#</Plugin>
-
-#<Plugin rrdtool>
-#	DataDir "/var/lib/collectd/rrd"
-#	CreateFilesAsync false
-#	CacheTimeout 120
-#	CacheFlush   900
-#	WritesPerSecond 50
-#</Plugin>
-
-#<Plugin sensors>
-#	SensorConfigFile "/etc/sensors.conf"
-#	Sensor "it8712-isa-0290/temperature-temp1"
-#	Sensor "it8712-isa-0290/fanspeed-fan3"
-#	Sensor "it8712-isa-0290/voltage-in8"
-#	IgnoreSelected false
-#</Plugin>
-
-
 {% if enable_smart == true and smart_disk != "" %}
 <Plugin smart>
   Disk "/^[hs]d[a-f][0-9]?$/"
@@ -406,105 +117,6 @@ LoadPlugin uptime
 </Plugin>
 {% endif %}
 
-#<Plugin snmp>
-#   <Data "powerplus_voltge_input">
-#       Table false
-#       Type "voltage"
-#       TypeInstance "input_line1"
-#       Values "SNMPv2-SMI::enterprises.6050.5.4.1.1.2.1"
-#   </Data>
-#   <Data "hr_users">
-#       Table false
-#       Type "users"
-#       TypeInstance ""
-#       Values "HOST-RESOURCES-MIB::hrSystemNumUsers.0"
-#   </Data>
-#   <Data "std_traffic">
-#       Table true
-#       Type "if_octets"
-#       TypeInstanceOID "IF-MIB::ifDescr"
-#       #TypeInstancePrefix "port"
-#       Values "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets"
-#       #FilterOID "IF-MIB::ifOperStatus"
-#       #FilterValues "1", "2"
-#   </Data>
-#   <Data "interface_traffic">
-#       Table true
-#       Type "if_octets"
-#       Plugin "interface"
-#       PluginInstanceOID "IF-MIB::ifDescr"
-#       Values "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets"
-#   </Data>
-#
-#   <Host "some.switch.mydomain.org">
-#       Address "192.168.0.2"
-#       Version 1
-#       Community "community_string"
-#       Collect "std_traffic"
-#       Interval 120
-# 	Timeout 10
-#	Retries 1
-#   </Host>
-#   <Host "some.server.mydomain.org">
-#       Address "192.168.0.42"
-#       Version 2
-#       Community "another_string"
-#       Collect "std_traffic" "hr_users"
-#   </Host>
-#   <Host "some.ups.mydomain.org">
-#       Address "192.168.0.3"
-#       Version 1
-#       Community "more_communities"
-#       Collect "powerplus_voltge_input"
-#       Interval 300
-# 	Timeout 5
-#	Retries 5
-#   </Host>
-#</Plugin>
-
-#<Plugin snmp_agent>
-#  <Data "memAvailReal">
-#    Plugin "memory"
-#    Type "memory"
-#    TypeInstance "free"
-#    OIDs "1.3.6.1.4.1.2021.4.6.0"
-#  </Data>
-#  <Table "ifTable">
-#    IndexOID "IF-MIB::ifIndex"
-#    SizeOID "IF-MIB::ifNumber"
-#    <Data "ifDescr">
-#      <IndexKey>
-#        Source "PluginInstance"
-#      </IndexKey>
-#      Plugin "interface"
-#      OIDs "IF-MIB::ifDescr"
-#    </Data>
-#    <Data "ifOctets">
-#      Plugin "interface"
-#      Type "if_octets"
-#      TypeInstance ""
-#      OIDs "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets"
-#    </Data>
-#  </Table>
-#</Plugin>
-
-#<Plugin statsd>
-#  Host "::"
-#  Port "8125"
-#  DeleteCounters false
-#  DeleteTimers   false
-#  DeleteGauges   false
-#  DeleteSets     false
-#  CounterSum     false
-#  TimerPercentile 90.0
-#  TimerPercentile 95.0
-#  TimerPercentile 99.0
-#  TimerLower     false
-#  TimerUpper     false
-#  TimerSum       false
-#  TimerCount     false
-#</Plugin>
-
 {% if enable_swap == true %}
 <Plugin swap>
 	ReportByDevice false
@@ -521,34 +133,6 @@ LoadPlugin uptime
 </Plugin>
 {% endif %}
 
-#<Plugin sysevent>
-#       Listen "127.0.0.1" "6666"
-#       BufferSize 1024
-#       BufferLength 10
-#       RegexFilter "regex"
-#</Plugin>
-
-#<Plugin virt>
-#	Connection "xen:///"
-#	RefreshInterval 60
-#	Domain "name"
-#	ReportBlockDevices true
-#	ReportNetworkInterfaces true
-#	BlockDevice "name:device"
-#	BlockDeviceFormat target
-#	BlockDeviceFormatBasename false
-#	InterfaceDevice "name:device"
-#	IgnoreSelected false
-#	HostnameFormat name
-#	HostnameMetadataXPath "/instance/name/text()"
-#	HostnameMetadataNS "http://openstack.org/xmlns/libvirt/nova/1.0"
-#	InterfaceFormat name
-#	PluginInstanceFormat name
-#	Instances 1
-#	ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpu vcpupin disk_physical disk_allocation disk_capacity memory"
-#	PersistentNotification false
-#</Plugin>
-
 {% if enable_vmem == true %}
 <Plugin vmem>
 	Verbose {{ vmem_verbose }}