diff --git a/js/chromium.js b/js/chromium.js
index c35cd50b16..7e02ebbbc2 100644
--- a/js/chromium.js
+++ b/js/chromium.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   // Browser specific functions for Chrom*
diff --git a/js/conversation_controller.js b/js/conversation_controller.js
index b8289214ff..d2e58e4805 100644
--- a/js/conversation_controller.js
+++ b/js/conversation_controller.js
@@ -1,7 +1,4 @@
 /*global $, Whisper, Backbone, textsecure, extension*/
-/*
- * vim: ts=4:sw=4:expandtab
- */
 
 // This script should only be included in background.html
 (function() {
diff --git a/js/delivery_receipts.js b/js/delivery_receipts.js
index 4cce1f2a4f..94bf07fe46 100644
--- a/js/delivery_receipts.js
+++ b/js/delivery_receipts.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/emoji_util.js b/js/emoji_util.js
index 289339480e..c97a4ef712 100644
--- a/js/emoji_util.js
+++ b/js/emoji_util.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 (function() {
   'use strict';
   window.emoji_util = window.emoji_util || {};
diff --git a/js/expiring_messages.js b/js/expiring_messages.js
index 5230daa5bf..6c8dd6420c 100644
--- a/js/expiring_messages.js
+++ b/js/expiring_messages.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/keychange_listener.js b/js/keychange_listener.js
index cca039d0a2..b42df42cd7 100644
--- a/js/keychange_listener.js
+++ b/js/keychange_listener.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/libphonenumber-util.js b/js/libphonenumber-util.js
index 8e4f102746..ac13013c86 100644
--- a/js/libphonenumber-util.js
+++ b/js/libphonenumber-util.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
 
diff --git a/js/models/blockedNumbers.js b/js/models/blockedNumbers.js
index 25421366f7..0950cc302f 100644
--- a/js/models/blockedNumbers.js
+++ b/js/models/blockedNumbers.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   storage.isBlocked = function(number) {
diff --git a/js/notifications.js b/js/notifications.js
index d7adf1684b..95029fe50e 100644
--- a/js/notifications.js
+++ b/js/notifications.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/read_receipts.js b/js/read_receipts.js
index 0504d3907f..1180467fd2 100644
--- a/js/read_receipts.js
+++ b/js/read_receipts.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/read_syncs.js b/js/read_syncs.js
index e846ce104d..9f13125c42 100644
--- a/js/read_syncs.js
+++ b/js/read_syncs.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/registration.js b/js/registration.js
index 7398e742d1..bb068250ea 100644
--- a/js/registration.js
+++ b/js/registration.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   Whisper.Registration = {
diff --git a/js/rotate_signed_prekey_listener.js b/js/rotate_signed_prekey_listener.js
index 6802356dab..44d01b7d0d 100644
--- a/js/rotate_signed_prekey_listener.js
+++ b/js/rotate_signed_prekey_listener.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/signal_protocol_store.js b/js/signal_protocol_store.js
index 5276c80f4b..d522a6bb09 100644
--- a/js/signal_protocol_store.js
+++ b/js/signal_protocol_store.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   var TIMESTAMP_THRESHOLD = 5 * 1000; // 5 seconds
diff --git a/js/storage.js b/js/storage.js
index 541addf951..93f427edac 100644
--- a/js/storage.js
+++ b/js/storage.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/attachment_preview_view.js b/js/views/attachment_preview_view.js
index 7e33b0ecc0..53122db2d5 100644
--- a/js/views/attachment_preview_view.js
+++ b/js/views/attachment_preview_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/banner_view.js b/js/views/banner_view.js
index 7ad2cc757a..ae23b216f9 100644
--- a/js/views/banner_view.js
+++ b/js/views/banner_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/confirmation_dialog_view.js b/js/views/confirmation_dialog_view.js
index 8937a4da15..6d5b5569d0 100644
--- a/js/views/confirmation_dialog_view.js
+++ b/js/views/confirmation_dialog_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/contact_list_view.js b/js/views/contact_list_view.js
index 3b3f619b16..9d525a216b 100644
--- a/js/views/contact_list_view.js
+++ b/js/views/contact_list_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/conversation_list_item_view.js b/js/views/conversation_list_item_view.js
index 1d96895253..3f1b4928c6 100644
--- a/js/views/conversation_list_item_view.js
+++ b/js/views/conversation_list_item_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/conversation_list_view.js b/js/views/conversation_list_view.js
index b7608ce866..daaa9b9956 100644
--- a/js/views/conversation_list_view.js
+++ b/js/views/conversation_list_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/error_view.js b/js/views/error_view.js
index 8d7ee6aea9..041d334f7c 100644
--- a/js/views/error_view.js
+++ b/js/views/error_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
 
diff --git a/js/views/group_member_list_view.js b/js/views/group_member_list_view.js
index f3f678b147..5b7201e855 100644
--- a/js/views/group_member_list_view.js
+++ b/js/views/group_member_list_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/group_update_view.js b/js/views/group_update_view.js
index 17a8121a04..0cff0b9927 100644
--- a/js/views/group_update_view.js
+++ b/js/views/group_update_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
 
diff --git a/js/views/hint_view.js b/js/views/hint_view.js
index 6e1fa9b544..63b07d965a 100644
--- a/js/views/hint_view.js
+++ b/js/views/hint_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/identicon_svg_view.js b/js/views/identicon_svg_view.js
index 07889a0b0a..31b2669c36 100644
--- a/js/views/identicon_svg_view.js
+++ b/js/views/identicon_svg_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/identity_key_send_error_view.js b/js/views/identity_key_send_error_view.js
index 90572e7de9..b39a7293ab 100644
--- a/js/views/identity_key_send_error_view.js
+++ b/js/views/identity_key_send_error_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/import_view.js b/js/views/import_view.js
index 2a50e010e4..1cf100ef29 100644
--- a/js/views/import_view.js
+++ b/js/views/import_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/install_view.js b/js/views/install_view.js
index 4d8575cb1d..c9b401daae 100644
--- a/js/views/install_view.js
+++ b/js/views/install_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/key_verification_view.js b/js/views/key_verification_view.js
index 949c26a491..7e21df4aaf 100644
--- a/js/views/key_verification_view.js
+++ b/js/views/key_verification_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/last_seen_indicator_view.js b/js/views/last_seen_indicator_view.js
index 9637e9dbb2..4f6101e98f 100644
--- a/js/views/last_seen_indicator_view.js
+++ b/js/views/last_seen_indicator_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/list_view.js b/js/views/list_view.js
index 80c29377e3..8c65253803 100644
--- a/js/views/list_view.js
+++ b/js/views/list_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/message_detail_view.js b/js/views/message_detail_view.js
index 8cbb8c419c..c9c2c58fd9 100644
--- a/js/views/message_detail_view.js
+++ b/js/views/message_detail_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/message_list_view.js b/js/views/message_list_view.js
index a659ce26b9..0bd8aeb910 100644
--- a/js/views/message_list_view.js
+++ b/js/views/message_list_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/new_group_update_view.js b/js/views/new_group_update_view.js
index 9edce44051..cce50c239a 100644
--- a/js/views/new_group_update_view.js
+++ b/js/views/new_group_update_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/phone-input-view.js b/js/views/phone-input-view.js
index 7b69e1ded9..60d0030633 100644
--- a/js/views/phone-input-view.js
+++ b/js/views/phone-input-view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/recipients_input_view.js b/js/views/recipients_input_view.js
index 2e72b90543..bc84d7c896 100644
--- a/js/views/recipients_input_view.js
+++ b/js/views/recipients_input_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/recorder_view.js b/js/views/recorder_view.js
index 17e036fddc..ba28761963 100644
--- a/js/views/recorder_view.js
+++ b/js/views/recorder_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/scroll_down_button_view.js b/js/views/scroll_down_button_view.js
index 690752bc33..de9eb87057 100644
--- a/js/views/scroll_down_button_view.js
+++ b/js/views/scroll_down_button_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/standalone_registration_view.js b/js/views/standalone_registration_view.js
index a5787e4bbe..05328ac2c8 100644
--- a/js/views/standalone_registration_view.js
+++ b/js/views/standalone_registration_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/timestamp_view.js b/js/views/timestamp_view.js
index 2d39e4e82e..070ec6fee4 100644
--- a/js/views/timestamp_view.js
+++ b/js/views/timestamp_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/toast_view.js b/js/views/toast_view.js
index de27cb753c..9733f7adc9 100644
--- a/js/views/toast_view.js
+++ b/js/views/toast_view.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/js/views/whisper_view.js b/js/views/whisper_view.js
index 44baa00b42..b9c572abd3 100644
--- a/js/views/whisper_view.js
+++ b/js/views/whisper_view.js
@@ -1,6 +1,4 @@
 /*
- * vim: ts=4:sw=4:expandtab
- *
  * Whisper.View
  *
  * This is the base for most of our views. The Backbone view is extended
diff --git a/js/wall_clock_listener.js b/js/wall_clock_listener.js
index 70ef8b0316..c1cba44707 100644
--- a/js/wall_clock_listener.js
+++ b/js/wall_clock_listener.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 (function() {
   'use strict';
   window.Whisper = window.Whisper || {};
diff --git a/libtextsecure/account_manager.js b/libtextsecure/account_manager.js
index f36e650d6c..351a40ec24 100644
--- a/libtextsecure/account_manager.js
+++ b/libtextsecure/account_manager.js
@@ -1,8 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
-
 ;(function () {
     'use strict';
     window.textsecure = window.textsecure || {};
diff --git a/libtextsecure/api.js b/libtextsecure/api.js
index 38fd0a6dcc..e89e5d0725 100644
--- a/libtextsecure/api.js
+++ b/libtextsecure/api.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 var TextSecureServer = (function() {
     'use strict';
 
diff --git a/libtextsecure/contacts_parser.js b/libtextsecure/contacts_parser.js
index 6a7c5aa0a9..678ffeb7f5 100644
--- a/libtextsecure/contacts_parser.js
+++ b/libtextsecure/contacts_parser.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 function ProtoParser(arrayBuffer, protobuf) {
     this.protobuf = protobuf;
     this.buffer = new dcodeIO.ByteBuffer();
diff --git a/libtextsecure/crypto.js b/libtextsecure/crypto.js
index 7687e2c547..7455e4cc0e 100644
--- a/libtextsecure/crypto.js
+++ b/libtextsecure/crypto.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 ;(function(){
     'use strict';
 
diff --git a/libtextsecure/errors.js b/libtextsecure/errors.js
index 9a46f84587..1236030675 100644
--- a/libtextsecure/errors.js
+++ b/libtextsecure/errors.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 ;(function() {
     'use strict';
 
diff --git a/libtextsecure/event_target.js b/libtextsecure/event_target.js
index 3af5071aca..3bfce9cd06 100644
--- a/libtextsecure/event_target.js
+++ b/libtextsecure/event_target.js
@@ -1,11 +1,7 @@
 /*
- * vim: ts=4:sw=4:expandtab
- *
  * Implements EventTarget
  * https://developer.mozilla.org/en-US/docs/Web/API/EventTarget
- *
  */
-
 ;(function () {
     'use strict';
     window.textsecure = window.textsecure || {};
diff --git a/libtextsecure/helpers.js b/libtextsecure/helpers.js
index c1d5e5bdc8..9dd5caafbd 100644
--- a/libtextsecure/helpers.js
+++ b/libtextsecure/helpers.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 window.textsecure = window.textsecure || {};
 
 /*********************************
diff --git a/libtextsecure/key_worker.js b/libtextsecure/key_worker.js
index 82bfc9fe0d..d32e420beb 100644
--- a/libtextsecure/key_worker.js
+++ b/libtextsecure/key_worker.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 'use strict';
 
 /*
diff --git a/libtextsecure/outgoing_message.js b/libtextsecure/outgoing_message.js
index 2b68762b55..b8cfbdf910 100644
--- a/libtextsecure/outgoing_message.js
+++ b/libtextsecure/outgoing_message.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 function OutgoingMessage(server, timestamp, numbers, message, silent, callback) {
     if (message instanceof textsecure.protobuf.DataMessage) {
         var content = new textsecure.protobuf.Content();
diff --git a/libtextsecure/protocol_wrapper.js b/libtextsecure/protocol_wrapper.js
index 920d3b504e..931089d241 100644
--- a/libtextsecure/protocol_wrapper.js
+++ b/libtextsecure/protocol_wrapper.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 ;(function() {
     'use strict';
     window.textsecure = window.textsecure || {};
diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js
index 7fa768ac54..0f429daa7e 100644
--- a/libtextsecure/sendmessage.js
+++ b/libtextsecure/sendmessage.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 function stringToArrayBuffer(str) {
     if (typeof str !== 'string') {
         throw new Error('Passed non-string to stringToArrayBuffer');
diff --git a/libtextsecure/storage.js b/libtextsecure/storage.js
index 1c919e8000..17b952d69e 100644
--- a/libtextsecure/storage.js
+++ b/libtextsecure/storage.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 'use strict';
 
 ;(function() {
diff --git a/libtextsecure/storage/groups.js b/libtextsecure/storage/groups.js
index 226b46ed79..9c303d92d2 100644
--- a/libtextsecure/storage/groups.js
+++ b/libtextsecure/storage/groups.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 ;(function() {
     'use strict';
 
diff --git a/libtextsecure/storage/unprocessed.js b/libtextsecure/storage/unprocessed.js
index 6e696560d4..7177090501 100644
--- a/libtextsecure/storage/unprocessed.js
+++ b/libtextsecure/storage/unprocessed.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 ;(function() {
     'use strict';
 
diff --git a/libtextsecure/storage/user.js b/libtextsecure/storage/user.js
index 5c6fad765e..3eab84f017 100644
--- a/libtextsecure/storage/user.js
+++ b/libtextsecure/storage/user.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 'use strict';
 
 ;(function() {
diff --git a/libtextsecure/stringview.js b/libtextsecure/stringview.js
index d20e51fdb1..269d05c32b 100644
--- a/libtextsecure/stringview.js
+++ b/libtextsecure/stringview.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 ;(function() {
     "use strict";
 
diff --git a/libtextsecure/sync_request.js b/libtextsecure/sync_request.js
index e992ec5f35..c438b7657b 100644
--- a/libtextsecure/sync_request.js
+++ b/libtextsecure/sync_request.js
@@ -1,8 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
-
 ;(function () {
     'use strict';
     window.textsecure = window.textsecure || {};
diff --git a/libtextsecure/task_with_timeout.js b/libtextsecure/task_with_timeout.js
index d2cdd6c942..fe05b01313 100644
--- a/libtextsecure/task_with_timeout.js
+++ b/libtextsecure/task_with_timeout.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function () {
     window.textsecure = window.textsecure || {};
 
diff --git a/libtextsecure/test/contacts_parser_test.js b/libtextsecure/test/contacts_parser_test.js
index fa4e25264a..d47ab94b51 100644
--- a/libtextsecure/test/contacts_parser_test.js
+++ b/libtextsecure/test/contacts_parser_test.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 'use strict';
 
 describe("ContactBuffer", function() {
diff --git a/libtextsecure/test/fake_api.js b/libtextsecure/test/fake_api.js
index f2f0356c28..3f089e9b47 100644
--- a/libtextsecure/test/fake_api.js
+++ b/libtextsecure/test/fake_api.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 var getKeysForNumberMap = {};
 TextSecureServer.getKeysForNumber = function(number, deviceId) {
     var res = getKeysForNumberMap[number];
diff --git a/libtextsecure/test/generate_keys_test.js b/libtextsecure/test/generate_keys_test.js
index dd7a18caf6..4c985054bf 100644
--- a/libtextsecure/test/generate_keys_test.js
+++ b/libtextsecure/test/generate_keys_test.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 'use strict';
 
 describe("Key generation", function() {
diff --git a/libtextsecure/test/helpers_test.js b/libtextsecure/test/helpers_test.js
index 7c883b272f..70b547ac05 100644
--- a/libtextsecure/test/helpers_test.js
+++ b/libtextsecure/test/helpers_test.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 'use strict';
 
 describe("Helpers", function() {
diff --git a/libtextsecure/test/message_receiver_test.js b/libtextsecure/test/message_receiver_test.js
index 9ce47a7548..5f62768c68 100644
--- a/libtextsecure/test/message_receiver_test.js
+++ b/libtextsecure/test/message_receiver_test.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 describe('MessageReceiver', function() {
     textsecure.storage.impl = new SignalProtocolStore();
     var WebSocket = window.WebSocket;
diff --git a/libtextsecure/test/protocol_test.js b/libtextsecure/test/protocol_test.js
index 54123d27f8..35dd4c144f 100644
--- a/libtextsecure/test/protocol_test.js
+++ b/libtextsecure/test/protocol_test.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 'use strict';
 describe('Protocol', function() {
 
diff --git a/libtextsecure/test/protocol_wrapper_test.js b/libtextsecure/test/protocol_wrapper_test.js
index 64db34bfd2..da96ab2766 100644
--- a/libtextsecure/test/protocol_wrapper_test.js
+++ b/libtextsecure/test/protocol_wrapper_test.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 'use strict';
 
 describe('Protocol Wrapper', function() {
diff --git a/libtextsecure/test/storage_test.js b/libtextsecure/test/storage_test.js
index e621b54459..7f9ce4ba44 100644
--- a/libtextsecure/test/storage_test.js
+++ b/libtextsecure/test/storage_test.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 'use strict';
 
 describe("SignalProtocolStore", function() {
diff --git a/libtextsecure/test/websocket-resources_test.js b/libtextsecure/test/websocket-resources_test.js
index c110cfca21..279e423f55 100644
--- a/libtextsecure/test/websocket-resources_test.js
+++ b/libtextsecure/test/websocket-resources_test.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 ;(function() {
     'use strict';
 
diff --git a/libtextsecure/test/websocket_test.js b/libtextsecure/test/websocket_test.js
index 85d54991db..5e242ef3a0 100644
--- a/libtextsecure/test/websocket_test.js
+++ b/libtextsecure/test/websocket_test.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 describe('TextSecureWebSocket', function() {
     var RealWebSocket = window.WebSocket;
     before(function() { window.WebSocket = MockSocket; });
diff --git a/libtextsecure/websocket-resources.js b/libtextsecure/websocket-resources.js
index fc3672f573..85ee4f41fc 100644
--- a/libtextsecure/websocket-resources.js
+++ b/libtextsecure/websocket-resources.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 ;(function(){
     'use strict';
 
diff --git a/test/libphonenumber_util_test.js b/test/libphonenumber_util_test.js
index 5140da9744..bd6cd631f1 100644
--- a/test/libphonenumber_util_test.js
+++ b/test/libphonenumber_util_test.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 (function() {
   'use strict';
   describe('libphonenumber util', function() {
diff --git a/test/models/conversations_test.js b/test/models/conversations_test.js
index fd13281bfe..a28c68b9a4 100644
--- a/test/models/conversations_test.js
+++ b/test/models/conversations_test.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 (function() {
   'use strict';
   var attributes = {
diff --git a/test/models/messages_test.js b/test/models/messages_test.js
index 87d4f1f67a..8992e22205 100644
--- a/test/models/messages_test.js
+++ b/test/models/messages_test.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 (function() {
   'use strict';
 
diff --git a/test/spellcheck_test.js b/test/spellcheck_test.js
index 3a52e4472c..21c1459755 100644
--- a/test/spellcheck_test.js
+++ b/test/spellcheck_test.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 describe('spellChecker', function() {
   it('should work', function() {
     assert(window.spellChecker.spellCheck('correct'));
diff --git a/test/views/last_seen_indicator_view_test.js b/test/views/last_seen_indicator_view_test.js
index 3339ac32c8..cb288fb581 100644
--- a/test/views/last_seen_indicator_view_test.js
+++ b/test/views/last_seen_indicator_view_test.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 describe('LastSeenIndicatorView', function() {
   it('renders provided count', function() {
     var view = new Whisper.LastSeenIndicatorView({ count: 10 });
diff --git a/test/views/scroll_down_button_view_test.js b/test/views/scroll_down_button_view_test.js
index 7d1ccc6f23..5abad01d62 100644
--- a/test/views/scroll_down_button_view_test.js
+++ b/test/views/scroll_down_button_view_test.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 describe('ScrollDownButtonView', function() {
   it('renders with count = 0', function() {
     var view = new Whisper.ScrollDownButtonView();
diff --git a/test/views/threads_test.js b/test/views/threads_test.js
index 729d8be4ab..e529425162 100644
--- a/test/views/threads_test.js
+++ b/test/views/threads_test.js
@@ -1,7 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
-
 describe('Threads', function() {
   it('should be ordered newest to oldest', function() {
     // Timestamps
diff --git a/test/views/timestamp_view_test.js b/test/views/timestamp_view_test.js
index 994830b37d..b7bdba28ab 100644
--- a/test/views/timestamp_view_test.js
+++ b/test/views/timestamp_view_test.js
@@ -1,6 +1,3 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
 'use strict';
 
 describe('TimestampView', function() {