diff --git a/org/open_power/Inventory/Decorator/Asset.interface.yaml b/org/open_power/Inventory/Decorator/Asset.interface.yaml
index bd8a4ee..4347b4d 100644
--- a/org/open_power/Inventory/Decorator/Asset.interface.yaml
+++ b/org/open_power/Inventory/Decorator/Asset.interface.yaml
@@ -5,5 +5,3 @@
       type: string
       description: >
           Customer card identification number.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/org/open_power/OCC/PassThrough.interface.yaml b/org/open_power/OCC/PassThrough.interface.yaml
index 3fc968c..666c288 100644
--- a/org/open_power/OCC/PassThrough.interface.yaml
+++ b/org/open_power/OCC/PassThrough.interface.yaml
@@ -24,5 +24,3 @@
               An array of integers representing the response. This
               should still be bytes worth of data (as though using array[byte]),
               so each entry in the array should pack as many bytes as possible.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Association.interface.yaml b/xyz/openbmc_project/Association.interface.yaml
index bbe373d..262dfaf 100644
--- a/xyz/openbmc_project/Association.interface.yaml
+++ b/xyz/openbmc_project/Association.interface.yaml
@@ -11,5 +11,3 @@
       type: array[path]
       description: >
           An array of association endpoints.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Control/FanSpeed.interface.yaml b/xyz/openbmc_project/Control/FanSpeed.interface.yaml
index 3ce4497..019fec5 100644
--- a/xyz/openbmc_project/Control/FanSpeed.interface.yaml
+++ b/xyz/openbmc_project/Control/FanSpeed.interface.yaml
@@ -14,5 +14,3 @@
       type: uint64
       description: >
           The fan speed target RPM value.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Control/MinimumShipLevel.interface.yaml b/xyz/openbmc_project/Control/MinimumShipLevel.interface.yaml
index fff9c67..7de8070 100644
--- a/xyz/openbmc_project/Control/MinimumShipLevel.interface.yaml
+++ b/xyz/openbmc_project/Control/MinimumShipLevel.interface.yaml
@@ -12,5 +12,3 @@
           'A user has requested that the implementation
           specific requirements associated with minimum ship level
           enforcement be applied when MinimumShipLevelRequired is true.'
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Control/Mode.interface.yaml b/xyz/openbmc_project/Control/Mode.interface.yaml
index ff7e0b0..da40d0d 100644
--- a/xyz/openbmc_project/Control/Mode.interface.yaml
+++ b/xyz/openbmc_project/Control/Mode.interface.yaml
@@ -15,5 +15,3 @@
       type: boolean
       description: >
           Whether the object is in fail-safe mode or not.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Control/ThermalMode.interface.yaml b/xyz/openbmc_project/Control/ThermalMode.interface.yaml
index 8ec8eba..b448d69 100644
--- a/xyz/openbmc_project/Control/ThermalMode.interface.yaml
+++ b/xyz/openbmc_project/Control/ThermalMode.interface.yaml
@@ -22,5 +22,3 @@
       description: >
           The current mode the thermal control application should execute in
           selected from the supported modes provided.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Decorator/Asset.interface.yaml b/xyz/openbmc_project/Inventory/Decorator/Asset.interface.yaml
index d105dd3..9e5cecc 100644
--- a/xyz/openbmc_project/Inventory/Decorator/Asset.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Decorator/Asset.interface.yaml
@@ -22,5 +22,3 @@
       type: string
       description: >
           The model of the item.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Decorator/Cacheable.interface.yaml b/xyz/openbmc_project/Inventory/Decorator/Cacheable.interface.yaml
index 2809de0..36019dc 100644
--- a/xyz/openbmc_project/Inventory/Decorator/Cacheable.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Decorator/Cacheable.interface.yaml
@@ -6,5 +6,3 @@
       description: >
           Whether or not the item is cached.  When true, the item
           and its remaining attributes are undefined.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Decorator/CoolingType.interface.yaml b/xyz/openbmc_project/Inventory/Decorator/CoolingType.interface.yaml
