From 4a3121960f4dfcd22fb3a51ce627d5998cafacf4 Mon Sep 17 00:00:00 2001 From: Matthew Wilson Date: Thu, 26 Jan 2006 05:39:16 +0000 Subject: [PATCH] removal of dumpSession. --- lib/WebGUI.pm | 24 --------- lib/WebGUI/AdminConsole.pm | 2 +- lib/WebGUI/Affiliate.pm | 2 +- lib/WebGUI/Asset.pm | 20 +++---- lib/WebGUI/Asset/Event.pm | 2 +- lib/WebGUI/Asset/File.pm | 2 +- lib/WebGUI/Asset/File/Image.pm | 2 +- lib/WebGUI/Asset/File/ZipArchive.pm | 2 +- lib/WebGUI/Asset/Post.pm | 4 +- lib/WebGUI/Asset/Post/Thread.pm | 2 +- lib/WebGUI/Asset/Redirect.pm | 2 +- lib/WebGUI/Asset/RichEdit.pm | 2 +- lib/WebGUI/Asset/Shortcut.pm | 2 +- lib/WebGUI/Asset/Snippet.pm | 2 +- lib/WebGUI/Asset/Wobject.pm | 2 +- lib/WebGUI/Asset/Wobject/Article.pm | 2 +- lib/WebGUI/Asset/Wobject/Collaboration.pm | 2 +- lib/WebGUI/Asset/Wobject/Dashboard.pm | 2 +- lib/WebGUI/Asset/Wobject/DataForm.pm | 2 +- lib/WebGUI/Asset/Wobject/EventsCalendar.pm | 2 +- lib/WebGUI/Asset/Wobject/Folder.pm | 2 +- lib/WebGUI/Asset/Wobject/HttpProxy.pm | 2 +- lib/WebGUI/Asset/Wobject/InOutBoard.pm | 2 +- lib/WebGUI/Asset/Wobject/Layout.pm | 2 +- lib/WebGUI/Asset/Wobject/Matrix.pm | 2 +- lib/WebGUI/Asset/Wobject/MessageBoard.pm | 2 +- lib/WebGUI/Asset/Wobject/MultiSearch.pm | 2 +- lib/WebGUI/Asset/Wobject/Navigation.pm | 2 +- lib/WebGUI/Asset/Wobject/Poll.pm | 2 +- lib/WebGUI/Asset/Wobject/Product.pm | 2 +- lib/WebGUI/Asset/Wobject/SQLReport.pm | 2 +- lib/WebGUI/Asset/Wobject/StockData.pm | 2 +- lib/WebGUI/Asset/Wobject/Survey.pm | 2 +- lib/WebGUI/Asset/Wobject/SyndicatedContent.pm | 2 +- lib/WebGUI/Asset/Wobject/WSClient.pm | 2 +- lib/WebGUI/Asset/Wobject/WeatherData.pm | 2 +- lib/WebGUI/AssetLineage.pm | 2 +- lib/WebGUI/Auth/LDAP.pm | 2 +- lib/WebGUI/Auth/WebGUI.pm | 2 +- lib/WebGUI/Cache.pm | 2 +- lib/WebGUI/Cache/FileCache.pm | 2 +- lib/WebGUI/Cache/Memcached.pm | 2 +- lib/WebGUI/Commerce.pm | 2 +- lib/WebGUI/Commerce/Payment.pm | 4 +- lib/WebGUI/Commerce/Payment/ITransact.pm | 2 +- lib/WebGUI/Commerce/Shipping.pm | 2 +- lib/WebGUI/Commerce/Transaction.pm | 2 +- lib/WebGUI/DatabaseLink.pm | 6 +-- lib/WebGUI/Form.pm | 4 +- lib/WebGUI/Form/Asset.pm | 2 +- lib/WebGUI/Form/Button.pm | 2 +- lib/WebGUI/Form/CheckList.pm | 2 +- lib/WebGUI/Form/Checkbox.pm | 2 +- lib/WebGUI/Form/Codearea.pm | 2 +- lib/WebGUI/Form/Color.pm | 2 +- lib/WebGUI/Form/Combo.pm | 2 +- lib/WebGUI/Form/ContentType.pm | 2 +- lib/WebGUI/Form/Control.pm | 6 +-- lib/WebGUI/Form/DatabaseLink.pm | 2 +- lib/WebGUI/Form/Date.pm | 2 +- lib/WebGUI/Form/DateTime.pm | 2 +- lib/WebGUI/Form/DynamicField.pm | 4 +- lib/WebGUI/Form/Email.pm | 2 +- lib/WebGUI/Form/FieldType.pm | 4 +- lib/WebGUI/Form/File.pm | 2 +- lib/WebGUI/Form/FilterContent.pm | 2 +- lib/WebGUI/Form/Float.pm | 2 +- lib/WebGUI/Form/Group.pm | 2 +- lib/WebGUI/Form/HTMLArea.pm | 2 +- lib/WebGUI/Form/Hidden.pm | 2 +- lib/WebGUI/Form/HiddenList.pm | 2 +- lib/WebGUI/Form/Image.pm | 2 +- lib/WebGUI/Form/Integer.pm | 2 +- lib/WebGUI/Form/Interval.pm | 2 +- lib/WebGUI/Form/LdapLink.pm | 2 +- lib/WebGUI/Form/List.pm | 2 +- lib/WebGUI/Form/Password.pm | 2 +- lib/WebGUI/Form/Phone.pm | 2 +- lib/WebGUI/Form/Radio.pm | 2 +- lib/WebGUI/Form/RadioList.pm | 2 +- lib/WebGUI/Form/ReadOnly.pm | 2 +- lib/WebGUI/Form/SelectBox.pm | 2 +- lib/WebGUI/Form/SelectList.pm | 2 +- lib/WebGUI/Form/Submit.pm | 2 +- lib/WebGUI/Form/Template.pm | 2 +- lib/WebGUI/Form/Text.pm | 2 +- lib/WebGUI/Form/Textarea.pm | 2 +- lib/WebGUI/Form/TimeField.pm | 2 +- lib/WebGUI/Form/TimeZone.pm | 2 +- lib/WebGUI/Form/Url.pm | 2 +- lib/WebGUI/Form/WhatNext.pm | 2 +- lib/WebGUI/Form/YesNo.pm | 2 +- lib/WebGUI/Form/Zipcode.pm | 2 +- lib/WebGUI/Group.pm | 4 +- lib/WebGUI/HTML.pm | 4 +- lib/WebGUI/HTMLForm.pm | 2 +- lib/WebGUI/Help/Macros.pm | 2 +- lib/WebGUI/International.pm | 1 - lib/WebGUI/LDAPLink.pm | 4 +- lib/WebGUI/Macro.pm | 2 +- lib/WebGUI/Macro/AOIHits.pm | 2 +- lib/WebGUI/Macro/AOIRank.pm | 2 +- lib/WebGUI/Macro/AdminBar.pm | 2 +- lib/WebGUI/Macro/AdminText.pm | 2 +- lib/WebGUI/Macro/AdminToggle.pm | 2 +- lib/WebGUI/Macro/AssetProxy.pm | 2 +- lib/WebGUI/Macro/At_username.pm | 2 +- lib/WebGUI/Macro/CanEditText.pm | 2 +- lib/WebGUI/Macro/D_date.pm | 2 +- lib/WebGUI/Macro/EditableToggle.pm | 2 +- lib/WebGUI/Macro/Env.pm | 2 +- lib/WebGUI/Macro/Execute.pm | 2 +- lib/WebGUI/Macro/Extras.pm | 2 +- lib/WebGUI/Macro/FetchMimeType.pm | 2 +- lib/WebGUI/Macro/FileUrl.pm | 2 +- lib/WebGUI/Macro/FormParam.pm | 2 +- lib/WebGUI/Macro/GroupAdd.pm | 2 +- lib/WebGUI/Macro/GroupDelete.pm | 2 +- lib/WebGUI/Macro/GroupText.pm | 2 +- lib/WebGUI/Macro/H_homeLink.pm | 2 +- lib/WebGUI/Macro/Hash_userId.pm | 2 +- lib/WebGUI/Macro/Include.pm | 2 +- lib/WebGUI/Macro/JavaScript.pm | 2 +- lib/WebGUI/Macro/L_loginBox.pm | 4 +- lib/WebGUI/Macro/LastModified.pm | 2 +- lib/WebGUI/Macro/LoginToggle.pm | 2 +- lib/WebGUI/Macro/Page.pm | 2 +- lib/WebGUI/Macro/PageTitle.pm | 2 +- lib/WebGUI/Macro/PageUrl.pm | 2 +- lib/WebGUI/Macro/Product.pm | 2 +- lib/WebGUI/Macro/Quote.pm | 2 +- lib/WebGUI/Macro/RandomAssetProxy.pm | 2 +- lib/WebGUI/Macro/RandomThread.pm | 4 +- lib/WebGUI/Macro/RawHeadTags.pm | 2 +- lib/WebGUI/Macro/RootTitle.pm | 2 +- lib/WebGUI/Macro/SQL.pm | 2 +- lib/WebGUI/Macro/Slash_gatewayUrl.pm | 2 +- lib/WebGUI/Macro/Spacer.pm | 2 +- lib/WebGUI/Macro/Splat_random.pm | 2 +- lib/WebGUI/Macro/StyleSheet.pm | 2 +- lib/WebGUI/Macro/SubscriptionItem.pm | 2 +- .../Macro/SubscriptionItemPurchaseUrl.pm | 2 +- lib/WebGUI/Macro/Thumbnail.pm | 2 +- lib/WebGUI/Macro/URLEncode.pm | 2 +- lib/WebGUI/Macro/User.pm | 2 +- lib/WebGUI/Macro/a_account.pm | 2 +- lib/WebGUI/Macro/c_companyName.pm | 2 +- lib/WebGUI/Macro/e_companyEmail.pm | 2 +- lib/WebGUI/Macro/r_printable.pm | 2 +- lib/WebGUI/Macro/u_companyUrl.pm | 2 +- lib/WebGUI/Operation.pm | 2 +- lib/WebGUI/Operation/ActiveSessions.pm | 4 +- lib/WebGUI/Operation/Admin.pm | 6 +-- lib/WebGUI/Operation/Auth.pm | 4 +- lib/WebGUI/Operation/Cache.pm | 6 +-- lib/WebGUI/Operation/Commerce.pm | 52 +++++++++---------- lib/WebGUI/Operation/DatabaseLink.pm | 14 ++--- lib/WebGUI/Operation/FormHelpers.pm | 8 +-- lib/WebGUI/Operation/Group.pm | 44 ++++++++-------- lib/WebGUI/Operation/Help.pm | 20 +++---- lib/WebGUI/Operation/LDAPLink.pm | 12 ++--- lib/WebGUI/Operation/LoginHistory.pm | 2 +- lib/WebGUI/Operation/MessageLog.pm | 6 +-- lib/WebGUI/Operation/ProductManager.pm | 36 ++++++------- lib/WebGUI/Operation/Profile.pm | 14 ++--- lib/WebGUI/Operation/ProfileSettings.pm | 24 ++++----- lib/WebGUI/Operation/Replacements.pm | 10 ++-- lib/WebGUI/Operation/Scratch.pm | 4 +- lib/WebGUI/Operation/Settings.pm | 4 +- lib/WebGUI/Operation/Shared.pm | 4 +- lib/WebGUI/Operation/Statistics.pm | 4 +- lib/WebGUI/Operation/Style.pm | 6 +-- lib/WebGUI/Operation/Subscription.pm | 28 +++++----- lib/WebGUI/Operation/TransactionLog.pm | 8 +-- lib/WebGUI/Operation/User.pm | 22 ++++---- lib/WebGUI/Operation/WebGUI.pm | 6 +-- lib/WebGUI/Paginator.pm | 2 +- lib/WebGUI/PassiveProfiling.pm | 6 +-- lib/WebGUI/Product.pm | 8 +-- lib/WebGUI/ProfileCategory.pm | 4 +- lib/WebGUI/ProfileField.pm | 4 +- lib/WebGUI/SQL.pm | 2 +- lib/WebGUI/Session/DateTime.pm | 2 +- lib/WebGUI/Session/ErrorHandler.pm | 2 +- lib/WebGUI/Session/Form.pm | 2 +- lib/WebGUI/Session/Http.pm | 2 +- lib/WebGUI/Session/Icon.pm | 2 +- lib/WebGUI/Session/Id.pm | 2 +- lib/WebGUI/Session/Privilege.pm | 2 +- lib/WebGUI/Session/Scratch.pm | 2 +- lib/WebGUI/Session/Setting.pm | 2 +- lib/WebGUI/Session/Stow.pm | 2 +- lib/WebGUI/Session/Style.pm | 2 +- lib/WebGUI/Session/Url.pm | 2 +- lib/WebGUI/Session/Var.pm | 2 +- lib/WebGUI/Storage.pm | 6 +-- lib/WebGUI/Subscription.pm | 2 +- lib/WebGUI/TabForm.pm | 2 +- lib/WebGUI/User.pm | 4 +- 199 files changed, 379 insertions(+), 404 deletions(-) diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm index e39e30dd3..8eb270c28 100644 --- a/lib/WebGUI.pm +++ b/lib/WebGUI.pm @@ -217,28 +217,4 @@ sub upgrading { close(FILE); } - -sub dumpSession { - my $session = shift; - if ($session) { - if (ref $session eq 'WebGUI::Session') { - return; - } else { - use Data::Dumper; print '
$session is '.Dumper($session).' (not a WebGUI::Session!) at ';
-		}
-	} else {
-		print '
$session is empty at ';
-	}
-	my $i = 1;
-	my $output;
-	while (my @data = caller($i)) {
-		print "\t".join(",",@data)."\n";
-		$i++;
-	}
-	print '
';
-	exit;
-}
-
 1;
-
-
diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm
index 6b8dd6568..36c675002 100644
--- a/lib/WebGUI/AdminConsole.pm
+++ b/lib/WebGUI/AdminConsole.pm
@@ -368,7 +368,7 @@ If supplied, updates the _function of the AdminFunction.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $id = shift;
 	my $self;
 	$self->{_session} = $session;
