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 f630ae3f3..298427cf4 100644
--- a/t/Account/Friends.t
+++ b/t/Account/Friends.t
@@ -69,9 +69,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/Asset/EMSSubmissionForm.t b/t/Asset/EMSSubmissionForm.t
index 12f92c226..763b01396 100644
--- a/t/Asset/EMSSubmissionForm.t
+++ b/t/Asset/EMSSubmissionForm.t
@@ -507,10 +507,4 @@ $sub1->getFormattedComments;
 
 #done_testing();
 #print 'press return to complete test' ; <>;
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-
-}
 #vim:ft=perl
diff --git a/t/Asset/Sku/Donation.t b/t/Asset/Sku/Donation.t
index 7e6e833d2..4d52370a7 100644
--- a/t/Asset/Sku/Donation.t
+++ b/t/Asset/Sku/Donation.t
@@ -53,11 +53,4 @@ is($sku->getConfiguredTitle, "Test Donation (200)", "getConfiguredTitle()");
 
 $sku->purge;
 
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
-
 1;
diff --git a/t/Asset/Story.t b/t/Asset/Story.t
index 4f9340172..00b9ef886 100644
--- a/t/Asset/Story.t
+++ b/t/Asset/Story.t
@@ -432,5 +432,3 @@ cmp_bag(
     '...asset package data has the storage locations in it'
 );
 
-END {
-}
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/Exception/Shop.t b/t/Exception/Shop.t
index 745d0f34e..4fb6fe1e4 100644
--- a/t/Exception/Shop.t
+++ b/t/Exception/Shop.t
@@ -45,9 +45,4 @@ $e = Exception::Class->caught;
 isa_ok($e, 'WebGUI::Error');
 isa_ok($e, 'WebGUI::Error::Shop::RemoteShippingRate');
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
 #vim:ft=perl
diff --git a/t/Form.t b/t/Form.t
index 3acb18843..4d0848bbe 100644
--- a/t/Form.t
+++ b/t/Form.t
@@ -24,12 +24,6 @@ use WebGUI::Test;
 # Init
 my $session         = WebGUI::Test->session;
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
-
 #----------------------------------------------------------------------------
 # Tests
 
diff --git a/t/Form/DataTable.t b/t/Form/DataTable.t
index ada791856..df0bf63ec 100644
--- a/t/Form/DataTable.t
+++ b/t/Form/DataTable.t
@@ -120,9 +120,4 @@ like( $html, qr{<table[^>]*id="test-container-table"}, "getTableHtml table has I
 my $html    = $dt->toHtml;
 ok( $dt->get( "showEdit" ), "showEdit gets set by toHtml" );
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
 #vim:ft=perl
diff --git a/t/Form/SelectRichEditor.t b/t/Form/SelectRichEditor.t
index 5a8351813..d9f4e808d 100644
--- a/t/Form/SelectRichEditor.t
+++ b/t/Form/SelectRichEditor.t
@@ -28,12 +28,6 @@ use WebGUI::Form::SelectRichEditor;
 my $session         = WebGUI::Test->session;
 my $root            = WebGUI::Asset->getRoot( $session );
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
-
 #----------------------------------------------------------------------------
 # Tests
 plan tests => 1;
diff --git a/t/FormBuilder/Tab.t b/t/FormBuilder/Tab.t
index 39b949e6d..44a6a65da 100644
--- a/t/FormBuilder/Tab.t
+++ b/t/FormBuilder/Tab.t
@@ -46,10 +46,4 @@ is( $tab->label, 'My Label' );
 is( $tab->label('New Label'), 'New Label' );
 is( $tab->label, 'New Label' );
 
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
 #vim:ft=perl
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/Operation/AdSpace.t b/t/Operation/AdSpace.t
index eff95ceb3..ce35b6984 100644
--- a/t/Operation/AdSpace.t
+++ b/t/Operation/AdSpace.t
@@ -68,8 +68,3 @@ ok( $adSpace->get('name') eq 'oldname', 'AdSpace does not get saved.' );
 
 $adSpace->delete;
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
diff --git a/t/Operation/Auth.t b/t/Operation/Auth.t
index a0d5c8e34..d5c891f9c 100644
--- a/t/Operation/Auth.t
+++ b/t/Operation/Auth.t
@@ -55,9 +55,3 @@ unlike(
     "Hidden form elements for login NOT displayed to valid user",
 );
 
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
diff --git a/t/Operation/User/service.t b/t/Operation/User/service.t
index 26d89b6db..23494198c 100644
--- a/t/Operation/User/service.t
+++ b/t/Operation/User/service.t
@@ -454,10 +454,4 @@ cmp_deeply(
 );
 ok( !WebGUI::User->validUserId( $session, $userRed->getId ), "UserId no longer exists" );
 
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
 #vim:ft=perl
diff --git a/t/Pluggable.t b/t/Pluggable.t
index bd8bf280a..01ef8273f 100644
--- a/t/Pluggable.t
+++ b/t/Pluggable.t
@@ -135,10 +135,3 @@ is($dumper->Dump, q|$VAR1 = {
     );
 };
 
-#----------------------------------------------------------------------------
-# Cleanup
-
-END {
-
-}
-
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 84229a9b2..02a3b77d1 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/PayDriver.t b/t/Shop/PayDriver.t
index 362b37800..5357ab9b8 100644
--- a/t/Shop/PayDriver.t
+++ b/t/Shop/PayDriver.t
@@ -478,8 +478,3 @@ undef $driver;
 
 
 }
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-}
diff --git a/t/Shop/PayDriver/Ogone.t b/t/Shop/PayDriver/Ogone.t
index ce68f5459..eb169d89e 100644
--- a/t/Shop/PayDriver/Ogone.t
+++ b/t/Shop/PayDriver/Ogone.t
@@ -577,16 +577,5 @@ is ($count, 0, 'delete deleted the object');
 
 undef $driver;
 
