diff --git a/playbooks/roles/os_aodh/templates/aodh-upstart-init.j2 b/playbooks/roles/os_aodh/templates/aodh-upstart-init.j2
index f1b5741cbe..7434296394 100644
--- a/playbooks/roles/os_aodh/templates/aodh-upstart-init.j2
+++ b/playbooks/roles/os_aodh/templates/aodh-upstart-init.j2
@@ -1,6 +1,5 @@
 # {{ ansible_managed }}
 
-# vim:set ft=upstart ts=2 et:
 
 description "{{ program_name }}"
 author "Kevin Carter <kevin.carter@rackspace.com>"
diff --git a/playbooks/roles/os_ceilometer/templates/ceilometer-upstart-init.j2 b/playbooks/roles/os_ceilometer/templates/ceilometer-upstart-init.j2
index 467323e59f..1f2764c34f 100644
--- a/playbooks/roles/os_ceilometer/templates/ceilometer-upstart-init.j2
+++ b/playbooks/roles/os_ceilometer/templates/ceilometer-upstart-init.j2
@@ -1,7 +1,5 @@
 # {{ ansible_managed }}
 
-# vim:set ft=upstart ts=2 et:
-
 description "{{ program_name }}"
 author "Kevin Carter <kevin.carter@rackspace.com>"
 
diff --git a/playbooks/roles/os_cinder/templates/cinder-upstart-init.j2 b/playbooks/roles/os_cinder/templates/cinder-upstart-init.j2
index b0235b77fa..cb03d2872c 100644
--- a/playbooks/roles/os_cinder/templates/cinder-upstart-init.j2
+++ b/playbooks/roles/os_cinder/templates/cinder-upstart-init.j2
@@ -1,7 +1,5 @@
 # {{ ansible_managed }}
 
-# vim:set ft=upstart ts=2 et:
-
 description "{{ program_name }}"
 author "Kevin Carter <kevin.carter@rackspace.com>"
 
diff --git a/playbooks/roles/os_glance/templates/glance-upstart-init.j2 b/playbooks/roles/os_glance/templates/glance-upstart-init.j2
index 870ce3fa48..042da6a497 100644
--- a/playbooks/roles/os_glance/templates/glance-upstart-init.j2
+++ b/playbooks/roles/os_glance/templates/glance-upstart-init.j2
@@ -1,7 +1,5 @@
 # {{ ansible_managed }}
 
-# vim:set ft=upstart ts=2 et:
-
 description "{{ program_name }}"
 author "Kevin Carter <kevin.carter@rackspace.com>"
 
diff --git a/playbooks/roles/os_heat/templates/heat-upstart-init.j2 b/playbooks/roles/os_heat/templates/heat-upstart-init.j2
index a37848ebc5..f797f94095 100644
--- a/playbooks/roles/os_heat/templates/heat-upstart-init.j2
+++ b/playbooks/roles/os_heat/templates/heat-upstart-init.j2
@@ -1,7 +1,5 @@
 # {{ ansible_managed }}
 
-# vim:set ft=upstart ts=2 et:
-
 description "{{ program_name }}"
 author "Kevin Carter <kevin.carter@rackspace.com>"
 
diff --git a/playbooks/roles/os_neutron/templates/neutron-upstart-init.j2 b/playbooks/roles/os_neutron/templates/neutron-upstart-init.j2
index e501d213ab..bfeb7973b4 100644
--- a/playbooks/roles/os_neutron/templates/neutron-upstart-init.j2
+++ b/playbooks/roles/os_neutron/templates/neutron-upstart-init.j2
@@ -1,7 +1,5 @@
 # {{ ansible_managed }}
 
-# vim:set ft=upstart ts=2 et:
-
 description "{{ program_name }}"
 author "Kevin Carter <kevin.carter@rackspace.com>"
 
diff --git a/playbooks/roles/os_nova/templates/nova-upstart-init.j2 b/playbooks/roles/os_nova/templates/nova-upstart-init.j2
index 40a303ffbc..f4a486ef55 100644
--- a/playbooks/roles/os_nova/templates/nova-upstart-init.j2
+++ b/playbooks/roles/os_nova/templates/nova-upstart-init.j2
@@ -1,7 +1,5 @@
 # {{ ansible_managed }}
 
-# vim:set ft=upstart ts=2 et:
-
 description "{{ program_name }}"
 author "Kevin Carter <kevin.carter@rackspace.com>"
 
diff --git a/playbooks/roles/os_swift/templates/swift-upstart-init.j2 b/playbooks/roles/os_swift/templates/swift-upstart-init.j2
index 1f268fcc92..1ba5552174 100644
--- a/playbooks/roles/os_swift/templates/swift-upstart-init.j2
+++ b/playbooks/roles/os_swift/templates/swift-upstart-init.j2
@@ -2,7 +2,6 @@
 {% if (swift.replication_network is not defined or swift.replication_network == swift.storage_network) and 'replicator-server' in program_name %}
 # Blank script - dedicated replication network not in use
 {% else %}
-# vim:set ft=upstart ts=2 et:
 
 description "{{ program_name }}"
 author "Kevin Carter <kevin.carter@rackspace.com>"