From c4553012d1ce185c3c1d5cf6d2d40ce546ca759f Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 17 Nov 2010 16:34:11 -0800
Subject: [PATCH] Syntax clean.

---
 lib/WebGUI/Admin.pm                             |  2 +-
 lib/WebGUI/Asset.pm                             | 17 +++++++++--------
 lib/WebGUI/Asset/File.pm                        |  4 ++--
 lib/WebGUI/Asset/File/Image.pm                  |  4 ++--
 lib/WebGUI/Asset/File/ZipArchive.pm             |  6 +++---
 lib/WebGUI/Asset/Redirect.pm                    |  4 ++--
 lib/WebGUI/Asset/Shortcut.pm                    | 14 +++++++-------
 lib/WebGUI/Asset/Sku/Product.pm                 |  4 ++--
 lib/WebGUI/Asset/Snippet.pm                     |  4 ++--
 lib/WebGUI/Asset/Template.pm                    |  4 ++--
 lib/WebGUI/Asset/Template/Parser.pm             |  2 +-
 lib/WebGUI/Asset/Wobject/Article.pm             |  4 ++--
 lib/WebGUI/Asset/Wobject/Calendar.pm            |  2 +-
 lib/WebGUI/Asset/Wobject/Dashboard.pm           | 10 +++++-----
 lib/WebGUI/Asset/Wobject/DataForm.pm            |  4 ++--
 lib/WebGUI/Asset/Wobject/HttpProxy.pm           |  2 +-
 lib/WebGUI/Asset/Wobject/Layout.pm              |  4 ++--
 lib/WebGUI/Asset/Wobject/Matrix.pm              |  4 ++--
 lib/WebGUI/Asset/Wobject/MultiSearch.pm         |  4 ++--
 lib/WebGUI/Asset/Wobject/Navigation.pm          |  2 +-
 lib/WebGUI/Asset/Wobject/SQLReport.pm           |  4 ++--
 lib/WebGUI/Asset/Wobject/SyndicatedContent.pm   |  4 ++--
 lib/WebGUI/Asset/Wobject/Thingy.pm              |  4 ++--
 lib/WebGUI/AssetExportHtml.pm                   |  6 +++---
 lib/WebGUI/Auth.pm                              |  2 +-
 lib/WebGUI/Content/Asset.pm                     |  4 ++--
 lib/WebGUI/Macro/AdminBar.pm                    |  2 +-
 lib/WebGUI/Macro/AdminText.pm                   |  2 +-
 lib/WebGUI/Macro/AdminToggle.pm                 |  2 +-
 lib/WebGUI/Macro/AssetProxy.pm                  |  6 +++---
 lib/WebGUI/Macro/EditableToggle.pm              |  2 +-
 lib/WebGUI/Macro/FilePump.pm                    |  2 +-
 lib/WebGUI/Macro/L_loginBox.pm                  |  2 +-
 lib/WebGUI/Middleware/WGAccess.pm               |  2 +-
 lib/WebGUI/Operation/ActiveSessions.pm          |  2 +-
 lib/WebGUI/Operation/Admin.pm                   |  6 +++---
 lib/WebGUI/Operation/User.pm                    |  2 +-
 lib/WebGUI/PassiveProfiling.pm                  |  4 ++--
 lib/WebGUI/Role/Asset/Comments.pm               |  2 +-
 lib/WebGUI/Session.pm                           |  1 -
 lib/WebGUI/Session/Http.pm                      |  7 ++++---
 lib/WebGUI/Test/Mechanize.pm                    |  2 +-
 lib/WebGUI/VersionTag.pm                        |  2 +-
 .../Workflow/Activity/DeleteExpiredSessions.pm  |  2 +-
 44 files changed, 88 insertions(+), 87 deletions(-)

