diff --git a/lib/Directory/Simplify/File.pm b/lib/Directory/Simplify/File.pm
index 2c4f492..7192622 100644
--- a/lib/Directory/Simplify/File.pm
+++ b/lib/Directory/Simplify/File.pm
@@ -1,5 +1,4 @@
 package Directory::Simplify::File;
-# vi: et sts=4 sw=4 ts=4
 use strict;
 use warnings;
 require Cwd;
diff --git a/lib/Directory/Simplify/Instruction/CopyTimestamp.pm b/lib/Directory/Simplify/Instruction/CopyTimestamp.pm
index 88cb3de..ca1e6ce 100644
--- a/lib/Directory/Simplify/Instruction/CopyTimestamp.pm
+++ b/lib/Directory/Simplify/Instruction/CopyTimestamp.pm
@@ -1,5 +1,4 @@
 package Directory::Simplify::Instruction::CopyTimestamp;
-# vi: et sts=4 sw=4 ts=4
 use strict;
 use warnings;
 use overload '""' => 'as_string';
diff --git a/lib/Directory/Simplify/Instruction/Generator.pm b/lib/Directory/Simplify/Instruction/Generator.pm
index 98d6c86..6a805b8 100644
--- a/lib/Directory/Simplify/Instruction/Generator.pm
+++ b/lib/Directory/Simplify/Instruction/Generator.pm
@@ -1,5 +1,4 @@
 package Directory::Simplify::Instruction::Generator;
-# vi: et sts=4 sw=4 ts=4
 use strict;
 use warnings;
 use overload '""' => 'as_string';
diff --git a/lib/Directory/Simplify/Instruction/Hardlink.pm b/lib/Directory/Simplify/Instruction/Hardlink.pm
index a039f49..4d6c24f 100644
--- a/lib/Directory/Simplify/Instruction/Hardlink.pm
+++ b/lib/Directory/Simplify/Instruction/Hardlink.pm
@@ -1,5 +1,4 @@
 package Directory::Simplify::Instruction::Hardlink;
-# vi: et sts=4 sw=4 ts=4
 use strict;
 use warnings;
 use overload '""' => 'as_string';
diff --git a/lib/Directory/Simplify/Utils.pm b/lib/Directory/Simplify/Utils.pm
index 6438e16..54d395f 100644
--- a/lib/Directory/Simplify/Utils.pm
+++ b/lib/Directory/Simplify/Utils.pm
@@ -1,5 +1,4 @@
 package Directory::Simplify::Utils;
-# vi: et sts=4 sw=4 ts=4
 use strict;
 use warnings;
 
diff --git a/make-allinone.sh b/make-allinone.sh
index 6bbaa4d..4fe10d9 100755
--- a/make-allinone.sh
+++ b/make-allinone.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-# vi: et sts=4 sw=4 ts=4
 WORKDIR=${0%/*}
 OUT=$WORKDIR/simplify_static_dir.pl
 
diff --git a/simplify_static_dir-main.pl b/simplify_static_dir-main.pl
index c9f2ec4..b7bf35f 100755
--- a/simplify_static_dir-main.pl
+++ b/simplify_static_dir-main.pl
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# vi: et sts=4 sw=4 ts=4
 
 package main;
 use strict;
diff --git a/t/TestFunctions.pm b/t/TestFunctions.pm
index f19d91d..7f610a0 100644
--- a/t/TestFunctions.pm
+++ b/t/TestFunctions.pm
@@ -1,5 +1,4 @@
 package TestFunctions;
-# vi: et sts=4 sw=4 ts=4
 use strict;
 use warnings;
 
diff --git a/t/freed-bytes-commas.t b/t/freed-bytes-commas.t
index 27dafa6..c675997 100644
--- a/t/freed-bytes-commas.t
+++ b/t/freed-bytes-commas.t
@@ -1,4 +1,3 @@
-# vi: et sts=4 sw=4 ts=4
 use strict;
 use warnings;
 
diff --git a/t/freed-bytes.t b/t/freed-bytes.t
index fabbe02..b269a6b 100644
--- a/t/freed-bytes.t
+++ b/t/freed-bytes.t
@@ -1,4 +1,3 @@
-# vi: et sts=4 sw=4 ts=4
 use strict;
 use warnings;
 
diff --git a/t/link-counting.t b/t/link-counting.t
index d2de4c8..bbd80f7 100644
--- a/t/link-counting.t
+++ b/t/link-counting.t
@@ -1,4 +1,3 @@
-# vi: et sts=4 sw=4 ts=4
 use strict;
 use warnings;
 
diff --git a/t/normal-non-linkage.t b/t/normal-non-linkage.t
index c9b372d..4187f4a 100644
--- a/t/normal-non-linkage.t
+++ b/t/normal-non-linkage.t
@@ -1,4 +1,3 @@
-# vi: et sts=4 sw=4 ts=4
 use strict;
 use warnings;
 
diff --git a/t/sha1collision-non-linkage.t b/t/sha1collision-non-linkage.t
index f7d8c67..501bfc4 100644
--- a/t/sha1collision-non-linkage.t
+++ b/t/sha1collision-non-linkage.t
@@ -1,4 +1,3 @@
-# vi: et sts=4 sw=4 ts=4
 use strict;
 use warnings;
 
diff --git a/t/timestamp-preservation.t b/t/timestamp-preservation.t
index 09be7a8..60e52c6 100644
--- a/t/timestamp-preservation.t
+++ b/t/timestamp-preservation.t
@@ -1,4 +1,3 @@
-# vi: et sts=4 sw=4 ts=4
 use strict;
 use warnings;
 
diff --git a/t/zero-size-non-linkage.t b/t/zero-size-non-linkage.t
index b4c4257..55d3121 100644
--- a/t/zero-size-non-linkage.t
+++ b/t/zero-size-non-linkage.t
@@ -1,4 +1,3 @@
-# vi: et sts=4 sw=4 ts=4
 use strict;
 use warnings;
 
diff --git a/util/squash b/util/squash
index a015533..c0bd4af 100755
--- a/util/squash
+++ b/util/squash
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# vi: et sts=4 sw=4 ts=4
 
 # Squashes together the parts of the app into the single script.
 # (Adapted from the script that squashes App::Ack - see https://github.com/beyondgrep/ack3)