diff --git a/env.cpp b/env.cpp
index 318009f..dd828f0 100644
--- a/env.cpp
+++ b/env.cpp
@@ -30,5 +30,3 @@
 EnvImpl env_impl;
 
 } // namespace env
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/hwmon.hpp b/hwmon.hpp
index c02ec52..6931b61 100644
--- a/hwmon.hpp
+++ b/hwmon.hpp
@@ -98,5 +98,3 @@
 bool getAttributes(const std::string& type, Attributes& attributes);
 
 } //  namespace hwmon
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/hwmonio.hpp b/hwmonio.hpp
index ff18204..ddb436e 100644
--- a/hwmonio.hpp
+++ b/hwmonio.hpp
@@ -135,5 +135,3 @@
 };
 
 } // namespace hwmonio
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/interface.hpp b/interface.hpp
index 234af4c..037a68a 100644
--- a/interface.hpp
+++ b/interface.hpp
@@ -51,5 +51,3 @@
     ACCURACY,
     PRIORITY,
 };
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/mainloop.cpp b/mainloop.cpp
index d5e0369..2271fba 100644
--- a/mainloop.cpp
+++ b/mainloop.cpp
@@ -700,5 +700,3 @@
         }
     }
 }
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/readd.cpp b/readd.cpp
index 911f076..733e9bc 100644
--- a/readd.cpp
+++ b/readd.cpp
@@ -88,5 +88,3 @@
 
     return 0;
 }
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/sensorset.cpp b/sensorset.cpp
index e3f4e9c..033d669 100644
--- a/sensorset.cpp
+++ b/sensorset.cpp
@@ -50,5 +50,3 @@
         _container[make_pair(match[1], match[2])].emplace(match[3]);
     }
 }
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/sensorset.hpp b/sensorset.hpp
index 7f6f3f9..9bf9fe7 100644
--- a/sensorset.hpp
+++ b/sensorset.hpp
@@ -70,5 +70,3 @@
      */
     container_t _container;
 };
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/sysfs.cpp b/sysfs.cpp
index aae6ff3..4ff7a67 100644
--- a/sysfs.cpp
+++ b/sysfs.cpp
@@ -240,5 +240,3 @@
 }
 
 } // namespace sysfs
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/sysfs.hpp b/sysfs.hpp
index aac9c2b..6a84cba 100644
--- a/sysfs.hpp
+++ b/sysfs.hpp
@@ -73,5 +73,3 @@
 std::string findCalloutPath(const std::string& instancePath);
 
 } // namespace sysfs
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/test/hwmonio_mock.hpp b/test/hwmonio_mock.hpp
index 0edcf52..170e9ac 100644
--- a/test/hwmonio_mock.hpp
+++ b/test/hwmonio_mock.hpp
@@ -24,5 +24,3 @@
 };
 
 } // namespace hwmonio
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/thresholds.hpp b/thresholds.hpp
index 5fb2947..ef9d481 100644
--- a/thresholds.hpp
+++ b/thresholds.hpp
@@ -175,5 +175,3 @@
 
     return iface;
 }
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/tools/find_callout_path.cpp b/tools/find_callout_path.cpp
index f72673c..f2b8d79 100644
--- a/tools/find_callout_path.cpp
+++ b/tools/find_callout_path.cpp
@@ -36,5 +36,3 @@
     }
     return 0;
 }
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/tools/find_hwmon.cpp b/tools/find_hwmon.cpp
index f155541..a421085 100644
--- a/tools/find_hwmon.cpp
+++ b/tools/find_hwmon.cpp
@@ -36,5 +36,3 @@
     }
     return 0;
 }
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/util.hpp b/util.hpp
index d91b1b5..d4a06cb 100644
--- a/util.hpp
+++ b/util.hpp
@@ -32,4 +32,3 @@
 }
 } // namespace utility
 } // namespace phosphor
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4