diff --git a/app/access_controls/access_control_export.php b/app/access_controls/access_control_export.php
index 7455cc5d67..e52e0bf52e 100644
--- a/app/access_controls/access_control_export.php
+++ b/app/access_controls/access_control_export.php
@@ -38,9 +38,6 @@
 		exit;
 	}
 
-//initialize the database object
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/app/access_controls/access_control_import.php b/app/access_controls/access_control_import.php
index 49d1f7ed7b..09b4f82026 100644
--- a/app/access_controls/access_control_import.php
+++ b/app/access_controls/access_control_import.php
@@ -314,9 +314,6 @@
 							//process a chunk of the array
 								if ($row_id === 1000) {
 									//save to the data
-										$database = new database;
-										$database->app_name = 'access_controls';
-										$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
 										$database->save($array);
 
 									//clear the array
@@ -337,9 +334,6 @@
 
 				//save to the data
 					if (!empty($array)) {
-						$database = new database;
-						$database->app_name = 'access_controls';
-						$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
 						$database->save($array);
 						unset($array);
 					}
diff --git a/app/access_controls/access_controls.php b/app/access_controls/access_controls.php
index faf6cab642..289abd7650 100644
--- a/app/access_controls/access_controls.php
+++ b/app/access_controls/access_controls.php
@@ -76,11 +76,6 @@
 			$x++;
 		}
 
-		//prepare the database object
-		$database = new database;
-		$database->app_name = 'access_controls';
-		$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
-
 		//send the array to the database class
 		switch ($action) {
 			case 'copy':
@@ -125,7 +120,6 @@
 		$sql .= "	or lower(access_control_description) like :search ";
 		$sql .= ") ";
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //get the list
@@ -143,7 +137,6 @@
 		$sql .= ") ";
 	}
 	$sql .= order_by($order_by, $order, 'access_control_name', 'asc');
-	$database = new database;
 	$access_controls = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/basic_operator_panel/autocomplete.php b/app/basic_operator_panel/autocomplete.php
index 4b30442929..c5f647c247 100644
--- a/app/basic_operator_panel/autocomplete.php
+++ b/app/basic_operator_panel/autocomplete.php
@@ -61,9 +61,6 @@
 	//add user's uuid to group uuid list to include private (non-shared) contacts
 	$user_group_uuids[] = $_SESSION["user_uuid"];
 
-//create the database object
-	$database = new database;
-
 //get extensions list
 	$sql = "select \n";
 	$sql .= "e.extension, \n";
@@ -93,7 +90,6 @@
 	if (isset($_GET['debug'])) { echo $sql."<br><br>"; }
 	$parameters['term'] = '%'.$term.'%';
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$result = $database->select($sql, $parameters, 'all');
 	unset ($parameters, $sql);
 
@@ -159,7 +155,6 @@
 	if (isset($_GET['debug'])) { echo $sql."<br><br>"; }
 	$parameters['term'] = '%'.$term.'%';
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$result = $database->select($sql, $parameters, 'all');
 	unset ($parameters, $sql);
 
diff --git a/app/basic_operator_panel/index.php b/app/basic_operator_panel/index.php
index 93ea0eb073..55d1ec6246 100644
--- a/app/basic_operator_panel/index.php
+++ b/app/basic_operator_panel/index.php
@@ -72,9 +72,6 @@
 				$array['users'][0]['user_uuid'] = $_SESSION['user']['user_uuid'];
 				$array['users'][0]['domain_uuid'] = $_SESSION['user']['domain_uuid'];
 				$array['users'][0]['user_status'] = $user_status;
-				$database = new database;
-				$database->app_name = 'operator_panel';
-				$database->app_uuid = 'dd3d173a-5d51-4231-ab22-b18c5b712bb2';
 				$database->save($array);
 
 				//remove the temporary permission
@@ -91,7 +88,6 @@
 					$sql .= "and user_uuid = :user_uuid ";
 					$parameters['domain_uuid'] = $_SESSION['user']['domain_uuid'];
 					$parameters['user_uuid'] = $_SESSION['user']['user_uuid'];
-					$database = new database;
 					$call_center_agent_uuid = $database->select($sql, $parameters, 'column');
 					unset($sql, $parameters);
 
@@ -157,9 +153,6 @@
 					$p->add('extension_edit', 'temp');
 
 				//execute update
-					$database = new database;
-					$database->app_name = 'calls';
-					$database->app_uuid = '19806921-e8ed-dcff-b325-dd3e5da4959d';
 					$database->save($array);
 					unset($array);
 
diff --git a/app/bridges/bridge_edit.php b/app/bridges/bridge_edit.php
index 84951a3c9f..add4093d10 100644
--- a/app/bridges/bridge_edit.php
+++ b/app/bridges/bridge_edit.php
@@ -167,9 +167,6 @@
 			$array['bridges'][0]['bridge_description'] = $bridge_description;
 
 		//save to the data
-			$database = new database;
-			$database->app_name = 'bridges';
-			$database->app_uuid = 'a6a7c4c5-340a-43ce-bcbc-2ed9bab8659d';
 			$database->save($array);
 			$message = $database->message;
 
@@ -197,7 +194,6 @@
 		$sql = "select * from v_bridges ";
 		$sql .= "where bridge_uuid = :bridge_uuid ";
 		$parameters['bridge_uuid'] = $bridge_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters ?? null, 'row');
 		if (!empty($row)) {
 			$bridge_name = $row["bridge_name"];
@@ -337,14 +333,12 @@
 		$sql .= "and domain_uuid = :domain_uuid ";
 	}
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$gateways = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
 //get the domains
 	$sql = "select * from v_domains ";
 	$sql .= "where domain_enabled = true ";
-	$database = new database;
 	$domains = $database->select($sql, null, 'all');
 	unset($sql);
 
@@ -353,7 +347,6 @@
 	$sql .= "from v_sip_profiles ";
 	$sql .= "where sip_profile_enabled = true ";
 	$sql .= "order by sip_profile_name asc ";
-	$database = new database;
 	$sip_profiles = $database->select($sql, null, 'all');
 	unset($sql);
 
diff --git a/app/bridges/bridge_imports.php b/app/bridges/bridge_imports.php
index 7f25e88e39..6f8c8fe617 100644
--- a/app/bridges/bridge_imports.php
+++ b/app/bridges/bridge_imports.php
@@ -299,9 +299,6 @@
 								if ($row_id === 1000) {
 
 									//save to the data
-										$database = new database;
-										$database->app_name = 'bridges';
-										$database->app_uuid = 'b523c2d2-64cd-46f1-9520-ca4b4098e044';
 										$database->save($array);
 
 									//clear the array
@@ -319,9 +316,6 @@
 
 				//save to the data
 					if (!empty($array) && is_array($array)) {
-						$database = new database;
-						$database->app_name = 'bridges';
-						$database->app_uuid = 'b523c2d2-64cd-46f1-9520-ca4b4098e044';
 						$database->save($array);
 						unset($array);
 					}
diff --git a/app/bridges/bridges.php b/app/bridges/bridges.php
index 08492e3005..2f8c703d6a 100644
--- a/app/bridges/bridges.php
+++ b/app/bridges/bridges.php
@@ -112,7 +112,6 @@
 		}
 		$parameters['domain_uuid'] = $domain_uuid;
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare to page the results
@@ -142,7 +141,6 @@
 	}
 	$sql .= order_by($order_by, $order, 'bridge_name', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$bridges = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php
index 4850455582..ec7c5dfcc8 100644
--- a/app/call_block/call_block.php
+++ b/app/call_block/call_block.php
@@ -136,7 +136,6 @@
 		$sql .= ") ";
 		$parameters['search'] = '%'.$search.'%';
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 	unset($parameters);
 
@@ -204,7 +203,6 @@
 	}
 	$sql .= order_by($order_by, $order, ['domain_uuid','call_block_country_code','call_block_number']);
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$result = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php
index fde803ace7..492f2f61f4 100644
--- a/app/call_block/call_block_edit.php
+++ b/app/call_block/call_block_edit.php
@@ -40,9 +40,6 @@
 	$language = new text;
 	$text = $language->get();
 
-//initialize the database object
-	$database = new database;
-
 //set the defaults
 	$call_block_name = '';
 	$call_block_country_code = '';
diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php
index 15b9c5cef1..71831f30e0 100644
--- a/app/call_broadcast/call_broadcast.php
+++ b/app/call_broadcast/call_broadcast.php
@@ -103,7 +103,6 @@
 		$sql .= ") ";
 		$parameters['search'] = '%'.$search.'%';
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare the paging
@@ -145,7 +144,6 @@
 	}
 	$sql .= order_by($order_by, $order, 'broadcast_name', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$result = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php
index b7363be709..f928321907 100644
--- a/app/call_broadcast/call_broadcast_edit.php
+++ b/app/call_broadcast/call_broadcast_edit.php
@@ -126,7 +126,6 @@
 			$sql .= "and type_value = :type_value ";
 			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 			$parameters['type_value'] = $_POST['accountcode'];
-			$database = new database;
 			$num_rows = $database->select($sql, $parameters, 'column');
 			$broadcast_accountcode = $num_rows > 0 ? $_POST["broadcast_accountcode"] : $_SESSION['domain_name'];
 			unset($sql, $parameters, $num_rows);
@@ -266,10 +265,7 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
 					}
 					$array['call_broadcasts'][0]['broadcast_description'] = $broadcast_description;
 
-				//execute
-					$database = new database;
-					$database->app_name = 'call_broadcast';
-					$database->app_uuid = 'efc11f6b-ed73-9955-4d4d-3a1bed75a056';
+				//save changes to the database
 					$database->save($array);
 					unset($array);
 
@@ -290,7 +286,6 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
 		$sql .= "and call_broadcast_uuid = :call_broadcast_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['call_broadcast_uuid'] = $call_broadcast_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$broadcast_name = $row["broadcast_name"];
@@ -428,7 +423,6 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
 	//$sql .= "select * from v_recordings ";
 	//$sql .= "where domain_uuid = :domain_uuid ";
 	//$parameters['domain_uuid'] = $domain_uuid;
-	//$database = new database;
 	//$rows = $database->select($sql, $parameters, 'all');
 	//if (!empty($rows)) {
 	//	foreach ($rows as $row) {
diff --git a/app/call_broadcast/call_broadcast_send.php b/app/call_broadcast/call_broadcast_send.php
index 9c037f19fe..97050fc9cf 100644
--- a/app/call_broadcast/call_broadcast_send.php
+++ b/app/call_broadcast/call_broadcast_send.php
@@ -77,7 +77,6 @@
 	$sql .= "and call_broadcast_uuid = :call_broadcast_uuid ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['call_broadcast_uuid'] = $call_broadcast_uuid;
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (!empty($row)) {
 		$broadcast_name = $row["broadcast_name"];
diff --git a/app/call_center_active/call_center_active_inc.php b/app/call_center_active/call_center_active_inc.php
index 5091dac96d..7e3b05db0f 100644
--- a/app/call_center_active/call_center_active_inc.php
+++ b/app/call_center_active/call_center_active_inc.php
@@ -38,9 +38,6 @@
 		exit;
 	}
 
-//initialize the database object
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/app/call_center_active/call_center_exec.php b/app/call_center_active/call_center_exec.php
index 15903d3226..bd476d2c7c 100644
--- a/app/call_center_active/call_center_exec.php
+++ b/app/call_center_active/call_center_exec.php
@@ -125,7 +125,6 @@
 			$sql .= "where domain_uuid = '$domain_uuid' ";
 			$sql .= "and username = '".$username."' ";
 			$parameters['user_status'] = trim($user_status, "'");
-			$database = new database;
 			$database->execute($sql, $parameters);
 			unset($sql, $parameters);
 		}
diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php
index 1ea8d52fea..9d58ab5048 100644
--- a/app/call_center_active/call_center_queue.php
+++ b/app/call_center_active/call_center_queue.php
@@ -62,7 +62,6 @@
 		$sql .= "and ".$sql_search;
 	}
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //paging the records
@@ -77,7 +76,6 @@
 	$sql = str_replace('count(*)', '*', $sql);
 	$sql .= order_by($order_by, $order);
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$call_center_queues = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/call_centers/call_center_agent_edit.php b/app/call_centers/call_center_agent_edit.php
index 4c985e0a26..1662815096 100644
--- a/app/call_centers/call_center_agent_edit.php
+++ b/app/call_centers/call_center_agent_edit.php
@@ -42,9 +42,6 @@
 	$language = new text;
 	$text = $language->get();
 
-//connect to the database
-	$database = new database;
-
 //set the defaults
 	$agent_id = '';
 	$agent_name = '';
diff --git a/app/call_centers/call_center_agent_status.php b/app/call_centers/call_center_agent_status.php
index 94a3e3e0a1..61fcc19beb 100644
--- a/app/call_centers/call_center_agent_status.php
+++ b/app/call_centers/call_center_agent_status.php
@@ -46,7 +46,6 @@
 	$sql = "select * from v_call_center_tiers ";
 	$sql .= "where domain_uuid = :domain_uuid ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$tiers = $database->select($sql, $parameters, 'all');
 	if (!empty($_SESSION['call_center']['queue_login']['text']) && $_SESSION['call_center']['queue_login']['text'] == 'dynamic') {
 		$per_queue_login = true;
@@ -64,7 +63,6 @@
 	$sql .= "where domain_uuid = :domain_uuid ";
 	$sql .= "order by agent_name asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$agents = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
@@ -86,7 +84,6 @@
 	$sql .= "and q.domain_uuid = d.domain_uuid ";
 	$sql .= "order by queue_name asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$call_center_queues = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 	//view_array($call_center_queues, false);
@@ -175,11 +172,8 @@
 								$p = permissions::new();
 								$p->add('user_edit', 'temp');
 
-								$database = new database;
-								$database->app_name = 'call_centers';
-								$database->app_uuid = '95788e50-9500-079e-2807-fd530b0ea370';
 								$database->save($array);
-								$response = $database->message;
+								//$response = $database->message;
 								unset($array);
 
 								$p->delete('user_edit', 'temp');
@@ -273,7 +267,6 @@
 							$sql .= "and call_center_agent_uuid = :call_center_agent_uuid ";
 							$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 							$parameters['call_center_agent_uuid'] = $row['agent_uuid'];
-							$database = new database;
 							$agent_name = $database->select($sql, $parameters, 'all');
 							unset($sql, $parameters);
 
diff --git a/app/call_centers/call_center_agents.php b/app/call_centers/call_center_agents.php
index d030d7e1ee..3005a8f165 100644
--- a/app/call_centers/call_center_agents.php
+++ b/app/call_centers/call_center_agents.php
@@ -91,7 +91,6 @@
 		$sql .= ") ";
 		$parameters['search'] = '%'.strtolower($search).'%';
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare to page the results
@@ -124,7 +123,6 @@
 	}
 	$sql .= order_by($order_by, $order, 'agent_name', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$result = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
@@ -256,7 +254,6 @@
 				$sql = "select gateway from v_gateways ";
 				$sql .= "where gateway_uuid = :gateway_uuid ";
 				$parameters['gateway_uuid'] = $bridge_statement[2];
-				$database = new database;
 				$result = $database->select($sql, $parameters ?? null, 'all');
 				if (count($result) > 0) {
 					$gateway_name = $result[0]['gateway'];
diff --git a/app/call_centers/call_center_queues.php b/app/call_centers/call_center_queues.php
index 4ecc590e3d..f45ee1c477 100644
--- a/app/call_centers/call_center_queues.php
+++ b/app/call_centers/call_center_queues.php
@@ -101,7 +101,6 @@
 	if (!empty($sql_search)) {
 		$sql .= "and ".$sql_search;
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare to page the results
@@ -120,7 +119,6 @@
 	$sql = str_replace('count(*)', '*', $sql ?? '');
 	$sql .= order_by($order_by, $order, 'queue_name', 'asc', $sort);
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$result = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/call_centers/cmd.php b/app/call_centers/cmd.php
index a1782ee9ff..573a3d543c 100644
--- a/app/call_centers/cmd.php
+++ b/app/call_centers/cmd.php
@@ -65,7 +65,6 @@
 		$sql .= "and call_center_queue_uuid = :call_center_queue_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['call_center_queue_uuid'] = $call_center_queue_uuid;
-		$database = new database;
 		$queue_extension = $database->select($sql, $parameters, 'column');
 		unset($sql, $parameters);
 	}
diff --git a/app/call_centers/resources/dashboard/call_center_agents.php b/app/call_centers/resources/dashboard/call_center_agents.php
index 2541e19ca2..7e97ca5681 100644
--- a/app/call_centers/resources/dashboard/call_center_agents.php
+++ b/app/call_centers/resources/dashboard/call_center_agents.php
@@ -45,11 +45,6 @@
 	$order_by = $_GET["order_by"] ?? null;
 	$order = $_GET["order"] ?? null;
 
-//connect to the database
-	if (!isset($database)) {
-		$database = new database;
-	}
-
 //setup the event socket connection
 	$esl = event_socket::create();
 
diff --git a/app/call_centers/resources/jobs/call_center_agents.php b/app/call_centers/resources/jobs/call_center_agents.php
index ec83d3f9b4..6baa51da1a 100644
--- a/app/call_centers/resources/jobs/call_center_agents.php
+++ b/app/call_centers/resources/jobs/call_center_agents.php
@@ -43,8 +43,6 @@
 	$sql .= "from v_call_center_agents as a, v_domains as d \n";
 	$sql .= "where a.domain_uuid = d.domain_uuid \n";
 	$sql .= "order by agent_name asc \n";
-	//echo $sql;
-	$database = new database;
 	$agents = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php
index c1c32b6b40..0123a17d51 100644
--- a/app/call_flows/call_flow_edit.php
+++ b/app/call_flows/call_flow_edit.php
@@ -242,9 +242,6 @@
 			$p->add("dialplan_edit", "temp");
 
 		//save to the data
-			$database = new database;
-			$database->app_name = 'call_flows';
-			$database->app_uuid = 'b1b70f85-6b42-429b-8c5a-60c8b02b7d14';
 			if (!empty($call_flow_uuid)) {
 				$database->uuid($call_flow_uuid);
 			}
@@ -317,7 +314,6 @@
 		$sql .= "and call_flow_uuid = :call_flow_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['call_flow_uuid'] = $call_flow_uuid;
-		$database = new database;
 		$result = $database->select($sql, $parameters, 'all');
 		foreach ($result as $row) {
 			//set the php variables
diff --git a/app/call_forward/call_forward.php b/app/call_forward/call_forward.php
index a0c63949c3..0941e45474 100644
--- a/app/call_forward/call_forward.php
+++ b/app/call_forward/call_forward.php
@@ -123,7 +123,6 @@
 			$sql .= "and extension = 'disabled' ";
 		}
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 	unset($parameters);
 
@@ -190,7 +189,6 @@
 	}
 	$sql .= order_by($order_by, $order, 'extension', 'asc', $sort);
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$extensions = $database->select($sql, $parameters ?? null, 'all');
 	unset($parameters);
 
@@ -353,7 +351,6 @@
 				//	$sql .= "and domain_uuid = :domain_uuid ";
 				//	$parameters['follow_me_uuid'] = $row['follow_me_uuid'];
 				//	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-				//	$database = new database;
 				//	$follow_me_destination_count = $database->select($sql, $parameters, 'column');
 				//	$button_label = $follow_me_destination_count ? $text['label-enabled'].' ('.$follow_me_destination_count.')' : $text['label-invalid'];
 				//	unset($sql, $parameters);
@@ -376,7 +373,6 @@
 					$sql .= "and domain_uuid = :domain_uuid ";
 					$parameters['follow_me_uuid'] = $row['follow_me_uuid'];
 					$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-					$database = new database;
 					$follow_me_destination_count = $database->select($sql, $parameters ?? null, 'column');
 					unset($sql, $parameters);
 				}
