diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 26131755d7..39b38ea955 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -41,9 +41,6 @@
 	*/
 	class common
 	{
-		var $phpgw;
-		var $iv = '';
-		var $key = '';
 		var $crypto;
 		var $debug_info;		// An array with debugging info from the API
 		
@@ -1022,7 +1019,6 @@
 		// Note: $no_permission_check should *ONLY* be used when it *HAS* to be. (jengo)
 		function hook($location, $order = '', $no_permission_check = False)
 		{
-			global $phpgw, $phpgw_info;
 			if ($order == '')
 			{
 				settype($order,'array');
@@ -1088,7 +1084,6 @@
 		// Note: $no_permission_check should *ONLY* be used when it *HAS* to be. (jengo)
 		function hook_single($location, $appname = '', $no_permission_check = False)
 		{
-			global $phpgw, $phpgw_info, $PHP_VERSION;
 			if (! $appname)
 			{
 				$appname = $GLOBALS['phpgw_info']['flags']['currentapp'];
diff --git a/phpgwapi/inc/class.config.inc.php b/phpgwapi/inc/class.config.inc.php
index 6fa77c2635..4d3e0506d6 100755
--- a/phpgwapi/inc/class.config.inc.php
+++ b/phpgwapi/inc/class.config.inc.php
@@ -30,13 +30,12 @@
 
 		function config($appname = '')
 		{
-			global $phpgw, $phpgw_info;
 			if (! $appname)
 			{
-				$appname = $phpgw_info['flags']['currentapp'];
+				$appname = $GLOBALS['phpgw_info']['flags']['currentapp'];
 			}
 
-			$this->db      = $phpgw->db;
+			$this->db      = $GLOBALS['phpgw']->db;
 			$this->appname = $appname;
 		}