diff --git a/lib/WebGUI/Admin.pm b/lib/WebGUI/Admin.pm
index ad1036c68..442ea532d 100644
--- a/lib/WebGUI/Admin.pm
+++ b/lib/WebGUI/Admin.pm
@@ -754,7 +754,7 @@ sub www_view {
     $var->{backToSiteUrl} = $url->page;
 
     # temporary! We are now in admin mode!
-    $session->var->switchAdminOn;
+    $session->switchAdminOn;
 
     # Add vars for AdminBar
     $var->{adminPlugins} = $self->getAdminPluginTemplateVars;
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index fc7fa7f22..b5bf4fb18 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -454,7 +454,7 @@ The missing URL.
 sub addMissing {
 	my $self = shift;
 	my $assetUrl = shift;
-	return undef unless ($self->session->var->isAdminOn);
+	return undef unless ($self->session->isAdminOn);
 	my $i18n = WebGUI::International->new($self->session, "Asset");
 	my $output = $i18n->get("missing page query");
 	$output .= '<ul>
@@ -592,14 +592,15 @@ to SSL.
 sub checkView {
 	my $self = shift;
 	return $self->session->privilege->noAccess() unless $self->canView;
-	my ($conf, $var, $http) = $self->session->quick(qw(config var http));
+    my $session = $self->session;
+	my ($conf, $http) = $self->session->quick(qw(config http));
     if ($conf->get("sslEnabled") && $self->get("encryptPage") && ! $self->session->request->secure) {
         # getUrl already changes url to https if 'encryptPage'
         $http->setRedirect($self->getUrl);
         $http->sendHeader;
         return "chunked";
 	}
-    elsif ($var->isAdminOn && $self->get("state") =~ /^trash/) { # show em trash
+    elsif ($session->isAdminOn && $self->get("state") =~ /^trash/) { # show em trash
         my $queryFrag = "func=manageTrash";
         if ($self->session->form->process('revision')) {
             $queryFrag .= ";revision=".$self->session->form->process('revision');
@@ -608,7 +609,7 @@ sub checkView {
         $http->sendHeader;
 		return "chunked";
 	} 
-    elsif ($var->isAdminOn && $self->get("state") =~ /^clipboard/) { # show em clipboard
+    elsif ($session->isAdminOn && $self->get("state") =~ /^clipboard/) { # show em clipboard
         my $queryFrag = "func=manageClipboard";
         if ($self->session->form->process('revision')) {
             $queryFrag .= ";revision=".$self->session->form->process('revision');
@@ -679,7 +680,7 @@ sub dispatch {
     my $session = $self->session;
     my $state = $self->get('state');
     ##Only allow interaction with assets in certain states
-    return if $state ne 'published' && $state ne 'archived' && !$session->var->isAdminOn;
+    return if $state ne 'published' && $state ne 'archived' && !$session->isAdminOn;
     my $func    = $session->form->param('func') || 'view';
     my $viewing = $func eq 'view' ? 1 : 0;
     my $sub     = $self->can('www_'.$func);
@@ -1594,7 +1595,7 @@ Returns a toolbar with a set of icons that hyperlink to functions that delete, e
 
 sub getToolbar {
     my $self = shift;
-    return undef unless $self->canEdit && $self->session->var->isAdminOn;
+    return undef unless $self->canEdit && $self->session->isAdminOn;
     return $self->{_toolbar}
         if (exists $self->{_toolbar});
     my $userUiLevel = $self->session->user->profileField("uiLevel");
@@ -2370,7 +2371,7 @@ sub processTemplate {
     }
     if (! Exception::Class->caught() ) {
         $var = { %{ $var }, %{ $self->getMetaDataAsTemplateVariables } };
-        $var->{'controls'}   = $self->getToolbar if $session->var->isAdminOn;
+        $var->{'controls'}   = $self->getToolbar if $session->isAdminOn;
         $var->{'assetIdHex'} = $session->id->toHex($self->getId);
         my %vars = (
             %{$self->get},
@@ -2681,7 +2682,7 @@ The default view method for any asset that doesn't define one. Under all normal
 
 sub view {
 	my $self = shift;
-	if ($self->session->var->isAdminOn) {
+	if ($self->session->isAdminOn) {
 		return $self->getToolbar.' '.$self->getTitle;
 	} else {
 		return "";
diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm
index 28c871024..12b8ec526 100644
--- a/lib/WebGUI/Asset/File.pm
+++ b/lib/WebGUI/Asset/File.pm
@@ -564,7 +564,7 @@ Generate the view method for the Asset, and handle caching.
 
 sub view {
 	my $self = shift;
-	if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
+	if (!$self->session->isAdminOn && $self->get("cacheTimeout") > 10) {
 		my $out = $self->session->cache->get($self->getViewCacheKey);
 		return $out if $out;
 	}
@@ -574,7 +574,7 @@ sub view {
 	$var{fileIcon} = $self->getFileIconUrl;
 	$var{fileSize} = Number::Format::format_bytes($self->get("assetSize"));
     my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
-	if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
+	if (!$self->session->isAdminOn && $self->get("cacheTimeout") > 10) {
 		$self->session->cache->set($self->getViewCacheKey, $out, $self->get("cacheTimeout"));
 	}
     return $out;
diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm
index 38613c581..c117bf05f 100644
--- a/lib/WebGUI/Asset/File/Image.pm
+++ b/lib/WebGUI/Asset/File/Image.pm
@@ -210,7 +210,7 @@ sub view {
     my $session = $self->session;
     my $cache = $session->cache;
     my $cacheKey = $self->getWwwCacheKey('view');
-    if (!$session->var->isAdminOn && $self->cacheTimeout > 10) {
+    if (!$session->isAdminOn && $self->cacheTimeout > 10) {
         my $out = $cache->get( $cacheKey );
 		return $out if $out;
 	}
@@ -233,7 +233,7 @@ sub view {
     $var{annotateJs}  = $crop_js . $domMe;
     $var{parameters} .= sprintf(q{ id="%s"}, $self->getId);
     my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
-    if (!$session->var->isAdminOn && $self->cacheTimeout > 10) {
+    if (!$session->isAdminOn && $self->cacheTimeout > 10) {
         $cache->set( $cacheKey, $out, $self->get("cacheTimeout") );
     }
     return $out;
diff --git a/lib/WebGUI/Asset/File/ZipArchive.pm b/lib/WebGUI/Asset/File/ZipArchive.pm
index e2bd61571..fc62fb3ca 100644
--- a/lib/WebGUI/Asset/File/ZipArchive.pm
+++ b/lib/WebGUI/Asset/File/ZipArchive.pm
@@ -209,7 +209,7 @@ sub view {
 	my $self = shift;
     my $cache = $self->session->cache;
     my $cacheKey = $self->getWwwCacheKey('view');
-    if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) {
+    if (!$self->session->isAdminOn && $self->cacheTimeout > 10) {
         my $out = $cache->get( $cacheKey );
 		return $out if $out;
 	}
@@ -232,7 +232,7 @@ sub view {
 	$var{noInitialPage} = $i18n->get('noInitialPage');
 	$var{noFileSpecified} = $i18n->get('noFileSpecified');
        	my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
-    if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) {
+    if (!$self->session->isAdminOn && $self->cacheTimeout > 10) {
         $cache->set( $cacheKey, $out, $self->cacheTimeout);
     }
     return $out;
@@ -268,7 +268,7 @@ Web facing method which is the default view page.  This method does a
 sub www_view {
 	my $self = shift;
 	return $self->session->privilege->noAccess() unless $self->canView;
-	if ($self->session->var->isAdminOn) {
+	if ($self->session->isAdminOn) {
 		return $self->session->asset($self->getContainer)->www_view;
 	}
 	$self->session->http->setRedirect($self->getFileUrl($self->showPage));
diff --git a/lib/WebGUI/Asset/Redirect.pm b/lib/WebGUI/Asset/Redirect.pm
index a5ad06223..d250aed76 100644
--- a/lib/WebGUI/Asset/Redirect.pm
+++ b/lib/WebGUI/Asset/Redirect.pm
@@ -99,7 +99,7 @@ Display the redirect url when in admin mode.
 
 sub view {
 	my $self = shift;
-	if ($self->session->var->isAdminOn) {
+	if ($self->session->isAdminOn) {
 		return $self->getToolbar.' '.$self->getTitle.' '.$self->redirectUrl;
 	}
     else {
@@ -121,7 +121,7 @@ sub www_view {
 	my $i18n = WebGUI::International->new($self->session, "Asset_Redirect");
     my $url = $self->redirectUrl;
     WebGUI::Macro::process($self->session, \$url);
-    if ($self->session->var->isAdminOn() && $self->canEdit) {
+    if ($self->session->isAdminOn() && $self->canEdit) {
         return $self->getAdminConsole->render($i18n->get("what do you want to do with this redirect").'
             <ul>
                 <li><a href="'.$url.'">'.$i18n->get("go to the redirect url").'</a></li>
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index a2739ec65..a347b9068 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -239,7 +239,7 @@ Shortcut that the Visitor would see, or their own.
 
 sub discernUserId {
 	my $self = shift;
-	return ($self->canManage && $self->session->var->isAdminOn) ? '1' : $self->session->user->userId;
+	return ($self->canManage && $self->session->isAdminOn) ? '1' : $self->session->user->userId;
 }
 
 #-------------------------------------------------------------------
@@ -464,7 +464,7 @@ admin mode is on.
 sub _overridesCacheTag {
 	my $self = shift;
 	#cache by userId, assetId of this shortcut, and whether adminMode is on or not.
-	return ["shortcutOverrides", $self->getId, $self->session->user->userId, $self->session->var->isAdminOn];
+	return ["shortcutOverrides", $self->getId, $self->session->user->userId, $self->session->isAdminOn];
 }
 
 #-------------------------------------------------------------------
@@ -488,7 +488,7 @@ sub getOverrides {
 	my $overridesRef = $cache->get($self->_overridesCacheTag);
     ##If admin mode is not on, and the cache is valid, and not expired, and the user object was not updated,
     ##return the cached value.
-    if ( ! $session->var->isAdminOn
+    if ( ! $session->isAdminOn
         && $overridesRef
         && $overridesRef->{cacheNotExpired}
         && $overridesRef->{userLastUpdated} >= $u->get('lastUpdated')) {
@@ -591,7 +591,7 @@ sub getShortcutByCriteria {
 	if ($assetId) {
 		$scratchId = "Shortcut_" . $assetId;
 		if($self->session->scratch->get($scratchId) && !$self->disableContentLock) {
-			unless ($self->session->var->isAdminOn) {
+			unless ($self->session->isAdminOn) {
 				return WebGUI::Asset->newById($self->session, $self->session->scratch->get($scratchId));
 			}
 		}
@@ -990,8 +990,8 @@ sub www_getUserPrefsForm {
 	my @fielden = $self->getPrefFieldsToShow;
 	my $f = WebGUI::HTMLForm->new($self->session,extras=>' onsubmit="submitForm(this,\''.$self->getId.'\',\''.$self->getUrl.'\');return false;"');
 	$f->raw('<table cellspacing="0" cellpadding="3" border="0">');
-    my $allowedToSave = ( ! $session->var->isAdminOn && $self->getParent->canPersonalize )
-                     || (   $session->var->isAdminOn && $session->user->isInGroup($session->setting->get('groupIdAdminUser')) );
+    my $allowedToSave = ( ! $session->isAdminOn && $self->getParent->canPersonalize )
+                     || (   $session->isAdminOn && $session->user->isInGroup($session->setting->get('groupIdAdminUser')) );
     if ($allowedToSave) {
         $f->hidden(  
             -name => 'func', 
@@ -1090,7 +1090,7 @@ sub www_saveUserPrefs {
 	my $self    = shift;
     my $session = $self->session;
 	return '' unless $self->getParent->canPersonalize
-                  || ( $session->var->isAdminOn && $session->user->isInGroup($session->setting->get('groupIdAdminUser')) );
+                  || ( $session->isAdminOn && $session->user->isInGroup($session->setting->get('groupIdAdminUser')) );
 	my @fellowFields = $self->getPrefFieldsToShow;
 	my %data = ();
 	$self->uncacheOverrides;
diff --git a/lib/WebGUI/Asset/Sku/Product.pm b/lib/WebGUI/Asset/Sku/Product.pm
index df8c8f6eb..521f6ea2d 100644
--- a/lib/WebGUI/Asset/Sku/Product.pm
+++ b/lib/WebGUI/Asset/Sku/Product.pm
@@ -1654,7 +1654,7 @@ sub view {
     my $session = $self->session;
     my $cache = $session->cache;
     my $cacheKey = $self->getWwwCacheKey( 'view' );
-    if (!$session->var->isAdminOn && $self->get("cacheTimeout") > 10){
+    if (!$session->isAdminOn && $self->get("cacheTimeout") > 10){
         my $out = $cache->get( $cacheKey );
         return $out if $out;
     }
@@ -1856,7 +1856,7 @@ sub view {
     $var{continueShoppingUrl} = $self->getUrl;
 
     my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
-    if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10 && $self->{_hasAddedToCart} != 1){
+    if (!$self->session->isAdminOn && $self->cacheTimeout > 10 && $self->{_hasAddedToCart} != 1){
         $cache->set( $cacheKey, $out, $self->cacheTimeout );
     }
     return $out;
diff --git a/lib/WebGUI/Asset/Snippet.pm b/lib/WebGUI/Asset/Snippet.pm
index aeaf109d4..9d5955dbc 100644
--- a/lib/WebGUI/Asset/Snippet.pm
+++ b/lib/WebGUI/Asset/Snippet.pm
@@ -253,7 +253,7 @@ sub view {
     my $session    = $self->session;
     my $versionTag = WebGUI::VersionTag->getWorking($session, 1);
     my $noCache =
-        $session->var->isAdminOn
+        $session->isAdminOn
         || $self->cacheTimeout <= 10
         || ($versionTag && $versionTag->getId eq $self->tagId);
     my $cacheKey = $self->getWwwCacheKey('view', $calledAsWebMethod);
@@ -265,7 +265,7 @@ sub view {
                ? $self->snippetPacked
                : $self->snippet
                ;
-	$output = $self->getToolbar.$output if ($session->var->isAdminOn && !$calledAsWebMethod);
+	$output = $self->getToolbar.$output if ($session->isAdminOn && !$calledAsWebMethod);
 	if ($self->processAsTemplate) {
 		$output = WebGUI::Asset::Template->processRaw($session, $output, $self->get);
 	}
diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index e7df99f65..1f55e6c68 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -564,13 +564,13 @@ sub process {
         my $i18n = WebGUI::International->new($session, 'Asset_Template');
         $session->log->warn('process called on template in trash: '.$self->getId
             .'. The template was called through this url: '.$session->asset->url);
-        return $session->var->isAdminOn ? $i18n->get('template in trash') : '';
+        return $session->isAdminOn ? $i18n->get('template in trash') : '';
     }
     elsif ($self->state =~ /^clipboard/) {
         my $i18n = WebGUI::International->new($session, 'Asset_Template');
         $session->log->warn('process called on template in clipboard: '.$self->getId
             .'. The template was called through this url: '.$session->asset->url);
-        return $session->var->isAdminOn ? $i18n->get('template in clipboard') : '';
+        return $session->isAdminOn ? $i18n->get('template in clipboard') : '';
     }
 
     # Return a JSONinfied version of vars if JSON is the only requested content type.
diff --git a/lib/WebGUI/Asset/Template/Parser.pm b/lib/WebGUI/Asset/Template/Parser.pm
index b37f606f5..2771736d6 100644
--- a/lib/WebGUI/Asset/Template/Parser.pm
+++ b/lib/WebGUI/Asset/Template/Parser.pm
@@ -39,7 +39,7 @@ sub addSessionVars {
 	$vars->{"session.user.username"} = $self->session->user->username;
 	$vars->{"session.user.firstDayOfWeek"} = $self->session->user->profileField("firstDayOfWeek");
 	$vars->{"session.config.extrasurl"} = $self->session->url->extras();
-	$vars->{"session.var.adminOn"} = $self->session->var->isAdminOn;
+	$vars->{"session.var.adminOn"} = $self->session->isAdminOn;
 	$vars->{"session.setting.companyName"} = $self->session->setting->get("companyName");
 	$vars->{"session.setting.anonymousRegistration"} = $self->session->setting->get("anonymousRegistration");
 	my $forms = $self->session->form->paramsHashRef();
diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm
index ce08d4bd1..b963285c6 100644
--- a/lib/WebGUI/Asset/Wobject/Article.pm
+++ b/lib/WebGUI/Asset/Wobject/Article.pm
@@ -320,7 +320,7 @@ returns the output.
 sub view {
 	my $self = shift;
     my $cache = $self->session->cache;
-	if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10 && !$self->session->form->process("overrideTemplateId") &&
+	if (!$self->session->isAdminOn && $self->cacheTimeout > 10 && !$self->session->form->process("overrideTemplateId") &&
             !$self->session->form->process($self->paginateVar) && !$self->session->form->process("makePrintable")) {
 		my $out = $cache->get($self->getViewCacheKey);
 		return $out if $out;
@@ -384,7 +384,7 @@ sub view {
 	}
 	$p->appendTemplateVars(\%var);
        	my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
-	if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10 && !$self->session->form->process("overrideTemplateId") &&
+	if (!$self->session->isAdminOn && $self->cacheTimeout > 10 && !$self->session->form->process("overrideTemplateId") &&
             !$self->session->form->process($self->paginateVar) && !$self->session->form->process("makePrintable")) {
 		$cache->set($self->getViewCacheKey, $out, $self->cacheTimeout);
 	}
diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm
index af0aa67ad..c5aa3c1f4 100644
--- a/lib/WebGUI/Asset/Wobject/Calendar.pm
+++ b/lib/WebGUI/Asset/Wobject/Calendar.pm
@@ -957,7 +957,7 @@ sub view {
     ##### Process the template
     # Add any global variables
     # Admin
-    if ($self->session->var->isAdminOn) {
+    if ($self->session->isAdminOn) {
         $var->{'admin'}         = 1;
         $var->{'adminControls'} = $self->getToolbar;
     }
diff --git a/lib/WebGUI/Asset/Wobject/Dashboard.pm b/lib/WebGUI/Asset/Wobject/Dashboard.pm
index 4d67eaa48..512078b6e 100644
--- a/lib/WebGUI/Asset/Wobject/Dashboard.pm
+++ b/lib/WebGUI/Asset/Wobject/Dashboard.pm
@@ -121,7 +121,7 @@ Dashboard that Visitor would see, or their own.
 
 sub discernUserId {
 	my $self = shift;
-	return ($self->canManage && $self->session->var->isAdminOn) ? '1' : $self->session->user->userId;
+	return ($self->canManage && $self->session->isAdminOn) ? '1' : $self->session->user->userId;
 }
 
 #-------------------------------------------------------------------
@@ -243,7 +243,7 @@ turned on.
 
 sub isManaging {
 	my $self = shift;
-	return 1 if ($self->canManage && $self->session->var->isAdminOn());
+	return 1 if ($self->canManage && $self->session->isAdminOn());
 	return 0;
 }
 
@@ -415,7 +415,7 @@ sub view {
 			}
 		}
 	}
-	$vars{showAdmin} = ($self->session->var->isAdminOn && $self->canEdit);
+	$vars{showAdmin} = ($self->session->isAdminOn && $self->canEdit);
 	$vars{"dragger.init"} = '
 		<script type="text/javascript">
 			dragable_init("'.$self->getUrl.'");
@@ -459,10 +459,10 @@ sub www_view {
         unless ($self->canView) {
                 if ($self->state eq "published") { # no privileges, make em log in
                         return $self->session->privilege->noAccess();
-                } elsif ($self->session->var->isAdminOn && $self->state =~ /^trash/) { # show em trash
+                } elsif ($self->session->isAdminOn && $self->state =~ /^trash/) { # show em trash
                         $self->session->http->setRedirect($self->getUrl("func=manageTrash"));
                         return undef;
-                } elsif ($self->session->var->isAdminOn && $self->state =~ /^clipboard/) { # show em clipboard
+                } elsif ($self->session->isAdminOn && $self->state =~ /^clipboard/) { # show em clipboard
                         $self->session->http->setRedirect($self->getUrl("func=manageClipboard"));
                         return undef;
                 } else { # tell em it doesn't exist anymore
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index d0de629b8..1e2f533da 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -301,7 +301,7 @@ sub _getFormFields {
             $value = $formValue;
         }
         my $hidden
-            = ($field->{status} eq 'hidden' && !$session->var->isAdminOn)
+            = ($field->{status} eq 'hidden' && !$session->isAdminOn)
             || ($field->{isMailField} && !$self->get('mailData'));
 	
         # populate Rich Editor field if the field is an HTMLArea
@@ -955,7 +955,7 @@ sub getRecordTemplateVars {
     for my $field_form (@fields) {
         my ($field, $form) = @{ $field_form };
         # need a copy
-        my $hidden =  ($field->{status} eq 'hidden' && !$session->var->isAdminOn)
+        my $hidden =  ($field->{status} eq 'hidden' && !$session->isAdminOn)
                    || ($field->{isMailField} && !$self->mailData);
 	
         # populate Rich Editor field if the field is an HTMLArea
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index cd4bbd7f3..b6b421fdb 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -296,7 +296,7 @@ sub view {
 	my $i18n = WebGUI::International->new($self->session, 'Asset_HttpProxy');
 	
 	### Set up a cookie jar
-	my $cookiebox = $self->session->url->escape($self->session->var->get("sessionId"));
+	my $cookiebox = $self->session->url->escape($self->session->getId);
 	$cookiebox =~ s/[^A-Za-z0-9\-\.\_]//g;  #removes all funky characters
 	$cookiebox .= '.cookie';
 	my $jar = HTTP::Cookies->new(File => $self->getCookieJar->getPath($cookiebox), AutoSave => 1, Ignore_Discard => 1);
diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm
index 95d40ec56..2f8c4ee2b 100644
--- a/lib/WebGUI/Asset/Wobject/Layout.pm
+++ b/lib/WebGUI/Asset/Wobject/Layout.pm
@@ -169,7 +169,7 @@ sub prepareView {
     }
 
     my %vars;
-    $vars{showAdmin} = ($session->var->isAdminOn && $self->canEdit && $self->canEditIfLocked);
+    $vars{showAdmin} = ($session->isAdminOn && $self->canEdit && $self->canEditIfLocked);
 
     my $splitter = $self->{_viewSplitter} = $self->getSeparator;
 
@@ -369,7 +369,7 @@ override www_view => sub {
     my $self = shift;
     my $session = $self->session;
     # slashdot / burst protection hack
-    if ($session->var->get("userId") eq "1"
+    if ($session->user->isVisitor
         && $session->form->param() == 0
         && !$session->scratch->get('isExporting')
     ) {
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index 4ed453bf4..5c1687c3f 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -479,7 +479,7 @@ sub getListings {
     my ($listings, $listingsEncoded);
 
     my $noCache =
-        $session->var->isAdminOn
+        $session->isAdminOn
         || $self->listingsCacheTimeout <= 10
         || ($versionTag && $versionTag->getId eq $self->tagId);
     my $cache = $session->cache;
@@ -645,7 +645,7 @@ sub view {
    
     my $versionTag = WebGUI::VersionTag->getWorking($session, 1); 
     my $noCache =
-        $session->var->isAdminOn
+        $session->isAdminOn
         || $self->statisticsCacheTimeout <= 10
         || ($versionTag && $versionTag->getId eq $self->tagId);
     my $cache = $session->cache;
diff --git a/lib/WebGUI/Asset/Wobject/MultiSearch.pm b/lib/WebGUI/Asset/Wobject/MultiSearch.pm
index c18588d5e..217f83fb2 100644
--- a/lib/WebGUI/Asset/Wobject/MultiSearch.pm
+++ b/lib/WebGUI/Asset/Wobject/MultiSearch.pm
@@ -99,7 +99,7 @@ sub view {
 	my $self = shift;	
     my $cache = $self->session->cache;
     my $cacheKey = $self->getWwwCacheKey( 'view' );
-    if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) {
+    if (!$self->session->isAdminOn && $self->cacheTimeout > 10) {
         my $out = eval { $cache->get( $cacheKey ) };
 		return $out if $out;
 	}
@@ -112,7 +112,7 @@ sub view {
 	$var{'submit'} = WebGUI::Form::Submit->new($self->session, {name=>'SearchSubmit',value=>$i18n->get('submit','WebGUI')})->toHtml();
 
        	my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
-    if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) {
+    if (!$self->session->isAdminOn && $self->cacheTimeout > 10) {
         eval { $cache->set( $cacheKey, $out, $self->cacheTimeout) };
     }
     return $out;
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index 19d1eadf2..c16f63604 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -307,7 +307,7 @@ Returns a toolbar with a set of icons that hyperlink to functions that delete, e
 override getToolbar => sub {
 	my $self = shift;
     return undef
-        unless $self->canEdit && $self->session->var->isAdminOn;
+        unless $self->canEdit && $self->session->isAdminOn;
 	if ($self->getToolbarState) {
         my $toolbar = '';
         if ($self->canEditIfLocked) {
diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm
index 4bf835abb..c04b19e4e 100644
--- a/lib/WebGUI/Asset/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm
@@ -435,7 +435,7 @@ sub view {
 	my $self = shift;
     my $cache = $self->session->cache;
     my $cacheKey = $self->getWwwCacheKey( 'view' );
-    if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) {
+    if (!$self->session->isAdminOn && $self->cacheTimeout > 10) {
         my $out = eval{ $cache->get( $cacheKey ) };
 		return $out if $out;
 	}
@@ -461,7 +461,7 @@ sub view {
     }
 	
        	my $out = $self->processTemplate($var,undef,$self->{_viewTemplate});
-    if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) {
+    if (!$self->session->isAdminOn && $self->cacheTimeout > 10) {
         eval { $cache->set( $cacheKey, $out, $self->cacheTimeout ) };
     }
     return $out;
diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
index 0b4b1e9a9..4c2692a7c 100644
--- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
+++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
@@ -368,13 +368,13 @@ sub view {
 	# try the cached version
 	my $cache = $session->cache; 
 	my $out = $cache->get("view_".$self->getId);
-	return $out if ($out ne "" && !$session->var->isAdminOn);
+	return $out if ($out ne "" && !$session->isAdminOn);
     #return $out if $out;
 
 	# generate from scratch
 	my $feed = $self->generateFeed;
 	$out = $self->processTemplate($self->getTemplateVariables($feed),undef,$self->{_viewTemplate});
-	if (!$session->var->isAdminOn && $self->cacheTimeout > 10) {
+	if (!$session->isAdminOn && $self->cacheTimeout > 10) {
 		$cache->set("view_".$self->getId, $out, $self->cacheTimeout);
 	}
 	return $out;
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index 7d69d21d6..eb74f091c 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -1134,7 +1134,7 @@ sub getViewThingVars {
             [$self->getId,$thingId]);
         while (my %field = $fields->hash) {
             next unless ($field{display} eq '1');
-            my $hidden = ($field{status} eq "hidden" && !$self->session->var->isAdminOn);
+            my $hidden = ($field{status} eq "hidden" && !$self->session->isAdminOn);
 
             my $originalValue = $thingData{"field_".$field{fieldId}};
             my $value = $self->getFieldValue($originalValue,\%field);
@@ -2468,7 +2468,7 @@ sub editThingData {
         $field{value} = $fieldValue || $field{defaultValue};
         my $formElement .= $self->getFormPlugin(\%field,($resetForm eq ""))->toHtml;
         
-        my $hidden = ($field{status} eq "hidden" && !$self->session->var->isAdminOn);
+        my $hidden = ($field{status} eq "hidden" && !$self->session->isAdminOn);
         my $value = $field{value};
         $value = $self->getFieldValue($value,\%field);
 
diff --git a/lib/WebGUI/AssetExportHtml.pm b/lib/WebGUI/AssetExportHtml.pm
index a82ab6017..74075dece 100644
--- a/lib/WebGUI/AssetExportHtml.pm
+++ b/lib/WebGUI/AssetExportHtml.pm
@@ -266,7 +266,7 @@ sub exportAsHtml {
     # the exported assets are taken from that user's perspective.
     my $exportSession = WebGUI::Session->open($session->config);
     my $esGuard = Scope::Guard->new(sub {
-        $exportSession->var->end;
+        $exportSession->end;
         $exportSession->close;
     });
 
@@ -394,7 +394,7 @@ sub exportBranch {
             $cs->output->setHandle($handle);
             my $guard = guard {
                 close $handle;
-                $cs->var->end;
+                $cs->end;
                 $cs->close();
                 $asset->$report('collateral notes', $output) if $output;
             };
@@ -553,7 +553,7 @@ sub exportGetDescendants {
             $session = WebGUI::Session->open($session->config);
             $session->user( { userId => $user->userId } );
             $sGuard = Scope::Guard->new(sub {
-                $session->var->end;
+                $session->end;
                 $session->close;
             });
             # clone self in the new session
diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm
index 90ac44d11..f13fce605 100644
--- a/lib/WebGUI/Auth.pm
+++ b/lib/WebGUI/Auth.pm
@@ -1229,7 +1229,7 @@ Superclass method that performs standard logout routines.
 
 sub www_logout {
 	my $self = shift;
-	$self->session->var->end($self->session->var->get("sessionId"));
+	$self->session->end();
 	$self->session->user({userId=>'1'});
 	my $u = WebGUI::User->new($self->session,1);
 	$self->{user} = $u;
diff --git a/lib/WebGUI/Content/Asset.pm b/lib/WebGUI/Content/Asset.pm
index 5235a865b..53d9c82a5 100644
--- a/lib/WebGUI/Content/Asset.pm
+++ b/lib/WebGUI/Content/Asset.pm
@@ -83,7 +83,7 @@ sub dispatch {
         }
     }
     $session->clearAsset;
-    if ($session->var->isAdminOn) {
+    if ($session->isAdminOn) {
         my $asset = WebGUI::Asset->newByUrl($session, $session->url->getRefererUrl) || WebGUI::Asset->getDefault($session);
         return $asset->addMissing($assetUrl);
     }
@@ -163,7 +163,7 @@ The content handler for this package.
 
 sub handler {
     my ($session) = @_;
-    my ($log, $http, $var, $asset, $request, $config) = $session->quick(qw(errorHandler http var asset request config));
+    my ($log, $http, $asset, $request, $config) = $session->quick(qw(errorHandler http asset request config));
     my $output = "";
     if (my $perfLog = $log->performanceLogger) { #show performance indicators if required
         my $t = [Time::HiRes::gettimeofday()];
diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm
index b6bc29ee8..83c4ee9c0 100644
--- a/lib/WebGUI/Macro/AdminBar.pm
+++ b/lib/WebGUI/Macro/AdminBar.pm
@@ -34,7 +34,7 @@ process takes one optional parameters for customizing the layout of the Admin ba
 
 sub process {
 	my $session = shift;
-	return undef unless $session->var->isAdminOn;
+	return undef unless $session->isAdminOn;
 	my $i18n = WebGUI::International->new($session,'Macro_AdminBar');
 	my ($url, $style, $asset, $user, $config) = $session->quick(qw(url style asset user config));
 	$style->setScript($url->extras('yui/build/utilities/utilities.js'));
diff --git a/lib/WebGUI/Macro/AdminText.pm b/lib/WebGUI/Macro/AdminText.pm
index 83343ffbb..f7d0fbfa8 100644
--- a/lib/WebGUI/Macro/AdminText.pm
+++ b/lib/WebGUI/Macro/AdminText.pm
@@ -33,7 +33,7 @@ string is returned.
 sub process {	
 	my $session = shift;
         my @param = @_;
-        return "" unless ($session->var->isAdminOn);
+        return "" unless ($session->isAdminOn);
         return $param[0];
 }
 
diff --git a/lib/WebGUI/Macro/AdminToggle.pm b/lib/WebGUI/Macro/AdminToggle.pm
index bb1cd518a..f6cd6ca20 100644
--- a/lib/WebGUI/Macro/AdminToggle.pm
+++ b/lib/WebGUI/Macro/AdminToggle.pm
@@ -52,7 +52,7 @@ sub process {
     my $i18n = WebGUI::International->new($session,'Macro_AdminToggle');
     my %var;
     $var{'toggle_text'} = $turnOn || $i18n->get(516);
-    if ($session->var->isAdminOn) {
+    if ($session->isAdminOn) {
         $var{'toggle_url'} = '#'
     }
     else {
diff --git a/lib/WebGUI/Macro/AssetProxy.pm b/lib/WebGUI/Macro/AssetProxy.pm
index 4f669f17b..6dc8671df 100644
--- a/lib/WebGUI/Macro/AssetProxy.pm
+++ b/lib/WebGUI/Macro/AssetProxy.pm
@@ -55,7 +55,7 @@ sub process {
     if (Exception::Class->caught()) {
         $session->log->warn('AssetProxy macro called invalid asset: '.$identifier
             .'. The macro was called through this url: '.$session->asset->get('url'));
-        if ($session->var->isAdminOn) {
+        if ($session->isAdminOn) {
             my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
             return $i18n->get('invalid url');
         }
@@ -63,7 +63,7 @@ sub process {
     elsif ($asset->get('state') =~ /^trash/) {
         $session->log->warn('AssetProxy macro called on asset in trash: '.$identifier
             .'. The macro was called through this url: '.$session->asset->get('url'));
-        if ($session->var->isAdminOn) {
+        if ($session->isAdminOn) {
             my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
             return $i18n->get('asset in trash');
         }
@@ -71,7 +71,7 @@ sub process {
     elsif ($asset->get('state') =~ /^clipboard/) {
         $session->log->warn('AssetProxy macro called on asset in clipboard: '.$identifier
             .'. The macro was called through this url: '.$session->asset->get('url'));
-        if ($session->var->isAdminOn) {
+        if ($session->isAdminOn) {
             my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
             return $i18n->get('asset in clipboard');
         }
diff --git a/lib/WebGUI/Macro/EditableToggle.pm b/lib/WebGUI/Macro/EditableToggle.pm
index c66b325fd..15f0fc015 100644
--- a/lib/WebGUI/Macro/EditableToggle.pm
+++ b/lib/WebGUI/Macro/EditableToggle.pm
@@ -55,7 +55,7 @@ sub process {
         my $i18n    = WebGUI::International->new( $session, 'Macro_EditableToggle' );
         my $turnOn  = $param[0] || $i18n->get(516);
         my $turnOff = $param[1] || $i18n->get(517);
-        if ( $session->var->isAdminOn ) {
+        if ( $session->isAdminOn ) {
             $var{'toggle.url'}  = $session->url->page('op=switchOffAdmin');
             $var{'toggle.text'} = $turnOff;
         }
diff --git a/lib/WebGUI/Macro/FilePump.pm b/lib/WebGUI/Macro/FilePump.pm
index 7edb8c9b9..0d6a71d67 100644
--- a/lib/WebGUI/Macro/FilePump.pm
+++ b/lib/WebGUI/Macro/FilePump.pm
@@ -96,7 +96,7 @@ sub process {
     my $extrasUrl  = Path::Class::Dir->new($session->url->make_urlmap_work($session->config->get('extrasURL')));
 
     ##Normal mode
-    if (! $session->var->isAdminOn) {
+    if (! $session->isAdminOn) {
         # Built files live at /path/to/uploads/filepump/bundle.timestamp/ which is
         # a sub-dir of uploadsDir, so resolve the dir relative to uploads
         my $dir = $bundle->getPathClassDir->relative($uploadsDir);
diff --git a/lib/WebGUI/Macro/L_loginBox.pm b/lib/WebGUI/Macro/L_loginBox.pm
index 3553c9fc1..91b25e726 100644
--- a/lib/WebGUI/Macro/L_loginBox.pm
+++ b/lib/WebGUI/Macro/L_loginBox.pm
@@ -68,7 +68,7 @@ sub process {
 	my $templateId = $param[2] || "PBtmpl0000000000000044";
 	my %var;	
 	my $i18n = WebGUI::International->new($session,'Macro_L_loginBox');
-        $var{'user.isVisitor'} = ($session->var->get("userId") eq "1");
+        $var{'user.isVisitor'} = ($session->user->isVisitor);
 	$var{'customText'} = $param[1];
 	$var{'customText'} =~ s/%(.*?)%/_createURL($session,$1)/ge;
 	$var{'hello.label'} = $i18n->get(48);
diff --git a/lib/WebGUI/Middleware/WGAccess.pm b/lib/WebGUI/Middleware/WGAccess.pm
index 0cbb40b0f..4a15ffd1a 100644
--- a/lib/WebGUI/Middleware/WGAccess.pm
+++ b/lib/WebGUI/Middleware/WGAccess.pm
@@ -61,7 +61,7 @@ sub call {
         }
 
         require WebGUI::Asset;
-        my $userId = $session->var->get('userId');
+        my $userId = $session->get('userId');
 
         return
             if grep { $_ eq '1' || $_ eq $userId }                      @{ $privs->{users} }
diff --git a/lib/WebGUI/Operation/ActiveSessions.pm b/lib/WebGUI/Operation/ActiveSessions.pm
index 9ebe7b677..35c0c1eaf 100644
--- a/lib/WebGUI/Operation/ActiveSessions.pm
+++ b/lib/WebGUI/Operation/ActiveSessions.pm
@@ -53,7 +53,7 @@ $session->form->process("sid").  Afterwards, it calls www_viewActiveSessions.
 
 sub www_killSession {
 	my $session = shift;
-	return www_viewActiveSessions($session) if $session->form->process("sid") eq $session->var->get("sessionId");
+	return www_viewActiveSessions($session) if $session->form->process("sid") eq $session->getId;
 	return $session->privilege->adminOnly unless canView($session);
 	$session->db->write("delete from userSession where sessionId=?",[$session->form->process("sid")]);
 	$session->db->write("delete from userSessionScratch where sessionId=?", [$session->form->process("sid")]);
diff --git a/lib/WebGUI/Operation/Admin.pm b/lib/WebGUI/Operation/Admin.pm
index a42b1fb8b..97e6425ce 100644
--- a/lib/WebGUI/Operation/Admin.pm
+++ b/lib/WebGUI/Operation/Admin.pm
@@ -43,7 +43,7 @@ sub www_adminConsole {
 =head2 www_switchOffAdmin ( )
 
 If the current user is in the Turn On Admin Group, then allow them to turn off Admin mode
-via WebGUI::Session::Var::switchAdminOff()
+via WebGUI::Session::switchAdminOff()
 
 
 =cut
@@ -52,7 +52,7 @@ sub www_switchOffAdmin {
 	my $session = shift;
 	return "" unless ($session->user->canUseAdminMode);
 	$session->http->setCacheControl("none");
-	$session->var->switchAdminOff();
+	$session->switchAdminOff();
 	return "";
 }
 
@@ -68,7 +68,7 @@ sub www_switchOnAdmin {
 	my $session = shift;
 	return "" unless ($session->user->canUseAdminMode);
 	$session->http->setCacheControl("none");
-	$session->var->switchAdminOn();
+	$session->switchAdminOn();
 	return "";
 }
 
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index df6e1547f..f001acc13 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -581,7 +581,7 @@ sub www_becomeUser {
 	my $session = shift;
 	return $session->privilege->adminOnly() unless canEdit($session) && $session->form->validToken;
 	return undef unless WebGUI::User->validUserId($session, $session->form->process("uid"));
-	$session->var->end($session->var->get("sessionId"));
+	$session->end();
 	$session->user({userId=>$session->form->process("uid")});
 	return "";
 }
diff --git a/lib/WebGUI/PassiveProfiling.pm b/lib/WebGUI/PassiveProfiling.pm
index 82857bd9c..76118866d 100644
--- a/lib/WebGUI/PassiveProfiling.pm
+++ b/lib/WebGUI/PassiveProfiling.pm
@@ -58,8 +58,8 @@ sub add {
     my $assetId = shift;
 	$session->db->write("insert into passiveProfileLog (passiveProfileLogId, userId, sessionId, assetId, dateOfEntry) values (?,?,?,?,?)",
                        [
-                        $session->id->generate(),        $session->user->userId,
-                        $session->var->get("sessionId"), $assetId,
+                        $session->id->generate(),  $session->user->userId,
+                        $session->getId,           $assetId,
                         time(),
                        ]);
     return undef;
diff --git a/lib/WebGUI/Role/Asset/Comments.pm b/lib/WebGUI/Role/Asset/Comments.pm
index 169b5e45f..f805d69bb 100644
--- a/lib/WebGUI/Role/Asset/Comments.pm
+++ b/lib/WebGUI/Role/Asset/Comments.pm
@@ -89,7 +89,7 @@ sub addComment {
 		comment		=> $comment,
 		rating		=> $rating,
 		date		=> time(),
-		ip			=> $session->var->get('lastIP'),
+		ip			=> $session->get('lastIP'),
 		};
 	
 	# calculate average
diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index 65bff7eeb..940a87043 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -38,7 +38,6 @@ use WebGUI::Session::Setting;
 use WebGUI::Session::Stow;
 use WebGUI::Session::Style;
 use WebGUI::Session::Url;
-use WebGUI::Session::Var;
 
 =head1 NAME
 
diff --git a/lib/WebGUI/Session/Http.pm b/lib/WebGUI/Session/Http.pm
index 29fd302e0..355ea5040 100644
--- a/lib/WebGUI/Session/Http.pm
+++ b/lib/WebGUI/Session/Http.pm
@@ -251,13 +251,14 @@ sub sendHeader {
 	return undef if ($self->{_http}{noHeader});
 	return $self->_sendMinimalHeader unless defined $self->session->db(1);
 
-	my ($request, $response, $config, $var) = $self->session->quick(qw(request response config var));
+    my $session = $self->session;
+	my ($request, $response, $config) = $session->quick(qw(request response config ));
 	return undef unless $request;
-	my $userId = $var->get("userId");
+	my $userId = $session->get("userId");
 	
 	# send webgui session cookie
 	my $cookieName = $config->getCookieName;
-	$self->setCookie($cookieName,$var->getId, $config->getCookieTTL, $config->get("cookieDomain")) unless $var->getId eq $request->cookies->{$cookieName};
+	$self->setCookie($cookieName, $session->getId, $config->getCookieTTL, $config->get("cookieDomain")) unless $session->getId eq $request->cookies->{$cookieName};
 
 	$self->setNoHeader(1);
 	my %params;
diff --git a/lib/WebGUI/Test/Mechanize.pm b/lib/WebGUI/Test/Mechanize.pm
index fe11ba5db..f272b922f 100644
--- a/lib/WebGUI/Test/Mechanize.pm
+++ b/lib/WebGUI/Test/Mechanize.pm
@@ -88,7 +88,7 @@ sub DESTROY {
     my $self = shift;
     try {
         my $session = $self->session;
-        $session->var->end;
+        $session->end;
         $session->close;
     };
 }
diff --git a/lib/WebGUI/VersionTag.pm b/lib/WebGUI/VersionTag.pm
index 5f830554e..33f3f54e0 100644
--- a/lib/WebGUI/VersionTag.pm
+++ b/lib/WebGUI/VersionTag.pm
@@ -263,7 +263,7 @@ sub commitAsUser {
         }
     }
     #End the new session
-    $new_session->var->end;
+    $new_session->end;
     $new_session->close;
     return 1;
 }
diff --git a/lib/WebGUI/Workflow/Activity/DeleteExpiredSessions.pm b/lib/WebGUI/Workflow/Activity/DeleteExpiredSessions.pm
index c36e8f521..72ad02ae2 100644
--- a/lib/WebGUI/Workflow/Activity/DeleteExpiredSessions.pm
+++ b/lib/WebGUI/Workflow/Activity/DeleteExpiredSessions.pm
@@ -89,7 +89,7 @@ sub execute {
         }
 		my $session = WebGUI::Session->open($self->session->config, undef, $sessionId, 1);
 		if (defined $session) {
-			$session->var->end;
+			$session->end;
 			$session->close;
 		}
 		if ((time() - $time) > $ttl) {