diff --git a/lib/WebGUI/Affiliate.pm b/lib/WebGUI/Affiliate.pm
index 042224ec5..5504e9fb5 100644
--- a/lib/WebGUI/Affiliate.pm
+++ b/lib/WebGUI/Affiliate.pm
@@ -49,7 +49,7 @@ A reference to the current session.
 =cut
 
 sub grabReferral {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	if ($session->user->userId ne "1" && $session->user->referringAffiliate) {
 		return "";
 	} elsif ($session->user->userId ne "1" && (($session->user->referringAffiliate eq "0" && $session->scratch->process("referringAffiliate")) || $session->form->process("affiliateId"))) {
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index fd0b783a6..2538f131f 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -78,7 +78,7 @@ Only developers extending this method should use this parameter. By default WebG
 
 sub canAdd {
 	my $className = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $userId = shift || $session->user->userId;
 	my $subclassGroupId = shift;
 	my $groupId = $session->config->get("assetAddPrivilege")->{$className} || $subclassGroupId || '12';
@@ -152,7 +152,7 @@ An array reference containing additional information to include with the default
 
 sub definition {
         my $class = shift;
-        my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+        my $session = shift;
         my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session, "Asset");
         push(@{$definition}, {
@@ -472,7 +472,7 @@ A reference to the current session.
 
 sub getDefault {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $class->newByDynamicClass($session, $session->setting->get("defaultPage"));
 }
 
@@ -740,7 +740,7 @@ A reference to the current session.
 
 sub getImportNode {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return WebGUI::Asset->newByDynamicClass($session, "PBasset000000000000002");
 }
 
@@ -792,7 +792,7 @@ A reference to the current session.
 
 sub getNotFound {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	if ($session->url->getRequestedUrl eq "*give-credit-where-credit-is-due*") {
 		my $content = "";
 		open(FILE,"<".$session->config->getWebguiRoot."/docs/credits.txt");
@@ -829,7 +829,7 @@ A reference to the current session.
 
 sub getRoot {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return WebGUI::Asset->new($session, "PBasset000000000000001");
 }
 
@@ -1267,7 +1267,7 @@ An epoch date that represents a specific version of an asset. By default the mos
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $assetId = shift;
 	return undef unless ($assetId);
 	my $className = shift;
@@ -1336,7 +1336,7 @@ A specific revision date for the asset to retrieve. If not specified, the most r
 
 sub newByDynamicClass {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $assetId = shift;
 	my $revisionDate = shift;
 	return undef unless defined $assetId;
@@ -1370,7 +1370,7 @@ A properties hash reference. The className of the properties hash must be valid.
 
 sub newByPropertyHashRef {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $properties = shift;
 	return undef unless defined $properties;
 	return undef unless exists $properties->{className};
@@ -1406,7 +1406,7 @@ A specific revision to instanciate. By default we instanciate the newest publish
 
 sub newByUrl {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $url = shift || $session->url->getRequestedUrl;
 	my $revisionDate = shift;
 	$url = lc($url);
diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm
index bf5e89685..8304e30f1 100644
--- a/lib/WebGUI/Asset/Event.pm
+++ b/lib/WebGUI/Asset/Event.pm
@@ -25,7 +25,7 @@ our @ISA = qw(WebGUI::Asset);
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
   my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Event");
   push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm
index 5420ebe55..6b8573d96 100644
--- a/lib/WebGUI/Asset/File.pm
+++ b/lib/WebGUI/Asset/File.pm
@@ -75,7 +75,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_File");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm
index c1bf29f8e..e7961a701 100644
--- a/lib/WebGUI/Asset/File/Image.pm
+++ b/lib/WebGUI/Asset/File/Image.pm
@@ -60,7 +60,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
         my $class = shift;
-        my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+        my $session = shift;
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Image");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/File/ZipArchive.pm b/lib/WebGUI/Asset/File/ZipArchive.pm
index d1f607105..6333c62df 100644
--- a/lib/WebGUI/Asset/File/ZipArchive.pm
+++ b/lib/WebGUI/Asset/File/ZipArchive.pm
@@ -103,7 +103,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
    my $class = shift;
-   my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+   my $session = shift;
    my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_ZipArchive");
    push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index fa3ac2d04..fb3b1997c 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -53,7 +53,7 @@ sub addRevision {
 #-------------------------------------------------------------------
 sub canAdd {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$class->SUPER::canAdd($session, undef, '7');
 }
 
@@ -103,7 +103,7 @@ sub chopTitle {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Post");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Post/Thread.pm b/lib/WebGUI/Asset/Post/Thread.pm
index 42f2c3d32..32fbee7cb 100644
--- a/lib/WebGUI/Asset/Post/Thread.pm
+++ b/lib/WebGUI/Asset/Post/Thread.pm
@@ -67,7 +67,7 @@ sub decrementReplies {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Thread");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Redirect.pm b/lib/WebGUI/Asset/Redirect.pm
index f0acaa3f6..9779ebe31 100644
--- a/lib/WebGUI/Asset/Redirect.pm
+++ b/lib/WebGUI/Asset/Redirect.pm
@@ -56,7 +56,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
         my $class = shift;
-        my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+        my $session = shift;
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Redirect");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm
index e1b864723..2e0d4a3f1 100644
--- a/lib/WebGUI/Asset/RichEdit.pm
+++ b/lib/WebGUI/Asset/RichEdit.pm
@@ -58,7 +58,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
         my $class = shift;
-        my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+        my $session = shift;
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,'Asset_RichEdit');
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index 3ea39ee25..eaa89becf 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -155,7 +155,7 @@ sub canManage {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Shortcut");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Snippet.pm b/lib/WebGUI/Asset/Snippet.pm
index c2f366689..0473804ed 100644
--- a/lib/WebGUI/Asset/Snippet.pm
+++ b/lib/WebGUI/Asset/Snippet.pm
@@ -57,7 +57,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
         my $class = shift;
-        my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+        my $session = shift;
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Snippet");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject.pm b/lib/WebGUI/Asset/Wobject.pm
index b715f03db..69a782b16 100644
--- a/lib/WebGUI/Asset/Wobject.pm
+++ b/lib/WebGUI/Asset/Wobject.pm
@@ -60,7 +60,7 @@ An array of hashes to prepend to the list
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,'Wobject');
 	my %properties;
diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm
index 3830df8c0..1fbc0668e 100644
--- a/lib/WebGUI/Asset/Wobject/Article.pm
+++ b/lib/WebGUI/Asset/Wobject/Article.pm
@@ -67,7 +67,7 @@ text will come out formatted as paragraphs.
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,'Asset_Article');
 	my %properties;
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index e024dd2ff..02c443327 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -253,7 +253,7 @@ sub decrementThreads {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Collaboration");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/Dashboard.pm b/lib/WebGUI/Asset/Wobject/Dashboard.pm
index 113ad2aba..0af9ab9a9 100644
--- a/lib/WebGUI/Asset/Wobject/Dashboard.pm
+++ b/lib/WebGUI/Asset/Wobject/Dashboard.pm
@@ -38,7 +38,7 @@ sub canPersonalize {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
   my $definition = shift;
 	my %properties;
 	tie %properties, 'Tie::IxHash';
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 8cd23acc8..69be49f41 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -131,7 +131,7 @@ sub defaultViewForm {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_DataForm");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
index df03f5a07..05365bc83 100644
--- a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
+++ b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm
@@ -35,7 +35,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_EventsCalendar");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm
index 58d477835..b01b3173d 100644
--- a/lib/WebGUI/Asset/Wobject/Folder.pm
+++ b/lib/WebGUI/Asset/Wobject/Folder.pm
@@ -55,7 +55,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
         my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Folder");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index 892d4ea2a..d73b2d156 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -28,7 +28,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_HttpProxy");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/InOutBoard.pm b/lib/WebGUI/Asset/Wobject/InOutBoard.pm
index f1e15d98d..0b41415f4 100644
--- a/lib/WebGUI/Asset/Wobject/InOutBoard.pm
+++ b/lib/WebGUI/Asset/Wobject/InOutBoard.pm
@@ -59,7 +59,7 @@ sub _fetchDepartments {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_InOutBoard");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm
index eac9c50ea..f35c5f637 100644
--- a/lib/WebGUI/Asset/Wobject/Layout.pm
+++ b/lib/WebGUI/Asset/Wobject/Layout.pm
@@ -55,7 +55,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
         my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Layout");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index 461998ad5..c90efe9c1 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -17,7 +17,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 sub definition {
         my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Matrix");
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/MessageBoard.pm b/lib/WebGUI/Asset/Wobject/MessageBoard.pm
index de2a04cd9..37f58e59d 100644
--- a/lib/WebGUI/Asset/Wobject/MessageBoard.pm
+++ b/lib/WebGUI/Asset/Wobject/MessageBoard.pm
@@ -22,7 +22,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_MessageBoard");
 	my %properties;
diff --git a/lib/WebGUI/Asset/Wobject/MultiSearch.pm b/lib/WebGUI/Asset/Wobject/MultiSearch.pm
index b757f17d8..5427b8dbf 100644
--- a/lib/WebGUI/Asset/Wobject/MultiSearch.pm
+++ b/lib/WebGUI/Asset/Wobject/MultiSearch.pm
@@ -39,7 +39,7 @@ defines wobject properties for MultiSearch instances
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session, "Asset_MultiSearch");
 	my $properties = {
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index 3553add13..49a3dafd0 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -25,7 +25,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Navigation");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index e626f4301..1b5da6883 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -33,7 +33,7 @@ sub _hasVoted {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Poll");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/Product.pm b/lib/WebGUI/Asset/Wobject/Product.pm
index 31b341bba..c7ba0a7a1 100644
--- a/lib/WebGUI/Asset/Wobject/Product.pm
+++ b/lib/WebGUI/Asset/Wobject/Product.pm
@@ -92,7 +92,7 @@ sub addRevision {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_Product");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm
index 73b21e7b8..6cc1407b9 100644
--- a/lib/WebGUI/Asset/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm
@@ -26,7 +26,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session,"Asset_SQLReport");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/StockData.pm b/lib/WebGUI/Asset/Wobject/StockData.pm
index ead39666e..3f6fb3e39 100644
--- a/lib/WebGUI/Asset/Wobject/StockData.pm
+++ b/lib/WebGUI/Asset/Wobject/StockData.pm
@@ -269,7 +269,7 @@ defines wobject properties for Stock Data instances
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $properties = {
 		templateId =>{
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index 38c5a3b0a..3d344ee63 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -55,7 +55,7 @@ sub completeResponse {
 #-------------------------------------------------------------------
 sub definition {
         my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $definition = shift;
 	my $i18n = WebGUI::International->new($session,'Asset_Survey');
         push(@{$definition}, {
diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
index aa96d269f..b8dcc59c9 100644
--- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
+++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
@@ -63,7 +63,7 @@ A hash reference passed in from a subclass definition.
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $definition = shift;
 	my %properties;
 	tie %properties, 'Tie::IxHash';
diff --git a/lib/WebGUI/Asset/Wobject/WSClient.pm b/lib/WebGUI/Asset/Wobject/WSClient.pm
index a9dee917c..7750903ed 100644
--- a/lib/WebGUI/Asset/Wobject/WSClient.pm
+++ b/lib/WebGUI/Asset/Wobject/WSClient.pm
@@ -31,7 +31,7 @@ sub _create_cache_key {
 #-------------------------------------------------------------------
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 my $httpHeaderFieldType;
    if ($session->config->get('soapHttpHeaderOverride')) {
diff --git a/lib/WebGUI/Asset/Wobject/WeatherData.pm b/lib/WebGUI/Asset/Wobject/WeatherData.pm
index f912d7473..018c77aa6 100644
--- a/lib/WebGUI/Asset/Wobject/WeatherData.pm
+++ b/lib/WebGUI/Asset/Wobject/WeatherData.pm
@@ -41,7 +41,7 @@ defines wobject properties for WeatherData instances
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift;
 	my $i18n = WebGUI::International->new($session, "Asset_WeatherData");
 	my $properties = {
diff --git a/lib/WebGUI/AssetLineage.pm b/lib/WebGUI/AssetLineage.pm
index 4400170d2..ae6b43c5f 100644
--- a/lib/WebGUI/AssetLineage.pm
+++ b/lib/WebGUI/AssetLineage.pm
@@ -516,7 +516,7 @@ Lineage string.
 
 sub newByLineage {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $lineage = shift;
 	my $assetLineage = $session->stow->get("assetLineage");
 	my $id = $assetLineage->{$lineage}{id};
diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm
index 7c1a000be..2d0db3422 100644
--- a/lib/WebGUI/Auth/LDAP.pm
+++ b/lib/WebGUI/Auth/LDAP.pm
@@ -411,7 +411,7 @@ sub login {
 #-------------------------------------------------------------------
 sub new {
    my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
    my $authMethod = $_[0];
    my $userId = $_[1];
    my @callable = ('createAccount','deactivateAccount','displayAccount','displayLogin','login','logout','createAccountSave','deactivateAccountConfirm');
diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm
index df918b661..5847ae656 100644
--- a/lib/WebGUI/Auth/WebGUI.pm
+++ b/lib/WebGUI/Auth/WebGUI.pm
@@ -504,7 +504,7 @@ sub login {
 #-------------------------------------------------------------------
 sub new {
    my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
    my $authMethod = $_[0];
    my $userId = $_[1];
    my @callable = ('validateEmail','createAccount','deactivateAccount','displayAccount','displayLogin','login','logout','recoverPassword','resetExpiredPassword','recoverPasswordFinish','createAccountSave','deactivateAccountConfirm','resetExpiredPasswordSave','updateAccount');
diff --git a/lib/WebGUI/Cache.pm b/lib/WebGUI/Cache.pm
index a56047dcc..de71770c9 100644
--- a/lib/WebGUI/Cache.pm
+++ b/lib/WebGUI/Cache.pm
@@ -116,7 +116,7 @@ A subdivider to store this cache under. When building your own cache plug-in def
 sub new {
 	my $cache;
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	if ($session->config->get("memcached_servers")) {
 		require WebGUI::Cache::Memcached;
 		return WebGUI::Cache::Memcached->new($session,@_);
diff --git a/lib/WebGUI/Cache/FileCache.pm b/lib/WebGUI/Cache/FileCache.pm
index 6138bb28b..b3bfa2571 100644
--- a/lib/WebGUI/Cache/FileCache.pm
+++ b/lib/WebGUI/Cache/FileCache.pm
@@ -210,7 +210,7 @@ Defaults to the config filename for the current site. The only reason to overrid
 sub new {
 	my $cache;
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $key = $class->parseKey(shift);
 	my $namespace = shift || $session->config->getFilename;
 	bless {_session=>$session, _key=>$key, _namespace=>$namespace}, $class;
diff --git a/lib/WebGUI/Cache/Memcached.pm b/lib/WebGUI/Cache/Memcached.pm
index e9633718e..71fc681e4 100644
--- a/lib/WebGUI/Cache/Memcached.pm
+++ b/lib/WebGUI/Cache/Memcached.pm
@@ -115,7 +115,7 @@ Defaults to the config filename for the current site. The only reason to overrid
 sub new {
 	my $cache;
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $key = $class->parseKey(shift);
 	my $namespace = shift || $session->config->getFilename;
 
diff --git a/lib/WebGUI/Commerce.pm b/lib/WebGUI/Commerce.pm
index 7e0806219..963cbbc76 100644
--- a/lib/WebGUI/Commerce.pm
+++ b/lib/WebGUI/Commerce.pm
@@ -4,7 +4,7 @@ use strict;
 
 #-------------------------------------------------------------------
 sub setCommerceSetting {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($entry);
 	$entry = shift;
 	$session->db->write("delete from commerceSettings where ". 
diff --git a/lib/WebGUI/Commerce/Payment.pm b/lib/WebGUI/Commerce/Payment.pm
index 2596bcd57..a6ea2c9aa 100644
--- a/lib/WebGUI/Commerce/Payment.pm
+++ b/lib/WebGUI/Commerce/Payment.pm
@@ -200,7 +200,7 @@ The namespace of the plugin.
 sub init {
 	my ($class, $session, $namespace, $properties);
 	$class = shift;
-	$session = shift; use WebGUI; WebGUI::dumpSession($session);
+	$session = shift;
 	$namespace = shift;
 	
 	$properties = $session->db->buildHashRef("select fieldName, fieldValue from commerceSettings where namespace=".$session->db->quote($namespace)." and type='Payment'");
@@ -280,7 +280,7 @@ The namespace of the plugin.
 sub load {
 	my ($class, $namespace, $load, $cmd, $plugin);
     	$class = shift;
-    	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+    	my $session = shift;
 	$namespace = shift;
 	
     	$cmd = "WebGUI::Commerce::Payment::$namespace";
diff --git a/lib/WebGUI/Commerce/Payment/ITransact.pm b/lib/WebGUI/Commerce/Payment/ITransact.pm
index ef2026624..35c78e1a5 100644
--- a/lib/WebGUI/Commerce/Payment/ITransact.pm
+++ b/lib/WebGUI/Commerce/Payment/ITransact.pm
@@ -501,7 +501,7 @@ sub confirmTransaction {
 sub init {
 	my ($class, $self);
 	$class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$self = $class->SUPER::init($session,'ITransact');
 
 	return $self;
diff --git a/lib/WebGUI/Commerce/Shipping.pm b/lib/WebGUI/Commerce/Shipping.pm
index d4ecf3e8b..2546c3203 100644
--- a/lib/WebGUI/Commerce/Shipping.pm
+++ b/lib/WebGUI/Commerce/Shipping.pm
@@ -206,7 +206,7 @@ The namespace of the plugin.
 sub load {
 	my ($class, $namespace, $load, $cmd, $plugin);
     	$class = shift;
-    	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+    	my $session = shift;
 	$namespace = shift;
 
 	$session->errorHandler->fatal('No namespace passed to load.') unless ($namespace);
diff --git a/lib/WebGUI/Commerce/Transaction.pm b/lib/WebGUI/Commerce/Transaction.pm
index 213075d30..bbc9356b9 100644
--- a/lib/WebGUI/Commerce/Transaction.pm
+++ b/lib/WebGUI/Commerce/Transaction.pm
@@ -414,7 +414,7 @@ sub new {
 	my ($class, $transactionId, $gatewayId, $userId, $properties, $sth, $row, @items);
 	
 	$class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$transactionId = shift;
 	$gatewayId = shift;
 	$userId = shift || $session->user->userId;
diff --git a/lib/WebGUI/DatabaseLink.pm b/lib/WebGUI/DatabaseLink.pm
index 9dd73a330..ec7c3cbae 100644
--- a/lib/WebGUI/DatabaseLink.pm
+++ b/lib/WebGUI/DatabaseLink.pm
@@ -77,7 +77,7 @@ A hash reference containing the list of params to set. See the set() method for
 
 sub create {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $params = shift;
 	$params->{databaseLinkId} = "new";
 	my $id = $session->db->setRow("databaseLink","databaseLinkId",$params);
@@ -193,7 +193,7 @@ A reference to the current session.
 
 sub getList {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $list = $session->db->buildHashRef("select databaseLinkId, title from databaseLink order by title");
 	my $i18n = WebGUI::International->new($session);
 	$list->{'0'} = $i18n->get(1076);
@@ -221,7 +221,7 @@ sub new {
     my ($class, $databaseLinkId, %databaseLink);
     tie %databaseLink, 'Tie::CPHash';
     $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$databaseLinkId = shift;
 	unless ($databaseLinkId eq "") {
 		if ($databaseLinkId eq "0") {
diff --git a/lib/WebGUI/Form.pm b/lib/WebGUI/Form.pm
index e386094a9..b027e25b3 100644
--- a/lib/WebGUI/Form.pm
+++ b/lib/WebGUI/Form.pm
@@ -60,7 +60,7 @@ Dynamically creates functions on the fly for all the different form control type
 sub AUTOLOAD {
 	our $AUTOLOAD;
 	my $name = ucfirst((split /::/, $AUTOLOAD)[-1]);	
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my @params = @_;
 	my $cmd = "use WebGUI::Form::".$name;
         eval ($cmd);
@@ -123,7 +123,7 @@ If you want to add anything special to the form header like javascript actions o
 =cut
 
 sub formHeader {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $params = shift;
         my $action = $params->{action} || $session->url->page();
 	my $hidden;
diff --git a/lib/WebGUI/Form/Asset.pm b/lib/WebGUI/Form/Asset.pm
index e35f0c42e..cbfc0a4f3 100644
--- a/lib/WebGUI/Form/Asset.pm
+++ b/lib/WebGUI/Form/Asset.pm
@@ -65,7 +65,7 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session, "Asset");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Button.pm b/lib/WebGUI/Form/Button.pm
index 7ee44b6e7..36901963a 100644
--- a/lib/WebGUI/Form/Button.pm
+++ b/lib/WebGUI/Form/Button.pm
@@ -54,7 +54,7 @@ The default text to appear on the button. Defaults to an internationalized versi
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session,"WebGUI");
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/CheckList.pm b/lib/WebGUI/Form/CheckList.pm
index 5625e9245..322b95fca 100644
--- a/lib/WebGUI/Form/CheckList.pm
+++ b/lib/WebGUI/Form/CheckList.pm
@@ -58,7 +58,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Checkbox.pm b/lib/WebGUI/Form/Checkbox.pm
index 547b121be..09f9a3c79 100644
--- a/lib/WebGUI/Form/Checkbox.pm
+++ b/lib/WebGUI/Form/Checkbox.pm
@@ -61,7 +61,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Codearea.pm b/lib/WebGUI/Form/Codearea.pm
index ef57d9214..271318c5b 100644
--- a/lib/WebGUI/Form/Codearea.pm
+++ b/lib/WebGUI/Form/Codearea.pm
@@ -55,7 +55,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Color.pm b/lib/WebGUI/Form/Color.pm
index 59d4239f8..ce6e85216 100644
--- a/lib/WebGUI/Form/Color.pm
+++ b/lib/WebGUI/Form/Color.pm
@@ -46,7 +46,7 @@ See the super class for additional details.
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Combo.pm b/lib/WebGUI/Form/Combo.pm
index 0e295110e..2dd3756a5 100644
--- a/lib/WebGUI/Form/Combo.pm
+++ b/lib/WebGUI/Form/Combo.pm
@@ -59,7 +59,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/ContentType.pm b/lib/WebGUI/Form/ContentType.pm
index acfa6dc55..793ee0809 100644
--- a/lib/WebGUI/Form/ContentType.pm
+++ b/lib/WebGUI/Form/ContentType.pm
@@ -62,7 +62,7 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Control.pm b/lib/WebGUI/Form/Control.pm
index b87cf58fb..830bd2016 100644
--- a/lib/WebGUI/Form/Control.pm
+++ b/lib/WebGUI/Form/Control.pm
@@ -149,7 +149,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	push(@{$definition}, {
 		formName=>{
@@ -304,7 +304,7 @@ Returns a human readable name for this form control type. You MUST override this
 
 sub getName {
 	my $self = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = $self->definition($session);
 	return $definition->[0]->{formName}->{defaultValue};
 }
@@ -430,7 +430,7 @@ Please note that an id attribute is automatically added to every form element wi
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my %raw;
 	# deal with a hash reference full of properties
 	if (ref $_[0] eq "HASH") {
diff --git a/lib/WebGUI/Form/DatabaseLink.pm b/lib/WebGUI/Form/DatabaseLink.pm
index c7c011bd4..9732f5793 100644
--- a/lib/WebGUI/Form/DatabaseLink.pm
+++ b/lib/WebGUI/Form/DatabaseLink.pm
@@ -71,7 +71,7 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Date.pm b/lib/WebGUI/Form/Date.pm
index 04b9b1fe9..62bf52244 100644
--- a/lib/WebGUI/Form/Date.pm
+++ b/lib/WebGUI/Form/Date.pm
@@ -72,7 +72,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/DateTime.pm b/lib/WebGUI/Form/DateTime.pm
index c8a294b56..99dc947a3 100644
--- a/lib/WebGUI/Form/DateTime.pm
+++ b/lib/WebGUI/Form/DateTime.pm
@@ -67,7 +67,7 @@ If no value is specified, this will be used. Defaults to today and now.
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/DynamicField.pm b/lib/WebGUI/Form/DynamicField.pm
index dbcb5dd4e..bbbc7b22e 100644
--- a/lib/WebGUI/Form/DynamicField.pm
+++ b/lib/WebGUI/Form/DynamicField.pm
@@ -55,7 +55,7 @@ Defaults to "Text". Should be any valid field type.
 
 sub definition {
         my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
         push(@{$definition}, {
@@ -97,7 +97,7 @@ array will be used.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my %raw = @_;
 	my $param = \%raw;
         my $fieldType = ucfirst($param->{fieldType});
diff --git a/lib/WebGUI/Form/Email.pm b/lib/WebGUI/Form/Email.pm
index b0a986fb9..ff192a23a 100644
--- a/lib/WebGUI/Form/Email.pm
+++ b/lib/WebGUI/Form/Email.pm
@@ -54,7 +54,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/FieldType.pm b/lib/WebGUI/Form/FieldType.pm
index ff5f29a0b..283f9da7d 100644
--- a/lib/WebGUI/Form/FieldType.pm
+++ b/lib/WebGUI/Form/FieldType.pm
@@ -60,7 +60,7 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
@@ -90,7 +90,7 @@ and DynamicField, the form class dispatcher.
 
 sub getTypes {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	opendir(DIR,$session->config->getWebguiRoot."/lib/WebGUI/Form/");
 	my @rawTypes = readdir(DIR);
 	closedir(DIR);
diff --git a/lib/WebGUI/Form/File.pm b/lib/WebGUI/Form/File.pm
index 80410c1d0..7cc1fd4d1 100644
--- a/lib/WebGUI/Form/File.pm
+++ b/lib/WebGUI/Form/File.pm
@@ -63,7 +63,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/FilterContent.pm b/lib/WebGUI/Form/FilterContent.pm
index d8c348a87..7d12fd64d 100644
--- a/lib/WebGUI/Form/FilterContent.pm
+++ b/lib/WebGUI/Form/FilterContent.pm
@@ -63,7 +63,7 @@ A tooltip for what to do with this field. Defaults to a general explaination of
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Float.pm b/lib/WebGUI/Form/Float.pm
index 5f3d7ab95..345435cc5 100644
--- a/lib/WebGUI/Form/Float.pm
+++ b/lib/WebGUI/Form/Float.pm
@@ -66,7 +66,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Group.pm b/lib/WebGUI/Form/Group.pm
index 239c5a585..4bf09a43a 100644
--- a/lib/WebGUI/Form/Group.pm
+++ b/lib/WebGUI/Form/Group.pm
@@ -71,7 +71,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/HTMLArea.pm b/lib/WebGUI/Form/HTMLArea.pm
index 8942ab3ca..df03a18ea 100644
--- a/lib/WebGUI/Form/HTMLArea.pm
+++ b/lib/WebGUI/Form/HTMLArea.pm
@@ -69,7 +69,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
         my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
         push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Hidden.pm b/lib/WebGUI/Form/Hidden.pm
index 2d8513a6f..12e729b79 100644
--- a/lib/WebGUI/Form/Hidden.pm
+++ b/lib/WebGUI/Form/Hidden.pm
@@ -54,7 +54,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/HiddenList.pm b/lib/WebGUI/Form/HiddenList.pm
index f2c469b87..847f977b9 100644
--- a/lib/WebGUI/Form/HiddenList.pm
+++ b/lib/WebGUI/Form/HiddenList.pm
@@ -62,7 +62,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
         my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
         push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Image.pm b/lib/WebGUI/Form/Image.pm
index fb5b0b1af..db38f25ee 100644
--- a/lib/WebGUI/Form/Image.pm
+++ b/lib/WebGUI/Form/Image.pm
@@ -64,7 +64,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Integer.pm b/lib/WebGUI/Form/Integer.pm
index f89954238..96c73e0b7 100644
--- a/lib/WebGUI/Form/Integer.pm
+++ b/lib/WebGUI/Form/Integer.pm
@@ -66,7 +66,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Interval.pm b/lib/WebGUI/Form/Interval.pm
index e4abf34e0..0da25f0e2 100644
--- a/lib/WebGUI/Form/Interval.pm
+++ b/lib/WebGUI/Form/Interval.pm
@@ -63,7 +63,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/LdapLink.pm b/lib/WebGUI/Form/LdapLink.pm
index 4082c3e23..efbbf3956 100644
--- a/lib/WebGUI/Form/LdapLink.pm
+++ b/lib/WebGUI/Form/LdapLink.pm
@@ -75,7 +75,7 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/List.pm b/lib/WebGUI/Form/List.pm
index fe3d0af06..ffd61b34a 100644
--- a/lib/WebGUI/Form/List.pm
+++ b/lib/WebGUI/Form/List.pm
@@ -145,7 +145,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Password.pm b/lib/WebGUI/Form/Password.pm
index c24b7671c..febee44f3 100644
--- a/lib/WebGUI/Form/Password.pm
+++ b/lib/WebGUI/Form/Password.pm
@@ -62,7 +62,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Phone.pm b/lib/WebGUI/Form/Phone.pm
index b43acf1bf..99a6532c3 100644
--- a/lib/WebGUI/Form/Phone.pm
+++ b/lib/WebGUI/Form/Phone.pm
@@ -54,7 +54,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Radio.pm b/lib/WebGUI/Form/Radio.pm
index 17340f788..bdcf2cd7f 100644
--- a/lib/WebGUI/Form/Radio.pm
+++ b/lib/WebGUI/Form/Radio.pm
@@ -58,7 +58,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/RadioList.pm b/lib/WebGUI/Form/RadioList.pm
index aaf6ecc98..311db7556 100644
--- a/lib/WebGUI/Form/RadioList.pm
+++ b/lib/WebGUI/Form/RadioList.pm
@@ -70,7 +70,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/ReadOnly.pm b/lib/WebGUI/Form/ReadOnly.pm
index 35dcd59e9..585b2fd16 100644
--- a/lib/WebGUI/Form/ReadOnly.pm
+++ b/lib/WebGUI/Form/ReadOnly.pm
@@ -55,7 +55,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/SelectBox.pm b/lib/WebGUI/Form/SelectBox.pm
index 1b5caa7c4..7fcb50d2a 100644
--- a/lib/WebGUI/Form/SelectBox.pm
+++ b/lib/WebGUI/Form/SelectBox.pm
@@ -68,7 +68,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/SelectList.pm b/lib/WebGUI/Form/SelectList.pm
index c160ecc79..7a034e462 100644
--- a/lib/WebGUI/Form/SelectList.pm
+++ b/lib/WebGUI/Form/SelectList.pm
@@ -62,7 +62,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Submit.pm b/lib/WebGUI/Form/Submit.pm
index bad7aebe4..416cba507 100644
--- a/lib/WebGUI/Form/Submit.pm
+++ b/lib/WebGUI/Form/Submit.pm
@@ -46,7 +46,7 @@ See the super class for additional details.
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Template.pm b/lib/WebGUI/Form/Template.pm
index 6f94c6573..623f18045 100644
--- a/lib/WebGUI/Form/Template.pm
+++ b/lib/WebGUI/Form/Template.pm
@@ -63,7 +63,7 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session, 'Asset_Template');
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Text.pm b/lib/WebGUI/Form/Text.pm
index 5319e2e22..eed96ca0d 100644
--- a/lib/WebGUI/Form/Text.pm
+++ b/lib/WebGUI/Form/Text.pm
@@ -62,7 +62,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Textarea.pm b/lib/WebGUI/Form/Textarea.pm
index ff69c7bf6..fec8cdc97 100644
--- a/lib/WebGUI/Form/Textarea.pm
+++ b/lib/WebGUI/Form/Textarea.pm
@@ -66,7 +66,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/TimeField.pm b/lib/WebGUI/Form/TimeField.pm
index f603e56f7..f6870d1cc 100644
--- a/lib/WebGUI/Form/TimeField.pm
+++ b/lib/WebGUI/Form/TimeField.pm
@@ -64,7 +64,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/TimeZone.pm b/lib/WebGUI/Form/TimeZone.pm
index 3be3635e8..26f346a5e 100644
--- a/lib/WebGUI/Form/TimeZone.pm
+++ b/lib/WebGUI/Form/TimeZone.pm
@@ -46,7 +46,7 @@ See the super class for additional details.
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Url.pm b/lib/WebGUI/Form/Url.pm
index 24837d9f7..988209d6b 100644
--- a/lib/WebGUI/Form/Url.pm
+++ b/lib/WebGUI/Form/Url.pm
@@ -58,7 +58,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/WhatNext.pm b/lib/WebGUI/Form/WhatNext.pm
index 1cfe5c665..cf32a2329 100644
--- a/lib/WebGUI/Form/WhatNext.pm
+++ b/lib/WebGUI/Form/WhatNext.pm
@@ -58,7 +58,7 @@ A text label that will be displayed if toHtmlWithWrapper() is called. Defaults t
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/YesNo.pm b/lib/WebGUI/Form/YesNo.pm
index 5b164ab97..6f58d909c 100644
--- a/lib/WebGUI/Form/YesNo.pm
+++ b/lib/WebGUI/Form/YesNo.pm
@@ -59,7 +59,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Form/Zipcode.pm b/lib/WebGUI/Form/Zipcode.pm
index e885dc4ac..968052d98 100644
--- a/lib/WebGUI/Form/Zipcode.pm
+++ b/lib/WebGUI/Form/Zipcode.pm
@@ -58,7 +58,7 @@ Flag that tells the User Profile system that this is a valid form element in a U
 
 sub definition {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $definition = shift || [];
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
diff --git a/lib/WebGUI/Group.pm b/lib/WebGUI/Group.pm
index 3e15bb79f..4d1638df3 100755
--- a/lib/WebGUI/Group.pm
+++ b/lib/WebGUI/Group.pm
@@ -431,7 +431,7 @@ The name of the group you wish to instantiate.
 
 sub find {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $name = shift;
 	my ($groupId) = $session->db->quickArray("select groupId from groups where groupName=".$session->db->quote($name));
 	return WebGUI::Group->new($session,$groupId);
@@ -697,7 +697,7 @@ sub new {
         tie %group, 'Tie::CPHash';
         $class = shift;
 	my $self = {};
-	$self->{_session} = shift; use WebGUI; WebGUI::dumpSession($self->{_session});
+	$self->{_session} = shift;
 	$self->{_groupId} = shift;
 	bless $self, $class;
         $self->_create() if ($self->{_groupId} eq "new");
diff --git a/lib/WebGUI/HTML.pm b/lib/WebGUI/HTML.pm
index 0366d4d4a..e5326a9b0 100644
--- a/lib/WebGUI/HTML.pm
+++ b/lib/WebGUI/HTML.pm
@@ -242,7 +242,7 @@ The base URL to use. Defaults to current page's url.
 my $absolute = "";
                                                                                                  
 sub makeAbsolute {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $html = shift;
 	my $baseURL = shift; 
 
@@ -321,7 +321,7 @@ The content to be processed through the replacements filter.
 =cut
 
 sub processReplacements {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($content) = @_;
 	my $replacements = $session->stow->get("replacements");
 	if (defined $replacements) {
diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm
index e0c6204ed..b3de9acb3 100644
--- a/lib/WebGUI/HTMLForm.pm
+++ b/lib/WebGUI/HTMLForm.pm
@@ -142,7 +142,7 @@ If you want to add anything special to the form's table like a name or styleshee
 sub new {
 	my ($header, $footer);
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my %param = @_;
 	$header = "\n\n".WebGUI::Form::formHeader($session,{
 		action=>($param{action} || $param{'-action'} || $session->url->page),
diff --git a/lib/WebGUI/Help/Macros.pm b/lib/WebGUI/Help/Macros.pm
index c54b2d8e7..9024ac5ca 100644
--- a/lib/WebGUI/Help/Macros.pm
+++ b/lib/WebGUI/Help/Macros.pm
@@ -22,7 +22,7 @@ our $HELP = {
 		fields => [
 		],
 		related => sub {   ##Hey, you gotta pass in the session var, right?
-			     my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+			     my $session = shift;
                              sort { $a->{tag} cmp $b->{tag} }
                              map {
                                  $tag = $_;
diff --git a/lib/WebGUI/International.pm b/lib/WebGUI/International.pm
index a05e8a84f..dc536121c 100644
--- a/lib/WebGUI/International.pm
+++ b/lib/WebGUI/International.pm
@@ -207,7 +207,6 @@ Specify a default language. Defaults to user preference or "English".
 
 sub new {
 	my ($class, $session, $namespace, $language) = @_;
-	use WebGUI; WebGUI::dumpSession($session);
 	bless( {
 		_session   => $session,
 		_namespace => $namespace,
diff --git a/lib/WebGUI/LDAPLink.pm b/lib/WebGUI/LDAPLink.pm
index bab464cb8..5339add6e 100644
--- a/lib/WebGUI/LDAPLink.pm
+++ b/lib/WebGUI/LDAPLink.pm
@@ -152,7 +152,7 @@ A reference to the current session.
 
 sub getList {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
     my %list;
 	tie %list, "Tie::IxHash";
 	%list = $session->db->buildHash("select ldapLinkId, ldapLinkName from ldapLink order by ldapLinkName");
@@ -195,7 +195,7 @@ The ldapLinkId of the ldapLink you're creating an object reference for.
 sub new {
     my ( $ldapLinkId, $ldapLink);
     my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$ldapLinkId = shift;
 	return undef unless $ldapLinkId;
 	$ldapLink = $session->db->quickHash("select * from ldapLink where ldapLinkId=".$session->db->quote($ldapLinkId));
diff --git a/lib/WebGUI/Macro.pm b/lib/WebGUI/Macro.pm
index 564a2c0d1..8cc816b7b 100644
--- a/lib/WebGUI/Macro.pm
+++ b/lib/WebGUI/Macro.pm
@@ -118,7 +118,7 @@ A scalar reference of HTML to be processed.
 =cut
 
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
    	my $content = shift;
    	while ($$content =~ /$nestedMacro/gs) {
       		my ($macro, $searchString, $params) = ($1, $2, $3);
diff --git a/lib/WebGUI/Macro/AOIHits.pm b/lib/WebGUI/Macro/AOIHits.pm
index 5fbf5bfe8..072b8e3bb 100644
--- a/lib/WebGUI/Macro/AOIHits.pm
+++ b/lib/WebGUI/Macro/AOIHits.pm
@@ -35,7 +35,7 @@ The value for the key that will be looked up.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $key = shift; 
 	my $value = shift;
 	my $sql = "select count from passiveProfileAOI a, metaData_properties f 
diff --git a/lib/WebGUI/Macro/AOIRank.pm b/lib/WebGUI/Macro/AOIRank.pm
index 7e116d78f..750731e82 100644
--- a/lib/WebGUI/Macro/AOIRank.pm
+++ b/lib/WebGUI/Macro/AOIRank.pm
@@ -35,7 +35,7 @@ Define which value, by it's ranking, will be displayed.  The highest ranking is
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $key = shift;
 	my $rank = shift || 1; # 1 is highest rank
 	$rank--;	# Rank is zero based
diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm
index acbf3f73f..ea8dd5369 100644
--- a/lib/WebGUI/Macro/AdminBar.pm
+++ b/lib/WebGUI/Macro/AdminBar.pm
@@ -41,7 +41,7 @@ Admin bar to the left of the screen.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return "" unless ($session->var->isAdminOn);
 	my @param = @_;
         my $templateId = $param[0] || "PBtmpl0000000000000090";
diff --git a/lib/WebGUI/Macro/AdminText.pm b/lib/WebGUI/Macro/AdminText.pm
index ee2642f4e..07ce24057 100644
--- a/lib/WebGUI/Macro/AdminText.pm
+++ b/lib/WebGUI/Macro/AdminText.pm
@@ -31,7 +31,7 @@ string is returned.
 
 #-------------------------------------------------------------------
 sub process {	
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my @param = @_;
         return "" unless ($session->var->get("adminOn"));
         return $param[0];
diff --git a/lib/WebGUI/Macro/AdminToggle.pm b/lib/WebGUI/Macro/AdminToggle.pm
index 860a79bd3..8bbb756ab 100644
--- a/lib/WebGUI/Macro/AdminToggle.pm
+++ b/lib/WebGUI/Macro/AdminToggle.pm
@@ -45,7 +45,7 @@ A template from the Macro/AdminToggle namespace to use for formatting the link.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
          if ($session->user->isInGroup(12)) {
         	my %var;
                  my ($turnOn,$turnOff,$templateName) = @_;
diff --git a/lib/WebGUI/Macro/AssetProxy.pm b/lib/WebGUI/Macro/AssetProxy.pm
index 5c938663b..62db526d6 100644
--- a/lib/WebGUI/Macro/AssetProxy.pm
+++ b/lib/WebGUI/Macro/AssetProxy.pm
@@ -37,7 +37,7 @@ Admin is turned on.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $url = shift;
 	my $t = [Time::HiRes::gettimeofday()] if ($session->errorHandler->canShowPerformanceIndicators());
 	my $asset = WebGUI::Asset->newByUrl($session,$url);
diff --git a/lib/WebGUI/Macro/At_username.pm b/lib/WebGUI/Macro/At_username.pm
index dbd6cc075..113b4e29c 100644
--- a/lib/WebGUI/Macro/At_username.pm
+++ b/lib/WebGUI/Macro/At_username.pm
@@ -26,7 +26,7 @@ Macro for displaying the current User's username.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->user->username;
 }
 
diff --git a/lib/WebGUI/Macro/CanEditText.pm b/lib/WebGUI/Macro/CanEditText.pm
index 10175f3b1..90f94fc87 100644
--- a/lib/WebGUI/Macro/CanEditText.pm
+++ b/lib/WebGUI/Macro/CanEditText.pm
@@ -33,7 +33,7 @@ this asset, an empty string will be returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my @param = @_;
 	if ($session->asset && $session->asset->canEdit) { 
 		return $param[0];
diff --git a/lib/WebGUI/Macro/D_date.pm b/lib/WebGUI/Macro/D_date.pm
index cc22c8342..ae610c355 100644
--- a/lib/WebGUI/Macro/D_date.pm
+++ b/lib/WebGUI/Macro/D_date.pm
@@ -37,7 +37,7 @@ time is used instead.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my (@param, $temp, $time);
         @param = @_;
 	$time = $param[1] ||$session->datetime->time();
diff --git a/lib/WebGUI/Macro/EditableToggle.pm b/lib/WebGUI/Macro/EditableToggle.pm
index dba3c36ad..68e446f61 100644
--- a/lib/WebGUI/Macro/EditableToggle.pm
+++ b/lib/WebGUI/Macro/EditableToggle.pm
@@ -48,7 +48,7 @@ A template from the Macro/EditableToggle namespace to use for formatting the lin
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
          if ($session->asset && $session->asset->canEdit && $session->user->isInGroup(12)) {
         	my %var;
               my @param = @_;
diff --git a/lib/WebGUI/Macro/Env.pm b/lib/WebGUI/Macro/Env.pm
index 28d3d3022..670a1488b 100644
--- a/lib/WebGUI/Macro/Env.pm
+++ b/lib/WebGUI/Macro/Env.pm
@@ -31,7 +31,7 @@ then undef will be returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->env->get(shift);
 }
 
diff --git a/lib/WebGUI/Macro/Execute.pm b/lib/WebGUI/Macro/Execute.pm
index 0e38cf437..de2d94b6a 100644
--- a/lib/WebGUI/Macro/Execute.pm
+++ b/lib/WebGUI/Macro/Execute.pm
@@ -33,7 +33,7 @@ be blocked and an error message returned instead.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my @param = @_;
 	if ($param[0] =~ /passwd/ || $param[0] =~ /shadow/ || $param[0] =~ /\.conf/) {
 		my $i18n = WebGUI::International->new($session, 'Macro_Execute');
diff --git a/lib/WebGUI/Macro/Extras.pm b/lib/WebGUI/Macro/Extras.pm
index 6328a708e..32a37f3e9 100644
--- a/lib/WebGUI/Macro/Extras.pm
+++ b/lib/WebGUI/Macro/Extras.pm
@@ -29,7 +29,7 @@ Returns the extrasURL.  A trailing slash '/' is appended to the URL.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->config->get("extrasURL")."/";
 }
 
diff --git a/lib/WebGUI/Macro/FetchMimeType.pm b/lib/WebGUI/Macro/FetchMimeType.pm
index 0dd66a598..ffd8cde70 100644
--- a/lib/WebGUI/Macro/FetchMimeType.pm
+++ b/lib/WebGUI/Macro/FetchMimeType.pm
@@ -35,7 +35,7 @@ A path to a file
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $path = shift;
 	return guess_media_type($path);
 }
diff --git a/lib/WebGUI/Macro/FileUrl.pm b/lib/WebGUI/Macro/FileUrl.pm
index 99a01355c..4abfc23e9 100644
--- a/lib/WebGUI/Macro/FileUrl.pm
+++ b/lib/WebGUI/Macro/FileUrl.pm
@@ -40,7 +40,7 @@ The URL to the Asset.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $url = shift;
 	my $asset = WebGUI::Asset->newByUrl($session,$url);
 	if (defined $asset) {
diff --git a/lib/WebGUI/Macro/FormParam.pm b/lib/WebGUI/Macro/FormParam.pm
index 7f07339f1..9139b9223 100644
--- a/lib/WebGUI/Macro/FormParam.pm
+++ b/lib/WebGUI/Macro/FormParam.pm
@@ -32,7 +32,7 @@ The name of the field to pull from the session variable.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->form->process(shift);
 }
 
diff --git a/lib/WebGUI/Macro/GroupAdd.pm b/lib/WebGUI/Macro/GroupAdd.pm
index a53c5d1aa..6cd1897d7 100644
--- a/lib/WebGUI/Macro/GroupAdd.pm
+++ b/lib/WebGUI/Macro/GroupAdd.pm
@@ -44,7 +44,7 @@ An optional template for formatting the text and link.
 #-------------------------------------------------------------------
 sub process {
 	my @param = @_;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return "" if ($param[0] eq "");
 	return "" if ($param[1] eq "");
 	return "" if ($session->user->userId eq '1');
diff --git a/lib/WebGUI/Macro/GroupDelete.pm b/lib/WebGUI/Macro/GroupDelete.pm
index 6bc54bb77..5116102c8 100644
--- a/lib/WebGUI/Macro/GroupDelete.pm
+++ b/lib/WebGUI/Macro/GroupDelete.pm
@@ -43,7 +43,7 @@ An optional template for formatting the text and link.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my @param = @_;
 	return "" if ($param[0] eq "");
 	return "" if ($param[1] eq "");
diff --git a/lib/WebGUI/Macro/GroupText.pm b/lib/WebGUI/Macro/GroupText.pm
index eb714f618..a2726a803 100644
--- a/lib/WebGUI/Macro/GroupText.pm
+++ b/lib/WebGUI/Macro/GroupText.pm
@@ -41,7 +41,7 @@ Text to be shown to someone not in the group.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my @param = @_;
 	my ($groupId) = $session->dbSlave->quickArray("select groupId from groups where groupName=".$session->db->quote($param[0]));
 	$groupId = 3 if ($groupId eq "");
diff --git a/lib/WebGUI/Macro/H_homeLink.pm b/lib/WebGUI/Macro/H_homeLink.pm
index 603084c01..a817333db 100644
--- a/lib/WebGUI/Macro/H_homeLink.pm
+++ b/lib/WebGUI/Macro/H_homeLink.pm
@@ -42,7 +42,7 @@ be used.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my ($label, $templateUrl) = @_;
 	my $home = WebGUI::Asset->getDefault($session);
 	if ($label ne "linkonly") {
diff --git a/lib/WebGUI/Macro/Hash_userId.pm b/lib/WebGUI/Macro/Hash_userId.pm
index 058a8002b..5dd1b41b8 100644
--- a/lib/WebGUI/Macro/Hash_userId.pm
+++ b/lib/WebGUI/Macro/Hash_userId.pm
@@ -29,7 +29,7 @@ Returns the userId from the session variable for the current user.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->user->userId;
 }
 
diff --git a/lib/WebGUI/Macro/Include.pm b/lib/WebGUI/Macro/Include.pm
index fa1e5112e..69b363402 100644
--- a/lib/WebGUI/Macro/Include.pm
+++ b/lib/WebGUI/Macro/Include.pm
@@ -36,7 +36,7 @@ The complete path to a file in the local filesystem.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my (@param, $temp, $file);
         @param = @_;
 	my $i18n = WebGUI::International->new($session,'Macro_Include');
diff --git a/lib/WebGUI/Macro/JavaScript.pm b/lib/WebGUI/Macro/JavaScript.pm
index 8e6c54ca6..6a5a5049f 100644
--- a/lib/WebGUI/Macro/JavaScript.pm
+++ b/lib/WebGUI/Macro/JavaScript.pm
@@ -33,7 +33,7 @@ URL to the javascript to include in the page's header tags.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$session->style->setScript(shift,{type=>'text/javascript'});
 	return "";
 }
diff --git a/lib/WebGUI/Macro/L_loginBox.pm b/lib/WebGUI/Macro/L_loginBox.pm
index a1ad87879..2fae8a8d8 100644
--- a/lib/WebGUI/Macro/L_loginBox.pm
+++ b/lib/WebGUI/Macro/L_loginBox.pm
@@ -36,7 +36,7 @@ text to wrap in a link for logging out.
 
 #-------------------------------------------------------------------
 sub _createURL {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $text = shift;
 	return ''.$text.'';
 }
@@ -61,7 +61,7 @@ The ID of a template for custom layout of the login box and text.
 =cut
 
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my @param = @_;
 	my $templateId = $param[2] || "PBtmpl0000000000000044";
 	my %var;	
diff --git a/lib/WebGUI/Macro/LastModified.pm b/lib/WebGUI/Macro/LastModified.pm
index dfa0d29db..d8be38ec1 100644
--- a/lib/WebGUI/Macro/LastModified.pm
+++ b/lib/WebGUI/Macro/LastModified.pm
@@ -39,7 +39,7 @@ sprintf.  See L for a list of codes.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return '' unless $session->asset;
 	my ($label, $format, $time);
 	($label, $format) = @_;
diff --git a/lib/WebGUI/Macro/LoginToggle.pm b/lib/WebGUI/Macro/LoginToggle.pm
index 3635ffaf1..96ae053b4 100644
--- a/lib/WebGUI/Macro/LoginToggle.pm
+++ b/lib/WebGUI/Macro/LoginToggle.pm
@@ -45,7 +45,7 @@ The ID of a template for custom layout of the link and text.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my @param = @_;
 	my $i18n = WebGUI::International->new($session,'Macro_LoginToggle');
         my $login = $param[0] || $i18n->get(716);
diff --git a/lib/WebGUI/Macro/Page.pm b/lib/WebGUI/Macro/Page.pm
index 37706b846..5e7ff1835 100644
--- a/lib/WebGUI/Macro/Page.pm
+++ b/lib/WebGUI/Macro/Page.pm
@@ -33,7 +33,7 @@ The name of the property to retrieve from the assset via $session->asset->get()
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	if ($session->asset) {
 		return $session->asset->get(shift);
 	}
diff --git a/lib/WebGUI/Macro/PageTitle.pm b/lib/WebGUI/Macro/PageTitle.pm
index f6ea52bae..4227df80b 100644
--- a/lib/WebGUI/Macro/PageTitle.pm
+++ b/lib/WebGUI/Macro/PageTitle.pm
@@ -30,7 +30,7 @@ no asset cached in the session variable, nothing is returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	if ($session->asset) {
 		if ($session->form->process("op") || $session->form->process("func")) {
 	        	return ''.$session->asset->get("title").'';
diff --git a/lib/WebGUI/Macro/PageUrl.pm b/lib/WebGUI/Macro/PageUrl.pm
index cf859e0bf..d8380a330 100644
--- a/lib/WebGUI/Macro/PageUrl.pm
+++ b/lib/WebGUI/Macro/PageUrl.pm
@@ -28,7 +28,7 @@ process is really a wrapper around $session->url->page();
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->url->page();
 }
 
diff --git a/lib/WebGUI/Macro/Product.pm b/lib/WebGUI/Macro/Product.pm
index dbe0961f4..7f00c68bc 100644
--- a/lib/WebGUI/Macro/Product.pm
+++ b/lib/WebGUI/Macro/Product.pm
@@ -27,7 +27,7 @@ is left blank, a default template from the Macro/Product namespace will be used.
 =cut
 
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my (@param, $productId, $variantId, $product, $variant, $output, $templateId, @variantLoop, %var);
 	
 	@param = @_;
diff --git a/lib/WebGUI/Macro/Quote.pm b/lib/WebGUI/Macro/Quote.pm
index 39e175ec5..c03fc9c2c 100644
--- a/lib/WebGUI/Macro/Quote.pm
+++ b/lib/WebGUI/Macro/Quote.pm
@@ -32,7 +32,7 @@ The text to quote.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->db->quote(shift);
 	
 }
diff --git a/lib/WebGUI/Macro/RandomAssetProxy.pm b/lib/WebGUI/Macro/RandomAssetProxy.pm
index 1e620e3e9..bb794fb47 100644
--- a/lib/WebGUI/Macro/RandomAssetProxy.pm
+++ b/lib/WebGUI/Macro/RandomAssetProxy.pm
@@ -34,7 +34,7 @@ if no asset exists at that url, or if the asset has no children.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $url = shift;
 	my $i18n = WebGUI::International->new($session,'Macro_RandomAssetProxy');
 	my $asset = WebGUI::Asset->newByUrl($session, $url);
diff --git a/lib/WebGUI/Macro/RandomThread.pm b/lib/WebGUI/Macro/RandomThread.pm
index 98c5eb74a..1fe1262c7 100644
--- a/lib/WebGUI/Macro/RandomThread.pm
+++ b/lib/WebGUI/Macro/RandomThread.pm
@@ -57,7 +57,7 @@ URL of the template to use to display the random thread. Must be a valid URL wit
 =cut
 
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($startURL, $relatives, $templateURL) = @_;
 	# Seed the randomizer:
 	srand;
@@ -129,7 +129,7 @@ Reference to an array with lineage of Collaboration Systems to select a random t
 =cut
 
 sub _getRandomThread {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $lineage = shift;
 
 	# Get random CS:
diff --git a/lib/WebGUI/Macro/RawHeadTags.pm b/lib/WebGUI/Macro/RawHeadTags.pm
index d80897ba7..cb3bf0df7 100644
--- a/lib/WebGUI/Macro/RawHeadTags.pm
+++ b/lib/WebGUI/Macro/RawHeadTags.pm
@@ -32,7 +32,7 @@ Text that will be added to the HEAD tags for this page.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$session->style->setRawHeadTags(shift);
 	return "";
 }
diff --git a/lib/WebGUI/Macro/RootTitle.pm b/lib/WebGUI/Macro/RootTitle.pm
index 154698b9a..40b63eab0 100644
--- a/lib/WebGUI/Macro/RootTitle.pm
+++ b/lib/WebGUI/Macro/RootTitle.pm
@@ -31,7 +31,7 @@ is returned.  Otherwise a space is returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	if ($session->asset) {
 		my $lineage = $session->asset->get("lineage");
 		$lineage = substr($lineage,0,6);
diff --git a/lib/WebGUI/Macro/SQL.pm b/lib/WebGUI/Macro/SQL.pm
index 1f14e2d27..1ef57bb37 100644
--- a/lib/WebGUI/Macro/SQL.pm
+++ b/lib/WebGUI/Macro/SQL.pm
@@ -38,7 +38,7 @@ be used to position its output in the format.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($output, @data, $rownum, $temp);
 	my ($statement, $format) = @_;
 	my $i18n = WebGUI::International->new($session,'Macro_SQL');
diff --git a/lib/WebGUI/Macro/Slash_gatewayUrl.pm b/lib/WebGUI/Macro/Slash_gatewayUrl.pm
index f7ee3d241..73a37e4b5 100644
--- a/lib/WebGUI/Macro/Slash_gatewayUrl.pm
+++ b/lib/WebGUI/Macro/Slash_gatewayUrl.pm
@@ -28,7 +28,7 @@ process is really a wrapper around $session->url->gateway();
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->url->gateway();
 }
 
diff --git a/lib/WebGUI/Macro/Spacer.pm b/lib/WebGUI/Macro/Spacer.pm
index 501af8c35..08e4275e5 100644
--- a/lib/WebGUI/Macro/Spacer.pm
+++ b/lib/WebGUI/Macro/Spacer.pm
@@ -38,7 +38,7 @@ Set the height of the spacer.
 =cut
 
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my ($output, @param, $width, $height);
         @param = @_;
         $width = $param[0] if defined $param[0];
diff --git a/lib/WebGUI/Macro/Splat_random.pm b/lib/WebGUI/Macro/Splat_random.pm
index 0bc072c42..c5d819b34 100644
--- a/lib/WebGUI/Macro/Splat_random.pm
+++ b/lib/WebGUI/Macro/Splat_random.pm
@@ -34,7 +34,7 @@ used as a default.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my ($temp, @param);
         @param = @_;
         if ($param[0] ne "") {
diff --git a/lib/WebGUI/Macro/StyleSheet.pm b/lib/WebGUI/Macro/StyleSheet.pm
index d88821f2b..81f1c2ab1 100644
--- a/lib/WebGUI/Macro/StyleSheet.pm
+++ b/lib/WebGUI/Macro/StyleSheet.pm
@@ -32,7 +32,7 @@ The URL to the CSS document.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$session->style->setLink(shift,{
 		type=>'text/css',
 		rel=>'stylesheet'
diff --git a/lib/WebGUI/Macro/SubscriptionItem.pm b/lib/WebGUI/Macro/SubscriptionItem.pm
index ba0c65c24..fe2ef4b71 100644
--- a/lib/WebGUI/Macro/SubscriptionItem.pm
+++ b/lib/WebGUI/Macro/SubscriptionItem.pm
@@ -28,7 +28,7 @@ be used from the Macro/SubscriptionItem namespace.
 =cut
 
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($subscriptionId, $templateId, %var);
 	($subscriptionId, $templateId) = @_;
 	%var = $session->db->quickHash('select * from subscription where subscriptionId='.$session->db->quote($subscriptionId));
diff --git a/lib/WebGUI/Macro/SubscriptionItemPurchaseUrl.pm b/lib/WebGUI/Macro/SubscriptionItemPurchaseUrl.pm
index 097274923..83ef582e3 100644
--- a/lib/WebGUI/Macro/SubscriptionItemPurchaseUrl.pm
+++ b/lib/WebGUI/Macro/SubscriptionItemPurchaseUrl.pm
@@ -22,7 +22,7 @@ The ID of the subscription item to purchase.
 =cut
 
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->url->page('op=purchaseSubscription;sid='.shift);
 }
 
diff --git a/lib/WebGUI/Macro/Thumbnail.pm b/lib/WebGUI/Macro/Thumbnail.pm
index 04d516760..a702a6315 100644
--- a/lib/WebGUI/Macro/Thumbnail.pm
+++ b/lib/WebGUI/Macro/Thumbnail.pm
@@ -32,7 +32,7 @@ Image Asset can be found with that URL, then undef will be returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $url = shift;
 	if (my $image = WebGUI::Asset::File::Image->newByUrl($session,$url)) {
 	        return $image->getThumbnailUrl;
diff --git a/lib/WebGUI/Macro/URLEncode.pm b/lib/WebGUI/Macro/URLEncode.pm
index 8028ba05c..bcaf4a1cd 100644
--- a/lib/WebGUI/Macro/URLEncode.pm
+++ b/lib/WebGUI/Macro/URLEncode.pm
@@ -33,7 +33,7 @@ The text to URL encode.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->url->escape(shift);
 }
 
diff --git a/lib/WebGUI/Macro/User.pm b/lib/WebGUI/Macro/User.pm
index 4f0d01156..3c3fc4200 100644
--- a/lib/WebGUI/Macro/User.pm
+++ b/lib/WebGUI/Macro/User.pm
@@ -29,7 +29,7 @@ the data stored in $session .  If the field does not exist, undef is returned.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return  $session->user->profileField(shift);
 }
 
diff --git a/lib/WebGUI/Macro/a_account.pm b/lib/WebGUI/Macro/a_account.pm
index 128a91772..453f36815 100644
--- a/lib/WebGUI/Macro/a_account.pm
+++ b/lib/WebGUI/Macro/a_account.pm
@@ -39,7 +39,7 @@ A template to use for formatting the link.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my %var;
 	my  @param = @_;
 	return $session->url->page("op=auth;method=init") if ($param[0] eq "linkonly");
diff --git a/lib/WebGUI/Macro/c_companyName.pm b/lib/WebGUI/Macro/c_companyName.pm
index f90ab29a3..d3e0a0b4f 100644
--- a/lib/WebGUI/Macro/c_companyName.pm
+++ b/lib/WebGUI/Macro/c_companyName.pm
@@ -28,7 +28,7 @@ returns the companyName from the session variable.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->setting->get("companyName");
 }
 
diff --git a/lib/WebGUI/Macro/e_companyEmail.pm b/lib/WebGUI/Macro/e_companyEmail.pm
index 94373adcb..cfe85b466 100644
--- a/lib/WebGUI/Macro/e_companyEmail.pm
+++ b/lib/WebGUI/Macro/e_companyEmail.pm
@@ -28,7 +28,7 @@ returns the companyEmail from the session variable.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->setting->get("companyEmail");
 }
 
diff --git a/lib/WebGUI/Macro/r_printable.pm b/lib/WebGUI/Macro/r_printable.pm
index f2b8960d7..4049f641d 100644
--- a/lib/WebGUI/Macro/r_printable.pm
+++ b/lib/WebGUI/Macro/r_printable.pm
@@ -49,7 +49,7 @@ is used.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my ($temp, @param, $styleId);
         @param = @_;
 	my $append = 'op=makePrintable';
diff --git a/lib/WebGUI/Macro/u_companyUrl.pm b/lib/WebGUI/Macro/u_companyUrl.pm
index 46c0ff553..36eecd3be 100644
--- a/lib/WebGUI/Macro/u_companyUrl.pm
+++ b/lib/WebGUI/Macro/u_companyUrl.pm
@@ -29,7 +29,7 @@ returns the companyURL from the session variable.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->setting->get("companyURL");
 }
 
diff --git a/lib/WebGUI/Operation.pm b/lib/WebGUI/Operation.pm
index c3ed1505f..e05c40aeb 100644
--- a/lib/WebGUI/Operation.pm
+++ b/lib/WebGUI/Operation.pm
@@ -48,7 +48,7 @@ The name of the operation to execute.
 =cut
 
 sub execute {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $op = shift;
 	my ($output, $cmd);
 	my $operation = getOperations();
diff --git a/lib/WebGUI/Operation/ActiveSessions.pm b/lib/WebGUI/Operation/ActiveSessions.pm
index 80acd2ac9..7340903ae 100644
--- a/lib/WebGUI/Operation/ActiveSessions.pm
+++ b/lib/WebGUI/Operation/ActiveSessions.pm
@@ -37,7 +37,7 @@ $session->form->process("sid").  Afterwards, it calls www_viewActiveSessions.
 =cut
 
 sub www_killSession {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return www_viewActiveSessions($session) if $session->form->process("sid") eq $session->var->get("sessionId");
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	WebGUI::Session::end($session->form->process("sid"));
@@ -54,7 +54,7 @@ delete (kill) each one via www_killSession
 =cut
 
 sub www_viewActiveSessions {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my ($output, $p, @row, $i, $sth, %data);
 	tie %data, 'Tie::CPHash';
diff --git a/lib/WebGUI/Operation/Admin.pm b/lib/WebGUI/Operation/Admin.pm
index 333070b5d..6c44cd15a 100644
--- a/lib/WebGUI/Operation/Admin.pm
+++ b/lib/WebGUI/Operation/Admin.pm
@@ -32,7 +32,7 @@ If the current user is in the Turn On Admin Group, then return an Admin Console.
 =cut
 
 sub www_adminConsole {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return "" unless ($session->user->isInGroup(12));
 	my $ac = WebGUI::AdminConsole->new($session);
 	return $ac->render;
@@ -49,7 +49,7 @@ via WebGUI::Session::switchAdminOff()
 =cut
 
 sub www_switchOffAdmin {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return "" unless ($session->user->isInGroup(12));
 	$session->var->switchAdminOff();
 	return "";
@@ -64,7 +64,7 @@ If the current user is in the Turn On Admin Group, then allow them to turn on Ad
 =cut
 
 sub www_switchOnAdmin {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return "" unless ($session->user->isInGroup(12));
 	$session->var->switchAdminOn();
 	return "";
diff --git a/lib/WebGUI/Operation/Auth.pm b/lib/WebGUI/Operation/Auth.pm
index 8f58a9fc4..59ad3f784 100644
--- a/lib/WebGUI/Operation/Auth.pm
+++ b/lib/WebGUI/Operation/Auth.pm
@@ -30,7 +30,7 @@ Get the instance of this object or create a new instance if none exists
 =cut
 
 sub getInstance {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	#Get Auth Settings
 	my $authMethod = $session->user->authMethod || $session->setting->get("authMethod");
 	$authMethod = $session->setting->get("authMethod") if($session->user->userId eq '1');
@@ -58,7 +58,7 @@ is returned.
 =cut
 
 sub www_auth {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $auth;
 	($auth) = $session->db->quickArray("select authMethod from users where username=".$session->db->quote($session->form->process("username"))) if($session->form->process("username"));
 	my $authMethod = getInstance($session,$auth);
diff --git a/lib/WebGUI/Operation/Cache.pm b/lib/WebGUI/Operation/Cache.pm
index 9c0b0112b..738f4323c 100644
--- a/lib/WebGUI/Operation/Cache.pm
+++ b/lib/WebGUI/Operation/Cache.pm
@@ -45,7 +45,7 @@ is looked up in the i18n table in the WebGUI namespace.
 =cut
 
 sub _submenu {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $workarea = shift;
 	my $title = shift;
 	my $i18n = WebGUI::International->new($session);
@@ -74,7 +74,7 @@ Text description of how long the subscription lasts.
 =cut
 
 sub www_flushCache {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $cache = WebGUI::Cache->new($session,);
 	$cache->flush;
@@ -91,7 +91,7 @@ provides an option to clear the cache.
 =cut
 
 sub www_manageCache {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
         my ($output, $data);
 	my $cache = WebGUI::Cache->new($session);
diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index 56bf08d05..3ca1f57ab 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -20,7 +20,7 @@ use Storable;
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $i18n = WebGUI::International->new($session, "Commerce");
 
 	my $workarea = shift;
@@ -38,27 +38,27 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub _clearCheckoutScratch {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	_clearShippingScratch($session);
 	_clearPaymentScratch($session);
 }
 
 #-------------------------------------------------------------------
 sub _clearPaymentScratch {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$session->scratch->set('paymentGateway', '-delete-');
 }
 
 #-------------------------------------------------------------------
 sub _clearShippingScratch {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$session->scratch->set('shippingMethod', '-delete-');
 	$session->scratch->set('shippingOptions', '-delete-');
 }
 
 #-------------------------------------------------------------------
 sub _paymentSelected {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return 0 unless ($session->scratch->get('paymentGateway'));
 	my $plugin = WebGUI::Commerce::Payment->load($session, $session->scratch->get('paymentGateway'));
 	return 1 if ($plugin && $plugin->enabled);
@@ -67,7 +67,7 @@ sub _paymentSelected {
 
 #-------------------------------------------------------------------
 sub _shippingSelected {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return 0 unless ($session->scratch->get('shippingMethod'));
 
 	my $plugin = WebGUI::Commerce::Shipping->load($session, $session->scratch->get('shippingMethod'));
@@ -81,7 +81,7 @@ sub _shippingSelected {
 
 #-------------------------------------------------------------------
 sub www_addToCart {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	WebGUI::Commerce::ShoppingCart->new($session)->add($session->form->process("itemId"), $session->form->process("itemType"), $session->form->process("quantity"));
 
 	return WebGUI::Operation::execute($session,'viewCart');
@@ -89,7 +89,7 @@ sub www_addToCart {
 
 #-------------------------------------------------------------------
 sub www_cancelTransaction {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($transaction, %var);
 	
 	$transaction = WebGUI::Commerce::Transaction->new($session, $session->form->process("tid"));
@@ -106,7 +106,7 @@ sub www_cancelTransaction {
 # This operation is here for easier future extensions to the commerce system.
 #-------------------------------------------------------------------
 sub www_checkout {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return WebGUI::Operation::execute($session,'selectShippingMethod') unless (_shippingSelected($session));
 
 	return WebGUI::Operation::execute($session,'selectPaymentGateway') unless (_paymentSelected($session));
@@ -116,7 +116,7 @@ sub www_checkout {
 
 #-------------------------------------------------------------------
 sub www_checkoutConfirm {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($plugin, $f, %var, $errors, $i18n, $shoppingCart, $normal, $recurring, $shipping, $total);
 	$errors = shift;
 	
@@ -196,7 +196,7 @@ sub www_checkoutConfirm {
 
 #-------------------------------------------------------------------
 sub www_checkoutSubmit {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($plugin, $shoppingCart, $transaction, $var, $amount, @cartItems, $i18n, @transactions, 
 		@normal, $currentPurchase, $checkoutError, @resultLoop, %param, $normal, $recurring, 
 		$formError, $shipping, $shippingCost, $shippingDescription);
@@ -326,7 +326,7 @@ sub www_checkoutSubmit {
 
 #-------------------------------------------------------------------
 sub www_completePendingTransaction {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 
 	WebGUI::Commerce::Transaction->new($session, $session->form->process("tid"))->completeTransaction;
@@ -336,7 +336,7 @@ sub www_completePendingTransaction {
 
 #-------------------------------------------------------------------
 sub www_confirmRecurringTransaction {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my($plugin, %var);
 	
 	$plugin = WebGUI::Commerce::Payment->load($session, $session->form->process("gateway"));
@@ -347,7 +347,7 @@ sub www_confirmRecurringTransaction {
 
 #-------------------------------------------------------------------
 sub www_confirmTransaction {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my($plugin, %var);
 	$plugin = WebGUI::Commerce::Payment->load($session, $session->form->process("pg"));
 
@@ -358,7 +358,7 @@ sub www_confirmTransaction {
 
 #-------------------------------------------------------------------
 sub www_deleteCartItem {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	WebGUI::Commerce::ShoppingCart->new($session)->delete($session->form->process("itemId"), $session->form->process("itemType"));
 
 	return WebGUI::Operation::execute($session,'viewCart');
@@ -366,7 +366,7 @@ sub www_deleteCartItem {
 
 #-------------------------------------------------------------------
 sub www_editCommerceSettings {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my (%tabs, $tabform, $currentPlugin, $ac, $jscript, $i18n, 
 		$paymentPlugin, @paymentPlugins, %paymentPlugins, @failedPaymentPlugins, $plugin,
 		$shippingPlugin, @shippingPlugins, %shippingPlugins, @failedShippingPlugins);
@@ -510,7 +510,7 @@ sub www_editCommerceSettings {
 
 #-------------------------------------------------------------------
 sub www_editCommerceSettingsSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
 	foreach ($session->form->param) {
@@ -533,7 +533,7 @@ sub www_editCommerceSettingsSave {
 
 #-------------------------------------------------------------------
 sub www_listPendingTransactions {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($p, $transactions, $output, $properties, $i18n);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
@@ -566,7 +566,7 @@ sub www_listPendingTransactions {
 
 #-------------------------------------------------------------------
 sub www_listTransactions {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($output, %criteria, $transaction, @transactions);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(3));
@@ -662,7 +662,7 @@ sub www_listTransactions {
 
 #-------------------------------------------------------------------
 sub www_selectPaymentGateway {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($plugins, $f, $i18n, @pluginLoop, %var);
 
 	_clearPaymentScratch($session);
@@ -695,7 +695,7 @@ sub www_selectPaymentGateway {
 
 #-------------------------------------------------------------------
 sub www_selectPaymentGatewaySave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	if (WebGUI::Commerce::Payment->load($session, $session->form->process("paymentGateway"))->enabled) {
 		$session->scratch->set('paymentGateway', $session->form->process("paymentGateway"));
 	} else {
@@ -707,7 +707,7 @@ sub www_selectPaymentGatewaySave {
 
 #-------------------------------------------------------------------
 sub www_selectShippingMethod {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($plugins, $f, $i18n, @pluginLoop, %var);
 
 	_clearShippingScratch($session);
@@ -741,7 +741,7 @@ sub www_selectShippingMethod {
 
 #-------------------------------------------------------------------
 sub www_selectShippingMethodSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $shipping = WebGUI::Commerce::Shipping->load($session, $session->form->process("shippingMethod"));
 	
 	$shipping->processOptionsForm;
@@ -759,13 +759,13 @@ sub www_selectShippingMethodSave {
 
 #-------------------------------------------------------------------
 sub www_transactionComplete {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return WebGUI::Operation::execute($session,'viewPurchaseHistory');	
 }
 
 #-------------------------------------------------------------------
 sub www_updateCart {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 my	$shoppingCart = WebGUI::Commerce::ShoppingCart->new($session);
 
 	foreach my $formElement ($session->form->param) {
@@ -779,7 +779,7 @@ my	$shoppingCart = WebGUI::Commerce::ShoppingCart->new($session);
 
 #-------------------------------------------------------------------
 sub www_viewCart {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($shoppingCart, $normal, $recurring, %var, $total, $i18n);
 
 	$i18n = WebGUI::International->new($session, 'Commerce');
diff --git a/lib/WebGUI/Operation/DatabaseLink.pm b/lib/WebGUI/Operation/DatabaseLink.pm
index 037cfa347..7721ceb60 100644
--- a/lib/WebGUI/Operation/DatabaseLink.pm
+++ b/lib/WebGUI/Operation/DatabaseLink.pm
@@ -18,7 +18,7 @@ use WebGUI::International;
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $workarea = shift;
         my $title = shift;
 	my $i18n = WebGUI::International->new($session);
@@ -40,7 +40,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_copyDatabaseLink {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->insufficient unless ($session->user->isInGroup(3));
 	WebGUI::DatabaseLink->new($session,$session->form->process("dlid"))->copy;
         return www_listDatabaseLinks();
@@ -48,7 +48,7 @@ sub www_copyDatabaseLink {
 
 #-------------------------------------------------------------------
 sub www_deleteDatabaseLink {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->insufficient unless ($session->user->isInGroup(3));
 	my $i18n = WebGUI::International->new($session);
         my ($output);
@@ -63,7 +63,7 @@ sub www_deleteDatabaseLink {
 
 #-------------------------------------------------------------------
 sub www_deleteDatabaseLinkConfirm {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->insufficient unless ($session->user->isInGroup(3));
 	WebGUI::DatabaseLink->new($session,$session->form->process("dlid"))->delete;
         return www_listDatabaseLinks();
@@ -71,7 +71,7 @@ sub www_deleteDatabaseLinkConfirm {
 
 #-------------------------------------------------------------------
 sub www_editDatabaseLink {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->insufficient unless ($session->user->isInGroup(3));
         my ($output, %db, $f);
 	tie %db, 'Tie::CPHash';
@@ -130,7 +130,7 @@ sub www_editDatabaseLink {
 
 #-------------------------------------------------------------------
 sub www_editDatabaseLinkSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->insufficient unless ($session->user->isInGroup(3));
 	my $params = {
 		title=>$session->form->process("title"),
@@ -148,7 +148,7 @@ sub www_editDatabaseLinkSave {
 
 #-------------------------------------------------------------------
 sub www_listDatabaseLinks {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless($session->user->isInGroup(3));
 	my $links = WebGUI::DatabaseLink->getList($session);
         my $output = '';
diff --git a/lib/WebGUI/Operation/FormHelpers.pm b/lib/WebGUI/Operation/FormHelpers.pm
index 9b35b3f82..a372fc42c 100644
--- a/lib/WebGUI/Operation/FormHelpers.pm
+++ b/lib/WebGUI/Operation/FormHelpers.pm
@@ -16,7 +16,7 @@ use WebGUI::HTMLForm;
 
 #-------------------------------------------------------------------
 sub www_formAssetTree {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $base = WebGUI::Asset->newByUrl($session) || WebGUI::Asset->getRoot($session);
 	my @crumb;
 	my $ancestors = $base->getLineage(["self","ancestors"],{returnObjects=>1});
@@ -46,7 +46,7 @@ sub www_formAssetTree {
 #-------------------------------------------------------------------
 
 sub www_richEditPageTree {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $i18n = WebGUI::International->new($session);
 	my $f = WebGUI::HTMLForm->new($session,-action=>"#",-extras=>'name"linkchooser"');
 	$f->text(
@@ -100,7 +100,7 @@ window.opener.tinyMCE.insertLink("^" + "/" + ";" + document.getElementById("url_
 
 #-------------------------------------------------------------------
 sub www_richEditImageTree {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $base = WebGUI::Asset->newByUrl($session) || WebGUI::Asset->getRoot($session);
 	my @crumb;
 	my $ancestors = $base->getLineage(["self","ancestors"],{returnObjects=>1});
@@ -125,7 +125,7 @@ sub www_richEditImageTree {
 
 #-------------------------------------------------------------------
 sub www_richEditViewThumbnail {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $image = WebGUI::Asset->newByUrl($session);
 	$session->style->useEmptyStyle("1");
 	if ($image->get("className") =~ /WebGUI::Asset::File::Image/) {
diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index 79b120e8b..6da2bc60e 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -25,7 +25,7 @@ use WebGUI::Utility;
 
 #-------------------------------------------------------------------
 sub _hasSecondaryPrivilege {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return 0 unless ($session->user->isInGroup(11));
 	my $group = WebGUI::Group->new($session,$_[0]);
 	return $group->userIsAdmin($session->user->userId);
@@ -34,7 +34,7 @@ sub _hasSecondaryPrivilege {
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $workarea = shift;
         my $title = shift;
 	my $i18n = WebGUI::International->new($session);
@@ -65,7 +65,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub doGroupSearch {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $op = shift;
         my $returnPaginator = shift;
         my $groupFilter = shift;
@@ -94,7 +94,7 @@ sub doGroupSearch {
 
 #-------------------------------------------------------------------
 sub getGroupSearchForm {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $op = shift;
 	my $params = shift;
 	$session->scratch->set("groupSearchKeyword",$session->form->process("keyword"));
@@ -139,7 +139,7 @@ sub getGroupSearchForm {
 
 #-------------------------------------------------------------------
 sub walkGroups {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $parentId = shift;
         my $indent = shift;
 	my $output;
@@ -157,7 +157,7 @@ sub walkGroups {
 
 #-------------------------------------------------------------------
 sub www_addGroupsToGroupSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my $group = WebGUI::Group->new($session,$_[0]);
 	my @groups = $session->form->group('groups');
@@ -167,7 +167,7 @@ sub www_addGroupsToGroupSave {
 
 #-------------------------------------------------------------------
 sub www_addUsersToGroupSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
         my @users = $session->form->selectList('users');
 	my $group = WebGUI::Group->new($session,$session->form->process("gid"));
@@ -177,7 +177,7 @@ sub www_addUsersToGroupSave {
 
 #-------------------------------------------------------------------
 sub www_autoAddToGroup {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return WebGUI::AdminConsole->new($session,"groups")->render($session->privilege->insufficient()) unless ($session->user->userId ne 1);
 	my $group = WebGUI::Group->new($session,$session->form->process("groupId"));
 	if ($group->autoAdd) {
@@ -188,7 +188,7 @@ sub www_autoAddToGroup {
 
 #-------------------------------------------------------------------
 sub www_autoDeleteFromGroup {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return WebGUI::AdminConsole->new($session,"groups")->render($session->privilege->insufficient()) unless ($session->user->userId ne 1);
 	my $group = WebGUI::Group->new($session,$session->form->process("groupId"));
 	if ($group->autoDelete) {
@@ -199,7 +199,7 @@ sub www_autoDeleteFromGroup {
 
 #-------------------------------------------------------------------
 sub www_deleteGroup {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	return $session->privilege->vitalComponent() if (isIn($session->form->process("gid"), qw(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17)));
 	my $i18n = WebGUI::International->new($session);
@@ -214,7 +214,7 @@ sub www_deleteGroup {
 
 #-------------------------------------------------------------------
 sub www_deleteGroupConfirm {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	return $session->privilege->vitalComponent() if (isIn($session->form->process("gid"), qw(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17)));
 	my $g = WebGUI::Group->new($session,$session->form->process("gid"));
@@ -224,7 +224,7 @@ sub www_deleteGroupConfirm {
 
 #-------------------------------------------------------------------
 sub www_deleteGroupGrouping {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup('3') || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my $group = WebGUI::Group->new($session,$session->form->process("gid"));
 	$group->deleteGroups([$session->form->process("delete")]);
@@ -243,7 +243,7 @@ perform this operation, and the
 =cut
 
 sub www_deleteGrouping {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
         if (($session->user->userId eq $session->form->process("uid") || $session->form->process("uid") eq '3') && $session->form->process("gid") eq '3') {
                 return $session->privilege->vitalComponent();
@@ -260,7 +260,7 @@ sub www_deleteGrouping {
 
 #-------------------------------------------------------------------
 sub www_editGroup {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
         my ($output, $f, $g);
 	if ($session->form->process("gid") eq "new") {
@@ -408,7 +408,7 @@ sub www_editGroup {
 
 #-------------------------------------------------------------------
 sub www_editGroupSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my $g = WebGUI::Group->new($session,$session->form->process("gid"));
 	$g->description($session->form->process("description"));
@@ -434,7 +434,7 @@ sub www_editGroupSave {
 
 #-------------------------------------------------------------------
 sub www_editGrouping {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my $i18n = WebGUI::International->new($session);
 	my $f = WebGUI::HTMLForm->new($session);
@@ -481,7 +481,7 @@ sub www_editGrouping {
 
 #-------------------------------------------------------------------
 sub www_editGroupingSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my $group = WebGUI::Group->new($session,$session->form->process("gid"));
         $group->userGroupExpireDate($session->form->process("uid"),$session->datetime->setToEpoch($session->form->process("expireDate")));
@@ -491,7 +491,7 @@ sub www_editGroupingSave {
 
 #-------------------------------------------------------------------
 sub www_emailGroup {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my ($output,$f);
 	my $i18n = WebGUI::International->new($session);
@@ -528,7 +528,7 @@ sub www_emailGroup {
 
 #-------------------------------------------------------------------
 sub www_emailGroupSend {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my ($sth, $email);
 	$sth = $session->db->read("select b.fieldData from groupings a left join userProfileData b 
@@ -545,7 +545,7 @@ sub www_emailGroupSend {
 
 #-------------------------------------------------------------------
 sub www_listGroups {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $i18n = WebGUI::International->new($session);
 	if ($session->user->isInGroup(3)) {
 		my $output = getGroupSearchForm("listGroups");
@@ -603,7 +603,7 @@ sub www_listGroups {
 
 #-------------------------------------------------------------------
 sub www_manageGroupsInGroup {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
         my $f = WebGUI::HTMLForm->new($session);
         $f->hidden(
@@ -636,7 +636,7 @@ sub www_manageGroupsInGroup {
 
 #-------------------------------------------------------------------
 sub www_manageUsersInGroup {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session,$session->form->process("gid")));
 	my $i18n = WebGUI::International->new($session);
 	my $output = WebGUI::Form::formHeader($session,)
diff --git a/lib/WebGUI/Operation/Help.pm b/lib/WebGUI/Operation/Help.pm
index 3c1276920..0062227e6 100644
--- a/lib/WebGUI/Operation/Help.pm
+++ b/lib/WebGUI/Operation/Help.pm
@@ -20,7 +20,7 @@ use WebGUI::Utility;
 
 #-------------------------------------------------------------------
 sub _load {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $namespace = shift;
 	$namespace =~ s/[^\w\d\s]//g;
 	my $cmd = "WebGUI::Help::".$namespace;
@@ -37,7 +37,7 @@ sub _load {
 
 #-------------------------------------------------------------------
 sub _get {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $id = shift;
 	my $namespace = shift;
 	my $help = _load($session,$namespace);
@@ -51,19 +51,19 @@ sub _get {
 
 #-------------------------------------------------------------------
 sub _link {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->url->page('op=viewHelp;hid='.$session->url->escape($_[0]).';namespace='.$_[1]);
 }
 
 #-------------------------------------------------------------------
 sub _linkTOC {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->url->page('op=viewHelpChapter;namespace='.$_[0]);
 }
 
 #-------------------------------------------------------------------
 sub _getHelpFilesList {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $dir = join '/', $session->config->getWebguiRoot,"lib","WebGUI","Help";
         opendir (DIR,$dir) or $session->errorHandler->fatal("Can't open Help directory!");
 	my @files;
@@ -79,7 +79,7 @@ sub _getHelpFilesList {
 
 #-------------------------------------------------------------------
 sub _getHelpName {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $file = shift;
 	my $helpName;
 	if ($file =~ /^Asset_/) {
@@ -108,7 +108,7 @@ sub _related {
 
 #-------------------------------------------------------------------
 sub www_viewHelp {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->insufficient() unless ($session->user->isInGroup(7));
 	my $ac = WebGUI::AdminConsole->new($session,"help");
 	my $namespace = $session->form->process("namespace") || "WebGUI";
@@ -138,7 +138,7 @@ sub www_viewHelp {
 
 #-------------------------------------------------------------------
 sub www_viewHelpIndex {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->insufficient() unless ($session->user->isInGroup(7));
 	my $i18n = WebGUI::International->new($session);
         my @helpIndex;
@@ -173,7 +173,7 @@ sub www_viewHelpIndex {
 
 #-------------------------------------------------------------------
 sub www_viewHelpTOC {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->insufficient() unless ($session->user->isInGroup(7));
         my @helpIndex;
 	my $i;
@@ -204,7 +204,7 @@ sub www_viewHelpTOC {
 
 #-------------------------------------------------------------------
 sub www_viewHelpChapter {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->insufficient() unless ($session->user->isInGroup(7));
 	my $namespace = $session->form->process("namespace");
 	my $help = _load($session,$namespace);
diff --git a/lib/WebGUI/Operation/LDAPLink.pm b/lib/WebGUI/Operation/LDAPLink.pm
index b2775650a..36df6696b 100644
--- a/lib/WebGUI/Operation/LDAPLink.pm
+++ b/lib/WebGUI/Operation/LDAPLink.pm
@@ -20,7 +20,7 @@ use WebGUI::SQL;
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $workarea = shift;
 	my $title = shift;
 	my $i18n = WebGUI::International->new($session,"AuthLDAP");
@@ -46,7 +46,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_copyLDAPLink {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
    return $session->privilege->insufficient unless ($session->user->isInGroup(3));
    my (%db);
    tie %db, 'Tie::CPHash';
@@ -60,7 +60,7 @@ sub www_copyLDAPLink {
 
 #-------------------------------------------------------------------
 sub www_deleteLDAPLink {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
    return $session->privilege->insufficient unless ($session->user->isInGroup(3));
    $session->db->write("delete from ldapLink where ldapLinkId=".$session->db->quote($session->form->process("llid")));
    $session->form->process("op") = "listLDAPLinks";
@@ -69,7 +69,7 @@ sub www_deleteLDAPLink {
 
 #-------------------------------------------------------------------
 sub www_editLDAPLink {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
    return $session->privilege->insufficient unless ($session->user->isInGroup(3));
    my ($output, %db, $f);
    tie %db, 'Tie::CPHash';
@@ -182,7 +182,7 @@ sub www_editLDAPLink {
 
 #-------------------------------------------------------------------
 sub www_editLDAPLinkSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
    return $session->privilege->insufficient unless ($session->user->isInGroup(3));
    my $properties = {};
    $properties->{ldapLinkId} = $session->form->process("llid");
@@ -208,7 +208,7 @@ sub www_editLDAPLinkSave {
 
 #-------------------------------------------------------------------
 sub www_listLDAPLinks {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
    return $session->privilege->adminOnly() unless($session->user->isInGroup(3));
    my ($output, $p, $sth, $data, @row, $i);
 	my $i18n = WebGUI::International->new($session,"AuthLDAP");
diff --git a/lib/WebGUI/Operation/LoginHistory.pm b/lib/WebGUI/Operation/LoginHistory.pm
index 956f0bc21..c52a19588 100644
--- a/lib/WebGUI/Operation/LoginHistory.pm
+++ b/lib/WebGUI/Operation/LoginHistory.pm
@@ -34,7 +34,7 @@ they used.
 =cut
 
 sub www_viewLoginHistory {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my ($output, $p, @row, $i, $sth, %data);
 	my $i18n = WebGUI::International->new($session);
diff --git a/lib/WebGUI/Operation/MessageLog.pm b/lib/WebGUI/Operation/MessageLog.pm
index 892c248d0..5da1ad9ba 100644
--- a/lib/WebGUI/Operation/MessageLog.pm
+++ b/lib/WebGUI/Operation/MessageLog.pm
@@ -39,7 +39,7 @@ returns a hashref with internationalized values for message status.
 =cut
 
 sub _status {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $i18n = WebGUI::International->new($session);
 	return {"notice"=>$i18n->get(551),"pending"=>$i18n->get(552),"completed"=>$i18n->get(350)};
 }
@@ -53,7 +53,7 @@ Templated display all messages for the current user.
 =cut
 
 sub www_viewMessageLog {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
    my (@msg, $vars);
    return $session->privilege->insufficient() unless ($session->user->isInGroup(2,$session->user->userId));
 	my $i18n = WebGUI::International->new($session);
@@ -99,7 +99,7 @@ Templated display of a single message for the user.
 =cut
 
 sub www_viewMessageLogMessage {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
    my ($data, $vars);
    return $session->privilege->insufficient() unless ($session->user->isInGroup(2,$session->user->userId));
 	my $i18n = WebGUI::International->new($session);
diff --git a/lib/WebGUI/Operation/ProductManager.pm b/lib/WebGUI/Operation/ProductManager.pm
index 5a181bf15..769091133 100755
--- a/lib/WebGUI/Operation/ProductManager.pm
+++ b/lib/WebGUI/Operation/ProductManager.pm
@@ -12,7 +12,7 @@ use WebGUI::HTML;
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $i18n = WebGUI::International->new($session, "ProductManager");
 
 	my $workarea = shift;
@@ -36,7 +36,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_deleteProductParameterOption {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $optionId = $session->form->process("optionId");
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -48,7 +48,7 @@ sub www_deleteProductParameterOption {
 
 #-------------------------------------------------------------------
 sub www_deleteProductParameter {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $parameterId = $session->form->process("parameterId");
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -60,7 +60,7 @@ sub www_deleteProductParameter {
 
 #-------------------------------------------------------------------
 sub www_deleteProduct {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $productId = $session->form->process("productId");
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -72,7 +72,7 @@ sub www_deleteProduct {
 
 #-------------------------------------------------------------------
 sub www_editProduct {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($productId, $product, $f, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -148,7 +148,7 @@ sub www_editProduct {
 
 #-------------------------------------------------------------------
 sub www_editProductSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($self, @error, $productId, $product, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -180,7 +180,7 @@ sub www_editProductSave {
 		
 #-------------------------------------------------------------------
 sub www_editProductParameter {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($parameterId, $product, $productId, $parameter, $f, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -227,7 +227,7 @@ sub www_editProductParameter {
 
 #-------------------------------------------------------------------
 sub www_editProductParameterSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my (@error, $parameterId, $product, $i18n, $skuTemplate, $oldName, $newName);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -266,7 +266,7 @@ sub www_editProductParameterSave {
 
 #-------------------------------------------------------------------
 sub www_editProductParameterOption {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($self, $optionId, $option, $f, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -330,7 +330,7 @@ sub www_editProductParameterOption {
 
 #-------------------------------------------------------------------
 sub www_editProductParameterOptionSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($self, @error, $optionId, $product, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -357,7 +357,7 @@ sub www_editProductParameterOptionSave {
 
 #-------------------------------------------------------------------
 sub www_editProductVariant {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($variantId, $variant, $f, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -411,7 +411,7 @@ sub www_editProductVariant {
 
 #-------------------------------------------------------------------
 sub www_editProductVariantSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 my	$variantId = $session->form->process("variantId");
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -423,7 +423,7 @@ my	$variantId = $session->form->process("variantId");
 
 #-------------------------------------------------------------------
 sub www_editSkuTemplate {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($product, $productId, $output, $f, $name, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -463,7 +463,7 @@ sub www_editSkuTemplate {
 
 #-------------------------------------------------------------------
 sub www_editSkuTemplateSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($productId) = $session->form->process("productId");
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -477,7 +477,7 @@ sub www_editSkuTemplateSave {
 
 #-------------------------------------------------------------------
 sub www_listProducts {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($self, $sth, $output, $row, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -505,7 +505,7 @@ sub www_listProducts {
 
 #-------------------------------------------------------------------
 sub www_listProductVariants {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($productId, $product, @variants, %parameters, %options, $output, %composition, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
@@ -568,7 +568,7 @@ sub www_listProductVariants {
 
 #-------------------------------------------------------------------
 sub www_listProductVariantsSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
 	
@@ -587,7 +587,7 @@ sub www_listProductVariantsSave {
 
 #-------------------------------------------------------------------
 sub www_manageProduct {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($productId, $product, $output, $parameter, $option, $optionId, $i18n);
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(14));
diff --git a/lib/WebGUI/Operation/Profile.pm b/lib/WebGUI/Operation/Profile.pm
index 63e0bb099..87e091e0a 100644
--- a/lib/WebGUI/Operation/Profile.pm
+++ b/lib/WebGUI/Operation/Profile.pm
@@ -27,7 +27,7 @@ use WebGUI::Operation::Shared;
 #-------------------------------------------------------------------
 # Builds Extra form requirements for anonymous registration. 
 sub getRequiredProfileFields {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my @array;
 	foreach my $field (@{WebGUI::ProfileField->new($session,'dummy')->getRequiredFields}) {
 		push(@array, {
@@ -51,7 +51,7 @@ sub getRequiredProfileFields {
 =cut
 
 sub isDuplicateEmail {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $email = shift;
 	my ($otherEmail) = $session->db->quickArray("select count(*) from userProfileData where fieldName='email' and fieldData = ".$session->db->quote($email)." and userId <> ".$session->db->quote($session->user->userId));
 	return ($otherEmail > 0);
@@ -59,7 +59,7 @@ sub isDuplicateEmail {
 
 #-------------------------------------------------------------------
 sub saveProfileFields {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
    my $u = shift;
    my $profile = shift;
    
@@ -70,7 +70,7 @@ sub saveProfileFields {
 
 #-------------------------------------------------------------------
 sub validateProfileData {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my %data = ();
 	my $error = "";
 	my $warning = "";
@@ -93,7 +93,7 @@ sub validateProfileData {
 
 #-------------------------------------------------------------------
 sub www_editProfile {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return WebGUI::Operation::Auth::www_auth($session,"init") if($session->user->userId eq '1');
 	my $i18n = WebGUI::International->new($session);
 	my $vars = {};
@@ -130,7 +130,7 @@ sub www_editProfile {
 
 #-------------------------------------------------------------------
 sub www_editProfileSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($profile, $fieldName, $error, $u, $warning);
 	return WebGUI::Operation::Auth::www_auth("init") if ($session->user->userId eq '1');
 	
@@ -149,7 +149,7 @@ sub www_editProfileSave {
 
 #-------------------------------------------------------------------
 sub www_viewProfile {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $u = WebGUI::User->new($session,$session->form->process("uid"));
 	my $i18n = WebGUI::International->new($session);
 	my $vars = {};
diff --git a/lib/WebGUI/Operation/ProfileSettings.pm b/lib/WebGUI/Operation/ProfileSettings.pm
index 00c3432b0..dd765a118 100644
--- a/lib/WebGUI/Operation/ProfileSettings.pm
+++ b/lib/WebGUI/Operation/ProfileSettings.pm
@@ -21,7 +21,7 @@ use WebGUI::ProfileCategory;
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $workarea = shift;
         my $title = shift;
         my $help = shift;
@@ -48,7 +48,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_deleteProfileCategoryConfirm {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $category = WebGUI::ProfileCategory->new($session,$session->form->process("cid"));
         return WebGUI::AdminConsole->new($session,"userProfiling")->render($session->privilege->vitalComponent()) if ($category->isProtected);
@@ -58,7 +58,7 @@ sub www_deleteProfileCategoryConfirm {
 
 #-------------------------------------------------------------------
 sub www_deleteProfileFieldConfirm {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $field = WebGUI::ProfileField->new($session,$session->form->process("fid"));
         return WebGUI::AdminConsole->new($session,"userProfiling")->render($session->privilege->vitalComponent()) if ($field->isProtected);
@@ -68,7 +68,7 @@ sub www_deleteProfileFieldConfirm {
 
 #-------------------------------------------------------------------
 sub www_editProfileCategory {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $data = {};
 	my $i18n = WebGUI::International->new($session,"WebGUIProfile");
@@ -118,7 +118,7 @@ sub www_editProfileCategory {
 
 #-------------------------------------------------------------------
 sub www_editProfileCategorySave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my %data = (
 		label=>$session->form->text("label"),
@@ -135,7 +135,7 @@ sub www_editProfileCategorySave {
 
 #-------------------------------------------------------------------
 sub www_editProfileField {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $i18n = WebGUI::International->new($session,"WebGUIProfile");
         my $f = WebGUI::HTMLForm->new($session);
@@ -237,7 +237,7 @@ sub www_editProfileField {
 
 #-------------------------------------------------------------------
 sub www_editProfileFieldSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my %data = (
 		label=>$session->form->text("label"),
@@ -262,7 +262,7 @@ sub www_editProfileFieldSave {
 
 #-------------------------------------------------------------------
 sub www_editProfileSettings {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $i18n = WebGUI::International->new($session,"WebGUIProfile");
 	my $output = "";
@@ -287,7 +287,7 @@ sub www_editProfileSettings {
 
 #-------------------------------------------------------------------
 sub www_moveProfileCategoryDown {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	WebGUI::ProfileCategory->new($session,$session->form->process("cid"))->moveDown;
         return www_editProfileSettings($session);
@@ -295,7 +295,7 @@ sub www_moveProfileCategoryDown {
 
 #-------------------------------------------------------------------
 sub www_moveProfileCategoryUp {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	WebGUI::ProfileCategory->new($session,$session->form->process("cid"))->moveUp;
         return www_editProfileSettings($session);
@@ -303,7 +303,7 @@ sub www_moveProfileCategoryUp {
 
 #-------------------------------------------------------------------
 sub www_moveProfileFieldDown {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	WebGUI::ProfileField->new($session,$session->form->process("fid"))->moveDown;
         return www_editProfileSettings($session);
@@ -311,7 +311,7 @@ sub www_moveProfileFieldDown {
 
 #-------------------------------------------------------------------
 sub www_moveProfileFieldUp {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	WebGUI::ProfileField->new($session,$session->form->process("fid"))->moveUp;
         return www_editProfileSettings($session);
diff --git a/lib/WebGUI/Operation/Replacements.pm b/lib/WebGUI/Operation/Replacements.pm
index 7c6d2d5bd..268649513 100644
--- a/lib/WebGUI/Operation/Replacements.pm
+++ b/lib/WebGUI/Operation/Replacements.pm
@@ -18,7 +18,7 @@ use WebGUI::SQL;
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $workarea = shift;
         my $title = shift;
 	my $i18n = WebGUI::International->new($session);
@@ -36,7 +36,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_deleteReplacement {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	$session->db->write("delete from replacements where replacementId=".$session->db->quote($session->form->process("replacementId")));
 	return www_listReplacements();
@@ -44,7 +44,7 @@ sub www_deleteReplacement {
 
 #-------------------------------------------------------------------
 sub www_editReplacement {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $data = $session->db->getRow("replacements","replacementId",$session->form->process("replacementId"));
 	my $i18n = WebGUI::International->new($session);
@@ -79,7 +79,7 @@ sub www_editReplacement {
 
 #-------------------------------------------------------------------
 sub www_editReplacementSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	$session->db->setRow("replacements","replacementId",{
 		replacementId=>$session->form->process("replacementId"),
@@ -91,7 +91,7 @@ sub www_editReplacementSave {
 
 #-------------------------------------------------------------------
 sub www_listReplacements {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $i18n = WebGUI::International->new($session);
 	my $output = '
';
diff --git a/lib/WebGUI/Operation/Scratch.pm b/lib/WebGUI/Operation/Scratch.pm
index 7e77076b0..c3dfc77b7 100644
--- a/lib/WebGUI/Operation/Scratch.pm
+++ b/lib/WebGUI/Operation/Scratch.pm
@@ -32,7 +32,7 @@ variable, scratchName.
 =cut
 
 sub www_deleteScratch {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$session->scratch->delete("www_".$session->form->process("scratchName"));
 	return "";
 }
@@ -49,7 +49,7 @@ the value the variable should take.
 =cut
 
 sub www_setScratch {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$session->scratch->set("www_".$session->form->process("scratchName"),$session->form->process("scratchValue"));
 	return "";
 }
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index 992a3d968..aff525d32 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -19,7 +19,7 @@ use WebGUI::SQL;
 
 #-------------------------------------------------------------------
 sub www_editSettings {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $i18n = WebGUI::International->new($session, "WebGUI");
 	my %tabs;
@@ -288,7 +288,7 @@ sub www_editSettings {
 
 #-------------------------------------------------------------------
 sub www_saveSettings {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my ($key, $value);
 	foreach $key (%{$session->form->paramsHashRef}) {
diff --git a/lib/WebGUI/Operation/Shared.pm b/lib/WebGUI/Operation/Shared.pm
index af817764f..35f694bbb 100644
--- a/lib/WebGUI/Operation/Shared.pm
+++ b/lib/WebGUI/Operation/Shared.pm
@@ -18,7 +18,7 @@ use Safe;
 
 #-------------------------------------------------------------------
  sub accountOptions {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $i18n = WebGUI::International->new($session);
 	my @array;
 	if ($session->user->isInGroup(12)) {
@@ -69,7 +69,7 @@ use Safe;
 #-------------------------------------------------------------------
 # This function is here to replace the dangerous eval calls in the User Profile System.
 sub secureEval {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $code = shift;
 
 	# Handle WebGUI function calls
diff --git a/lib/WebGUI/Operation/Statistics.pm b/lib/WebGUI/Operation/Statistics.pm
index 9da8e6acb..596221bac 100644
--- a/lib/WebGUI/Operation/Statistics.pm
+++ b/lib/WebGUI/Operation/Statistics.pm
@@ -18,7 +18,7 @@ use WebGUI::SQL;
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $workarea = shift;
 	my $title = shift;
 	my $i18n = WebGUI::International->new($session);
@@ -33,7 +33,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_viewStatistics {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
         my ($output, $data);
 	my $i18n = WebGUI::International->new($session);
diff --git a/lib/WebGUI/Operation/Style.pm b/lib/WebGUI/Operation/Style.pm
index a1e4086bc..b77a0f737 100644
--- a/lib/WebGUI/Operation/Style.pm
+++ b/lib/WebGUI/Operation/Style.pm
@@ -33,7 +33,7 @@ the printableStyleId is used instead of the normal styleId for the page.
 =cut
 
 sub www_makePrintable {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	if ($session->form->process("styleId") ne "") {
 		$session->asset->{_properties}{printableStyleTemplateId} = $session->form->process("styleId");
 	}
@@ -52,7 +52,7 @@ overriding the style without setting a printable style and on a per user basis.
 =cut
 
 sub www_setPersonalStyle {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$session->scratch->set("personalStyleId",$session->form->process("styleId"));
 	return "";
 }
@@ -66,7 +66,7 @@ Clears the personalStyleId from the scratch area of the session variable.
 =cut
 
 sub www_unsetPersonalStyle {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$session->scratch->delete("personalStyleId");
 	return "";
 }
diff --git a/lib/WebGUI/Operation/Subscription.pm b/lib/WebGUI/Operation/Subscription.pm
index d65ba4691..174c529e7 100644
--- a/lib/WebGUI/Operation/Subscription.pm
+++ b/lib/WebGUI/Operation/Subscription.pm
@@ -14,7 +14,7 @@ use WebGUI::International;
 
 #-------------------------------------------------------------------
 sub _generateCode {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($codeLength, @codeElements, $code, $i);
 	$codeLength = shift || 64;
 	@codeElements = ('A'..'Z', 'a'..'z', 0..9, '-');
@@ -28,7 +28,7 @@ sub _generateCode {
 
 #-------------------------------------------------------------------
 sub _submenu {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $i18n = WebGUI::International->new($session, "Subscription");
 
 	my $workarea = shift;
@@ -49,7 +49,7 @@ sub _submenu {
 
 #-------------------------------------------------------------------
 sub www_createSubscriptionCodeBatch {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my (%subscriptions, $f, $error, $errorMessage);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
@@ -107,7 +107,7 @@ sub www_createSubscriptionCodeBatch {
 	
 #-------------------------------------------------------------------
 sub www_createSubscriptionCodeBatchSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($numberOfCodes, $description, $expires, $batchId, @codeElements, $currentCode, $code, $i, @subscriptions, 
 		@error, $creationEpoch);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
@@ -148,7 +148,7 @@ sub www_createSubscriptionCodeBatchSave {
 
 #-------------------------------------------------------------------
 sub www_deleteSubscription {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
 	WebGUI::Subscription->new($session,$session->form->process("sid"))->delete;
@@ -157,7 +157,7 @@ sub www_deleteSubscription {
 
 #-------------------------------------------------------------------
 sub www_deleteSubscriptionCodeBatch {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
 	$session->db->write("delete from subscriptionCodeBatch where batchId=".$session->db->quote($session->form->process("bid")));
@@ -168,7 +168,7 @@ sub www_deleteSubscriptionCodeBatch {
 
 #-------------------------------------------------------------------
 sub www_deleteSubscriptionCodes {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
 	if ($session->form->process("selection") eq 'dc') {
@@ -184,7 +184,7 @@ sub www_deleteSubscriptionCodes {
 
 #-------------------------------------------------------------------
 sub www_editSubscription {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($properties, $subscriptionId, $durationInterval, $durationUnits, $f);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
@@ -261,7 +261,7 @@ sub www_editSubscription {
 
 #-------------------------------------------------------------------
 sub www_editSubscriptionSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my (@relevantFields);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
@@ -272,7 +272,7 @@ sub www_editSubscriptionSave {
 
 #-------------------------------------------------------------------
 sub www_listSubscriptionCodeBatches {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($p, $batches, $output);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
@@ -302,7 +302,7 @@ sub www_listSubscriptionCodeBatches {
 
 #-------------------------------------------------------------------
 sub www_listSubscriptionCodes {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($p, $codes, $output, $where, $ops, $delete);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 
@@ -384,7 +384,7 @@ sub www_listSubscriptionCodes {
 
 #-------------------------------------------------------------------
 sub www_listSubscriptions {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($p, $subscriptions, $output);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	
@@ -413,7 +413,7 @@ sub www_listSubscriptions {
 
 #-------------------------------------------------------------------
 sub www_purchaseSubscription {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	WebGUI::Commerce::ShoppingCart->new($session)->add($session->form->process("sid"), 'Subscription');
 	
 	return $session->http->setRedirect($session->url->page('op=checkout'));
@@ -421,7 +421,7 @@ sub www_purchaseSubscription {
 
 #-------------------------------------------------------------------
 sub www_redeemSubscriptionCode {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my (%codeProperties, @subscriptions, %var, $f);
 	my $i18n = WebGUI::International->new($session, "Subscription");
 	
diff --git a/lib/WebGUI/Operation/TransactionLog.pm b/lib/WebGUI/Operation/TransactionLog.pm
index 103341f0e..fee908b9e 100644
--- a/lib/WebGUI/Operation/TransactionLog.pm
+++ b/lib/WebGUI/Operation/TransactionLog.pm
@@ -29,7 +29,7 @@ This error message will be added to the template variables.
 =cut
 
 sub www_viewPurchaseHistory {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my (@history, @historyLoop, %var, %properties);
 
 	$var{errorMessage} = shift;
@@ -63,7 +63,7 @@ $session->form->process("tid").
 =cut
 
 sub www_cancelRecurringTransaction {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my ($transaction, $error, $message);
 	
 	my $i18n = WebGUI::International->new($session, "TransactionLog");
@@ -89,7 +89,7 @@ Afterward, it calls www_listTransactions
 =cut
 
 sub www_deleteTransaction {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $transactionId;
 
 	return $session->privilege->insufficient unless ($session->user->isInGroup(3));
@@ -103,7 +103,7 @@ sub www_deleteTransaction {
 
 #-------------------------------------------------------------------
 sub www_deleteTransactionItem {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->insufficient unless ($session->user->isInGroup(3));
 	
 	WebGUI::Commerce::Transaction->new($session, $session->form->process("tid"))->deleteItem($session->form->process("iid"), $session->form->process("itype"));
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 258d8a972..54843a714 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -56,7 +56,7 @@ Help topic.  If set, then a Help icon will be displayed as a link to that topic.
 =cut
 
 sub _submenu {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $workarea = shift;
         my $title = shift;
 	my $i18n = WebGUI::International->new($session);
@@ -105,7 +105,7 @@ Array reference, used to screen out user names via a SQL "not in ()" clause.
 
 #-------------------------------------------------------------------
 sub doUserSearch {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $op = shift;
 	my $returnPaginator = shift;
 	my $userFilter = shift;
@@ -157,7 +157,7 @@ Hashref.  A set of key,value pairs that will be hidden in the user search form.
 
 #-------------------------------------------------------------------
 sub getUserSearchForm {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $op = shift;
 	my $params = shift;
 	$session->scratch->set("userSearchKeyword",$session->form->process("keyword"));
@@ -220,7 +220,7 @@ Allows an administrator to assume another user.
 =cut
 
 sub www_becomeUser {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	$session->user({userId=>$session->form->process("uid")});
 	$session->var->end($session->var->get("sessionId"));
@@ -240,7 +240,7 @@ of the user to delete is expected in a URL param names 'uid'.
 =cut
 
 sub www_deleteUser {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my ($output);
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my $i18n = WebGUI::International->new($session);
@@ -267,7 +267,7 @@ after this.
 =cut
 
 sub www_deleteUserConfirm {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
 	my ($u);
         if ($session->form->process("uid") eq '1' || $session->form->process("uid") eq '3') {
@@ -281,7 +281,7 @@ sub www_deleteUserConfirm {
 
 #-------------------------------------------------------------------
 sub www_editUser {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(11));
 	my $error = shift;
 	my $i18n = WebGUI::International->new($session, "WebGUI");
@@ -389,7 +389,7 @@ sub www_editUser {
 
 #-------------------------------------------------------------------
 sub www_editUserSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);	
+	my $session = shift;	
 	my $isAdmin = $session->user->isInGroup(3);
 	my $isSecondary;
 	unless ($isAdmin) {
@@ -429,7 +429,7 @@ sub www_editUserSave {
 
 #-------------------------------------------------------------------
 sub www_editUserKarma {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
         my ($output, $f, $a, %user, %data, $method, $values, $category, $label, $default, $previousCategory);
 	my $i18n = WebGUI::International->new($session);
@@ -459,7 +459,7 @@ sub www_editUserKarma {
 
 #-------------------------------------------------------------------
 sub www_editUserKarmaSave {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
         my ($u);
         $u = WebGUI::User->new($session,$session->form->process("uid"));
@@ -469,7 +469,7 @@ sub www_editUserKarmaSave {
 
 #-------------------------------------------------------------------
 sub www_listUsers {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	unless ($session->user->isInGroup(3)) {
 		if ($session->user->isInGroup(11)) {
 			$session->form->process("uid") = "new";
diff --git a/lib/WebGUI/Operation/WebGUI.pm b/lib/WebGUI/Operation/WebGUI.pm
index 83b19ebf3..7251895c9 100644
--- a/lib/WebGUI/Operation/WebGUI.pm
+++ b/lib/WebGUI/Operation/WebGUI.pm
@@ -24,7 +24,7 @@ The beginning of WebGUI.
 =cut
 
 sub www_genesis {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$session->style->useEmptyStyle("1");
 	my $output = 'About WebGUI
@@ -51,7 +51,7 @@ password and email address, as well as some other WebGUI settings.
 
 #-------------------------------------------------------------------
 sub www_setup {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$session->http->setMimeType("text/html");
 	return "" unless ($session->setting->get("specialState") eq "init");
 	my $i18n = WebGUI::International->new($session, "WebGUI");
@@ -161,7 +161,7 @@ to work, even superseding the session variable.
 
 #-------------------------------------------------------------------
 sub www_theWg {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$session->style->useEmptyStyle("1");
 	my $output = 'WebGUI

 packageWebGUI;our$VERSION="5.5.0";usestrictqw(varssubs);useTie::CPHash;useW
diff --git a/lib/WebGUI/Paginator.pm b/lib/WebGUI/Paginator.pm
index e336d233a..1821931e1 100644
--- a/lib/WebGUI/Paginator.pm
+++ b/lib/WebGUI/Paginator.pm
@@ -457,7 +457,7 @@ Specify the form variable the paginator should use in it's links.  Defaults to "
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $currentURL = shift;
 	my $rowsPerPage = shift || 25;
 	my $formVar = shift || "pn";
diff --git a/lib/WebGUI/PassiveProfiling.pm b/lib/WebGUI/PassiveProfiling.pm
index 686e8143e..1723076fa 100644
--- a/lib/WebGUI/PassiveProfiling.pm
+++ b/lib/WebGUI/PassiveProfiling.pm
@@ -54,7 +54,7 @@ The assetId to add.
 =cut
 
 sub add {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return unless ($session->setting->get("passiveProfilingEnabled"));
 	my $assetId = shift;
 	my $sql = "insert into passiveProfileLog (passiveProfileLogId, userId, sessionId, assetId, dateOfEntry)
@@ -84,7 +84,7 @@ The assetId of the page you want to log.
 =cut
 
 sub addPage {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	return unless ($session->setting->get("passiveProfilingEnabled"));
 	my $pageId = shift;
 	my @wids = $session->db->buildArray("select assetId from asset where parentId=".$session->db->quote($pageId));
@@ -112,7 +112,7 @@ A hashRef with userId and assetId.
 =cut
 
 sub summarizeAOI {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $data = shift;
 	my $sql = "
 		select f.fieldName, 
diff --git a/lib/WebGUI/Product.pm b/lib/WebGUI/Product.pm
index 32adb41c6..830119e4f 100755
--- a/lib/WebGUI/Product.pm
+++ b/lib/WebGUI/Product.pm
@@ -129,7 +129,7 @@ sub getByOptionId {
 	my ($class, $optionId, $productId);
 
 	$class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$optionId = shift;
 	
 
@@ -145,7 +145,7 @@ sub getByOptionId {
 sub getByParameterId {
 	my ($class, $parameterId, $productId);
 	$class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$parameterId = shift;
 	
 	($productId) = $session->db->quickArray("select productId from productParameters where parameterId=".$session->db->quote($parameterId));
@@ -157,7 +157,7 @@ sub getByParameterId {
 sub getByVariantId {
 	my ($class, $productId, $variantId);
 	$class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$variantId = shift;
 
 	($productId) = $session->db->quickArray("select productId from productVariants where variantId=".$session->db->quote($variantId));
@@ -202,7 +202,7 @@ sub getVariant {
 sub new {
 	my ($class, $productId, $properties, $parameters, $variants, $options, $sth, %row, $option, $new);
 	$class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$productId = shift;
 	$session->errorHandler->fatal('no productId') unless ($productId);
 	$parameters = {};
diff --git a/lib/WebGUI/ProfileCategory.pm b/lib/WebGUI/ProfileCategory.pm
index c5565ff70..238685376 100644
--- a/lib/WebGUI/ProfileCategory.pm
+++ b/lib/WebGUI/ProfileCategory.pm
@@ -69,7 +69,7 @@ A hash reference containing the properties of this field. See the set() method f
 
 sub create {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $properties = shift;
         my ($sequenceNumber) = $session->db->quickArray("select max(sequenceNumber) from userProfileCategory");
  	my $id = $session->db->setRow("userProfileCategory","profileCategoryId",{profileCategoryId=>"new", sequenceNumber=>$sequenceNumber+1});
@@ -276,7 +276,7 @@ The unique id of this category.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $id = shift;
 	return undef unless ($id);
 	my $properties = $session->db->getRow("userProfileCategory","profileCategoryId",$id);
diff --git a/lib/WebGUI/ProfileField.pm b/lib/WebGUI/ProfileField.pm
index 79292fdb8..90e0b05a5 100644
--- a/lib/WebGUI/ProfileField.pm
+++ b/lib/WebGUI/ProfileField.pm
@@ -80,7 +80,7 @@ The unique id of the category to assign this field to. Defaults to "1" (misc).
 
 sub create {
         my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $fieldName = shift;
         my $properties = shift;
 	my $categoryId = shift || "1";
@@ -412,7 +412,7 @@ The unique name of this field.
 
 sub new {
         my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
         my $id = shift;
         return undef unless ($id);
         my $properties = $session->db->getRow("userProfileField","fieldName",$id);
diff --git a/lib/WebGUI/SQL.pm b/lib/WebGUI/SQL.pm
index 032ebccb8..52723b259 100644
--- a/lib/WebGUI/SQL.pm
+++ b/lib/WebGUI/SQL.pm
@@ -218,7 +218,7 @@ The password to use to connect to the database defined by dsn.
 
 sub connect {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $dsn = shift;
 	my $user = shift;
 	my $pass = shift;
diff --git a/lib/WebGUI/Session/DateTime.pm b/lib/WebGUI/Session/DateTime.pm
index 2007980ce..db3ddfa6b 100644
--- a/lib/WebGUI/Session/DateTime.pm
+++ b/lib/WebGUI/Session/DateTime.pm
@@ -629,7 +629,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/ErrorHandler.pm b/lib/WebGUI/Session/ErrorHandler.pm
index 9af856ba7..22fdafc36 100644
--- a/lib/WebGUI/Session/ErrorHandler.pm
+++ b/lib/WebGUI/Session/ErrorHandler.pm
@@ -315,7 +315,7 @@ An active WebGUI::Session object.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	unless (Log::Log4perl->initialized()) {
 		$Log::Log4perl::caller_depth++;
  		Log::Log4perl->init( $session->config->getWebguiRoot."/etc/log.conf" );   
diff --git a/lib/WebGUI/Session/Form.pm b/lib/WebGUI/Session/Form.pm
index 65064e2e4..e49af34ae 100644
--- a/lib/WebGUI/Session/Form.pm
+++ b/lib/WebGUI/Session/Form.pm
@@ -111,7 +111,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/Http.pm b/lib/WebGUI/Session/Http.pm
index 6c97e3faa..d4e020557 100644
--- a/lib/WebGUI/Session/Http.pm
+++ b/lib/WebGUI/Session/Http.pm
@@ -174,7 +174,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/Icon.pm b/lib/WebGUI/Session/Icon.pm
index ac9a449db..83faae8b7 100644
--- a/lib/WebGUI/Session/Icon.pm
+++ b/lib/WebGUI/Session/Icon.pm
@@ -501,7 +501,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/Id.pm b/lib/WebGUI/Session/Id.pm
index 5b78bbea8..20512176a 100644
--- a/lib/WebGUI/Session/Id.pm
+++ b/lib/WebGUI/Session/Id.pm
@@ -89,7 +89,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	srand;
 	bless {_session=>$session}, $class;
 }
diff --git a/lib/WebGUI/Session/Privilege.pm b/lib/WebGUI/Session/Privilege.pm
index c7b36d4cc..e8122edf3 100644
--- a/lib/WebGUI/Session/Privilege.pm
+++ b/lib/WebGUI/Session/Privilege.pm
@@ -113,7 +113,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/Scratch.pm b/lib/WebGUI/Session/Scratch.pm
index cde9fa9a4..9feca8352 100644
--- a/lib/WebGUI/Session/Scratch.pm
+++ b/lib/WebGUI/Session/Scratch.pm
@@ -148,7 +148,7 @@ The current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $data = $session->db->buildHashRef("select name,value from userSessionScratch where sessionId=".$session->db->quote($session->getId));
 	bless {_session=>$session,_sessionId=>$session->getId, _data=>$data}, $class;
 }
diff --git a/lib/WebGUI/Session/Setting.pm b/lib/WebGUI/Session/Setting.pm
index 9b7e17783..8fa5526c6 100644
--- a/lib/WebGUI/Session/Setting.pm
+++ b/lib/WebGUI/Session/Setting.pm
@@ -114,7 +114,7 @@ A reference to the current WebGUI::Session.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $settings = $session->db->buildHashRef("select * from settings");
 	bless {_settings=>$settings, _session=>$session}, $class;
 }
diff --git a/lib/WebGUI/Session/Stow.pm b/lib/WebGUI/Session/Stow.pm
index 9eca8b7a0..e6b52eef1 100644
--- a/lib/WebGUI/Session/Stow.pm
+++ b/lib/WebGUI/Session/Stow.pm
@@ -125,7 +125,7 @@ A reference to the session.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/Style.pm b/lib/WebGUI/Session/Style.pm
index 5d0800ff8..687a5b866 100644
--- a/lib/WebGUI/Session/Style.pm
+++ b/lib/WebGUI/Session/Style.pm
@@ -144,7 +144,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/Url.pm b/lib/WebGUI/Session/Url.pm
index 86e778db9..9fa128535 100644
--- a/lib/WebGUI/Session/Url.pm
+++ b/lib/WebGUI/Session/Url.pm
@@ -259,7 +259,7 @@ A reference to the current session.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	bless {_session=>$session}, $class;
 }
 
diff --git a/lib/WebGUI/Session/Var.pm b/lib/WebGUI/Session/Var.pm
index 08056fefd..9a7eeca96 100644
--- a/lib/WebGUI/Session/Var.pm
+++ b/lib/WebGUI/Session/Var.pm
@@ -159,7 +159,7 @@ A reference to the session.
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $self = bless {_session=>$session}, $class;
 	my $sessionId = shift;
 	if ($sessionId eq "") {
diff --git a/lib/WebGUI/Storage.pm b/lib/WebGUI/Storage.pm
index 186c7ab6a..17d9095aa 100644
--- a/lib/WebGUI/Storage.pm
+++ b/lib/WebGUI/Storage.pm
@@ -326,7 +326,7 @@ A reference to the current session;
 
 sub create {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $id = $session->id->generate();
 	my $self = $class->get($session,$id); 
 	$self->_makePath;
@@ -348,7 +348,7 @@ A reference to the current session.
 
 sub createTemp {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $id = $session->id->generate();
 	$id =~ m/^(.{2})/;
 	my $self = {_session=>$session, _id => $id, _part1 => 'temp', _part2 => $1};
@@ -409,7 +409,7 @@ The unique identifier for this file system storage location.
 
 sub get {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $id = shift;
 	return undef unless $id;
 	$id =~ m/^(.{2})(.{2})/;
diff --git a/lib/WebGUI/Subscription.pm b/lib/WebGUI/Subscription.pm
index 96f82d9d2..62a327f4a 100644
--- a/lib/WebGUI/Subscription.pm
+++ b/lib/WebGUI/Subscription.pm
@@ -127,7 +127,7 @@ from the database.
 sub new {
 	my ($class, $subscriptionId, %properties);
 	$class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	$subscriptionId = shift;
 
 	if ($subscriptionId eq 'new') {
diff --git a/lib/WebGUI/TabForm.pm b/lib/WebGUI/TabForm.pm
index e58ac4074..d47c9ebd8 100644
--- a/lib/WebGUI/TabForm.pm
+++ b/lib/WebGUI/TabForm.pm
@@ -192,7 +192,7 @@ A string containing the link to the tab-CascadingStyleSheet
 
 sub new {
 	my $class = shift;
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $startingTabs = shift;
 	my $css = shift || $session->config->get("extrasURL").'/tabs/tabs.css';
 	my $cancelUrl = shift || $session->url->page();
diff --git a/lib/WebGUI/User.pm b/lib/WebGUI/User.pm
index 59b56aefb..405e50286 100644
--- a/lib/WebGUI/User.pm
+++ b/lib/WebGUI/User.pm
@@ -54,7 +54,7 @@ These methods are available from this class:
 
 #-------------------------------------------------------------------
 sub _create {
-	my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+	my $session = shift;
 	my $userId = shift || $session->id->generate();
 	$session->db->write("insert into users (userId,dateCreated) values (".$session->db->quote($userId).",".time().")");
 	WebGUI::Group->new($session,[2])->addUsers([$userId]);
@@ -470,7 +470,7 @@ A unique ID to use instead of the ID that WebGUI will generate for you. It must
 
 sub new {
         my $class = shift;
-        my $session = shift; use WebGUI; WebGUI::dumpSession($session);
+        my $session = shift;
         my $userId = shift || 1;
 	my $overrideId = shift;
         $userId = _create($session, $overrideId) if ($userId eq "new");