diff --git a/app/call_forward/resources/dashboard/call_forward.php b/app/call_forward/resources/dashboard/call_forward.php
index 6d88229ac2..2888b7e13e 100644
--- a/app/call_forward/resources/dashboard/call_forward.php
+++ b/app/call_forward/resources/dashboard/call_forward.php
@@ -13,11 +13,6 @@
 		exit;
 	}
 
-//connect to the database
-	if (!isset($database)) {
-		$database = new database;
-	}
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get($_SESSION['domain']['language']['code'], 'app/call_forward');
@@ -70,7 +65,6 @@
 		}
 	}
 	$sql .= order_by($order_by ?? null, $order ?? null, 'extension', 'asc');
-	$database = new database;
 	$extensions = $database->select($sql, $parameters, 'all');
 	unset($parameters);
 
@@ -229,7 +223,6 @@
 						$sql .= "and domain_uuid = :domain_uuid ";
 						$parameters['follow_me_uuid'] = $row['follow_me_uuid'];
 						$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-						$database = new database;
 						$follow_me_destination_count = $database->select($sql, $parameters, 'column');
 						unset($sql, $parameters);
 					}
diff --git a/app/call_forward/resources/jobs/dnd.php b/app/call_forward/resources/jobs/dnd.php
index f8cd0cc2db..7ffda04a01 100644
--- a/app/call_forward/resources/jobs/dnd.php
+++ b/app/call_forward/resources/jobs/dnd.php
@@ -51,7 +51,6 @@
 		$sql .= "where do_not_disturb = 'true' ";
 		$sql .= "and e.domain_uuid = d.domain_uuid ";
 		$sql .= "and enabled = 'true' ";
-		$database = new database;
 		$results = $database->select($sql, $parameters, 'all');
 		unset($parameters);
 		foreach ($results as $row) {
diff --git a/app/call_recordings/call_recordings.php b/app/call_recordings/call_recordings.php
index 31d0d1e1ce..2d518c931f 100644
--- a/app/call_recordings/call_recordings.php
+++ b/app/call_recordings/call_recordings.php
@@ -38,9 +38,6 @@
 		exit;
 	}
 
-//create the database connection
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/app/call_recordings/waveform.php b/app/call_recordings/waveform.php
index f7cba04c2b..0f9127f645 100644
--- a/app/call_recordings/waveform.php
+++ b/app/call_recordings/waveform.php
@@ -50,7 +50,6 @@
 		$sql .= "from view_call_recordings ";
 		$sql .= "where call_recording_uuid = :call_recording_uuid ";
 		$parameters['call_recording_uuid'] = $_GET['id'];
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$call_recording_name = $row['call_recording_name'];
diff --git a/app/calls_active/calls_active.php b/app/calls_active/calls_active.php
index 39a85d0915..f9bf5b7ec7 100644
--- a/app/calls_active/calls_active.php
+++ b/app/calls_active/calls_active.php
@@ -51,7 +51,6 @@
 
 //load gateways into a session variable
 	$sql = "select gateway_uuid, domain_uuid, gateway from v_gateways where enabled = 'true' ";