index 49a0429..759cbda 100644
--- a/xyz/openbmc_project/Inventory/Decorator/CoolingType.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Decorator/CoolingType.interface.yaml
@@ -9,5 +9,3 @@
       type: boolean
       description: >
           The element uses water for cooling when set to true.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel.interface.yaml b/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel.interface.yaml
index 33b9b20..bc7b7f1 100644
--- a/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Decorator/MeetsMinimumShipLevel.interface.yaml
@@ -13,5 +13,3 @@
       description: >
           'The inventory item meets the implementation defined minimum ship
           level requirements when MeetsMinimumShipLevel is true.'
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Decorator/Replaceable.interface.yaml b/xyz/openbmc_project/Inventory/Decorator/Replaceable.interface.yaml
index 0ba757b..411e26e 100644
--- a/xyz/openbmc_project/Inventory/Decorator/Replaceable.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Decorator/Replaceable.interface.yaml
@@ -5,5 +5,3 @@
       type: boolean
       description: >
           Whether or not the item is field replaceable.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Decorator/Revision.interface.yaml b/xyz/openbmc_project/Inventory/Decorator/Revision.interface.yaml
index 7611671..d2f7123 100644
--- a/xyz/openbmc_project/Inventory/Decorator/Revision.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Decorator/Revision.interface.yaml
@@ -5,5 +5,3 @@
       type: string
       description: >
           The item version.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Decorator/VendorInformation.interface.yaml b/xyz/openbmc_project/Inventory/Decorator/VendorInformation.interface.yaml
index a31e671..6d4eadc 100644
--- a/xyz/openbmc_project/Inventory/Decorator/VendorInformation.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Decorator/VendorInformation.interface.yaml
@@ -10,5 +10,3 @@
       type: string
       description: >
           The custom field 2 of the item.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Decorator/VoltageControl.interface.yaml b/xyz/openbmc_project/Inventory/Decorator/VoltageControl.interface.yaml
index aefa894..228b3c4 100644
--- a/xyz/openbmc_project/Inventory/Decorator/VoltageControl.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Decorator/VoltageControl.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to enable voltage configuration for the item.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item.interface.yaml b/xyz/openbmc_project/Inventory/Item.interface.yaml
index 82e4c75..0e19118 100644
--- a/xyz/openbmc_project/Inventory/Item.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item.interface.yaml
@@ -10,5 +10,3 @@
       type: boolean
       description: >
           Whether or not the item is present.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Bmc.interface.yaml b/xyz/openbmc_project/Inventory/Item/Bmc.interface.yaml
index 1afadff..43ae62e 100644
--- a/xyz/openbmc_project/Inventory/Item/Bmc.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Bmc.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide BMC attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Board.interface.yaml b/xyz/openbmc_project/Inventory/Item/Board.interface.yaml
index 5b06ff7..46a3d96 100644
--- a/xyz/openbmc_project/Inventory/Item/Board.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Board.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide board attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Board/IOBoard.interface.yaml b/xyz/openbmc_project/Inventory/Item/Board/IOBoard.interface.yaml
index ade9677..f4d0a92 100644
--- a/xyz/openbmc_project/Inventory/Item/Board/IOBoard.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Board/IOBoard.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide IO board attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Board/Motherboard.interface.yaml b/xyz/openbmc_project/Inventory/Item/Board/Motherboard.interface.yaml
index fb3b048..e795b42 100644
--- a/xyz/openbmc_project/Inventory/Item/Board/Motherboard.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Board/Motherboard.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide motherboard attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Chassis.interface.yaml b/xyz/openbmc_project/Inventory/Item/Chassis.interface.yaml
index 3320ea1..df2dc09 100644
--- a/xyz/openbmc_project/Inventory/Item/Chassis.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Chassis.interface.yaml
@@ -6,5 +6,3 @@
       type: string
       description: >
           The type of physical form factor of the chassis.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Connector.interface.yaml b/xyz/openbmc_project/Inventory/Item/Connector.interface.yaml
