diff --git a/app.cpp b/app.cpp
index 2dedf02..ca8521f 100644
--- a/app.cpp
+++ b/app.cpp
@@ -32,5 +32,3 @@
 
     return 0;
 }
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/errors.cpp b/errors.cpp
index 3712185..e9127f4 100644
--- a/errors.cpp
+++ b/errors.cpp
@@ -30,5 +30,3 @@
 } // namespace manager
 } // namespace inventory
 } // namespace phosphor
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/errors.hpp b/errors.hpp
index e19f193..37f8d81 100644
--- a/errors.hpp
+++ b/errors.hpp
@@ -44,5 +44,3 @@
 } // namespace manager
 } // namespace inventory
 } // namespace phosphor
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/events.hpp b/events.hpp
index 1abf444..7c32d84 100644
--- a/events.hpp
+++ b/events.hpp
@@ -81,5 +81,3 @@
 } // namespace manager
 } // namespace inventory
 } // namespace phosphor
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/functor.cpp b/functor.cpp
index 008e29f..e8d535e 100644
--- a/functor.cpp
+++ b/functor.cpp
@@ -114,5 +114,3 @@
 } // namespace manager
 } // namespace inventory
 } // namespace phosphor
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/functor.hpp b/functor.hpp
index ddb3604..726c943 100644
--- a/functor.hpp
+++ b/functor.hpp
@@ -405,5 +405,3 @@
 } // namespace manager
 } // namespace inventory
 } // namespace phosphor
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/manager.cpp b/manager.cpp
index f9e40c6..681c861 100644
--- a/manager.cpp
+++ b/manager.cpp
@@ -429,5 +429,3 @@
 } // namespace manager
 } // namespace inventory
 } // namespace phosphor
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/manager.hpp b/manager.hpp
index e580481..ac9c834 100644
--- a/manager.hpp
+++ b/manager.hpp
@@ -224,5 +224,3 @@
 } // namespace manager
 } // namespace inventory
 } // namespace phosphor
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/pimgen.py b/pimgen.py
index afe29ec..0b635bb 100755
--- a/pimgen.py
+++ b/pimgen.py
@@ -723,6 +723,3 @@
 
     function = getattr(Everything.load(args), valid_commands[args.command])
     function(lookup)
-
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/types.hpp b/types.hpp
index cb59510..4fe3825 100644
--- a/types.hpp
+++ b/types.hpp
@@ -42,5 +42,3 @@
 } // namespace manager
 } // namespace inventory
 } // namespace phosphor
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/utils.hpp b/utils.hpp
index d709b6f..dccf315 100644
--- a/utils.hpp
+++ b/utils.hpp
@@ -242,5 +242,3 @@
 } // namespace manager
 } // namespace inventory
 } // namespace phosphor
-
-// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4