-	$database = new database;
 	$gateways = $database->select($sql, $parameters ?? null, 'all');
 	foreach ($gateways as $row) {
 		$_SESSION['gateways'][$row['gateway_uuid']] = $row['gateway'];
diff --git a/app/click_to_call/click_to_call.php b/app/click_to_call/click_to_call.php
index 644ad7e805..b130461633 100644
--- a/app/click_to_call/click_to_call.php
+++ b/app/click_to_call/click_to_call.php
@@ -175,7 +175,6 @@
 						$sql = "select outbound_caller_id_name, outbound_caller_id_number from v_extensions where domain_uuid = :domain_uuid and extension = :src ";
 						$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 						$parameters['src'] = $src;
-						$database = new database;
 						$result = $database->select($sql, $parameters, 'all');
 						foreach ($result as $row) {
 							$dest_cid_name = $row["outbound_caller_id_name"];
diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php
index 439e982353..06477d4ff7 100644
--- a/app/conference_centers/conference_center_edit.php
+++ b/app/conference_centers/conference_center_edit.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php
index 9e09ae690e..afa55814b8 100644
--- a/app/conference_centers/conference_centers.php
+++ b/app/conference_centers/conference_centers.php
@@ -38,9 +38,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php
index dd34741dba..1972c520b1 100644
--- a/app/conference_centers/conference_room_edit.php
+++ b/app/conference_centers/conference_room_edit.php
@@ -38,9 +38,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php
index d4946085cc..e2df6a8e87 100644
--- a/app/conference_centers/conference_rooms.php
+++ b/app/conference_centers/conference_rooms.php
@@ -38,9 +38,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/app/conference_centers/conference_session_details.php b/app/conference_centers/conference_session_details.php
index e2785af7f9..941a5dd46e 100644
--- a/app/conference_centers/conference_session_details.php
+++ b/app/conference_centers/conference_session_details.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/app/conference_centers/conference_sessions.php b/app/conference_centers/conference_sessions.php
index 584649dea5..345fc049a3 100644
--- a/app/conference_centers/conference_sessions.php
+++ b/app/conference_centers/conference_sessions.php
@@ -38,9 +38,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/app/conference_controls/conference_control_detail_edit.php b/app/conference_controls/conference_control_detail_edit.php
index 0cd8f21353..be51a5dc79 100644
--- a/app/conference_controls/conference_control_detail_edit.php
+++ b/app/conference_controls/conference_control_detail_edit.php
@@ -123,9 +123,6 @@
 				}
 
 				if (is_uuid($array['conference_control_details'][0]['conference_control_detail_uuid'])) {
-					$database = new database;
-					$database->app_name = 'conference_controls';
-					$database->app_uuid = 'e1ad84a2-79e1-450c-a5b1-7507a043e048';
 					$database->save($array);
 					unset($array);
 				}
@@ -144,7 +141,6 @@
 		//$sql .= "and domain_uuid = :domain_uuid ";
 		$parameters['conference_control_detail_uuid'] = $conference_control_detail_uuid;
 		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-		$database = new database;
 		$row = $database->select($sql, $parameters ?? null, 'row');
 		if (!empty($row)) {
 			$control_digits = $row["control_digits"];
diff --git a/app/conference_controls/conference_controls.php b/app/conference_controls/conference_controls.php
index c88adb2667..cfb29d8969 100644
--- a/app/conference_controls/conference_controls.php
+++ b/app/conference_controls/conference_controls.php
@@ -96,7 +96,6 @@
 //get the count
 	$sql = "select count(conference_control_uuid) from v_conference_controls ";
 	$sql .= $sql_search ?? '';
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 	unset($sql);
 
@@ -118,7 +117,6 @@
 	$sql .= $sql_search ?? '';
 	$sql .= order_by($order_by, $order, 'control_name', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$conference_controls = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/conference_profiles/conference_profile_edit.php b/app/conference_profiles/conference_profile_edit.php
index 2f7f90b33f..55ecddb611 100644
--- a/app/conference_profiles/conference_profile_edit.php
+++ b/app/conference_profiles/conference_profile_edit.php
@@ -113,9 +113,6 @@
 				}
 
 				if (is_uuid($array['conference_profiles'][0]['conference_profile_uuid'])) {
-					$database = new database;
-					$database->app_name = 'conference_profiles';
-					$database->app_uuid = 'c33e2c2a-847f-44c1-8c0d-310df5d65ba9';
 					$database->save($array);
 					unset($array);
 				}
@@ -138,7 +135,6 @@
 		//$sql .= "and domain_uuid = :domain_uuid ";
 		$parameters['conference_profile_uuid'] = $conference_profile_uuid;
 		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$profile_name = $row["profile_name"];
diff --git a/app/conference_profiles/conference_profiles.php b/app/conference_profiles/conference_profiles.php
index c9c9e811ef..bd7eb83509 100644
--- a/app/conference_profiles/conference_profiles.php
+++ b/app/conference_profiles/conference_profiles.php
@@ -100,7 +100,6 @@
 	if (isset($sql_search)) {
 		$sql .= "where ".$sql_search;
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 	unset($sql);
 
@@ -116,7 +115,6 @@
 	}
 	$sql .= order_by($order_by, $order, 'profile_name', 'asc');
 	$sql .= limit_offset($rows_per_page ?? '', $offset ?? '');
-	$database = new database;
 	$conference_profiles = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php
index 4f4729551f..1b0f353c69 100644
--- a/app/conferences/conference_edit.php
+++ b/app/conferences/conference_edit.php
@@ -98,9 +98,6 @@
 		$array['conference_users'][0]['conference_uuid'] = $conference_uuid;
 		$array['conference_users'][0]['user_uuid'] = $user_uuid;
 
-		$database = new database;
-		$database->app_name = 'conferences';
-		$database->app_uuid = 'b81412e8-7253-91f4-e48e-42fc2c9a38d9';
 		$database->delete($array);
 		$response = $database->message;
 		unset($array);
@@ -127,9 +124,6 @@
 			$p = permissions::new();
 			$p->add('conference_user_add', 'temp');
 
-			$database = new database;
-			$database->app_name = 'conferences';
-			$database->app_uuid = 'b81412e8-7253-91f4-e48e-42fc2c9a38d9';
 			$database->save($array);
 			$response = $database->message;
 			unset($array);
@@ -243,9 +237,6 @@
 					$p->add('dialplan_add', 'temp');
 					$p->add('dialplan_edit', 'temp');
 
-					$database = new database;
-					$database->app_name = 'conferences';
-					$database->app_uuid = 'b81412e8-7253-91f4-e48e-42fc2c9a38d9';
 					$database->save($array);
 					$response = $database->message;
 					unset($array);
@@ -259,7 +250,6 @@
 					//$sql .= "and domain_uuid = :domain_uuid ";
 					//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 					$parameters['dialplan_uuid'] = $dialplan_uuid;
-					$database = new database;
 					$database->execute($sql, $parameters ?? null);
 					unset($sql, $parameters);
 
@@ -306,7 +296,6 @@
 		$sql .= "and conference_uuid = :conference_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['conference_uuid'] = $conference_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters ?? null, 'row');
 		if (!empty($row)) {
 			$dialplan_uuid = $row["dialplan_uuid"];
@@ -334,7 +323,6 @@
 	$sql .= "from v_conference_profiles ";
 	$sql .= "where profile_enabled = 'true' ";
 	$sql .= "and profile_name <> 'sla' ";
-	$database = new database;
 	$conference_profiles = $database->select($sql, null, 'all');
 	unset($sql);
 
@@ -346,7 +334,6 @@
 	$sql .= "and e.conference_uuid = :conference_uuid ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['conference_uuid'] = $conference_uuid ?? null;
-	$database = new database;
 	$conference_users = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
@@ -355,7 +342,6 @@
 	$sql .= "where domain_uuid = :domain_uuid ";
 	$sql .= "and user_enabled = true ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$users = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/conferences_active/conference_exec.php b/app/conferences_active/conference_exec.php
index 449ee70371..5e694e1d0c 100644
--- a/app/conferences_active/conference_exec.php
+++ b/app/conferences_active/conference_exec.php
@@ -82,7 +82,6 @@
 		$sql .= "and conference_extension = :conference_extension ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['conference_extension'] = $name;
-		$database = new database;
 		$name = $database->select($sql, $parameters, 'column');
 		unset ($parameters, $sql);
 	}
diff --git a/app/conferences_active/conferences_active_inc.php b/app/conferences_active/conferences_active_inc.php
index ddf8bf9058..96cdd52100 100644
--- a/app/conferences_active/conferences_active_inc.php
+++ b/app/conferences_active/conferences_active_inc.php
@@ -100,7 +100,6 @@
 						$sql .= "left join v_conference_centers as cc on cr.conference_center_uuid = cc.conference_center_uuid ";
 						$sql .= "where cr.conference_room_uuid = :conference_room_uuid ";
 						$parameters['conference_room_uuid'] = $conference_uuid;
-						$database = new database;
 						$conference = $database->select($sql, $parameters, 'row');
 						$conference_name = $conference['conference_room_name'];
 						$conference_extension = $conference['conference_center_extension'];
@@ -120,7 +119,6 @@
 						$sql .= "and conference_extension = :conference_extension ";
 						$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 						$parameters['conference_extension'] = $name_array[0];
-						$database = new database;
 						$conference = $database->select($sql, $parameters, 'row');
 						$conference_name = $conference['conference_name'];
 						$conference_extension = $conference['conference_extension'];
diff --git a/app/database_transactions/database_transaction_edit.php b/app/database_transactions/database_transaction_edit.php
index 560a559ef8..7b52094668 100644
--- a/app/database_transactions/database_transaction_edit.php
+++ b/app/database_transactions/database_transaction_edit.php
@@ -75,7 +75,6 @@
 		$sql .= "and t.database_transaction_uuid = :database_transaction_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['database_transaction_uuid'] = $database_transaction_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 
 		if (!empty($row)) {
@@ -101,11 +100,8 @@
 			$array = json_decode($transaction_old, true);
 
 		//save to the data
-			$database = new database;
-			$database->app_name = $app_name;
-			$database->app_uuid = $app_uuid;
 			$database->save($array);
-			$message = $database->message;
+			//$message = $database->message;
 
 		//redirect the user
 			$_SESSION["message"] = $text['message-update'];
diff --git a/app/database_transactions/database_transactions.php b/app/database_transactions/database_transactions.php
index b68b5e227a..59dd56043b 100644
--- a/app/database_transactions/database_transactions.php
+++ b/app/database_transactions/database_transactions.php
@@ -86,7 +86,6 @@
 		$parameters['search'] = '%'.$search.'%';
 	};
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 	unset($parameters);
 
@@ -126,7 +125,6 @@
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$sql .= order_by($order_by, $order, 't.transaction_date', 'desc');
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$transactions = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
@@ -135,7 +133,6 @@
 	$sql .= "where domain_uuid = :domain_uuid ";
 	$sql .= "order by username ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$rows = $database->select($sql, $parameters, 'all');
 	if (!empty($rows)) {
 		foreach ($rows as $row) {
diff --git a/app/destinations/destination_download.php b/app/destinations/destination_download.php
index 545f998d97..8bd5e8d8bc 100644
--- a/app/destinations/destination_download.php
+++ b/app/destinations/destination_download.php
@@ -128,7 +128,6 @@
 			$sql = "select ".implode(', ', $selected_columns)." from v_destinations ";
 			$sql .= "where domain_uuid = :domain_uuid ";
 			$parameters['domain_uuid'] = $domain_uuid;
-			$database = new database;
 			$destinations = $database->select($sql, $parameters, 'all');
 			unset($sql, $parameters, $selected_columns);
 
diff --git a/app/destinations/destination_imports.php b/app/destinations/destination_imports.php
index 8b34d84099..1487f01975 100644
--- a/app/destinations/destination_imports.php
+++ b/app/destinations/destination_imports.php
@@ -489,9 +489,6 @@
 								if ($row_id === 1000) {
 
 									//save to the data
-										$database = new database;
-										$database->app_name = 'destinations';
-										$database->app_uuid = '5ec89622-b19c-3559-64f0-afde802ab139';
 										$database->save($array);
 										//$message = $database->message;
 
@@ -510,11 +507,8 @@
 
 				//save to the data
 					if (!empty($array) && is_array($array)) {
-						$database = new database;
-						$database->app_name = 'destinations';
-						$database->app_uuid = '5ec89622-b19c-3559-64f0-afde802ab139';
 						$database->save($array);
-						$message = $database->message;
+						//$message = $database->message;
 					}
 
 			}
@@ -608,7 +602,6 @@
 											$sql .= "and destination_number = :destination_number; ";
 											$parameters['domain_uuid'] = $domain_uuid;
 											$parameters['destination_number'] = $destination_number;
-											$database = new database;
 											$destinations = $database->select($sql, $parameters, 'all');
 											$row = $destinations[0];
 											unset($sql, $parameters);
@@ -636,14 +629,12 @@
 									$sql = "delete from v_dialplan_details ";
 									$sql .= "where dialplan_uuid = :dialplan_uuid ";
 									$parameters['dialplan_uuid'] = $row['dialplan_uuid'];
-									$database = new database;
 									$database->execute($sql, $parameters);
 									unset($sql, $parameters);
 
 									$sql = "delete from v_dialplans ";
 									$sql .= "where dialplan_uuid = :dialplan_uuid ";
 									$parameters['dialplan_uuid'] = $row['dialplan_uuid'];
-									$database = new database;
 									$database->execute($sql, $parameters);
 									unset($sql, $parameters);
 								}
@@ -653,7 +644,6 @@
 									$sql = "delete from v_destinations ";
 									$sql .= "where destination_uuid = :destination_uuid ";
 									$parameters['destination_uuid'] = $row['destination_uuid'];
-									$database = new database;
 									$database->execute($sql, $parameters);
 									unset($sql, $parameters);
 								}
@@ -679,14 +669,12 @@
 								$sql = "delete from v_dialplan_details ";
 								$sql .= "where dialplan_uuid = :dialplan_uuid ";
 								$parameters['dialplan_uuid'] = $row['dialplan_uuid'];
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 
 								$sql = "delete from v_dialplans ";
 								$sql .= "where dialplan_uuid = :dialplan_uuid ";
 								$parameters['dialplan_uuid'] = $row['dialplan_uuid'];
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
@@ -696,7 +684,6 @@
 								$sql = "delete from v_destinations ";
 								$sql .= "where destination_uuid = :destination_uuid ";
 								$parameters['destination_uuid'] = $row['destination_uuid'];
-								$database = new database;
 								$database->execute($sql, $parameters);
 								unset($sql, $parameters);
 							}
diff --git a/app/devices/cmd.php b/app/devices/cmd.php
index e4467fb3f5..e3daf6d0e9 100644
--- a/app/devices/cmd.php
+++ b/app/devices/cmd.php
@@ -54,7 +54,6 @@
 	$sql .= "and extension = :extension ";
 	$parameters['extension'] = $user;
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (is_array($row)) {
 		$domain_name = $row['domain_name'];
diff --git a/app/devices/device_copy.php b/app/devices/device_copy.php
index a467de98a1..08c4051e61 100644
--- a/app/devices/device_copy.php
+++ b/app/devices/device_copy.php
@@ -59,7 +59,6 @@
 		$sql = "select count(*) from v_devices ";
 		$sql .= "where device_address = :device_address ";
 		$parameters['device_address'] = $device_address;
-		$database = new database;
 		$num_rows = $database->select($sql, $parameters, 'column');
 		if ($num_rows == 0) {
 			$save = true;
@@ -75,7 +74,6 @@
 	$sql = "select * from v_devices ";
 	$sql .= "where device_uuid = :device_uuid ";
 	$parameters['device_uuid'] = $device_uuid;
-	$database = new database;
 	$devices = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
@@ -84,7 +82,6 @@
 	$sql .= "where device_uuid = :device_uuid ";
 	$sql .= "order by line_number asc ";
 	$parameters['device_uuid'] = $device_uuid;
-	$database = new database;
 	$device_lines = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
@@ -100,7 +97,6 @@
 	$sql .= "else 100 END, ";
 	$sql .= "cast(device_key_id as int) asc ";
 	$parameters['device_uuid'] = $device_uuid;
-	$database = new database;
 	$device_keys = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
@@ -109,7 +105,6 @@
 	$sql .= "where device_uuid = :device_uuid ";
 	$sql .= "order by device_setting_subcategory asc ";
 	$parameters['device_uuid'] = $device_uuid;
-	$database = new database;
 	$device_settings = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
@@ -169,11 +164,8 @@
 
 //copy the device
 	if ($save) {
-		$database = new database;
-		$database->app_name = 'devices';
-		$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
 		$database->save($array);
-		$response = $database->message;
+		//$response = $database->message;
 		message::add($text['message-copy']);
 	}
 
diff --git a/app/devices/device_imports.php b/app/devices/device_imports.php
index e8d6ba4193..78baaabd4c 100644
--- a/app/devices/device_imports.php
+++ b/app/devices/device_imports.php
@@ -253,11 +253,6 @@
 		//set the domain_uuid
 			$domain_uuid = $_SESSION['domain_uuid'];
 
-		//open the database
-			$database = new database;
-			$database->app_name = 'devices';
-			$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
-
 		//get the users
 			$sql = "select * from v_users where domain_uuid = :domain_uuid ";
 			$parameters['domain_uuid'] = $domain_uuid;
diff --git a/app/devices/device_profile_copy.php b/app/devices/device_profile_copy.php
index 679338da6e..e5b50e3f49 100644
--- a/app/devices/device_profile_copy.php
+++ b/app/devices/device_profile_copy.php
@@ -50,7 +50,6 @@
 	$sql = "select * from v_device_profiles ";
 	$sql .= "where device_profile_uuid = :device_profile_uuid ";
 	$parameters['device_profile_uuid'] = $device_profile_uuid;
-	$database = new database;
 	$device_profiles = $database->select($sql, $parameters);
 	unset($sql, $parameters);
 
@@ -66,7 +65,6 @@
 	$sql .= "else 100 end, ";
 	$sql .= "profile_key_id asc ";
 	$parameters['device_profile_uuid'] = $device_profile_uuid;
-	$database = new database;
 	$device_profile_keys = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
@@ -75,7 +73,6 @@
 	$sql .= "where device_profile_uuid = :device_profile_uuid ";
 	$sql .= "order by profile_setting_name asc ";
 	$parameters['device_profile_uuid'] = $device_profile_uuid;
-	$database = new database;
 	$device_profile_settings = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
@@ -117,9 +114,6 @@
 	}
 
 //copy the device
-	$database = new database;
-	$database->app_name = 'devices';
-	$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
 	$database->save($array);
 	unset($array);
 
diff --git a/app/devices/device_vendor_edit.php b/app/devices/device_vendor_edit.php
index fac508cd84..10a9cccfef 100644
--- a/app/devices/device_vendor_edit.php
+++ b/app/devices/device_vendor_edit.php
@@ -107,9 +107,6 @@
 					$array['device_vendors'][0]['enabled'] = $enabled;
 					$array['device_vendors'][0]['description'] = $description;
 
-					$database = new database;
-					$database->app_name = 'devices';
-					$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
 					$database->save($array);
 					unset($array);
 
@@ -130,7 +127,6 @@
 		$sql .= "from v_device_vendors ";
 		$sql .= "where device_vendor_uuid = :device_vendor_uuid ";
 		$parameters['device_vendor_uuid'] = $device_vendor_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$name = $row["name"];
diff --git a/app/devices/device_vendor_function_edit.php b/app/devices/device_vendor_function_edit.php
index d6a81c48f9..32d0fa3e63 100644
--- a/app/devices/device_vendor_function_edit.php
+++ b/app/devices/device_vendor_function_edit.php
@@ -87,9 +87,6 @@
 
 		//delete the device vendor function group
 			$array['device_vendor_function_groups'][0]['device_vendor_function_group_uuid'] = $device_vendor_function_group_uuid;
-			$database = new database;
-			$database->app_name = 'devices';
-			$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
 			$database->delete($array);
 			unset($array);
 
diff --git a/app/devices/device_vendor_functions.php b/app/devices/device_vendor_functions.php
index 80e08c5fc7..a9a7cbe099 100644
--- a/app/devices/device_vendor_functions.php
+++ b/app/devices/device_vendor_functions.php
@@ -92,7 +92,6 @@
 		$parameters['search'] = '%'.$search.'%';
 	}
 	$parameters['device_vendor_uuid'] = $device_vendor_uuid;
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 	unset($sql, $parameters);
 
@@ -131,7 +130,6 @@
 	$parameters['device_vendor_uuid'] = $device_vendor_uuid;
 	$sql .= order_by($order_by, $order, 'type', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset ?? null);
-	$database = new database;
 	$vendor_functions = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
@@ -209,7 +207,6 @@
 				$sql .= "g.group_name asc ";
 				$parameters['device_vendor_uuid'] = $device_vendor_uuid;
 				$parameters['device_vendor_function_uuid'] = $row['device_vendor_function_uuid'];
-				$database = new database;
 				$vendor_function_groups = $database->select($sql, $parameters, 'all');
 				unset($sql, $parameters);
 				unset($group_list);
diff --git a/app/devices/device_vendor_restore.php b/app/devices/device_vendor_restore.php
index 2a40b1c475..f00a160c71 100644
--- a/app/devices/device_vendor_restore.php
+++ b/app/devices/device_vendor_restore.php
@@ -44,23 +44,19 @@
 
 //flush everything
 	$sql = "delete from v_device_vendors";
-	$database = new database;
 	$database->execute($sql);
 	unset($sql);
 
 	$sql = "delete from v_device_vendor_functions";
-	$database = new database;
 	$database->execute($sql);
 	unset($sql);
 
 	$sql = "delete from v_device_vendor_function_groups";
-	$database = new database;
 	$database->execute($sql);
 	unset($sql);
 
 //add device vendor functions to the database
 	$sql = "select count(*) from v_device_vendors; ";
-	$database = new database;
 	$num_rows = $database->select($sql, null, 'column');
 	unset($sql);
 
@@ -72,7 +68,6 @@
 
 		//get the groups and create an array to use the name to get the uuid
 			$sql = "select * from v_groups ";
-			$database = new database;
 			$groups = $database->select($sql, null, 'all');
 			if (is_array($groups) && @sizeof($groups) != 0) {
 				foreach ($groups as $row) {
@@ -135,9 +130,6 @@
 			$p->add('device_vendor_function_group_add', 'temp');
 
 		//process array
-			$database = new database;
-			$database->app_name = 'devices';
-			$database->app_uuid = '4efa1a1a-32e7-bf83-534b-6c8299958a8e';
 			$database->save($array);
 			unset($array);
 
diff --git a/app/devices/device_vendors.php b/app/devices/device_vendors.php
index 633ef35861..117ce46ddf 100644
--- a/app/devices/device_vendors.php
+++ b/app/devices/device_vendors.php
@@ -87,7 +87,6 @@
 		$sql .= ")";
 		$parameters['search'] = '%'.$search.'%';
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare to page the results
@@ -116,7 +115,6 @@
 	}
 	$sql .= order_by($order_by, $order, 'name', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$result = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/devices/resources/dashboard/device_keys.php b/app/devices/resources/dashboard/device_keys.php
index 58f0654a0d..d5e699e54a 100644
--- a/app/devices/resources/dashboard/device_keys.php
+++ b/app/devices/resources/dashboard/device_keys.php
@@ -30,11 +30,6 @@
 	$language = new text;
 	$text = $language->get($_SESSION['domain']['language']['code'], 'app/devices');
 
-//connect to the database
-	if (!isset($database)) {
-		$database = new database;
-	}
-
 //get the vendor functions
 	$sql = "select v.name as vendor_name, f.type, f.value ";
 	$sql .= "from v_device_vendors as v, v_device_vendor_functions as f ";
diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php
index 2035c769df..3bcf1b3eec 100644
--- a/app/dialplan_inbound/dialplan_inbound_add.php
+++ b/app/dialplan_inbound/dialplan_inbound_add.php
@@ -99,7 +99,6 @@
 			$sql .= "and destination_uuid = :destination_uuid ";
 			$parameters['domain_uuid'] = $domain_uuid;
 			$parameters['destination_uuid'] = $destination_uuid;
-			$database = new database;
 			$row = $database->select($sql, $parameters, 'row');
 			if (is_array($row) && @sizeof($row) != 0) {
 				$destination_number = $row["destination_number"];
@@ -266,7 +265,6 @@
 					$sql .= "and fax_uuid = :fax_uuid ";
 					$parameters['domain_uuid'] = $domain_uuid;
 					$parameters['fax_uuid'] = $fax_uuid;
-					$database = new database;
 					$row = $database->select($sql, $parameters, 'row');
 					if (is_array($row) && @sizeof($row) != 0) {
 						$fax_extension = $row["fax_extension"];
@@ -407,11 +405,8 @@
 			}
 
 		//save the data
-			$database = new database;
-			$database->app_name = 'inbound_routes';
-			$database->app_uuid = $app_uuid;
 			$database->save($array);
-			$message = $database->message;
+			//$message = $database->message;
 			unset($array);
 
 		//remove temp permission, if exists
@@ -676,7 +671,6 @@
 		$sql .= "and destination_type = 'inbound' ";
 		$sql .= "order by destination_number asc ";
 		$parameters['domain_uuid'] = $domain_uuid;
-		$database = new database;
 		$result = $database->select($sql, $parameters, 'all');
 		if (is_array($result) && @sizeof($result) != 0) {
 			echo "	<select name='destination_uuid' id='destination_uuid' class='formfld' >\n";
diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php
index dff992153f..6645ed9827 100644
--- a/app/dialplan_outbound/dialplan_outbound_add.php
+++ b/app/dialplan_outbound/dialplan_outbound_add.php
@@ -840,9 +840,6 @@
 			$p->add("dialplan_detail_add", "temp");
 
 		//save to the data
-			$database = new database;
-			$database->app_name = 'outbound_routes';
-			$database->app_uuid = $app_uuid;
 			$database->save($array);
 			$message = $database->message;
 			unset($array);
@@ -871,7 +868,6 @@
 //get the domains
 	$sql = "select * from v_domains ";
 	$sql .= "where domain_enabled = true ";
-	$database = new database;
 	$domains = $database->select($sql, null, 'all');
 	unset($sql);
 
@@ -886,7 +882,6 @@
 
 	}
 	$parameters['domain_uuid'] = $domain_uuid;
-	$database = new database;
 	$gateways = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
@@ -896,7 +891,6 @@
 		$sql .= "where bridge_enabled = true ";
 		$sql .= "and domain_uuid = :domain_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
-		$database = new database;
 		$bridges = $database->select($sql, $parameters, 'all');
 		unset($sql, $parameters);
 	}
diff --git a/app/dialplans/dialplan_add.php b/app/dialplans/dialplan_add.php
index 675caf3466..0a5988ee1d 100644
--- a/app/dialplans/dialplan_add.php
+++ b/app/dialplans/dialplan_add.php
@@ -176,9 +176,6 @@
 			}
 
 		//execute inserts
-			$database = new database;
-			$database->app_name = 'dialplans';
-			$database->app_uuid = '742714e5-8cdf-32fd-462c-cbe7e3d655db';
 			$database->save($array);
 			unset($array);
 
diff --git a/app/dialplans/dialplan_xml.php b/app/dialplans/dialplan_xml.php
index 9660c691fe..376940e4e4 100644
--- a/app/dialplans/dialplan_xml.php
+++ b/app/dialplans/dialplan_xml.php
@@ -63,7 +63,6 @@
 				$sql = "select * from v_dialplans ";
 				$sql .= "where dialplan_uuid = :dialplan_uuid ";
 				$parameters['dialplan_uuid'] = $dialplan_uuid;
-				$database = new database;
 				$row = $database->select($sql, $parameters, 'row');
 				if (is_array($row) && @sizeof($row) != 0) {
 					$app_uuid = $row["app_uuid"];
@@ -126,9 +125,6 @@
 					$array['dialplans'][$x]["dialplan_xml"] =  $dialplan_xml;
 
 				//save to the data
-					$database = new database;
-					$database->app_name = 'dialplans';
-					$database->app_uuid = is_uuid($app_uuid) ? $app_uuid : '742714e5-8cdf-32fd-462c-cbe7e3d655db';
 					$database->save($array);
 					unset($array);
 
@@ -158,7 +154,6 @@
 		$sql = "select * from v_dialplans ";
 		$sql .= "where dialplan_uuid = :dialplan_uuid ";
 		$parameters['dialplan_uuid'] = $dialplan_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$domain_uuid = $row["domain_uuid"];
diff --git a/app/domain_limits/resources/dashboard/domain_limits.php b/app/domain_limits/resources/dashboard/domain_limits.php
index ded6ff65c2..39afeb8cf9 100644
--- a/app/domain_limits/resources/dashboard/domain_limits.php
+++ b/app/domain_limits/resources/dashboard/domain_limits.php
@@ -41,11 +41,6 @@
 	$language = new text;
 	$text = $language->get($_SESSION['domain']['language']['code'], 'core/user_settings');
 
-//connect to the database
-	if (!isset($database)) {
-		$database = new database;
-	}
-
 //clear initial stat
 	unset($hud_stat);
 
diff --git a/app/email_queue/email_queue.php b/app/email_queue/email_queue.php
index e83f69c95c..8c9aeb1cae 100644
--- a/app/email_queue/email_queue.php
+++ b/app/email_queue/email_queue.php
@@ -73,11 +73,6 @@
 			$x++;
 		}
 
-		//prepare the database object
-		$database = new database;
-		$database->app_name = 'email_queue';
-		$database->app_uuid = '5befdf60-a242-445f-91b3-2e9ee3e0ddf7';
-
 		//send the array to the database class
 		switch ($action) {
 			case 'resend':
@@ -138,7 +133,6 @@
 	//	$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
 	//	$parameters['domain_uuid'] = $domain_uuid;
 	//}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 	unset($sql, $parameters);
 
@@ -186,7 +180,6 @@
 	$sql .= order_by($order_by, $order, 'email_date', 'desc');
 	$sql .= limit_offset($rows_per_page, $offset);
 	$parameters['time_zone'] = $time_zone;
-	$database = new database;
 	$email_queue = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/email_queue/email_queue_delete.php b/app/email_queue/email_queue_delete.php
index e2a191fc3a..43aaad038e 100644
--- a/app/email_queue/email_queue_delete.php
+++ b/app/email_queue/email_queue_delete.php
@@ -52,7 +52,6 @@
 
 		//delete the data
 			$array['email_queue'][]['email_queue_uuid'] = $id;
-			$database = new database;
 			$database->delete($array);
 			unset($array);
 
diff --git a/app/email_queue/email_queue_edit.php b/app/email_queue/email_queue_edit.php
index e6d12b6459..b3fcef38e6 100644
--- a/app/email_queue/email_queue_edit.php
+++ b/app/email_queue/email_queue_edit.php
@@ -84,20 +84,17 @@
 				switch ($_POST['action']) {
 					case 'copy':
 						if (permission_exists('email_queue_add')) {
-							$obj = new database;
-							$obj->copy($array);
+							$database->copy($array);
 						}
 						break;
 					case 'delete':
 						if (permission_exists('email_queue_delete')) {
-							$obj = new database;
-							$obj->delete($array);
+							$database->delete($array);
 						}
 						break;
 					case 'toggle':
 						if (permission_exists('email_queue_update')) {
-							$obj = new database;
-							$obj->toggle($array);
+							$database->toggle($array);
 						}
 						break;
 				}
@@ -190,9 +187,6 @@
 			$array['email_queue'][0]['email_response'] = $email_response;
 
 		//save the data
-			$database = new database;
-			$database->app_name = 'email queue';
-			$database->app_uuid = '5befdf60-a242-445f-91b3-2e9ee3e0ddf7';
 			$database->save($array);
 
 		//redirect the user
@@ -216,7 +210,6 @@
 		//$sql .= "and domain_uuid = :domain_uuid ";
 		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['email_queue_uuid'] = $email_queue_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$email_date = $row["email_date"];
diff --git a/app/email_queue/email_test.php b/app/email_queue/email_test.php
index 66d7adfd79..e9203f3903 100644
--- a/app/email_queue/email_test.php
+++ b/app/email_queue/email_test.php
@@ -60,7 +60,6 @@
 		$sql .= "limit 1 ";
 		$parameters['template_language'] = $language_dialect;
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-		$database = new database;
 		$template = $database->select($sql, $parameters, 'row');
 		unset($sql, $parameters);
 	}
diff --git a/app/email_queue/resources/command/send.php b/app/email_queue/resources/command/send.php
index ed7dd421ed..7a0de3fc32 100644
--- a/app/email_queue/resources/command/send.php
+++ b/app/email_queue/resources/command/send.php
@@ -148,7 +148,6 @@
 	$sql = "select domain_uuid from v_domains ";
 	$sql .= "where domain_name = :domain_name ";
 	$parameters['domain_name'] = $domain_name;
-	$database = new database;
 	$domain_uuid = $database->select($sql, $parameters, 'column');
 	unset($parameters);
 
@@ -208,7 +207,6 @@
 	$parameters['template_category'] = $template_category;
 	$parameters['template_subcategory'] = $template_subcategory;
 	$parameters['template_type'] = $template_type;
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (is_array($row)) {
 		$email_subject = $row['template_subject'];
diff --git a/app/email_queue/resources/jobs/email_queue.php b/app/email_queue/resources/jobs/email_queue.php
index 6059092861..d10e2f9fc7 100755
--- a/app/email_queue/resources/jobs/email_queue.php
+++ b/app/email_queue/resources/jobs/email_queue.php
@@ -128,7 +128,6 @@
         $parameters['hostname'] = gethostname();
     }
     $parameters['limit'] = $email_queue_limit;
-    $database = new database;
     $email_queue = $database->select($sql, $parameters, 'all');
     unset($parameters);
 
diff --git a/app/emergency/emergency.php b/app/emergency/emergency.php
index 60a3fe9965..eb66e14ef0 100644
--- a/app/emergency/emergency.php
+++ b/app/emergency/emergency.php
@@ -25,11 +25,6 @@ if (!empty($_POST['emergency_logs']) && is_array($_POST['emergency_logs'])) {
 	$emergency_logs = $_POST['emergency_logs'];
 }
 
-//prepare the database object
-$database = new database;
-$database->app_name = 'emergency_logs';
-$database->app_uuid = 'de63b1ae-7750-11ee-b3a5-005056a27559';
-
 //set permissions for CDR details and call recordings
 $permission = array();
 $permission['xml_cdr_hangup_cause'] = permission_exists('xml_cdr_hangup_cause');
diff --git a/app/event_guard/event_guard_log_edit.php b/app/event_guard/event_guard_log_edit.php
index 3c254444b9..16e5b71f7e 100644
--- a/app/event_guard/event_guard_log_edit.php
+++ b/app/event_guard/event_guard_log_edit.php
@@ -77,20 +77,17 @@
 				switch ($_POST['action']) {
 					case 'copy':
 						if (permission_exists('event_guard_log_add')) {
-							$obj = new database;
-							$obj->copy($array);
+							$database->copy($array);
 						}
 						break;
 					case 'delete':
 						if (permission_exists('event_guard_log_delete')) {
-							$obj = new database;
-							$obj->delete($array);
+							$database->delete($array);
 						}
 						break;
 					case 'toggle':
 						if (permission_exists('event_guard_log_update')) {
-							$obj = new database;
-							$obj->toggle($array);
+							$database->toggle($array);
 						}
 						break;
 				}
@@ -140,9 +137,6 @@
 			$array['event_guard_logs'][0]['log_status'] = $log_status;
 
 		//save the data
-			$database = new database;
-			$database->app_name = 'event guard';
-			$database->app_uuid = 'c5b86612-1514-40cb-8e2c-3f01a8f6f637';
 			$database->save($array);
 
 		//redirect the user
@@ -173,7 +167,6 @@
 		$sql .= "from v_event_guard_logs ";
 		$sql .= "where event_guard_log_uuid = :event_guard_log_uuid ";
 		$parameters['event_guard_log_uuid'] = $event_guard_log_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$hostname = $row["hostname"];
diff --git a/app/event_guard/event_guard_logs.php b/app/event_guard/event_guard_logs.php
index 23708ee953..736d6dd57f 100644
--- a/app/event_guard/event_guard_logs.php
+++ b/app/event_guard/event_guard_logs.php
@@ -105,7 +105,6 @@
 		$sql .= "and filter = :filter ";
 		$parameters['filter'] = $_GET["filter"];
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 	unset($sql, $parameters);
 
@@ -157,7 +156,6 @@
 	}
 	$sql .= order_by($order_by, $order, 'log_date', 'desc');
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$event_guard_logs = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/extension_settings/extension_setting_edit.php b/app/extension_settings/extension_setting_edit.php
index 87d52f5410..a10bbfc29a 100644
--- a/app/extension_settings/extension_setting_edit.php
+++ b/app/extension_settings/extension_setting_edit.php
@@ -92,20 +92,17 @@
 				switch ($_POST['action']) {
 					case 'copy':
 						if (permission_exists('extension_setting_add')) {
-							$obj = new database;
-							$obj->copy($array);
+							$database->copy($array);
 						}
 						break;
 					case 'delete':
 						if (permission_exists('extension_setting_delete')) {
-							$obj = new database;
-							$obj->delete($array);
+							$database->delete($array);
 						}
 						break;
 					case 'toggle':
 						if (permission_exists('extension_setting_update')) {
-							$obj = new database;
-							$obj->toggle($array);
+							$database->toggle($array);
 						}
 						break;
 				}
@@ -155,16 +152,12 @@
 			$array['extension_settings'][0]['extension_setting_description'] = $extension_setting_description;
 
 		//save the data
-			$database = new database;
-			$database->app_name = 'extension settings';
-			$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
 			$database->save($array);
 
 		//clear the cache
 			$sql = "select extension, number_alias, user_context from v_extensions ";
 			$sql .= "where extension_uuid = :extension_uuid ";
 			$parameters['extension_uuid'] = $extension_uuid;
-			$database = new database;
 			$extension = $database->select($sql, $parameters, 'row');
 			$cache = new cache;
 			$cache->delete("directory:".$extension["extension"]."@".$extension["user_context"]);
@@ -200,7 +193,6 @@
 		//$sql .= "and domain_uuid = :domain_uuid ";
 		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['extension_setting_uuid'] = $extension_setting_uuid ?? '';
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			if (!empty($row["extension_uuid"]) && is_uuid($row["extension_uuid"])) {
diff --git a/app/extension_settings/extension_settings.php b/app/extension_settings/extension_settings.php
index 3dc1e1634e..0c8361e3ea 100644
--- a/app/extension_settings/extension_settings.php
+++ b/app/extension_settings/extension_settings.php
@@ -126,7 +126,6 @@
 		$parameters['domain_uuid'] = $domain_uuid;
 	}
 	$parameters['extension_uuid'] = $extension_uuid;
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 	unset($sql, $parameters);
 
@@ -157,7 +156,6 @@
 	$sql .= limit_offset($rows_per_page ?? null, $offset ?? null);
 	$parameters['extension_uuid'] = $extension_uuid;
 	$parameters['domain_uuid'] = $domain_uuid;
-	$database = new database;
 	$extension_settings = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/extensions/extension_copy.php b/app/extensions/extension_copy.php
index 17c11fa391..932954a249 100644
--- a/app/extensions/extension_copy.php
+++ b/app/extensions/extension_copy.php
@@ -38,9 +38,6 @@
 		exit;
 	}
 
