Removed unnecessary session variables