diff --git a/t/Account.t b/t/Account.t
index 22d38d3ad..2cd2a29c0 100644
--- a/t/Account.t
+++ b/t/Account.t
@@ -68,9 +68,4 @@ is( $account->getUrl( 'op=account' ), $session->url->page( 'op=account' ),
     'getUrl doesnt add op=account if already exists'
 );
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
 #vim:ft=perl
diff --git a/t/Account/Friends.t b/t/Account/Friends.t
index 109447641..298427cf4 100644
--- a/t/Account/Friends.t
+++ b/t/Account/Friends.t
@@ -69,5 +69,4 @@ is( $account->getUrl( 'op=account' ), $session->url->page( 'op=account' ),
     'getUrl doesnt add op=account if already exists'
 );
 
-
 #vim:ft=perl
diff --git a/t/Asset/Wobject/Survey/ResponseJSON.t b/t/Asset/Wobject/Survey/ResponseJSON.t
index 506a46651..3b31bccc2 100644
--- a/t/Asset/Wobject/Survey/ResponseJSON.t
+++ b/t/Asset/Wobject/Survey/ResponseJSON.t
@@ -1032,6 +1032,3 @@ sub buildSurveyJSON {
     return $sjson;
 }
 
-#----------------------------------------------------------------------------
-# Cleanup
-END { }
diff --git a/t/Asset/Wobject/Survey/SurveyJSON.t b/t/Asset/Wobject/Survey/SurveyJSON.t
index dd381bd55..4830b4c25 100644
--- a/t/Asset/Wobject/Survey/SurveyJSON.t
+++ b/t/Asset/Wobject/Survey/SurveyJSON.t
@@ -2183,7 +2183,3 @@ sub getBareSkeletons {
            type                   => 'answer',
         };
 }
-
-#----------------------------------------------------------------------------
-# Cleanup
-END { }
diff --git a/t/Auth/mech.t b/t/Auth/mech.t
index ccde88b10..dd1a80f8f 100644
--- a/t/Auth/mech.t
+++ b/t/Auth/mech.t
@@ -276,7 +276,3 @@ $mech->submit_form_ok(
 );
 $mech->base_is( $assetUrl, "We don't get redirected" );
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-}
diff --git a/t/Inbox/Message.t b/t/Inbox/Message.t
index c35c9d104..20ad3774b 100644
--- a/t/Inbox/Message.t
+++ b/t/Inbox/Message.t
@@ -73,10 +73,4 @@ $tempMessage->delete;
 
 }
 
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
 #vim:ft=perl
diff --git a/t/Search.t b/t/Search.t
index e46fdbaec..932e87560 100644
--- a/t/Search.t
+++ b/t/Search.t
@@ -82,9 +82,4 @@ SKIP: {
     cmp_deeply( $assetIds, [ $article->getId ], 'ideograph search works');
 }
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
 #vim:ft=perl
diff --git a/t/Session/ErrorHandler.t b/t/Session/ErrorHandler.t
index dfdd3797f..3befb145a 100644
--- a/t/Session/ErrorHandler.t
+++ b/t/Session/ErrorHandler.t
@@ -239,5 +239,3 @@ TODO: {
     ok(0, 'output from fatal when there is a db handler and request present');
 }
 
-END {
-}
diff --git a/t/Session/Output.t b/t/Session/Output.t
index bf5fdde14..18c5364ef 100644
--- a/t/Session/Output.t
+++ b/t/Session/Output.t
@@ -68,5 +68,3 @@ SKIP: {
 
 }
 
-END {
-}
diff --git a/t/Shop/Tax.t b/t/Shop/Tax.t
index 3149055bb..e5f1494b0 100644
--- a/t/Shop/Tax.t
+++ b/t/Shop/Tax.t
@@ -126,10 +126,4 @@ SKIP: {
     }
 }
 
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
 #vim:ft=perl
diff --git a/t/Storage.t b/t/Storage.t
index b981b6603..0aa25f82f 100644
--- a/t/Storage.t
+++ b/t/Storage.t
@@ -15,7 +15,6 @@ use lib "$FindBin::Bin/lib";
 use WebGUI::Test;
 use WebGUI::Session;
 use WebGUI::Storage;
-use WebGUI::PseudoRequest;
 
 use File::Spec;
 use File::Temp qw/tempdir/;
diff --git a/t/Storage/Image.t b/t/Storage/Image.t
index 288f2de87..70a0603e0 100644
--- a/t/Storage/Image.t
+++ b/t/Storage/Image.t
@@ -315,6 +315,3 @@ TODO: {
 	local $TODO = "Methods that need to be tested";
 	ok(0, 'resize');
 }
-
-END {
-}
diff --git a/t/Workflow/Activity/RecheckVATNumber.t b/t/Workflow/Activity/RecheckVATNumber.t
index 8502a9f61..7f73bf065 100644
--- a/t/Workflow/Activity/RecheckVATNumber.t
+++ b/t/Workflow/Activity/RecheckVATNumber.t
@@ -110,6 +110,4 @@ sub createInstance {
     return $instance;
 };
 
-
-
 #vim:ft=perl