-//initialize the database object
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/app/extensions/extension_download.php b/app/extensions/extension_download.php
index 65b7119e03..19182ebdc9 100644
--- a/app/extensions/extension_download.php
+++ b/app/extensions/extension_download.php
@@ -38,9 +38,6 @@
 		exit;
 	}
 
-//initialize the database object
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 78a0006a93..0937d7d1f1 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -57,9 +57,6 @@
 		return is_array($value) ? $value[0] : $value;
 	}
 
-//initialize the database object
-	$database = new database;
-
 //initialize the settings object
 	$settings = new settings(['database' => $database, 'domain_uuid' => $domain_uuid, 'user_uuid' => $user_uuid]);
 
diff --git a/app/extensions/extension_imports.php b/app/extensions/extension_imports.php
index c6792a48e5..68581309c2 100644
--- a/app/extensions/extension_imports.php
+++ b/app/extensions/extension_imports.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//initialize the database object
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php
index b9a5730a13..08548855f1 100644
--- a/app/extensions/extensions.php
+++ b/app/extensions/extensions.php
@@ -39,9 +39,6 @@
 		exit;
 	}
 
-//initialize the database object
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/app/extensions/resources/dashboard/caller_id.php b/app/extensions/resources/dashboard/caller_id.php
index 2fc4c65675..eaddb629a7 100644
--- a/app/extensions/resources/dashboard/caller_id.php
+++ b/app/extensions/resources/dashboard/caller_id.php
@@ -35,11 +35,6 @@
 			$language = new text;
 			$text = $language->get($_SESSION['domain']['language']['code'], 'app/extensions');
 
-		//connect to the database
-			if (!isset($database)) {
-				$database = new database;
-			}
-
 		//add or update the database
 			if (isset($_POST['extensions']) && is_array($_POST['extensions']) && @sizeof($_POST['extensions']) != 0) {
 
diff --git a/app/fax/fax.php b/app/fax/fax.php
index 26c8e984a9..b6eca16eaa 100644
--- a/app/fax/fax.php
+++ b/app/fax/fax.php
@@ -114,7 +114,6 @@
 		$sql .= "or lower(fax_description) like :search ";
 		$parameters['search'] = '%'.strtolower($search).'%';
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare paging
@@ -164,7 +163,6 @@
 	}
 	$sql .= order_by($order_by, $order, 'fax_name', 'asc', $sort);
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$result = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/fax/fax_advanced.php b/app/fax/fax_advanced.php
index ac8b2aef45..210e8635d0 100644
--- a/app/fax/fax_advanced.php
+++ b/app/fax/fax_advanced.php
@@ -139,10 +139,7 @@
 						$p->add('fax_add', 'temp');
 						$p->add('fax_edit', 'temp');
 
-						$database = new database;
-						$database->app_name = 'fax';
-						$database->app_uuid = '24108154-4ac3-1db6-1551-4731703a4440';
-						$message = $database->save($array);
+						$database->save($array);
 						unset($array);
 
 						//revoke temp permissions
@@ -170,7 +167,6 @@
 		$sql .= "and fax_uuid = :fax_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['fax_uuid'] = $fax_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$fax_email_connection_type = $row["fax_email_connection_type"];
diff --git a/app/fax/fax_copy.php b/app/fax/fax_copy.php
index dec3752933..88386e60c3 100644
--- a/app/fax/fax_copy.php
+++ b/app/fax/fax_copy.php
@@ -53,7 +53,6 @@
 			$sql .= "and fax_uuid = :fax_uuid ";
 			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 			$parameters['fax_uuid'] = $fax_uuid;
-			$database = new database;
 			$row = $database->select($sql, $parameters, 'row');
 			if (is_array($row) && @sizeof($row) != 0) {
 				$fax_extension = $row["fax_extension"];
@@ -110,9 +109,6 @@
 			$p = permissions::new();
 			$p->add('fax_add', 'temp');
 
-			$database = new database;
-			$database->app_name = 'fax';
-			$database->app_uuid = '24108154-4ac3-1db6-1551-4731703a4440';
 			$database->save($array);
 			unset($array);
 
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index bebc9572ba..77326bbd58 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -178,9 +178,6 @@
 			$p = permissions::new();
 			$p->add('fax_user_delete', 'temp');
 
-			$database = new database;
-			$database->app_name = 'fax';
-			$database->app_uuid = '24108154-4ac3-1db6-1551-4731703a4440';
 			$database->delete($array);
 			unset($array);
 
@@ -206,9 +203,6 @@
 			$p = permissions::new();
 			$p->add('fax_user_add', 'temp');
 
-			$database = new database;
-			$database->app_name = 'fax';
-			$database->app_uuid = '24108154-4ac3-1db6-1551-4731703a4440';
 			$database->save($array);
 			unset($array);
 
@@ -365,9 +359,6 @@
 						$array['fax'][0]['fax_description'] = $fax_description;
 
 					//execute
-						$database = new database;
-						$database->app_name = 'fax';
-						$database->app_uuid = '24108154-4ac3-1db6-1551-4731703a4440';
 						$database->save($array);
 						unset($array);
 
@@ -388,7 +379,6 @@
 					$sql .= "and fax_uuid = :fax_uuid ";
 					$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 					$parameters['fax_uuid'] = $fax_uuid;
-					$database = new database;
 					$dialplan_uuid = $database->select($sql, $parameters, 'column');
 					unset($sql, $parameters);
 
@@ -425,7 +415,6 @@
 		$sql .= "and fax_uuid = :fax_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['fax_uuid'] = $fax_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$dialplan_uuid = $row["dialplan_uuid"];
@@ -458,7 +447,6 @@
 		$sql .= "and e.fax_uuid = :fax_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['fax_uuid'] = $fax_uuid;
-		$database = new database;
 		$fax_users = $database->select($sql, $parameters, 'all');
 		unset($sql, $parameters);
 	}
@@ -475,7 +463,6 @@
 		$sql .= ")\n";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['fax_uuid'] = $fax_uuid;
-		$database = new database;
 		$available_users = $database->select($sql, $parameters, 'all');
 		unset($sql, $parameters);
 	}
diff --git a/app/fax/fax_files.php b/app/fax/fax_files.php
index d14f7af153..9792e2c336 100644
--- a/app/fax/fax_files.php
+++ b/app/fax/fax_files.php
@@ -38,9 +38,6 @@
 		exit;
 	}
 
-//create the database object
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/app/fax/fax_files_remote.php b/app/fax/fax_files_remote.php
index 16dd4c4a38..bb1aacd7d0 100644
--- a/app/fax/fax_files_remote.php
+++ b/app/fax/fax_files_remote.php
@@ -69,7 +69,6 @@
 			$parameters['fax_uuid'] = $fax_uuid;
 			$parameters['user_uuid'] = $_SESSION['user_uuid'];
 		}
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$fax_name = $row["fax_name"];
diff --git a/app/fax/fax_log_view.php b/app/fax/fax_log_view.php
index 182971d601..63e625564d 100644
--- a/app/fax/fax_log_view.php
+++ b/app/fax/fax_log_view.php
@@ -75,7 +75,6 @@
 		$sql .= "and fax_log_uuid = :fax_log_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['fax_log_uuid'] = $fax_log_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$fax_log_uuid = $row["fax_log_uuid"];
diff --git a/app/fax/fax_logs.php b/app/fax/fax_logs.php
index 9b91d7bf25..5c7d2e0bb8 100644
--- a/app/fax/fax_logs.php
+++ b/app/fax/fax_logs.php
@@ -91,7 +91,6 @@
 	$sql .= $sql_search ?? '';
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['fax_uuid'] = $fax_uuid;
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
@@ -108,7 +107,6 @@
 	$sql = str_replace('count(fax_log_uuid)', '*', $sql);
 	$sql .= order_by($order_by, $order, 'fax_epoch', 'desc');
 	$sql .= limit_offset($rows_per_page, $offset ?? 0);
-	$database = new database;
 	$fax_logs = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/fax/fax_outbox.php b/app/fax/fax_outbox.php
index e50de73454..9dd42ca789 100644
--- a/app/fax/fax_outbox.php
+++ b/app/fax/fax_outbox.php
@@ -68,7 +68,6 @@
 			$parameters['fax_uuid'] = $fax_uuid;
 			$parameters['user_uuid'] = $_SESSION['user_uuid'];
 		}
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			//set database fields as variables
@@ -90,7 +89,6 @@
 	$sql .= "and fax_mode = 'tx' ";
 	$parameters['fax_uuid'] = $_REQUEST["id"];
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$fax_files = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/fax_queue/fax_queue_delete.php b/app/fax_queue/fax_queue_delete.php
index 0a9f083a76..2c8bf6b5e0 100644
--- a/app/fax_queue/fax_queue_delete.php
+++ b/app/fax_queue/fax_queue_delete.php
@@ -28,7 +28,6 @@
 
 		//delete the data
 			$array['fax_queue'][]['fax_queue_uuid'] = $id;
-			$database = new database;
 			$database->delete($array);
 			unset($array);
 
diff --git a/app/fax_queue/fax_queue_edit.php b/app/fax_queue/fax_queue_edit.php
index 0d6e14eac3..f186466eef 100644
--- a/app/fax_queue/fax_queue_edit.php
+++ b/app/fax_queue/fax_queue_edit.php
@@ -88,20 +88,17 @@
 				switch ($_POST['action']) {
 					case 'copy':
 						if (permission_exists('fax_queue_add')) {
-							$obj = new database;
-							$obj->copy($array);
+							$database->copy($array);
 						}
 						break;
 					case 'delete':
 						if (permission_exists('fax_queue_delete')) {
-							$obj = new database;
-							$obj->delete($array);
+							$database->delete($array);
 						}
 						break;
 					case 'toggle':
 						if (permission_exists('fax_queue_update')) {
-							$obj = new database;
-							$obj->toggle($array);
+							$database->toggle($array);
 						}
 						break;
 				}
@@ -168,9 +165,6 @@
 			$array['fax_queue'][0]['fax_response'] = $fax_response;
 
 		//save the data
-			$database = new database;
-			$database->app_name = 'fax queue';
-			$database->app_uuid = '3656287f-4b22-4cf1-91f6-00386bf488f4';
 			$database->save($array);
 
 		//redirect the user
@@ -211,7 +205,6 @@
 		//$sql .= "and domain_uuid = :domain_uuid ";
 		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['fax_queue_uuid'] = $fax_queue_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$fax_uuid = $row["fax_uuid"];
diff --git a/app/fifo/fifo.php b/app/fifo/fifo.php
index acd9a1eeb9..a55f46b6c2 100644
--- a/app/fifo/fifo.php
+++ b/app/fifo/fifo.php
@@ -127,7 +127,6 @@
 		$sql .= ") ";
 		$parameters['search'] = '%'.$search.'%';
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 	unset($sql, $parameters);
 
@@ -172,7 +171,6 @@
 	$sql .= "and u.domain_uuid = d.domain_uuid ";
 	$sql .= order_by($order_by, $order, '', '');
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$fifo = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/gateways/gateway_copy.php b/app/gateways/gateway_copy.php
index e41f4e8325..11eaf70de6 100644
--- a/app/gateways/gateway_copy.php
+++ b/app/gateways/gateway_copy.php
@@ -50,7 +50,6 @@
 			$sql = "select * from v_gateways ";
 			$sql .= "where gateway_uuid = :gateway_uuid ";
 			$parameters['gateway_uuid'] = $gateway_uuid;
