diff --git a/configs/Barreleye.py b/configs/Barreleye.py
index 09b044e..2924ed0 100644
--- a/configs/Barreleye.py
+++ b/configs/Barreleye.py
@@ -668,5 +668,3 @@
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
 MISC_SENSORS = {}
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/configs/Firestone.py b/configs/Firestone.py
index d418dc0..539ebcb 100644
--- a/configs/Firestone.py
+++ b/configs/Firestone.py
@@ -592,5 +592,3 @@
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
 MISC_SENSORS = {}
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/configs/Garrison.py b/configs/Garrison.py
index 1b384e4..5aa1eed 100644
--- a/configs/Garrison.py
+++ b/configs/Garrison.py
@@ -593,5 +593,3 @@
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
 MISC_SENSORS = {}
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/configs/Lanyang.py b/configs/Lanyang.py
index 837c607..eadb793 100644
--- a/configs/Lanyang.py
+++ b/configs/Lanyang.py
@@ -595,5 +595,3 @@
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
 MISC_SENSORS = {}
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/configs/Palmetto.py b/configs/Palmetto.py
index 60eda3a..3dc16d6 100644
--- a/configs/Palmetto.py
+++ b/configs/Palmetto.py
@@ -90,5 +90,3 @@
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
 MISC_SENSORS = {}
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/configs/Romulus.py b/configs/Romulus.py
index 13d3308..007ed43 100644
--- a/configs/Romulus.py
+++ b/configs/Romulus.py
@@ -486,5 +486,3 @@
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
 MISC_SENSORS = {}
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/configs/Witherspoon.py b/configs/Witherspoon.py
index a10a89e..a2b56c6 100644
--- a/configs/Witherspoon.py
+++ b/configs/Witherspoon.py
@@ -539,5 +539,3 @@
 MISC_SENSORS = {
     # Garrison value is used, Not in P9 XML yet.
 }
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/configs/Zaius.py b/configs/Zaius.py
index 837c607..eadb793 100644
--- a/configs/Zaius.py
+++ b/configs/Zaius.py
@@ -595,5 +595,3 @@
 # Miscellaneous non-poll sensor with system specific properties.
 # The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
 MISC_SENSORS = {}
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/pychassisctl/chassis_control.py b/pychassisctl/chassis_control.py
index efe7227..88949e5 100644
--- a/pychassisctl/chassis_control.py
+++ b/pychassisctl/chassis_control.py
@@ -180,5 +180,3 @@
 
     print("Running ChassisControlService")
     mainloop.run()
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/pydownloadmgr/download_manager.py b/pydownloadmgr/download_manager.py
index 5cedbed..ee1b6ad 100644
--- a/pydownloadmgr/download_manager.py
+++ b/pydownloadmgr/download_manager.py
@@ -90,5 +90,3 @@
 
     print("Running Download Manager")
     mainloop.run()
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/pyflashbmc/bmc_update.py b/pyflashbmc/bmc_update.py
index c2046e4..db33f19 100644
--- a/pyflashbmc/bmc_update.py
+++ b/pyflashbmc/bmc_update.py
@@ -349,5 +349,3 @@
 
     print("Running Bmc Flash Control")
     mainloop.run()
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/pyinventorymgr/inventory_items.py b/pyinventorymgr/inventory_items.py
index 1c0a5f7..37f122a 100644
--- a/pyinventorymgr/inventory_items.py
+++ b/pyinventorymgr/inventory_items.py
@@ -116,5 +116,3 @@
     name = dbus.service.BusName(DBUS_NAME, bus)
     print("Running Inventory Manager")
     mainloop.run()
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/pyinventorymgr/sync_inventory_items.py b/pyinventorymgr/sync_inventory_items.py
index 7a5635a..06c5440 100644
--- a/pyinventorymgr/sync_inventory_items.py
+++ b/pyinventorymgr/sync_inventory_items.py
@@ -187,5 +187,3 @@
             chs_uuid = get_sys_uuid(chs_obj)
             if inv_uuid != sys_uuid:
                 set_sys_uuid(inv_uuid)
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/pyipmitest/ipmi_debug.py b/pyipmitest/ipmi_debug.py
index 537bb19..8426d62 100644
--- a/pyipmitest/ipmi_debug.py
+++ b/pyipmitest/ipmi_debug.py
@@ -111,5 +111,3 @@
 
 if __name__ == "__main__":
     sys.exit(main())
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/pystatemgr/discover_system_state.py b/pystatemgr/discover_system_state.py
index bff45ee..fa47cc8 100644
--- a/pystatemgr/discover_system_state.py
+++ b/pystatemgr/discover_system_state.py
@@ -115,5 +115,3 @@
             "RequestedHostTransition",
             "xyz.openbmc_project.State.Host.Transition.On",
         )
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/pysystemmgr/system_manager.py b/pysystemmgr/system_manager.py
index 82ab903..4b58b50 100644
--- a/pysystemmgr/system_manager.py
+++ b/pysystemmgr/system_manager.py
@@ -131,5 +131,3 @@
 
     print("Running SystemManager")
     mainloop.run()
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4