index 8547560..f6aeed4 100644
--- a/xyz/openbmc_project/Inventory/Item/Connector.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Connector.interface.yaml
@@ -2,5 +2,3 @@
     Implement to provide connector attributes. A connector is
     typically an external port or a slot into which cables are
     plugged.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Cpu.interface.yaml b/xyz/openbmc_project/Inventory/Item/Cpu.interface.yaml
index ab29cf3..83a99dd 100644
--- a/xyz/openbmc_project/Inventory/Item/Cpu.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Cpu.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide CPU attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/CpuCore.interface.yaml b/xyz/openbmc_project/Inventory/Item/CpuCore.interface.yaml
index 90e6886..a5d2f1e 100644
--- a/xyz/openbmc_project/Inventory/Item/CpuCore.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/CpuCore.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide CPU core attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Dimm.interface.yaml b/xyz/openbmc_project/Inventory/Item/Dimm.interface.yaml
index e08b690..bb19dc5 100644
--- a/xyz/openbmc_project/Inventory/Item/Dimm.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Dimm.interface.yaml
@@ -199,4 +199,3 @@
         - name: DDR4E_SDRAM
           description: >
               Double Data Rate 4 Extended Compliant SDRAM.
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/DiskBackplane.interface.yaml b/xyz/openbmc_project/Inventory/Item/DiskBackplane.interface.yaml
index c22de2c..db0c666 100644
--- a/xyz/openbmc_project/Inventory/Item/DiskBackplane.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/DiskBackplane.interface.yaml
@@ -2,5 +2,3 @@
     Implement to provide disk backplane attributes. A disk
     backplane is a card that typically houses storage disks
     such as hard drives and SSDs.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Drive.Interface.yaml b/xyz/openbmc_project/Inventory/Item/Drive.Interface.yaml
index 0818726..be17e7c 100644
--- a/xyz/openbmc_project/Inventory/Item/Drive.Interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Drive.Interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide drive attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Ethernet.interface.yaml b/xyz/openbmc_project/Inventory/Item/Ethernet.interface.yaml
index 57e788f..365fa33 100644
--- a/xyz/openbmc_project/Inventory/Item/Ethernet.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Ethernet.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide Ethernet card attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Fan.interface.yaml b/xyz/openbmc_project/Inventory/Item/Fan.interface.yaml
index dccc519..242e91b 100644
--- a/xyz/openbmc_project/Inventory/Item/Fan.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Fan.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide Fan attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Global.interface.yaml b/xyz/openbmc_project/Inventory/Item/Global.interface.yaml
index 1d99d93..2ceaf83 100644
--- a/xyz/openbmc_project/Inventory/Item/Global.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Global.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide global attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/MemoryBuffer.interface.yaml b/xyz/openbmc_project/Inventory/Item/MemoryBuffer.interface.yaml
index 49ea6c7..e5beaaa 100644
--- a/xyz/openbmc_project/Inventory/Item/MemoryBuffer.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/MemoryBuffer.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide memory buffer attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/NetworkInterface.interface.yaml b/xyz/openbmc_project/Inventory/Item/NetworkInterface.interface.yaml
index 5e4fe6b..b1251a1 100644
--- a/xyz/openbmc_project/Inventory/Item/NetworkInterface.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/NetworkInterface.interface.yaml
@@ -5,5 +5,3 @@
       type: string
       description: >
           MAC address of the item
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Panel.interface.yaml b/xyz/openbmc_project/Inventory/Item/Panel.interface.yaml
index a886d99..a1c2d57 100644
--- a/xyz/openbmc_project/Inventory/Item/Panel.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Panel.interface.yaml
@@ -3,5 +3,3 @@
     is typically found on the chassis of a system and can
     be used to physically control the system and/or display
     system status.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/PowerSupply.interface.yaml b/xyz/openbmc_project/Inventory/Item/PowerSupply.interface.yaml