-			$database = new database;
 			$row = $database->select($sql, $parameters, 'row');
 			if (is_array($row) && @sizeof($row) != 0) {
 				$domain_uuid = $row["domain_uuid"];
@@ -134,9 +133,6 @@
 			$array['gateways'][0]['enabled'] = $enabled;
 			$array['gateways'][0]['description'] = $description;
 
-			$database = new database;
-			$database->app_name = 'gateways';
-			$database->app_uuid = '297ab33e-2c2f-8196-552c-f3567d2caaf8';
 			$database->save($array);
 			unset($array);
 
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index 886a08b951..2ecf25dff9 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -62,7 +62,6 @@
 			$sql = "select count(gateway_uuid) from v_gateways ";
 			$sql .= "where (domain_uuid = :domain_uuid ".(permission_exists('gateway_domain') ? " or domain_uuid is null " : null).") ";
 			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-			$database = new database;
 			$total_gateways = $database->select($sql, $parameters, 'column');
 			unset($sql, $parameters);
 			if ($total_gateways >= $_SESSION['limit']['gateways']['numeric']) {
@@ -206,9 +205,6 @@
 					}
 
 				//save to the data
-					$database = new database;
-					$database->app_name = 'gateways';
-					$database->app_uuid = '297ab33e-2c2f-8196-552c-f3567d2caaf8';
 					if (is_uuid($gateway_uuid)) {
 						$database->uuid($gateway_uuid);
 					}
@@ -261,7 +257,6 @@
 		$sql = "select * from v_gateways ";
 		$sql .= "where gateway_uuid = :gateway_uuid ";
 		$parameters['gateway_uuid'] = $gateway_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$domain_uuid = $row["domain_uuid"];
@@ -305,7 +300,6 @@
 	$sql = "select sip_profile_name from v_sip_profiles ";
 	$sql .= "where sip_profile_enabled = true ";
 	$sql .= "order by sip_profile_name asc ";
-	$database = new database;
 	$sip_profiles = $database->select($sql, null, 'all');
 	unset($sql);
 
diff --git a/app/ivr_menus/resources/functions/ivr_menu_xml.php b/app/ivr_menus/resources/functions/ivr_menu_xml.php
index 67eeef7feb..bf042b5894 100644
--- a/app/ivr_menus/resources/functions/ivr_menu_xml.php
+++ b/app/ivr_menus/resources/functions/ivr_menu_xml.php
@@ -55,7 +55,6 @@
 			$sql = "select * from v_ivr_menus ";
 			$sql .= " where domain_uuid = :domain_uuid ";
 			$parameters['domain_uuid'] = $domain_uuid;
-			$database = new database;
 			$result = $database->select($sql, $parameters, 'all');
 			unset($sql, $parameters);
 
@@ -138,7 +137,6 @@
 						$sub_sql .= "order by ivr_menu_option_order asc ";
 						$parameters['ivr_menu_uuid'] = $ivr_menu_uuid;
 						$parameters['domain_uuid'] = $domain_uuid;
-						$database = new database;
 						$sub_result = $database->select($sub_sql, $parameters, 'all');
 						if (is_array($sub_result) && @sizeof($sub_result) != 0) {
 							foreach ($sub_result as $sub_row) {
diff --git a/app/modules/module_edit.php b/app/modules/module_edit.php
index b4accadac7..202c29210f 100644
--- a/app/modules/module_edit.php
+++ b/app/modules/module_edit.php
@@ -131,9 +131,6 @@
 					$array['modules'][0]['module_enabled'] = $module_enabled;
 					$array['modules'][0]['module_default_enabled'] = $module_default_enabled;
 
-					$database = new database;
-					$database->app_name = 'modules';
-					$database->app_uuid = '5eb9cba1-8cb6-5d21-e36a-775475f16b5e';
 					$database->save($array);
 					unset($array);
 
@@ -153,7 +150,6 @@
 		$sql = "select * from v_modules ";
 		$sql .= "where module_uuid = :module_uuid ";
 		$parameters['module_uuid'] = $module_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$module_label = $row["module_label"];
diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php
index eb2e525e3f..54a079bfec 100644
--- a/app/music_on_hold/music_on_hold.php
+++ b/app/music_on_hold/music_on_hold.php
@@ -57,7 +57,6 @@
 		$sql .= "or domain_uuid is null ";
 	}
 	$sql .= "order by domain_uuid desc, music_on_hold_name asc, music_on_hold_rate asc";
-	$database = new database;
 	$streams = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
@@ -275,9 +274,6 @@
 						$p = permissions::new();
 						$p->add('music_on_hold_add', 'temp');
 
-						$database = new database;
-						$database->app_name = 'music_on_hold';
-						$database->app_uuid = '1dafe0f8-c08a-289b-0312-15baf4f20f81';
 						$database->save($array);
 						unset($array);
 
diff --git a/app/music_on_hold/music_on_hold_edit.php b/app/music_on_hold/music_on_hold_edit.php
index ec7a9257ca..7bd770d88e 100644
--- a/app/music_on_hold/music_on_hold_edit.php
+++ b/app/music_on_hold/music_on_hold_edit.php
@@ -146,9 +146,6 @@
 						$array['music_on_hold'][0]['music_on_hold_chime_max'] = strlen($music_on_hold_chime_max) != 0 ? $music_on_hold_chime_max : null;
 
 					//execute
-						$database = new database;
-						$database->app_name = 'music_on_hold';
-						$database->app_uuid = '1dafe0f8-c08a-289b-0312-15baf4f20f81';
 						$database->save($array);
 						unset($array);
 
@@ -180,7 +177,6 @@
 		$sql .= "and music_on_hold_uuid = :music_on_hold_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['music_on_hold_uuid'] = $music_on_hold_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$domain_uuid = $row["domain_uuid"];
@@ -367,7 +363,6 @@
 		$tmp_selected = false;
 		$sql = "select recording_name, recording_filename from v_recordings where domain_uuid = :domain_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
-		$database = new database;
 		$recordings = $database->select($sql, $parameters, 'all');
 		if (is_array($recordings) && @sizeof($recordings) != 0) {
 			echo "<optgroup label='Recordings'>\n";
@@ -393,7 +388,6 @@
 	//phrases
 		$sql = "select * from v_phrases where domain_uuid = :domain_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
-		$database = new database;
 		$result = $database->select($sql, $parameters, 'all');
 		if (is_array($result) && @sizeof($result) != 0) {
 			echo "<optgroup label='Phrases'>\n";
diff --git a/app/music_on_hold/waveform.php b/app/music_on_hold/waveform.php
index 47fafbd10c..5c668fca9c 100644
--- a/app/music_on_hold/waveform.php
+++ b/app/music_on_hold/waveform.php
@@ -53,7 +53,6 @@
 			$sql .= "or domain_uuid is null ";
 		}
 		$parameters['id'] = $_GET['id'];
-		$database = new database;
 		$stream_path = $database->select($sql, $parameters ?? null, 'column');
 		unset($sql, $parameters);
 
diff --git a/app/number_translations/number_translation_edit.php b/app/number_translations/number_translation_edit.php
index a932564fbe..b4696bfd9a 100644
--- a/app/number_translations/number_translation_edit.php
+++ b/app/number_translations/number_translation_edit.php
@@ -90,20 +90,17 @@
 				switch ($_POST['action']) {
 					case 'copy':
 						if (permission_exists('number_translation_add')) {
-							$obj = new database;
-							$obj->copy($array);
+							$database->copy($array);
 						}
 						break;
 					case 'delete':
 						if (permission_exists('number_translation_delete')) {
-							$obj = new database;
-							$obj->delete($array);
+							$database->delete($array);
 						}
 						break;
 					case 'toggle':
 						if (permission_exists('number_translation_update')) {
-							$obj = new database;
-							$obj->toggle($array);
+							$database->toggle($array);
 						}
 						break;
 				}
@@ -153,9 +150,6 @@
 			}
 
 		//save the data
-			$database = new database;
-			$database->app_name = 'number translations';
-			$database->app_uuid = '6ad54de6-4909-11e7-a919-92ebcb67fe33';
 			$database->save($array);
 
 		//redirect the user
@@ -177,7 +171,6 @@
 		$sql = "select * from v_number_translations ";
 		$sql .= "where number_translation_uuid = :number_translation_uuid ";
 		$parameters['number_translation_uuid'] = $number_translation_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$number_translation_name = $row["number_translation_name"];
@@ -193,7 +186,6 @@
 		$sql .= "where number_translation_uuid = :number_translation_uuid ";
 		$sql .= "order by number_translation_detail_order asc";
 		$parameters['number_translation_uuid'] = $number_translation_uuid;
-		$database = new database;
 		$number_translation_details = $database->select($sql, $parameters ?? null, 'all');
 		unset ($sql, $parameters);
 	}
diff --git a/app/number_translations/number_translations.php b/app/number_translations/number_translations.php
index df0fc674ba..06e59644d9 100644
--- a/app/number_translations/number_translations.php
+++ b/app/number_translations/number_translations.php
@@ -75,11 +75,6 @@
 			$x++;
 		}
 
-		//prepare the database object
-		$database = new database;
-		$database->app_name = 'number_translations';
-		$database->app_uuid = '6ad54de6-4909-11e7-a919-92ebcb67fe33';
-
 		//send the array to the database class
 		switch ($action) {
 			case 'copy':
@@ -123,7 +118,6 @@
 		$sql .= "	or lower(number_translation_description) like :search ";
 		$sql .= ") ";
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare to page the results
@@ -149,7 +143,6 @@
 	}
 	$sql .= order_by($order_by, $order, 'number_translation_name', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$number_translations = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/pin_numbers/pin_download.php b/app/pin_numbers/pin_download.php
index 8149f58e71..91e90efe8a 100644
--- a/app/pin_numbers/pin_download.php
+++ b/app/pin_numbers/pin_download.php
@@ -103,7 +103,6 @@
 			$sql = "select ".implode(', ', $selected_columns)." from v_pin_numbers ";
 			$sql .= "where domain_uuid = :domain_uuid ";
 			$parameters['domain_uuid'] = $domain_uuid;
-			$database = new database;
 			$pin_numbers = $database->select($sql, $parameters, 'all');
 			unset($sql, $parameters, $selected_columns);
 
diff --git a/app/provision/resources/functions/device_by.php b/app/provision/resources/functions/device_by.php
index 5dca836297..e781a1856b 100644
--- a/app/provision/resources/functions/device_by.php
+++ b/app/provision/resources/functions/device_by.php
@@ -5,7 +5,6 @@ function device_by_mac($device_address) {
 	$sql .= "where device_address = :device_address ";
 	$sql .= "and device_enabled = true ";
 	$parameters['device_address'] = $device_address;
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	return is_array($row) && @sizeof($row) != 0 ? $row : false;
 }
@@ -21,7 +20,6 @@ function device_by_ext($ext, $domain) {
 	$sql .= "and t1.device_enabled = true ";
 	$parameters['ext'] = $ext;
 	$parameters['domain'] = $domain;
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	return is_array($row) && @sizeof($row) != 0 ? $row : false;
 }
diff --git a/app/ring_groups/resources/dashboard/ring_group_forward.php b/app/ring_groups/resources/dashboard/ring_group_forward.php
index 22b67a8ad5..f9d9743f99 100644
--- a/app/ring_groups/resources/dashboard/ring_group_forward.php
+++ b/app/ring_groups/resources/dashboard/ring_group_forward.php
@@ -41,11 +41,6 @@
 		$domain_uuid = $_SESSION['user']['domain_uuid'];
 	}
 
