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/Operation/AdSpace.t b/t/Operation/AdSpace.t
index eff95ceb3..a07fe923f 100644
--- a/t/Operation/AdSpace.t
+++ b/t/Operation/AdSpace.t
@@ -67,9 +67,3 @@ like(
 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..82b10ab0c 100644
--- a/t/Operation/Auth.t
+++ b/t/Operation/Auth.t
@@ -54,10 +54,3 @@ unlike(
     qr/<input type="hidden" name="method" value="login" /, 
     "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 3ad9d004b..6082ef979 100644
--- a/t/Pluggable.t
+++ b/t/Pluggable.t
@@ -136,11 +136,4 @@ is($dumper->Dump, q|$VAR1 = {
         "find() with return => name",
     );
 };
-
-#----------------------------------------------------------------------------
-# Cleanup
-
-END {
-
-}
-
+#vim:ft=perl