index 9cf016c..30e32a8 100644
--- a/xyz/openbmc_project/Inventory/Item/PowerSupply.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/PowerSupply.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide PowerSupply attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/StorageController.interface.yaml b/xyz/openbmc_project/Inventory/Item/StorageController.interface.yaml
index e950d4b..554aca3 100644
--- a/xyz/openbmc_project/Inventory/Item/StorageController.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/StorageController.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide storage controller attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/System.interface.yaml b/xyz/openbmc_project/Inventory/Item/System.interface.yaml
index d2c9cde..4df3dad 100644
--- a/xyz/openbmc_project/Inventory/Item/System.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/System.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide system/enclosure attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Tpm.interface.yaml b/xyz/openbmc_project/Inventory/Item/Tpm.interface.yaml
index 2414830..c03acbe 100644
--- a/xyz/openbmc_project/Inventory/Item/Tpm.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Tpm.interface.yaml
@@ -1,4 +1,2 @@
 description: >
     Implement to provide Trusted Platform Module(TPM) attributes.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Item/Vrm.interface.yaml b/xyz/openbmc_project/Inventory/Item/Vrm.interface.yaml
index 3ac4ec1..749563b 100644
--- a/xyz/openbmc_project/Inventory/Item/Vrm.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Item/Vrm.interface.yaml
@@ -1,5 +1,3 @@
 description: >
     Implement to provide VRM FRU attributes. A VRM is
     a volatge regulator module.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Inventory/Manager.interface.yaml b/xyz/openbmc_project/Inventory/Manager.interface.yaml
index a02848f..90534ac 100644
--- a/xyz/openbmc_project/Inventory/Manager.interface.yaml
+++ b/xyz/openbmc_project/Inventory/Manager.interface.yaml
@@ -15,5 +15,3 @@
           type: dict[path,dict[string,dict[string,variant[boolean,int64,string,array[byte]]]]]
           description: >
               A dictionary of fully enumerated items to be managed.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml b/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml
index 46cf919..0ddc025 100644
--- a/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml
+++ b/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml
@@ -53,5 +53,3 @@
           Session state.
       errors:
           - xyz.openbmc_project.Common.Error.InternalFailure
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Object/Delete.interface.yaml b/xyz/openbmc_project/Object/Delete.interface.yaml
index fa84e9c..e1677b3 100644
--- a/xyz/openbmc_project/Object/Delete.interface.yaml
+++ b/xyz/openbmc_project/Object/Delete.interface.yaml
@@ -6,5 +6,3 @@
           Delete the object implementing Delete.
       errors:
         - xyz.openbmc_project.Common.Error.InternalFailure
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/ObjectMapper.interface.yaml b/xyz/openbmc_project/ObjectMapper.interface.yaml
index 72e89a1..250cddf 100644
--- a/xyz/openbmc_project/ObjectMapper.interface.yaml
+++ b/xyz/openbmc_project/ObjectMapper.interface.yaml
@@ -87,5 +87,3 @@
           type: array[path]
           description: >
             An array of paths.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/PFR/Attributes.interface.yaml b/xyz/openbmc_project/PFR/Attributes.interface.yaml
index 4d94ed1..1482b4e 100644
--- a/xyz/openbmc_project/PFR/Attributes.interface.yaml
+++ b/xyz/openbmc_project/PFR/Attributes.interface.yaml
@@ -18,4 +18,3 @@
           Once the provisioning is locked, it can't be re-provisioned.
       errors:
           - xyz.openbmc_project.Common.Error.InternalFailure
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Sensor/Threshold/Critical.interface.yaml b/xyz/openbmc_project/Sensor/Threshold/Critical.interface.yaml
index c575bb5..af640fb 100644
--- a/xyz/openbmc_project/Sensor/Threshold/Critical.interface.yaml
+++ b/xyz/openbmc_project/Sensor/Threshold/Critical.interface.yaml
@@ -38,6 +38,3 @@
 
           CriticalAlarmLow may be set to False to clear an alarm condition.
           The behavior of setting CriticalAlarmLow to True is undefined.