-//connect to the database
-	if (!isset($database)) {
-		$database = new database;
-	}
-
 //find the path
 	switch ($_SERVER['REQUEST_URI']) {
 		case PROJECT_PATH."/core/dashboard/index.php":
diff --git a/app/sip_profiles/sip_profile_copy.php b/app/sip_profiles/sip_profile_copy.php
index 5a8a351ebf..b96e1951c7 100644
--- a/app/sip_profiles/sip_profile_copy.php
+++ b/app/sip_profiles/sip_profile_copy.php
@@ -51,7 +51,6 @@
 
 //get existing sip profile names to prevent duplicates
 	$sql = "select sip_profile_name from v_sip_profiles";
-	$database = new database;
 	$rows = $database->select($sql, $parameters ?? null, 'all');
 	if (is_array($rows) && @sizeof($rows) != 0) {
 		foreach ($rows as $row) {
@@ -69,7 +68,6 @@ if (is_uuid($sip_profile_uuid) && $sip_profile_name != '') {
 				$sql = "select sip_profile_hostname, sip_profile_enabled, sip_profile_description from v_sip_profiles ";
 				$sql .= "where sip_profile_uuid = :sip_profile_uuid ";
 				$parameters['sip_profile_uuid'] = $sip_profile_uuid;
-				$database = new database;
 				$row = $database->select($sql, $parameters, 'row');
 				$sip_profile_hostname = $row['sip_profile_hostname'];
 				$sip_profile_enabled = $row['sip_profile_enabled'];
@@ -89,7 +87,6 @@ if (is_uuid($sip_profile_uuid) && $sip_profile_name != '') {
 			$sql = "select * from v_sip_profile_domains ";
 			$sql .= "where sip_profile_uuid = :sip_profile_uuid ";
 			$parameters['sip_profile_uuid'] = $sip_profile_uuid;
-			$database = new database;
 			$result = $database->select($sql, $parameters, 'all');
 			if (is_array($result) && @sizeof($result) != 0) {
 				foreach ($result as $x => $row) {
@@ -106,7 +103,6 @@ if (is_uuid($sip_profile_uuid) && $sip_profile_name != '') {
 			$sql = "select * from v_sip_profile_settings ";
 			$sql .= "where sip_profile_uuid = :sip_profile_uuid ";
 			$parameters['sip_profile_uuid'] = $sip_profile_uuid;
-			$database = new database;
 			$result = $database->select($sql, $parameters, 'all');
 			if (is_array($result) && @sizeof($result) != 0) {
 				foreach ($result as $x => $row) {
@@ -121,9 +117,6 @@ if (is_uuid($sip_profile_uuid) && $sip_profile_name != '') {
 			unset($sql, $parameters, $result, $row);
 
 		//execute insert
-			$database = new database;
-			$database->app_name = 'sip_profiles';
-			$database->app_uuid = '159a8da8-0e8c-a26b-6d5b-19c532b6d470';
 			$database->save($array);
 			unset($array);
 
diff --git a/app/sip_profiles/sip_profile_edit.php b/app/sip_profiles/sip_profile_edit.php
index 035b38bc6e..3912881541 100644
--- a/app/sip_profiles/sip_profile_edit.php
+++ b/app/sip_profiles/sip_profile_edit.php
@@ -134,7 +134,6 @@
 			if ($action == 'update') {
 				$parameters['sip_profile_name'] = $sip_profile_name;
 			}
-			$database = new database;
 			$rows = $database->select($sql, $parameters, 'all');
 			if (!empty($rows) && @sizeof($rows) != 0) {
 				foreach ($rows as $array) {
@@ -209,9 +208,6 @@
 			$p->add('sip_profile_setting_add', 'temp');
 
 		//save to the data
-			$database = new database;
-			$database->app_name = 'sip_profiles';
-			$database->app_uuid = '159a8da8-0e8c-a26b-6d5b-19c532b6d470';
 			$database->save($array);
 			$message = $database->message;
 
@@ -283,7 +279,6 @@
 		$sql .= "from v_sip_profiles ";
 		$sql .= "where sip_profile_uuid = :sip_profile_uuid ";
 		$parameters['sip_profile_uuid'] = $sip_profile_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$sip_profile_name = $row["sip_profile_name"];
@@ -306,7 +301,6 @@
 	$sql .= "where sip_profile_uuid = :sip_profile_uuid ";
 	$sql .= "order by sip_profile_setting_name ";
 	$parameters['sip_profile_uuid'] = $sip_profile_uuid;
-	$database = new database;
 	$sip_profile_settings = $database->select($sql, $parameters, 'all');
 	if (empty($sip_profile_settings)) { $sip_profile_settings = []; }
 	unset($sql, $parameters);
@@ -332,7 +326,6 @@
 	$sql .= "from v_sip_profile_domains ";
 	$sql .= "where sip_profile_uuid = :sip_profile_uuid ";
 	$parameters['sip_profile_uuid'] = $sip_profile_uuid;
-	$database = new database;
 	$sip_profile_domains = $database->select($sql, $parameters, 'all');
 	if (empty($sip_profile_domains)) { $sip_profile_domains = []; }
 	unset($sql, $parameters);
@@ -349,7 +342,6 @@
 
 //create js array of existing sip profile names to prevent duplicates
 	$sql = "select sip_profile_name from v_sip_profiles";
-	$database = new database;
 	$rows = $database->select($sql, null, 'all');
 	if (is_array($rows) && @sizeof($rows) != 0) {
 		foreach ($rows as $array) {
diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php
index 54bb394844..56c90a7868 100644
--- a/app/sip_profiles/sip_profiles.php
+++ b/app/sip_profiles/sip_profiles.php
@@ -99,7 +99,6 @@
 		$sql .= ") ";
 		$parameters['search'] = '%'.$search.'%';
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare to page the results
@@ -114,7 +113,6 @@
 	$sql = str_replace('count(sip_profile_uuid)', 'sip_profile_uuid, sip_profile_name, sip_profile_hostname, cast(sip_profile_enabled as text), sip_profile_description', $sql);
 	$sql .= order_by($order_by, $order);
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$sip_profiles = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/sip_status/cmd.php b/app/sip_status/cmd.php
index 6609b815de..d43f500300 100644
--- a/app/sip_status/cmd.php
+++ b/app/sip_status/cmd.php
@@ -46,7 +46,6 @@
 	$sql = "select sip_profile_name from v_sip_profiles ";
 	$sql .= "where sip_profile_name = :profile_name ";
 	$parameters['profile_name'] = $profile;
-	$database = new database;
 	$profile_name = $database->select($sql, $parameters, 'column');
 	unset($sql, $parameters);
 
diff --git a/app/sofia_global_settings/sofia_global_setting_edit.php b/app/sofia_global_settings/sofia_global_setting_edit.php
index 5036f6e687..1152521a6a 100644
--- a/app/sofia_global_settings/sofia_global_setting_edit.php
+++ b/app/sofia_global_settings/sofia_global_setting_edit.php
@@ -84,20 +84,17 @@
 				switch ($_POST['action']) {
 					case 'copy':
 						if (permission_exists('sofia_global_setting_add')) {
-							$obj = new database;
-							$obj->copy($array);
+							$database->copy($array);
 						}
 						break;
 					case 'delete':
 						if (permission_exists('sofia_global_setting_delete')) {
-							$obj = new database;
-							$obj->delete($array);
+							$database->delete($array);
 						}
 						break;
 					case 'toggle':
 						if (permission_exists('sofia_global_setting_update')) {
-							$obj = new database;
-							$obj->toggle($array);
+							$database->toggle($array);
 						}
 						break;
 				}
@@ -135,9 +132,6 @@
 			$array['sofia_global_settings'][0]['global_setting_description'] = $global_setting_description;
 
 		//save the data
-			$database = new database;
-			$database->app_name = 'sofia_global_settings';
-			$database->app_uuid = '240c25a3-a2cf-44ea-a300-0626eca5b945';
 			$database->save($array);
 
 		//redirect the user
@@ -165,7 +159,6 @@
 		$sql .= "from v_sofia_global_settings ";
 		$sql .= "where sofia_global_setting_uuid = :sofia_global_setting_uuid ";
 		$parameters['sofia_global_setting_uuid'] = $sofia_global_setting_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$global_setting_name = $row["global_setting_name"];
diff --git a/app/sofia_global_settings/sofia_global_settings.php b/app/sofia_global_settings/sofia_global_settings.php
index aa280f56f2..2e864c2ee6 100644
--- a/app/sofia_global_settings/sofia_global_settings.php
+++ b/app/sofia_global_settings/sofia_global_settings.php
@@ -102,7 +102,6 @@
 		$sql .= ") ";
 		$parameters['search'] = '%'.$search.'%';
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? '', 'column');
 	unset($sql, $parameters);
 
@@ -132,7 +131,6 @@
 	}
 	$sql .= order_by($order_by, $order, 'global_setting_name', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$sofia_global_settings = $database->select($sql, $parameters ?? '', 'all');
 	unset($sql, $parameters);
 
diff --git a/app/streams/streams.php b/app/streams/streams.php
index 4b4ab1ee7c..795324c728 100644
--- a/app/streams/streams.php
+++ b/app/streams/streams.php
@@ -111,7 +111,6 @@
 		$sql .= "and domain_uuid = :domain_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 	unset($parameters);
 
@@ -153,7 +152,6 @@
 	}
 	$sql .= order_by($order_by, $order, 'stream_name', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$streams = $database->select($sql, (!empty($parameters) && @sizeof($parameters) != 0 ? $parameters : null), 'all');
 	unset($sql, $parameters);
 
diff --git a/app/system/resources/dashboard/system_counts.php b/app/system/resources/dashboard/system_counts.php
index bef68cbe83..2caf130121 100644
--- a/app/system/resources/dashboard/system_counts.php
+++ b/app/system/resources/dashboard/system_counts.php
@@ -13,11 +13,6 @@
 		exit;
 	}
 
-//connect to the database
-	if (!isset($database)) {
-		$database = new database;
-	}
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get($_SESSION['domain']['language']['code'], 'core/user_settings');
diff --git a/app/system/resources/dashboard/system_status.php b/app/system/resources/dashboard/system_status.php
index acf0ac59c9..de7aa06ff0 100644
--- a/app/system/resources/dashboard/system_status.php
+++ b/app/system/resources/dashboard/system_status.php
@@ -356,7 +356,6 @@
 			}
 
 			if (!empty($sql_current) && !empty($sql_max)) {
-				if (!isset($database)) { $database = new database; }
 
 				// Get current connections
 				$current_connections = $database->select($sql_current, null, 'column');
diff --git a/app/system/resources/functions/system_information.php b/app/system/resources/functions/system_information.php
index 6ab49fb2af..69260fc117 100644
--- a/app/system/resources/functions/system_information.php
+++ b/app/system/resources/functions/system_information.php
@@ -272,7 +272,6 @@
 
 				//database version
 				$sql = "select version(); ";
-				$database = new database;
 				$database_name = $database->select($sql, null, 'column');
 				$database_array = explode(' ', $database_name);
 
diff --git a/app/time_conditions/time_condition_edit.php b/app/time_conditions/time_condition_edit.php
index 9a0d66a9ac..4ae778df09 100644
--- a/app/time_conditions/time_condition_edit.php
+++ b/app/time_conditions/time_condition_edit.php
@@ -132,7 +132,6 @@
 					$sql = "select * from v_dialplans ";
 					$sql .= "where dialplan_uuid = :dialplan_uuid ";
 					$parameters['dialplan_uuid'] = $dialplan_uuid;
-					$database = new database;
 					$row = $database->select($sql, $parameters, 'row');
 					if (is_array($row) && @sizeof($row) != 0) {
 						$domain_uuid = $row["domain_uuid"];
@@ -165,9 +164,6 @@
 					$p->add('dialplan_detail_delete', 'temp');
 
 				//execute delete
-					$database = new database;
-					$database->app_name = 'time_conditions';
-					$database->app_uuid = '4b821450-926b-175a-af93-a03c441818b1';
 					$database->delete($array);
 					unset($array);
 
@@ -196,9 +192,6 @@
 					$array['dialplans'][0]['dialplan_description'] = $dialplan_description;
 
 				//execute insert/update
-					$database = new database;
-					$database->app_name = 'time_conditions';
-					$database->app_uuid = '4b821450-926b-175a-af93-a03c441818b1';
 					$database->save($array);
 					unset($array);
 
@@ -486,9 +479,6 @@
 					$p->add('dialplan_detail_edit', 'temp');
 
 				//execute insert
-					$database = new database;
-					$database->app_name = 'time_conditions';
-					$database->app_uuid = '4b821450-926b-175a-af93-a03c441818b1';
 					$database->save($array);
 					unset($array);
 
@@ -536,7 +526,6 @@
 			$sql .= "and domain_uuid = :domain_uuid ";
 			$parameters['dialplan_uuid'] = $dialplan_uuid;
 			$parameters['domain_uuid'] = $domain_uuid;
-			$database = new database;
 			$row = $database->select($sql, $parameters, 'row');
 			if (is_array($row) && @sizeof($row) != 0) {
 				$domain_uuid = $row["domain_uuid"];
@@ -570,7 +559,6 @@
 			$sql .= "order by dialplan_detail_group asc, dialplan_detail_order asc";
 			$parameters['dialplan_uuid'] = $dialplan_uuid;
 			$parameters['domain_uuid'] = $domain_uuid;
-			$database = new database;
 			$dialplan_details = $database->select($sql, $parameters, 'all');
 			unset($sql, $parameters);
 
diff --git a/app/time_conditions/time_conditions.php b/app/time_conditions/time_conditions.php
index 8179fd3174..a239b1469a 100644
--- a/app/time_conditions/time_conditions.php
+++ b/app/time_conditions/time_conditions.php
@@ -106,7 +106,6 @@
 	}
 	$sql .= "and app_uuid = '4b821450-926b-175a-af93-a03c441818b1' ";
 	$sql .= $sql_search ?? null;
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare to page data
@@ -124,7 +123,6 @@
 	$sql = str_replace('count(dialplan_uuid)', '*', $sql);
 	$sql .= order_by($order_by, $order, null, null, $sort);
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$dialplans = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/app/vars/var_edit.php b/app/vars/var_edit.php
index 89ffd376b5..cac05c8900 100644
--- a/app/vars/var_edit.php
+++ b/app/vars/var_edit.php
@@ -141,9 +141,6 @@
 						$array['vars'][0]['var_description'] = $var_description;
 
 					//execute insert/update
-						$database = new database;
-						$database->app_name = 'vars';
-						$database->app_uuid = '54e08402-c1b8-0a9d-a30a-f569fc174dd8';
 						$database->save($array);
 						unset($array);
 
@@ -167,7 +164,6 @@
 		$sql = "select * from v_vars ";
 		$sql .= "where var_uuid = :var_uuid ";
 		$parameters['var_uuid'] = $var_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$var_category = $row["var_category"];
diff --git a/app/vars/vars.php b/app/vars/vars.php
index c0b528557d..297b358914 100644
--- a/app/vars/vars.php
+++ b/app/vars/vars.php
@@ -101,7 +101,6 @@
 		$sql .= ") ";
 		$parameters['search'] = '%'.$search.'%';
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare to page the results
@@ -137,7 +136,6 @@
 	}
 	$sql .= $order_by != '' ? order_by($order_by, $order) : " order by var_category, var_order asc, var_name asc ";
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$vars = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql);
 
diff --git a/app/voicemail_greetings/voicemail_greeting_edit.php b/app/voicemail_greetings/voicemail_greeting_edit.php
index df6d91c005..89ac2faa73 100644
--- a/app/voicemail_greetings/voicemail_greeting_edit.php
+++ b/app/voicemail_greetings/voicemail_greeting_edit.php
@@ -158,7 +158,6 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
 		$sql .= "order by greeting_id asc ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['voicemail_id'] = $voicemail_id;
-		$database = new database;
 		$rows = $database->select($sql, $parameters, 'all');
 		$greeting_ids = array();
 		if (!empty($rows) && is_array($rows)) {
@@ -236,9 +235,6 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
 			$array['voicemail_greetings'][0]['greeting_description'] = $greeting_description;
 
 			//execute query
-			$database = new database;
-			$database->app_name = 'voicemail_greetings';
-			$database->app_uuid = 'e4b4fbee-9e4d-8e46-3810-91ba663db0c2';
 			$database->save($array);
 			unset($array);
 
@@ -264,7 +260,6 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
 		$sql .= "and voicemail_greeting_uuid = :voicemail_greeting_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['voicemail_greeting_uuid'] = $voicemail_greeting_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$greeting_id = $row["greeting_id"];
diff --git a/app/voicemail_greetings/waveform.php b/app/voicemail_greetings/waveform.php
index 78325752ef..6da66eb002 100644
--- a/app/voicemail_greetings/waveform.php
+++ b/app/voicemail_greetings/waveform.php
@@ -54,7 +54,6 @@
 		$sql .= "and voicemail_id = :voicemail_id ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['voicemail_id'] = $voicemail_id;
-		$database = new database;
 		$selected_greeting_id = $database->select($sql, $parameters, 'column');
 		unset($sql, $parameters);
 
@@ -68,7 +67,6 @@
 		$sql .= "and voicemail_greeting_uuid = :voicemail_greeting_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['voicemail_greeting_uuid'] = $voicemail_greeting_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row) && is_array($row) && @sizeof($row) != 0) {
 			$greeting_filename = $row['greeting_filename'];
diff --git a/app/voicemails/voicemail_export.php b/app/voicemails/voicemail_export.php
index c290d0cd51..bbbf662a9f 100644
--- a/app/voicemails/voicemail_export.php
+++ b/app/voicemails/voicemail_export.php
@@ -116,7 +116,6 @@
 			$sql = "select ".implode(', ', $selected_columns)." from v_voicemails ";
 			$sql .= "where domain_uuid = :domain_uuid ";
 			$parameters['domain_uuid'] = $domain_uuid;
-			$database = new database;
 			$voicemails = $database->select($sql, $parameters, 'all');
 			unset($sql, $parameters, $selected_columns);
 
diff --git a/app/voicemails/voicemail_imports.php b/app/voicemails/voicemail_imports.php
index d1edfb37f3..5730c997c2 100644
--- a/app/voicemails/voicemail_imports.php
+++ b/app/voicemails/voicemail_imports.php
@@ -320,9 +320,6 @@
 								if ($row_id === 1000) {
 
 									//save to the data
-									$database = new database;
-									$database->app_name = 'voicemails';
-									$database->app_uuid = 'b523c2d2-64cd-46f1-9520-ca4b4098e044';
 									$database->save($array);
 
 									//clear the array
@@ -340,9 +337,6 @@
 
 				//save to the data
 					if (!empty($array) && is_array($array)) {
-						$database = new database;
-						$database->app_name = 'voicemails';
-						$database->app_uuid = 'b523c2d2-64cd-46f1-9520-ca4b4098e044';
 						$database->save($array);
 						unset($array);
 					}
diff --git a/app/voicemails/voicemail_messages.php b/app/voicemails/voicemail_messages.php
index 538261e8d4..4ee6e3bd40 100644
--- a/app/voicemails/voicemail_messages.php
+++ b/app/voicemails/voicemail_messages.php
@@ -50,7 +50,6 @@
 			$sql .= "and vm.domain_uuid = d.domain_uuid ";
 			$parameters['voicemail_message_uuid'] = $_REQUEST["uuid"];
 			$parameters['voicemail_uuid'] = $_REQUEST["voicemail_uuid"];
-			$database = new database;
 			$result = $database->select($sql, $parameters, 'row');
 			if ($result !== false) {
 				$domain_uuid = $result['domain_uuid'];
diff --git a/app/voicemails/waveform.php b/app/voicemails/waveform.php
index effb3842f5..557aa8ca68 100644
--- a/app/voicemails/waveform.php
+++ b/app/voicemails/waveform.php
@@ -84,7 +84,6 @@
 						$parameters['voicemail_uuid'] = $voicemail_uuid;
 						$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 						$parameters['voicemail_message_uuid'] = $_GET['id'];
-						$database = new database;
 						$message_base64 = $database->select($sql, $parameters, 'column');
 						if (!empty($message_base64)) {
 							$message_decoded = base64_decode($message_base64);
@@ -173,7 +172,6 @@
 				$sql .= "and voicemail_id = :voicemail_id ";
 				$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 				$parameters['voicemail_id'] = $voicemail_id;
-				$database = new database;
 				$selected_greeting_id = $database->select($sql, $parameters, 'column');
 				unset($sql, $parameters);
 
@@ -187,7 +185,6 @@
 				$sql .= "and voicemail_greeting_uuid = :voicemail_greeting_uuid ";
 				$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 				$parameters['voicemail_greeting_uuid'] = $voicemail_greeting_uuid;
-				$database = new database;
 				$row = $database->select($sql, $parameters, 'row');
 				if (!empty($row) && is_array($row) && @sizeof($row) != 0) {
 					$greeting_filename = $row['greeting_filename'];
diff --git a/app/xml_cdr/report.php b/app/xml_cdr/report.php
index 91a79063f7..1b2ea70a69 100644
--- a/app/xml_cdr/report.php
+++ b/app/xml_cdr/report.php
@@ -132,7 +132,6 @@ for ($y = 0; $y < 4; $y++) {
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['last_month'] = $last_month;
 		$parameters['this_month'] = $this_month;
-		$database = new database;
 		$result = $database->select($sql, $parameters, 'all');
 		unset($sql);
 		$max = sizeof($result) - 1;
diff --git a/app/xml_cdr/resources/dashboard/missed_calls.php b/app/xml_cdr/resources/dashboard/missed_calls.php
index 21d99823e8..b7cba02cac 100644
--- a/app/xml_cdr/resources/dashboard/missed_calls.php
+++ b/app/xml_cdr/resources/dashboard/missed_calls.php
@@ -78,7 +78,6 @@
 	$parameters['missed_limit'] = $missed_limit;
 	$parameters['time_zone'] = isset($_SESSION['domain']['time_zone']['name']) ? $_SESSION['domain']['time_zone']['name'] : date_default_timezone_get();
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	if (!isset($database)) { $database = new database; }
 	$result = $database->select($sql, $parameters, 'all');
 	$num_rows = !empty($result) ? sizeof($result) : 0;
 
diff --git a/app/xml_cdr/resources/dashboard/recent_calls.php b/app/xml_cdr/resources/dashboard/recent_calls.php
index 7e2257f68e..7c766604c0 100644
--- a/app/xml_cdr/resources/dashboard/recent_calls.php
+++ b/app/xml_cdr/resources/dashboard/recent_calls.php
@@ -75,7 +75,6 @@
 	$parameters['recent_limit'] = $recent_limit;
 	$parameters['time_zone'] = isset($_SESSION['domain']['time_zone']['name']) ? $_SESSION['domain']['time_zone']['name'] : date_default_timezone_get();
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	if (!isset($database)) { $database = new database; }
 	$result = $database->select($sql, $parameters, 'all');
 	$num_rows = !empty($result) ? sizeof($result) : 0;
 
diff --git a/app/xml_cdr/waveform.php b/app/xml_cdr/waveform.php
index 885087ec78..5a67a6e165 100644
--- a/app/xml_cdr/waveform.php
+++ b/app/xml_cdr/waveform.php
@@ -50,7 +50,6 @@
 		$sql .= "from view_call_recordings ";
 		$sql .= "where call_recording_uuid = :call_recording_uuid ";
 		$parameters['call_recording_uuid'] = $_GET['id'];
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$call_recording_name = $row['call_recording_name'];
diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php
index 714e2dc517..460c688598 100644
--- a/app/xml_cdr/xml_cdr_inc.php
+++ b/app/xml_cdr/xml_cdr_inc.php
@@ -278,7 +278,6 @@
 		$sql .= "where domain_uuid = :domain_uuid ";
 		$sql .= ".$sql_where;
 		$parameters['domain_uuid'] = $domain_uuid;
-		$database = new database;
 		$num_rows = $database->select($sql, $parameters, 'column');
 		unset($sql, $parameters);
 	}
diff --git a/app/xml_cdr/xml_cdr_log.php b/app/xml_cdr/xml_cdr_log.php
index 4407492029..8dd71f9262 100644
--- a/app/xml_cdr/xml_cdr_log.php
+++ b/app/xml_cdr/xml_cdr_log.php
@@ -57,7 +57,6 @@
 		$parameters['domain_uuid'] = $domain_uuid;
 	}
 	$parameters['xml_cdr_uuid'] = $xml_cdr_uuid;
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (!empty($row) && is_array($row) && @sizeof($row) != 0) {
 		$log_content = trim($row["log_content"]);
diff --git a/app/xml_cdr/xml_cdr_statistics_inc.php b/app/xml_cdr/xml_cdr_statistics_inc.php
index 98d1926126..4beea5b7b4 100644
--- a/app/xml_cdr/xml_cdr_statistics_inc.php
+++ b/app/xml_cdr/xml_cdr_statistics_inc.php
@@ -583,7 +583,6 @@
 	$sql .= "	group by s.s_id, s.start_date, s.end_date, s.s_hour \n";
 	$sql .= "	order by s.s_id asc \n";
 	$sql .= ") as d; \n";
-	$database = new database;
 	$stats = $database->select($sql, $parameters, 'all');
 
 //set the hours
diff --git a/core/contacts/contact_address_edit.php b/core/contacts/contact_address_edit.php
index 21d2fbf830..2e6209af2a 100644
--- a/core/contacts/contact_address_edit.php
+++ b/core/contacts/contact_address_edit.php
@@ -134,9 +134,6 @@
 					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 
@@ -149,7 +146,6 @@
 						$sql .= "and contact_uuid = :contact_uuid ";
 						$parameters['domain_uuid'] = $domain_uuid;
 						$parameters['contact_uuid'] = $contact_uuid;
-						$database = new database;
 						$database->execute($sql, $parameters);
 						unset($sql, $parameters);
 					}
@@ -184,9 +180,6 @@
 					$array['contact_addresses'][0]['address_primary'] = $address_primary;
 					$array['contact_addresses'][0]['address_description'] = $address_description;
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 				}
@@ -205,7 +198,6 @@
 		$sql .= "and contact_address_uuid = :contact_address_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['contact_address_uuid'] = $contact_address_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$address_type = $row["address_type"];
diff --git a/core/contacts/contact_addresses.php b/core/contacts/contact_addresses.php
index 993f70114a..3d3d0c593f 100644
--- a/core/contacts/contact_addresses.php
+++ b/core/contacts/contact_addresses.php
@@ -52,7 +52,6 @@
 	$sql .= "order by address_primary desc, address_label asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_addresses = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_addresses_view.php b/core/contacts/contact_addresses_view.php
index 2b2de87980..365a81484e 100644
--- a/core/contacts/contact_addresses_view.php
+++ b/core/contacts/contact_addresses_view.php
@@ -44,7 +44,6 @@
 	$sql .= "order by address_primary desc, address_label asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_addresses = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_attachment.php b/core/contacts/contact_attachment.php
index f07714ca1e..5fd4c1bd03 100644
--- a/core/contacts/contact_attachment.php
+++ b/core/contacts/contact_attachment.php
@@ -45,7 +45,6 @@
 		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
 		$parameters['contact_attachment_uuid'] = $contact_attachment_uuid;
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-		$database = new database;
 		$attachment = $database->select($sql, $parameters ?? null, 'row');
 		unset($sql, $parameters);
 
diff --git a/core/contacts/contact_attachment_edit.php b/core/contacts/contact_attachment_edit.php
index 22a253dc95..48c995b64c 100644
--- a/core/contacts/contact_attachment_edit.php
+++ b/core/contacts/contact_attachment_edit.php
@@ -84,7 +84,6 @@
 			$sql .= "and contact_uuid = :contact_uuid ";
 			$parameters['domain_uuid'] = $domain_uuid;
 			$parameters['contact_uuid'] = $contact_uuid;
-			$database = new database;
 			$database->execute($sql, $parameters ?? null);
 			unset($sql, $parameters);
 
@@ -157,9 +156,6 @@
 		}
 
 		//save data
-		$database = new database;
-		$database->app_name = 'contacts';
-		$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 		$database->save($array);
 		unset($array);
 
@@ -176,7 +172,6 @@
 		$sql .= "and contact_attachment_uuid = :contact_attachment_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_attachment_uuid'] = $contact_attachment_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$attachment_primary = $row["attachment_primary"];
diff --git a/core/contacts/contact_attachments.php b/core/contacts/contact_attachments.php
index 1a667fb1df..4d5dc4b837 100644
--- a/core/contacts/contact_attachments.php
+++ b/core/contacts/contact_attachments.php
@@ -47,7 +47,6 @@
 	$sql .= "order by attachment_primary desc, attachment_filename asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_attachments = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_attachments_view.php b/core/contacts/contact_attachments_view.php
index 197761a30f..fe376bc26f 100644
--- a/core/contacts/contact_attachments_view.php
+++ b/core/contacts/contact_attachments_view.php
@@ -44,7 +44,6 @@
 	$sql .= "order by attachment_primary desc, attachment_filename asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_attachments = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_edit.php b/core/contacts/contact_edit.php
index 8a7b9e7140..acadde5953 100644
--- a/core/contacts/contact_edit.php
+++ b/core/contacts/contact_edit.php
@@ -34,9 +34,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -382,7 +379,6 @@
 								}
 								$parameters['phone_speed_dial'] = $row["phone_speed_dial"];
 								$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-								$database = new database;
 								if (!empty($database->execute($sql, $parameters, 'column'))) {
 									$phone_speed_dial_exists = true;
 								}
diff --git a/core/contacts/contact_email_edit.php b/core/contacts/contact_email_edit.php
index b9c76e5a3a..eba842766e 100644
--- a/core/contacts/contact_email_edit.php
+++ b/core/contacts/contact_email_edit.php
@@ -115,9 +115,6 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
 					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 
@@ -130,7 +127,6 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
 						$sql .= "and contact_uuid = :contact_uuid ";
 						$parameters['domain_uuid'] = $domain_uuid;
 						$parameters['contact_uuid'] = $contact_uuid;
-						$database = new database;
 						$database->execute($sql, $parameters);
 						unset($sql, $parameters);
 					}
@@ -156,9 +152,6 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
 					$array['contact_emails'][0]['email_primary'] = $email_primary ? 1 : 0;
 					$array['contact_emails'][0]['email_description'] = $email_description;
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 				}
@@ -177,7 +170,6 @@ if (!empty($_GET["contact_uuid"]) && is_uuid($_GET["contact_uuid"])) {
 		$sql .= "and contact_email_uuid = :contact_email_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['contact_email_uuid'] = $contact_email_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');;
 		if (!empty($row)) {
 			$email_label = $row["email_label"];
diff --git a/core/contacts/contact_emails.php b/core/contacts/contact_emails.php
index 8b99899f20..f9994cdc0a 100644
--- a/core/contacts/contact_emails.php
+++ b/core/contacts/contact_emails.php
@@ -47,7 +47,6 @@
 	$sql .= "order by email_primary desc, email_label asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_emails = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_emails_view.php b/core/contacts/contact_emails_view.php
index 5b474a0648..edb5076ac8 100644
--- a/core/contacts/contact_emails_view.php
+++ b/core/contacts/contact_emails_view.php
@@ -44,7 +44,6 @@
 	$sql .= "order by email_primary desc, email_label asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_emails = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_extensions.php b/core/contacts/contact_extensions.php
index 64907e3312..c9bf974706 100644
--- a/core/contacts/contact_extensions.php
+++ b/core/contacts/contact_extensions.php
@@ -50,7 +50,6 @@
 	$sql .= "order by e.extension asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_extensions = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_extensions_view.php b/core/contacts/contact_extensions_view.php
index 253cd4d577..8fe47a4adb 100644
--- a/core/contacts/contact_extensions_view.php
+++ b/core/contacts/contact_extensions_view.php
@@ -47,7 +47,6 @@
 	$sql .= "order by e.extension asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_extensions = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_import.php b/core/contacts/contact_import.php
index 6ea200e527..5ec1a90e1f 100644
--- a/core/contacts/contact_import.php
+++ b/core/contacts/contact_import.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/contacts/contact_import_google.php b/core/contacts/contact_import_google.php
index 2065455561..b8264702f8 100644
--- a/core/contacts/contact_import_google.php
+++ b/core/contacts/contact_import_google.php
@@ -83,7 +83,6 @@ if ($_POST['a'] == 'import') {
 			$sql .= "and contact_setting_enabled = true ";
 			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 			$parameters['contact_setting_value'] = $contact_id;
-			$database = new database;
 			$result = $database->select($sql, $parameters, 'row');
 			if (is_uuid($result['contact_uuid'])) {
 				$duplicate_exists = true;
@@ -241,9 +240,6 @@ if ($_POST['a'] == 'import') {
 			unset($contact_setting_columns, $contact_setting_array);
 
 			//insert records
-			$database = new database;
-			$database->app_name = 'contacts';
-			$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 			$database->save($array);
 			unset($array);
 
diff --git a/core/contacts/contact_json.php b/core/contacts/contact_json.php
index 33cb7a9d33..dabaf5c450 100644
--- a/core/contacts/contact_json.php
+++ b/core/contacts/contact_json.php
@@ -147,7 +147,6 @@
 	}
 	$sql .= "order by contact_organization asc ";
 	$sql .= "limit 300 ";
-	$database = new database;
 	$contact_array = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_note_edit.php b/core/contacts/contact_note_edit.php
index 5b5459bedf..4f23886b17 100644
--- a/core/contacts/contact_note_edit.php
+++ b/core/contacts/contact_note_edit.php
@@ -105,9 +105,6 @@
 					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 
@@ -136,9 +133,6 @@
 						$array['contact_notes'][0]['last_mod_date'] = 'now()';
 						$array['contact_notes'][0]['last_mod_user'] = $_SESSION['username'];
 
-						$database = new database;
-						$database->app_name = 'contacts';
-						$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 						$database->save($array);
 						unset($array);
 					}
@@ -158,7 +152,6 @@
 		$sql .= "and contact_note_uuid = :contact_note_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_note_uuid'] = $contact_note_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$contact_note = $row["contact_note"];
diff --git a/core/contacts/contact_notes.php b/core/contacts/contact_notes.php
index 61219ce9a5..47b323d0b0 100644
--- a/core/contacts/contact_notes.php
+++ b/core/contacts/contact_notes.php
@@ -49,7 +49,6 @@
 	$sql .= "order by last_mod_date desc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_notes = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_notes_view.php b/core/contacts/contact_notes_view.php
index 15d3bb5f5d..3e2d64847b 100644
--- a/core/contacts/contact_notes_view.php
+++ b/core/contacts/contact_notes_view.php
@@ -44,7 +44,6 @@
 	$sql .= "order by last_mod_date desc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_notes = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_phone_edit.php b/core/contacts/contact_phone_edit.php
index ab8177d37f..b088b5e342 100644
--- a/core/contacts/contact_phone_edit.php
+++ b/core/contacts/contact_phone_edit.php
@@ -135,9 +135,6 @@
 					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 
@@ -150,7 +147,6 @@
 						$sql .= "and contact_uuid = :contact_uuid ";
 						$parameters['domain_uuid'] = $domain_uuid;
 						$parameters['contact_uuid'] = $contact_uuid;
-						$database = new database;
 						$database->execute($sql, $parameters);
 						unset($sql, $parameters);
 					}
@@ -169,7 +165,6 @@
 							}
 							$parameters['phone_speed_dial'] = $phone_speed_dial;
 							$parameters['domain_uuid'] = $domain_uuid;
-							$database = new database;
 							if (!empty($database->execute($sql, $parameters, 'column'))) {
 								$phone_speed_dial_exists = true;
 							}
@@ -212,9 +207,6 @@
 						$array['contact_phones'][0]['phone_primary'] = $phone_primary ? 1 : 0;
 						$array['contact_phones'][0]['phone_description'] = $phone_description;
 
-						$database = new database;
-						$database->app_name = 'contacts';
-						$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 						$database->save($array);
 						unset($array);
 					}
@@ -234,7 +226,6 @@
 		$sql .= "and contact_phone_uuid = :contact_phone_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_phone_uuid'] = $contact_phone_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$phone_label = $row["phone_label"];
diff --git a/core/contacts/contact_phones.php b/core/contacts/contact_phones.php
index 98a587c3b6..838553ea8b 100644
--- a/core/contacts/contact_phones.php
+++ b/core/contacts/contact_phones.php
@@ -44,7 +44,6 @@
 	$sql .= "order by phone_primary desc, phone_label asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_phones = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_phones_view.php b/core/contacts/contact_phones_view.php
index 3a9664588c..265ab9473b 100644
--- a/core/contacts/contact_phones_view.php
+++ b/core/contacts/contact_phones_view.php
@@ -44,7 +44,6 @@
 	$sql .= "order by phone_primary desc, phone_label asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_phones = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
@@ -67,7 +66,6 @@
 			$sql .= "and (dialplan_detail_enabled = true or dialplan_detail_enabled is null) ";
 			$sql .= "limit 1";
 			$parameters['domain_uuid'] = $domain_uuid;
-			$database = new database;
 			$speed_dial_condition = $database->select($sql, $parameters, 'column');
 			if (!empty($speed_dial_condition)) {
 				$speed_dial_prefix = str_replace('(.*)', '', trim($speed_dial_condition,'^\$')); // default: ^\*0(.*)$
diff --git a/core/contacts/contact_relation_edit.php b/core/contacts/contact_relation_edit.php
index e9cf92e89e..8c7c875a45 100644
--- a/core/contacts/contact_relation_edit.php
+++ b/core/contacts/contact_relation_edit.php
@@ -113,9 +113,6 @@
 					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 
@@ -152,9 +149,6 @@
 						$array['contact_relations'][0]['relation_label'] = $relation_label;
 						$array['contact_relations'][0]['relation_contact_uuid'] = $relation_contact_uuid;
 
-						$database = new database;
-						$database->app_name = 'contacts';
-						$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 						$database->save($array);
 						unset($array);
 					}
@@ -174,7 +168,6 @@
 		$sql .= "and contact_relation_uuid = :contact_relation_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['contact_relation_uuid'] = $contact_relation_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$relation_label = $row["relation_label"];
@@ -191,7 +184,6 @@
 	$sql .= "order by contact_organization desc, contact_name_given asc, contact_name_family asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_relation_uuid;
-	$database = new database;
 	$contacts = $database->select($sql, $parameters, 'all');
 	if (!empty($contacts) && is_uuid($row['relation_contact_uuid'])) {
 		foreach($contacts as $field) {
diff --git a/core/contacts/contact_relations.php b/core/contacts/contact_relations.php
index 159abc7db3..28cd9914d3 100644
--- a/core/contacts/contact_relations.php
+++ b/core/contacts/contact_relations.php
@@ -61,7 +61,6 @@
 	$sql .= "c.contact_name_family asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_relations = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_relations_view.php b/core/contacts/contact_relations_view.php
index 42965f78b1..b72cf2fa35 100644
--- a/core/contacts/contact_relations_view.php
+++ b/core/contacts/contact_relations_view.php
@@ -58,7 +58,6 @@
 	$sql .= "c.contact_name_family asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_relations = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_setting_edit.php b/core/contacts/contact_setting_edit.php
index c8c31a224d..a4a3d8b503 100644
--- a/core/contacts/contact_setting_edit.php
+++ b/core/contacts/contact_setting_edit.php
@@ -132,9 +132,6 @@
 					$p = permissions::new();
 					$p->add('contact_edit', 'temp');
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 
@@ -167,9 +164,6 @@
 						$array['contact_settings'][0]['contact_setting_enabled'] = $contact_setting_enabled;
 						$array['contact_settings'][0]['contact_setting_description'] = $contact_setting_description;
 
-						$database = new database;
-						$database->app_name = 'contacts';
-						$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 						$database->save($array);
 						unset($array);
 					}
@@ -188,7 +182,6 @@
 		$sql .= "and contact_setting_uuid = :contact_setting_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_setting_uuid'] = $contact_setting_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$contact_setting_category = escape($row["contact_setting_category"]);
diff --git a/core/contacts/contact_settings.php b/core/contacts/contact_settings.php
index eba7244226..8ba5429384 100644
--- a/core/contacts/contact_settings.php
+++ b/core/contacts/contact_settings.php
@@ -51,7 +51,6 @@
 	$sql .= ", contact_setting_order asc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_settings = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_time_edit.php b/core/contacts/contact_time_edit.php
index 850f75b777..1168e2a3f9 100644
--- a/core/contacts/contact_time_edit.php
+++ b/core/contacts/contact_time_edit.php
@@ -105,9 +105,6 @@
 				$p = permissions::new();
 				$p->add('contact_edit', 'temp');
 
-				$database = new database;
-				$database->app_name = 'contacts';
-				$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 				$database->save($array);
 				unset($array);
 
@@ -134,9 +131,6 @@
 					$array['contact_times'][0]['time_stop'] = $time_stop;
 					$array['contact_times'][0]['time_description'] = $time_description;
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 				}
@@ -161,7 +155,6 @@
 		$parameters['contact_uuid'] = $contact_uuid ?? '';
 		$parameters['user_uuid'] = $_SESSION["user"]["user_uuid"];
 		$parameters['contact_time_uuid'] = $contact_time_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		$time_start = $row["time_start"];
 		$time_stop = $row["time_stop"];
diff --git a/core/contacts/contact_timer.php b/core/contacts/contact_timer.php
index 52cda7743b..05e183b70f 100644
--- a/core/contacts/contact_timer.php
+++ b/core/contacts/contact_timer.php
@@ -61,9 +61,6 @@
 		}
 
 		if (!empty($array)) {
-			$database = new database;
-			$database->app_name = 'contacts';
-			$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 			$database->save($array);
 			unset($array);
 		}
@@ -82,7 +79,6 @@
 	$sql .= "and contact_uuid = :contact_uuid ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid;
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (!empty($row)) {
 		$contact_organization = $row["contact_organization"];
@@ -108,7 +104,6 @@
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['user_uuid'] = $_SESSION['user']['user_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (!empty($row)) {
 		$contact_time_uuid = $row["contact_time_uuid"];
diff --git a/core/contacts/contact_timer_inc.php b/core/contacts/contact_timer_inc.php
index babff60c7c..040dfb88db 100644
--- a/core/contacts/contact_timer_inc.php
+++ b/core/contacts/contact_timer_inc.php
@@ -47,7 +47,6 @@
 	$parameters['contact_uuid'] = $contact_uuid;
 	$parameters['user_uuid'] = $_SESSION['user']['user_uuid'];
 	$parameters['contact_time_uuid'] = $contact_time_uuid;
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (!empty($row)) {
 		$time_start = strtotime($row["time_start"]);
diff --git a/core/contacts/contact_times.php b/core/contacts/contact_times.php
index e4c5f38cc9..94d1b6731a 100644
--- a/core/contacts/contact_times.php
+++ b/core/contacts/contact_times.php
@@ -54,7 +54,6 @@
 	$sql .= "order by ct.time_start desc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_times = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_times_view.php b/core/contacts/contact_times_view.php
index 4b79468cf7..de10574e72 100644
--- a/core/contacts/contact_times_view.php
+++ b/core/contacts/contact_times_view.php
@@ -46,7 +46,6 @@
 	$sql .= "order by ct.time_start desc ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['contact_uuid'] = $contact_uuid;
-	$database = new database;
 	$contact_times = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_url_edit.php b/core/contacts/contact_url_edit.php
index 2746a891fd..0f123eb50d 100644
--- a/core/contacts/contact_url_edit.php
+++ b/core/contacts/contact_url_edit.php
@@ -118,9 +118,6 @@
 				$p = permissions::new();
 				$p->add('contact_edit', 'temp');
 
-				$database = new database;
-				$database->app_name = 'contacts';
-				$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 				$database->save($array);
 				unset($array);
 
@@ -133,7 +130,6 @@
 					$sql .= "and contact_uuid = :contact_uuid ";
 					$parameters['domain_uuid'] = $domain_uuid;
 					$parameters['contact_uuid'] = $contact_uuid;
-					$database = new database;
 					$database->execute($sql, $parameters ?? null);
 					unset($sql, $parameters);
 				}
@@ -159,9 +155,6 @@
 					$array['contact_urls'][0]['url_primary'] = $url_primary ? 1 : 0;
 					$array['contact_urls'][0]['url_description'] = $url_description;
 
-					$database = new database;
-					$database->app_name = 'contacts';
-					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
 					$database->save($array);
 					unset($array);
 				}
@@ -180,7 +173,6 @@
 		$sql .= "and contact_url_uuid = :contact_url_uuid ";
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['contact_url_uuid'] = $contact_url_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$url_label = $row["url_label"];
diff --git a/core/contacts/contact_urls.php b/core/contacts/contact_urls.php
index 56648e59b9..4034091c64 100644
--- a/core/contacts/contact_urls.php
+++ b/core/contacts/contact_urls.php
@@ -49,7 +49,6 @@
 	$sql .= "order by url_primary desc, url_label asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_urls = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_urls_view.php b/core/contacts/contact_urls_view.php
index a304779ff3..872781ed3f 100644
--- a/core/contacts/contact_urls_view.php
+++ b/core/contacts/contact_urls_view.php
@@ -44,7 +44,6 @@
 	$sql .= "order by url_primary desc, url_label asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['contact_uuid'] = $contact_uuid ?? '';
-	$database = new database;
 	$contact_urls = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contact_view.php b/core/contacts/contact_view.php
index b28cd8b42d..a9aa29b922 100644
--- a/core/contacts/contact_view.php
+++ b/core/contacts/contact_view.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/contacts/contacts.php b/core/contacts/contacts.php
index 46170eeb2d..005dc43d11 100644
--- a/core/contacts/contacts.php
+++ b/core/contacts/contacts.php
@@ -116,7 +116,6 @@
 	}
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$parameters['group_uuid'] = $_SESSION['group_uuid'] ?? '';
-	$database = new database;
 	$result = $database->select($sql, $parameters, 'all');
 	if (!empty($result)) {
 		foreach($result as $row) {
@@ -228,7 +227,6 @@
 		$parameters['user_uuid'] = $_SESSION['user_uuid'];
 	}
 	$sql .= $sql_search ?? '';
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 
 //prepare to page the results
@@ -281,7 +279,6 @@
 		$parameters['user_uuid'] = $_SESSION['user_uuid'];
 	}
 	$sql .= $sql_search ?? '';
-	$database = new database;
 	if (!empty($order_by)) {
 		$sql .= order_by($order_by, $order);
 		$sql .= ", contact_organization asc ";
@@ -296,7 +293,6 @@
 		}
 	}
 	$sql .= limit_offset($rows_per_page, $offset);
-	$database = new database;
 	$contacts = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/contacts/contacts_vcard.php b/core/contacts/contacts_vcard.php
index 4b55fc840e..30d8e77e03 100644
--- a/core/contacts/contacts_vcard.php
+++ b/core/contacts/contacts_vcard.php
@@ -53,7 +53,6 @@ if (!empty($_GET)) {
 		$sql .= "and contact_uuid = :contact_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_uuid'] = $contact_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$contact_type = $row["contact_type"];
@@ -79,7 +78,6 @@ if (!empty($_GET)) {
 		$sql .= "order by email_primary desc ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_uuid'] = $contact_uuid;
-		$database = new database;
 		$result = $database->select($sql, $parameters, 'all');
 		if (!empty($result)) {
 			$e = 1;
@@ -97,7 +95,6 @@ if (!empty($_GET)) {
 		$sql .= "and url_primary = true ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_uuid'] = $contact_uuid;
-		$database = new database;
 		$url_address = $database->select($sql, $parameters, 'column');
 		$vcard->data['url'] = $url_address;
 		unset($sql, $parameters, $row);
@@ -121,7 +118,6 @@ if (!empty($_GET)) {
 		$sql .= "and contact_uuid = :contact_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['contact_uuid'] = $contact_uuid;
-		$database = new database;
 		$result = $database->select($sql, $parameters, 'all');
 		if (!empty($result)) {
 			foreach ($result as $row) {
@@ -150,7 +146,6 @@ if (!empty($_GET)) {
 			$sql .= "and contact_uuid = :contact_uuid ";
 			$parameters['domain_uuid'] = $domain_uuid;
 			$parameters['contact_uuid'] = $contact_uuid;
-			$database = new database;
 			$result = $database->select($sql, $parameters, 'all');
 			if (!empty($result)) {
 				foreach ($result as $row) {
diff --git a/core/dashboard/dashboard.php b/core/dashboard/dashboard.php
index 5e9b896c10..f52d1d8b17 100644
--- a/core/dashboard/dashboard.php
+++ b/core/dashboard/dashboard.php
@@ -105,7 +105,6 @@
 		$sql .= ")\n";
 		$parameters['search'] = '%'.strtolower($search).'%';
 	}
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 	unset($sql, $parameters);
 
@@ -140,7 +139,6 @@
 	}
 	$sql .= order_by($order_by, $order, 'dashboard_name', 'asc');
 	$sql .= limit_offset($rows_per_page ?? null, $offset ?? null);
-	$database = new database;
 	$dashboards = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/dashboard/dashboard_edit.php b/core/dashboard/dashboard_edit.php
index 31895b6795..1ea64c6f32 100644
--- a/core/dashboard/dashboard_edit.php
+++ b/core/dashboard/dashboard_edit.php
@@ -34,9 +34,6 @@
 		exit;
 	}
 
-//initialize the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/dashboard/dashboard_widget_edit.php b/core/dashboard/dashboard_widget_edit.php
index 7837bfb17f..8928c090f2 100644
--- a/core/dashboard/dashboard_widget_edit.php
+++ b/core/dashboard/dashboard_widget_edit.php
@@ -34,9 +34,6 @@
 		exit;
 	}
 
-//initialize the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/dashboard/dashboard_widget_list.php b/core/dashboard/dashboard_widget_list.php
index 601f7cbc8b..243b5bbbec 100644
--- a/core/dashboard/dashboard_widget_list.php
+++ b/core/dashboard/dashboard_widget_list.php
@@ -89,7 +89,6 @@
 	$sql .= "from v_dashboard_widgets ";
 	$sql .= "where dashboard_uuid = :dashboard_uuid ";
 	$parameters['dashboard_uuid'] = $dashboard_uuid;
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters ?? null, 'column');
 	unset($sql, $parameters);
 
@@ -117,7 +116,6 @@
 	$sql .= "where dashboard_uuid = :dashboard_uuid ";
 	$sql .= order_by($order_by, $order, 'widget_order, widget_name', 'asc');
 	$sql .= limit_offset($rows_per_page ?? null, $offset ?? null);
-	$database = new database;
 	$parameters['dashboard_uuid'] = $dashboard_uuid;
 	$result = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
@@ -150,7 +148,6 @@
 
 	//get the group list
 	$sql = "select group_uuid, group_name from v_groups ";
-	$database = new database;
 	$groups = $database->select($sql, $parameters ?? null, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/dashboard/index.php b/core/dashboard/index.php
index 2b19aa7bc8..714e3ee384 100644
--- a/core/dashboard/index.php
+++ b/core/dashboard/index.php
@@ -45,9 +45,6 @@
 //additional includes
 	require_once "resources/check_auth.php";
 
-//initialize the database
-	$database = new database;
-
 //disable login message
 	if (isset($_GET['msg']) && $_GET['msg'] == 'dismiss') {
 		unset($_SESSION['login']['message']['text']);
diff --git a/core/databases/database_edit.php b/core/databases/database_edit.php
index 32bd65e87c..677b218728 100644
--- a/core/databases/database_edit.php
+++ b/core/databases/database_edit.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
@@ -91,8 +88,7 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) {
 					$array[0]['checked'] = 'true';
 					$array[0]['uuid'] = $database_uuid;
 				//delete
-					$obj = new databases;
-					$obj->delete($array);
+					$database->delete($array);
 				//redirect
 					header('Location: databases.php');
 					exit;
diff --git a/core/databases/databases.php b/core/databases/databases.php
index 95577e7a5c..1ae7c77037 100644
--- a/core/databases/databases.php
+++ b/core/databases/databases.php
@@ -59,14 +59,12 @@
 		switch ($action) {
 			case 'copy':
 				if (permission_exists('database_add')) {
-					$obj = new databases;
-					$obj->copy($databases);
+					$database->copy($databases);
 				}
 				break;
 			case 'delete':
 				if (permission_exists('database_delete')) {
-					$obj = new databases;
-					$obj->delete($databases);
+					$database->delete($databases);
 				}
 				break;
 		}
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 7475b0908e..c338ffc285 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/default_settings/default_setting_toggle.php b/core/default_settings/default_setting_toggle.php
index 615e6e6472..24274fb8c6 100644
--- a/core/default_settings/default_setting_toggle.php
+++ b/core/default_settings/default_setting_toggle.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index b8cf21cdb5..9fe9a2a15c 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/core/domain_settings/domain_setting_edit.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index 3ede27278e..dd07b91644 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/domains/domain_json.php b/core/domains/domain_json.php
index 70cd9bfb03..1ef0def1c6 100644
--- a/core/domains/domain_json.php
+++ b/core/domains/domain_json.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //get posted data
 	if (!empty($_POST['search'])) {
 		$search = $_POST['search'];
diff --git a/core/domains/domains.php b/core/domains/domains.php
index 2bfba57ea1..eee3f53bee 100644
--- a/core/domains/domains.php
+++ b/core/domains/domains.php
@@ -29,9 +29,6 @@
 	require_once "resources/check_auth.php";
 	require_once "resources/paging.php";
 
-//connect to the database
-	$database = new database;
-
 //redirect admin to app instead
 	if (file_exists($_SERVER["PROJECT_ROOT"]."/app/domains/app_config.php") && !permission_exists('domain_all') && !is_cli()) {
 		header("Location: ".PROJECT_PATH."/app/domains/domains.php");
diff --git a/core/groups/group_member_add.php b/core/groups/group_member_add.php
index 98b4b310d4..c92e33636c 100644
--- a/core/groups/group_member_add.php
+++ b/core/groups/group_member_add.php
@@ -43,9 +43,6 @@
 		return;
 	}
 
-//connect to the database
-	$database = new database;
-
 //get the http values and set them as variables
 	$domain_uuid = $_POST["domain_uuid"];
 	$group_uuid = $_POST["group_uuid"];
diff --git a/core/groups/group_members.php b/core/groups/group_members.php
index 7d7be88c66..f5e603f4d8 100644
--- a/core/groups/group_members.php
+++ b/core/groups/group_members.php
@@ -43,9 +43,6 @@
 		return;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/groups/group_permissions.php b/core/groups/group_permissions.php
index 034f147621..867460e7a4 100644
--- a/core/groups/group_permissions.php
+++ b/core/groups/group_permissions.php
@@ -42,9 +42,6 @@
 		$group_uuid = $_GET['group_uuid'];
 	}
 
-//connect to the database
-	$database = new database;
-
 //get the group_name
 	if (isset($group_uuid) && is_uuid($group_uuid)) {
 		$sql = "select group_name from v_groups ";
diff --git a/core/groups/groups.php b/core/groups/groups.php
index 23610250a4..20cd2c1767 100644
--- a/core/groups/groups.php
+++ b/core/groups/groups.php
@@ -38,9 +38,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/groups/permissions_copy.php b/core/groups/permissions_copy.php
index c017b1321b..db3ff6654d 100644
--- a/core/groups/permissions_copy.php
+++ b/core/groups/permissions_copy.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/install/install.php b/core/install/install.php
index 1dba939638..cc64e42eaf 100644
--- a/core/install/install.php
+++ b/core/install/install.php
@@ -189,7 +189,7 @@
 			$sql = "select domain_uuid from v_domains ";
 			$sql .= "where domain_name = :domain_name ";
 			$parameters['domain_name'] = $domain_name;
-			$database = new database;
+
 			$domain_uuid = $database->select($sql, $parameters, 'column');
 			unset($parameters);
 
@@ -214,12 +214,8 @@
 				$array['domains'][0]['domain_enabled'] = 'true';
 
 				//save to the user data
-				$database = new database;
-				$database->app_name = 'domains';
-				$database->app_uuid = 'b31e723a-bf70-670c-a49b-470d2a232f71';
-				$database->uuid($domain_uuid);
 				$database->save($array);
-				$message = $database->message;
+				//$message = $database->message;
 				unset($array);
 
 				//remove the temporary permission
@@ -245,8 +241,6 @@
 			$sql .= "and username = :username ";
 			$parameters['domain_uuid'] = $domain_uuid;
 			$parameters['username'] = $admin_username;
-
-			$database = new database;
 			$user_uuid = $database->select($sql, $parameters, 'column');
 			unset($parameters);
 
@@ -266,7 +260,6 @@
 			$sql = "select group_uuid from v_groups ";
 			$sql .= "where group_name = :group_name ";
 			$parameters['group_name'] = 'superadmin';
-			$database = new database;
 			$group_uuid = $database->select($sql, $parameters, 'column');
 			unset($parameters);
 
@@ -288,9 +281,6 @@
 			$array['user_groups'][0]['group_name'] = 'superadmin';
 			$array['user_groups'][0]['group_uuid'] = $group_uuid;
 			$array['user_groups'][0]['user_uuid'] = $user_uuid;
-			$database = new database;
-			$database->app_name = 'users';
-			$database->app_uuid = '112124b3-95c2-5352-7e9d-d14c0b88f207';
 			$database->uuid($user_uuid);
 			$database->save($array);
 			$message = $database->message;
diff --git a/core/menu/menu.php b/core/menu/menu.php
index a9e1d31319..3a4638d358 100644
--- a/core/menu/menu.php
+++ b/core/menu/menu.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php
index 3f944b28b2..f6448122a7 100644
--- a/core/menu/menu_edit.php
+++ b/core/menu/menu_edit.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php
index 3724988b9e..47472d64b4 100644
--- a/core/menu/menu_item_edit.php
+++ b/core/menu/menu_item_edit.php
@@ -41,9 +41,6 @@
 	$language = new text;
 	$text = $language->get();
 
-//connect to the database
-	$database = new database;
-
 //define the variables
 	$menu_uuid = null;
 	$menu_item_uuid = null;
diff --git a/core/menu/menu_item_list.php b/core/menu/menu_item_list.php
index b2b8810261..b42a97ac92 100644
--- a/core/menu/menu_item_list.php
+++ b/core/menu/menu_item_list.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//initialize the database
-	$database = new database;
-
 //get the http post data
 	if (!empty($_POST['menu_items'])) {
 		$action = $_POST['action'];
@@ -246,7 +243,6 @@
 
 	//get the group list
 	$sql = "select group_uuid, group_name from v_groups ";
-	$database = new database;
 	$groups = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
diff --git a/core/menu/menu_item_move_down.php b/core/menu/menu_item_move_down.php
index b7b0d2625c..08b80ee5e2 100644
--- a/core/menu/menu_item_move_down.php
+++ b/core/menu/menu_item_move_down.php
@@ -37,9 +37,6 @@
 		return;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/menu/menu_item_move_up.php b/core/menu/menu_item_move_up.php
index a59cc9c7e9..84dfe899b5 100644
--- a/core/menu/menu_item_move_up.php
+++ b/core/menu/menu_item_move_up.php
@@ -36,9 +36,6 @@
 		return;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/notifications/notification_edit.php b/core/notifications/notification_edit.php
index 5351bcc1db..8cb998de70 100644
--- a/core/notifications/notification_edit.php
+++ b/core/notifications/notification_edit.php
@@ -37,9 +37,6 @@ Mark J Crane <markjcrane@fusionpbx.com>
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/upgrade/upgrade_menu.php b/core/upgrade/upgrade_menu.php
index 1c9709a769..09438233fb 100644
--- a/core/upgrade/upgrade_menu.php
+++ b/core/upgrade/upgrade_menu.php
@@ -346,7 +346,6 @@ function do_upgrade_menu() {
 	$sql = "select menu_uuid, menu_language from v_menus ";
 	$sql .= "where menu_name = :menu_name ";
 	$parameters['menu_name'] = 'default';
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (is_array($row) && sizeof($row) != 0) {
 		$menu_uuid = $row["menu_uuid"];
diff --git a/core/user_logs/user_log_edit.php b/core/user_logs/user_log_edit.php
index 0f62bfffca..0053b16aa0 100644
--- a/core/user_logs/user_log_edit.php
+++ b/core/user_logs/user_log_edit.php
@@ -27,7 +27,6 @@
 		//$sql .= "and domain_uuid = :domain_uuid ";
 		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['user_log_uuid'] = $user_log_uuid;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
 			$domain_uuid = $row["domain_uuid"];
@@ -55,7 +54,6 @@
 	$sql .= "WHERE domain_uuid = :domain_uuid ";
 	$sql .= "ORDER by username asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
 	$users = $database->execute($sql, $parameters, 'all');
 	unset ($sql, $parameters);
 
diff --git a/core/user_settings/user_setting_edit.php b/core/user_settings/user_setting_edit.php
index c1d2a017dd..11a92209ce 100644
--- a/core/user_settings/user_setting_edit.php
+++ b/core/user_settings/user_setting_edit.php
@@ -37,9 +37,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/user_settings/user_settings.php b/core/user_settings/user_settings.php
index de69b0e937..23473d1cf9 100644
--- a/core/user_settings/user_settings.php
+++ b/core/user_settings/user_settings.php
@@ -38,9 +38,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/users/user_imports.php b/core/users/user_imports.php
index 8df4d1fb6c..84320d5ed1 100644
--- a/core/users/user_imports.php
+++ b/core/users/user_imports.php
@@ -34,9 +34,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/core/users/user_json.php b/core/users/user_json.php
index 0a34e374b4..5e16fef877 100644
--- a/core/users/user_json.php
+++ b/core/users/user_json.php
@@ -43,9 +43,6 @@
 		$search =  strtolower($_GET["search"]);
 	}
 
-//connect to the database
-	$database = new database;
-
 //check to see if contact details are in the view
 	$sql = "select * from view_users ";
 	$sql .= "where domain_uuid = :domain_uuid ";
diff --git a/core/users/users.php b/core/users/users.php
index 5c2c90b581..83f26c6d9a 100644
--- a/core/users/users.php
+++ b/core/users/users.php
@@ -35,9 +35,6 @@
 		exit;
 	}
 
-//connect to the database
-	$database = new database;
-
 //add multi-lingual support
 	$language = new text;
 	$text = $language->get();
diff --git a/resources/switch.php b/resources/switch.php
index fe33a8a7b4..f745139bf7 100644
--- a/resources/switch.php
+++ b/resources/switch.php
@@ -121,7 +121,7 @@ function save_gateway_xml() {
 		}
 
 	//declare the global variables
-		global $domain_uuid, $config;
+		global $database, $domain_uuid, $config;
 
 	//delete all old gateways to prepare for new ones
 		if (count($_SESSION["domains"]) > 1) {
@@ -139,7 +139,6 @@ function save_gateway_xml() {
 		$sql = "select * from v_gateways ";
 		$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
 		$parameters['domain_uuid'] = $domain_uuid;
-		$database = new database;
 		$result = $database->select($sql, $parameters, 'all');
 		if (!empty($result)) {
 			foreach ($result as $row) {
@@ -256,7 +255,8 @@ function save_gateway_xml() {
 
 function save_var_xml() {
 	if (!empty($_SESSION['switch']['conf']) && is_array($_SESSION['switch']['conf'])) {
-		global $config, $domain_uuid;
+		//declare the global variables
+		global $database, $config, $domain_uuid;
 
 		//skip this function if the conf directory is empty
 		if (empty($_SESSION['switch']['conf']['dir'])) {
@@ -279,7 +279,6 @@ function save_var_xml() {
 		$sql = "select * from v_vars ";
 		$sql .= "where var_enabled = true ";
 		$sql .= "order by var_category, var_order asc ";
-		$database = new database;
 		$variables = $database->select($sql, null, 'all');
 		$prev_var_category = '';
 		$xml = '';
@@ -315,6 +314,8 @@ function save_var_xml() {
 }
 
 function outbound_route_to_bridge($domain_uuid, $destination_number, array $channel_variables=null) {
+	//declare the global variables
+	global $database;
 
 	$destination_number = trim($destination_number);
 	preg_match('/^[\*\+0-9]*$/', $destination_number, $matches, PREG_OFFSET_CAPTURE);
@@ -355,7 +356,6 @@ function outbound_route_to_bridge($domain_uuid, $destination_number, array $chan
 	$sql .= "and (dd.dialplan_detail_enabled = true or dd.dialplan_detail_enabled is null) ";
 	$sql .= "order by d.domain_uuid,  d.dialplan_order, dd.dialplan_detail_order ";
 	$parameters['hostname'] = $hostname;
-	$database = new database;
 	$result = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 	if (!empty($result)) {
@@ -438,7 +438,8 @@ function outbound_route_to_bridge($domain_uuid, $destination_number, array $chan
 //}
 
 function extension_exists($extension) {
-	global $domain_uuid;
+	//declare the global variables
+	global $database, $domain_uuid;
 
 	$sql = "select count(*) from v_extensions ";
 	$sql .= "where domain_uuid = :domain_uuid ";
@@ -449,14 +450,13 @@ function extension_exists($extension) {
 	$sql .= "and enabled = true ";
 	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['extension'] = $extension;
-	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 	unset($sql, $parameters);
 	return $num_rows > 0 ? true : false;
 }
 
 function extension_presence_id($extension, $number_alias = false) {
-	global $domain_uuid;
+	global $database, $domain_uuid;
 
 	if ($number_alias === false) {
 		$sql = "select extension, number_alias from v_extensions ";
@@ -467,7 +467,6 @@ function extension_presence_id($extension, $number_alias = false) {
 		$sql .= ") ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['extension'] = $extension;
-		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (!empty($row)) {
 			$extension = $row['extension'];
@@ -488,14 +487,13 @@ function extension_presence_id($extension, $number_alias = false) {
 }
 
 function get_recording_filename($id) {
-	global $domain_uuid;
+	global $database, $domain_uuid;
 
 	$sql = "select * from v_recordings ";
 	$sql .= "where recording_uuid = :recording_uuid ";
 	$sql .= "and domain_uuid = :domain_uuid ";
 	$parameters['recording_uuid'] = $id;
 	$parameters['domain_uuid'] = $domain_uuid;
-	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (!empty($row)) {
 		//$filename = $row["filename"];
@@ -522,13 +520,12 @@ if (!function_exists('phone_letter_to_number')) {
 
 if (!function_exists('save_call_center_xml')) {
 	function save_call_center_xml() {
-		global $domain_uuid;
+		global $database, $domain_uuid;
 
 		if (!empty($_SESSION['switch']['call_center']['dir'])) {
 
 			//get the call center queue array
 			$sql = "select * from v_call_center_queues ";
-			$database = new database;
 			$call_center_queues = $database->select($sql, null, 'all');
 			unset($sql);
 
@@ -600,7 +597,6 @@ if (!function_exists('save_call_center_xml')) {
 				//prepare Agent XML string
 					$v_agents = '';
 					$sql = "select * from v_call_center_agents ";
-					$database = new database;
 					$result = $database->select($sql, null, 'all');
 					unset($sql);
 
@@ -690,7 +686,6 @@ if (!function_exists('save_call_center_xml')) {
 				//prepare Tier XML string
 					$v_tiers = '';
 					$sql = "select * from v_call_center_tiers ";
-					$database = new database;
 					$result = $database->select($sql, null, 'all');
 					unset($sql);
 
@@ -840,6 +835,9 @@ if (!function_exists('xml_cdr_conf_xml')) {
 
 if (!function_exists('save_sip_profile_xml')) {
 	function save_sip_profile_xml() {
+		//declare the global variables
+			global $database;
+
 		//skip saving the sip profile xml if the directory is not set
 			if (empty($_SESSION['switch']['sip_profiles']['dir'])) {
 				return;
@@ -853,7 +851,6 @@ if (!function_exists('save_sip_profile_xml')) {
 
 		//get the sip profiles from the database
 			$sql = "select * from v_sip_profiles";
-			$database = new database;
 			$result = $database->select($sql, null, 'all');
 			unset($sql);
 
@@ -884,7 +881,6 @@ if (!function_exists('save_sip_profile_xml')) {
 						$sql .= "where sip_profile_uuid = :sip_profile_uuid ";
 						$sql .= "and sip_profile_setting_enabled = true ";
 						$parameters['sip_profile_uuid'] = $sip_profile_uuid;
-						$database = new database;
 						$result_2 = $database->select($sql, $parameters, 'all');
 						if (!empty($result_2)) {
 							$sip_profile_settings = '';
diff --git a/secure/v_mailto.php b/secure/v_mailto.php
index 29b557e519..80652768b0 100644
--- a/secure/v_mailto.php
+++ b/secure/v_mailto.php
@@ -136,9 +136,6 @@
 					$p->add('email_log_add', 'temp');
 
 				//execute insert
-					$database = new database;
-					$database->app_name = 'v_mailto';
-					$database->app_uuid = 'ba41954e-9d21-4b10-bbc2-fa5ceabeb184';
 					$database->save($array);
 					unset($array);
 
@@ -171,7 +168,6 @@
 
 	$sql = "select email from v_email_logs where email_log_uuid = :email_log_uuid ";
 	$parameters['email_log_uuid'] = $email_log_uuid;
-	$database = new database;
 	$email = $database->select($sql, $parameters, 'column');
 	echo $email;
 	unset($sql, $parameters, $email);