diff --git a/src/crypt/certificate.vala b/src/crypt/certificate.vala
index 6521bc7..b7ab52f 100644
--- a/src/crypt/certificate.vala
+++ b/src/crypt/certificate.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/application.vala b/src/mconnect/application.vala
index effdb51..f14f48f 100644
--- a/src/mconnect/application.vala
+++ b/src/mconnect/application.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/battery-proxy.vala b/src/mconnect/battery-proxy.vala
index bcf70e6..accf2c6 100644
--- a/src/mconnect/battery-proxy.vala
+++ b/src/mconnect/battery-proxy.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/battery.vala b/src/mconnect/battery.vala
index 69c13e8..d9baab5 100644
--- a/src/mconnect/battery.vala
+++ b/src/mconnect/battery.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/config.vala b/src/mconnect/config.vala
index eae32fd..e3e9c5e 100644
--- a/src/mconnect/config.vala
+++ b/src/mconnect/config.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/core.vala b/src/mconnect/core.vala
index b3bdc53..e448d2b 100644
--- a/src/mconnect/core.vala
+++ b/src/mconnect/core.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/device-proxy.vala b/src/mconnect/device-proxy.vala
index 1668666..6aa7eb4 100644
--- a/src/mconnect/device-proxy.vala
+++ b/src/mconnect/device-proxy.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/device.vala b/src/mconnect/device.vala
index 1743058..18e01ef 100644
--- a/src/mconnect/device.vala
+++ b/src/mconnect/device.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/devicechannel.vala b/src/mconnect/devicechannel.vala
index 6c1f85a..11d2ab6 100644
--- a/src/mconnect/devicechannel.vala
+++ b/src/mconnect/devicechannel.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/devicemanager-proxy.vala b/src/mconnect/devicemanager-proxy.vala
index 5d0b056..56e0f77 100644
--- a/src/mconnect/devicemanager-proxy.vala
+++ b/src/mconnect/devicemanager-proxy.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/devicemanager.vala b/src/mconnect/devicemanager.vala
index 6436261..3749c1f 100644
--- a/src/mconnect/devicemanager.vala
+++ b/src/mconnect/devicemanager.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/discovereddevice.vala b/src/mconnect/discovereddevice.vala
index e795f97..42b289d 100644
--- a/src/mconnect/discovereddevice.vala
+++ b/src/mconnect/discovereddevice.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/discovery.vala b/src/mconnect/discovery.vala
index d965aa7..67641b4 100644
--- a/src/mconnect/discovery.vala
+++ b/src/mconnect/discovery.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/main.vala b/src/mconnect/main.vala
index 6a24fd6..bc47d76 100644
--- a/src/mconnect/main.vala
+++ b/src/mconnect/main.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/mousepad.vala b/src/mconnect/mousepad.vala
index 86e4fa6..62428eb 100644
--- a/src/mconnect/mousepad.vala
+++ b/src/mconnect/mousepad.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/notification.vala b/src/mconnect/notification.vala
index 76836ce..6fb0f8b 100644
--- a/src/mconnect/notification.vala
+++ b/src/mconnect/notification.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/packet.vala b/src/mconnect/packet.vala
index e5bb43b..0e1ccdd 100644
--- a/src/mconnect/packet.vala
+++ b/src/mconnect/packet.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/packethandlerinterface-proxy.vala b/src/mconnect/packethandlerinterface-proxy.vala
index b532209..dabb458 100644
--- a/src/mconnect/packethandlerinterface-proxy.vala
+++ b/src/mconnect/packethandlerinterface-proxy.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/packethandlerinterface.vala b/src/mconnect/packethandlerinterface.vala
index 98dbdfe..6ade132 100644
--- a/src/mconnect/packethandlerinterface.vala
+++ b/src/mconnect/packethandlerinterface.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/packethandlers-proxy.vala b/src/mconnect/packethandlers-proxy.vala
index c9af288..48950e6 100644
--- a/src/mconnect/packethandlers-proxy.vala
+++ b/src/mconnect/packethandlers-proxy.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/packethandlers.vala b/src/mconnect/packethandlers.vala
index 5b8bcbe..9cff4ac 100644
--- a/src/mconnect/packethandlers.vala
+++ b/src/mconnect/packethandlers.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/ping-proxy.vala b/src/mconnect/ping-proxy.vala
index 26f2c1e..2737d40 100644
--- a/src/mconnect/ping-proxy.vala
+++ b/src/mconnect/ping-proxy.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/ping.vala b/src/mconnect/ping.vala
index 42b0deb..a7770b9 100644
--- a/src/mconnect/ping.vala
+++ b/src/mconnect/ping.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/share-proxy.vala b/src/mconnect/share-proxy.vala
index 3d8be82..a278e28 100644
--- a/src/mconnect/share-proxy.vala
+++ b/src/mconnect/share-proxy.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnect/telephony.vala b/src/mconnect/telephony.vala
index dc862ee..1d20d3e 100644
--- a/src/mconnect/telephony.vala
+++ b/src/mconnect/telephony.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/src/mconnectctl/main.vala b/src/mconnectctl/main.vala
index 852613a..ebee13a 100644
--- a/src/mconnectctl/main.vala
+++ b/src/mconnectctl/main.vala
@@ -1,5 +1,3 @@
-/* ex:ts=4:sw=4:sts=4:et */
-/* -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as