-
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Sensor/Threshold/Warning.interface.yaml b/xyz/openbmc_project/Sensor/Threshold/Warning.interface.yaml
index 9f4822b..5857492 100644
--- a/xyz/openbmc_project/Sensor/Threshold/Warning.interface.yaml
+++ b/xyz/openbmc_project/Sensor/Threshold/Warning.interface.yaml
@@ -39,5 +39,3 @@
 
           WarningAlarmLow may be set to False to clear an alarm condition.
           The behavior of setting WarningAlarmLow to True is undefined.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Sensor/Value.interface.yaml b/xyz/openbmc_project/Sensor/Value.interface.yaml
index 5e1b345..5f42b92 100644
--- a/xyz/openbmc_project/Sensor/Value.interface.yaml
+++ b/xyz/openbmc_project/Sensor/Value.interface.yaml
@@ -72,6 +72,3 @@
         - name: Joules
           description: >
             Energy transfer as Joules.
-
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/State/Watchdog.interface.yaml b/xyz/openbmc_project/State/Watchdog.interface.yaml
index da95d4c..f54ec3b 100644
--- a/xyz/openbmc_project/State/Watchdog.interface.yaml
+++ b/xyz/openbmc_project/State/Watchdog.interface.yaml
@@ -95,5 +95,3 @@
        - name: 'OEM'
          description: >
            OEM.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/Time/EpochTime.interface.yaml b/xyz/openbmc_project/Time/EpochTime.interface.yaml
index 26f7b3a..16724d5 100644
--- a/xyz/openbmc_project/Time/EpochTime.interface.yaml
+++ b/xyz/openbmc_project/Time/EpochTime.interface.yaml
@@ -14,5 +14,3 @@
       errors:
         - xyz.openbmc_project.Time.Error.NotAllowed
         - xyz.openbmc_project.Time.Error.Failed
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/User/AccountPolicy.interface.yaml b/xyz/openbmc_project/User/AccountPolicy.interface.yaml
index 9e81b08..1d04006 100644
--- a/xyz/openbmc_project/User/AccountPolicy.interface.yaml
+++ b/xyz/openbmc_project/User/AccountPolicy.interface.yaml
@@ -38,4 +38,3 @@
           this feature is not enforced.
       errors:
           - xyz.openbmc_project.Common.Error.InternalFailure
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/User/Attributes.interface.yaml b/xyz/openbmc_project/User/Attributes.interface.yaml
index c4f18ad..ff1065a 100644
--- a/xyz/openbmc_project/User/Attributes.interface.yaml
+++ b/xyz/openbmc_project/User/Attributes.interface.yaml
@@ -36,4 +36,3 @@
           the user after a timeout.
       errors:
           - xyz.openbmc_project.Common.Error.InternalFailure
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/User/Ldap/Config.interface.yaml b/xyz/openbmc_project/User/Ldap/Config.interface.yaml
index 28c76b8..d7af2e8 100644
--- a/xyz/openbmc_project/User/Ldap/Config.interface.yaml
+++ b/xyz/openbmc_project/User/Ldap/Config.interface.yaml
@@ -84,5 +84,3 @@
       values:
         - name: ActiveDirectory
         - name: OpenLdap
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/User/Ldap/Create.interface.yaml b/xyz/openbmc_project/User/Ldap/Create.interface.yaml
index 69c03e6..62a5ec4 100644
--- a/xyz/openbmc_project/User/Ldap/Create.interface.yaml
+++ b/xyz/openbmc_project/User/Ldap/Create.interface.yaml
@@ -75,5 +75,3 @@
       values:
         - name: ActiveDirectory
         - name: OpenLdap
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/xyz/openbmc_project/User/Manager.interface.yaml b/xyz/openbmc_project/User/Manager.interface.yaml
index 5784ea1..dac8efa 100644
--- a/xyz/openbmc_project/User/Manager.interface.yaml
+++ b/xyz/openbmc_project/User/Manager.interface.yaml
@@ -124,5 +124,3 @@
          - name: NewUserName
            type: string
            description: New name of the user.
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4