-
-
-
-#----------------------------------------------------------------------------
-# Cleanup
-
-
-
-}
-END {
-
 }
 #vim:ft=perl
diff --git a/t/Shop/PayDriver/PayPalStd.t b/t/Shop/PayDriver/PayPalStd.t
index fd8287c92..14387d74c 100644
--- a/t/Shop/PayDriver/PayPalStd.t
+++ b/t/Shop/PayDriver/PayPalStd.t
@@ -79,7 +79,3 @@ undef $driver;
 
 }
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-}
diff --git a/t/Shop/ShipDriver.t b/t/Shop/ShipDriver.t
index 6e9be7cad..6650a66c7 100644
--- a/t/Shop/ShipDriver.t
+++ b/t/Shop/ShipDriver.t
@@ -401,8 +401,3 @@ undef $driver;
 
 
 }
-
-#----------------------------------------------------------------------------
-# Cleanup
-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 60efc6453..7f6647766 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 4a04d5bcd..050e8c98d 100644
--- a/t/Storage/Image.t
+++ b/t/Storage/Image.t
@@ -281,6 +281,3 @@ TODO: {
 	local $TODO = "Methods that need to be tested";
 	ok(0, 'resize');
 }
-
-END {
-}
diff --git a/t/Workflow/Activity/GetCsMail.t b/t/Workflow/Activity/GetCsMail.t
index da874f98d..2bba5d725 100644
--- a/t/Workflow/Activity/GetCsMail.t
+++ b/t/Workflow/Activity/GetCsMail.t
@@ -143,9 +143,4 @@ $post2mock->set_always('getId', $post2_id);
     WebGUI::Test->unmockAssetId($post_id);
 }
 
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
 #vim:ft=perl
diff --git a/t/Workflow/Activity/RecheckVATNumber.t b/t/Workflow/Activity/RecheckVATNumber.t
index 04d2d6010..7f73bf065 100644
--- a/t/Workflow/Activity/RecheckVATNumber.t
+++ b/t/Workflow/Activity/RecheckVATNumber.t
@@ -110,11 +110,4 @@ sub createInstance {
     return $instance;
 };
 
-
-
-#----------------------------------------------------------------------------
-# Cleanup
-END {
-
-}
 #vim:ft=perl