diff --git a/misc/header.py b/misc/header.py
index 46d9c74..a7322f4 100644
--- a/misc/header.py
+++ b/misc/header.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_header -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/command/accurip.py b/whipper/command/accurip.py
index c55db1d..56ea470 100644
--- a/whipper/command/accurip.py
+++ b/whipper/command/accurip.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/command/cd.py b/whipper/command/cd.py
index 7ec864f..15af8b0 100644
--- a/whipper/command/cd.py
+++ b/whipper/command/cd.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/command/debug.py b/whipper/command/debug.py
index e9683f6..28d99df 100644
--- a/whipper/command/debug.py
+++ b/whipper/command/debug.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/command/drive.py b/whipper/command/drive.py
index 3a69e8c..3af5cbf 100644
--- a/whipper/command/drive.py
+++ b/whipper/command/drive.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/command/image.py b/whipper/command/image.py
index 313163d..94c12c3 100644
--- a/whipper/command/image.py
+++ b/whipper/command/image.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/command/offset.py b/whipper/command/offset.py
index db47fe1..b4223ed 100644
--- a/whipper/command/offset.py
+++ b/whipper/command/offset.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/common/accurip.py b/whipper/common/accurip.py
index e8df484..1ff2e03 100644
--- a/whipper/common/accurip.py
+++ b/whipper/common/accurip.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_common_accurip -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/common/cache.py b/whipper/common/cache.py
index 3f07110..6e5e4e6 100644
--- a/whipper/common/cache.py
+++ b/whipper/common/cache.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_common_cache -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/common/checksum.py b/whipper/common/checksum.py
index 3d6daea..17dd898 100644
--- a/whipper/common/checksum.py
+++ b/whipper/common/checksum.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_common_checksum -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/common/common.py b/whipper/common/common.py
index 1dd47d6..1fe563f 100644
--- a/whipper/common/common.py
+++ b/whipper/common/common.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_common_common -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/common/config.py b/whipper/common/config.py
index b567932..9c75d28 100644
--- a/whipper/common/config.py
+++ b/whipper/common/config.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_common_config -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/common/directory.py b/whipper/common/directory.py
index e38cf60..42942d6 100644
--- a/whipper/common/directory.py
+++ b/whipper/common/directory.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_common_directory -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2013 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/common/drive.py b/whipper/common/drive.py
index be8fc36..b20642a 100644
--- a/whipper/common/drive.py
+++ b/whipper/common/drive.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_common_drive -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/common/encode.py b/whipper/common/encode.py
index b76f5dc..309c581 100644
--- a/whipper/common/encode.py
+++ b/whipper/common/encode.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_common_encode -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/common/mbngs.py b/whipper/common/mbngs.py
index a5c4e02..a066d64 100644
--- a/whipper/common/mbngs.py
+++ b/whipper/common/mbngs.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_common_mbngs -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009, 2010, 2011 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/common/path.py b/whipper/common/path.py
index 1c5718a..6b1ff51 100644
--- a/whipper/common/path.py
+++ b/whipper/common/path.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_common_path -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/common/program.py b/whipper/common/program.py
index 1d0d2cb..d4978b5 100644
--- a/whipper/common/program.py
+++ b/whipper/common/program.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_common_program -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009, 2010, 2011 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/common/renamer.py b/whipper/common/renamer.py
index 042e38a..c71a136 100644
--- a/whipper/common/renamer.py
+++ b/whipper/common/renamer.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_common_renamer -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/extern/task/task.py b/whipper/extern/task/task.py
index 05f9f4c..30c0ed2 100644
--- a/whipper/extern/task/task.py
+++ b/whipper/extern/task/task.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/image/cue.py b/whipper/image/cue.py
index 9ab0729..e8a87ed 100644
--- a/whipper/image/cue.py
+++ b/whipper/image/cue.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_image_cue -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/image/image.py b/whipper/image/image.py
index 6d4e7af..90d5869 100644
--- a/whipper/image/image.py
+++ b/whipper/image/image.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_image_image -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/image/table.py b/whipper/image/table.py
index c4bffb9..b9909e6 100644
--- a/whipper/image/table.py
+++ b/whipper/image/table.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_image_table -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/image/toc.py b/whipper/image/toc.py
index 2dde18d..25d00d4 100644
--- a/whipper/image/toc.py
+++ b/whipper/image/toc.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_image_toc -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/program/cdparanoia.py b/whipper/program/cdparanoia.py
index 4ca1a29..81e7281 100644
--- a/whipper/program/cdparanoia.py
+++ b/whipper/program/cdparanoia.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_program_cdparanoia -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.
diff --git a/whipper/result/result.py b/whipper/result/result.py
index 6dcbe9a..0c12874 100644
--- a/whipper/result/result.py
+++ b/whipper/result/result.py
@@ -1,8 +1,6 @@
 # -*- Mode: Python; test-case-name: whipper.test.test_result_result -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
 # This file is part of whipper.