diff --git a/include/oauth.php b/include/oauth.php
index c916b6cec5..ae7a4718f3 100644
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -116,7 +116,7 @@ class FKOAuthDataStore extends OAuthDataStore {
 
 
 	if (!is_null($ret) && $uverifier!==false){
-		del_config("oauth", $verifier);
+		Config::delele("oauth", $verifier);
 	/*	$apps = PConfig::get($uverifier, "oauth", "apps");
 		if ($apps===false) $apps=array();
 		$apps[] = $consumer->key;
diff --git a/mod/admin.php b/mod/admin.php
index 5ecc74aa4d..4f156a0c3b 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -944,7 +944,7 @@ function admin_page_site_post(App $a) {
 	}
 
 	if ($info == "") {
-		del_config('config','info');
+		Config::delete('config','info');
 	} else {
 		Config::set('config','info',$info);
 	}
@@ -952,12 +952,12 @@ function admin_page_site_post(App $a) {
 	Config::set('system','theme', $theme);
 
 	if ($theme_mobile == '---') {
-		del_config('system','mobile-theme');
+		Config::delete('system','mobile-theme');
 	} else {
 		Config::set('system','mobile-theme', $theme_mobile);
 	}
 	if ($singleuser == '---') {
-		del_config('system','singleuser');
+		Config::delete('system','singleuser');
 	} else {
 		Config::set('system','singleuser', $singleuser);
 	}
@@ -1048,7 +1048,7 @@ function admin_page_site(App $a) {
 	if (strlen(Config::get('system','directory_submit_url')) &&
 		!strlen(Config::get('system','directory'))) {
 			Config::set('system','directory', dirname(Config::get('system','directory_submit_url')));
-			del_config('system','directory_submit_url');
+			Config::delete('system','directory_submit_url');
 	}
 
 	/* Installed themes */
@@ -2239,7 +2239,7 @@ function admin_page_features_post(App $a) {
 			if (x($_POST, $featurelock)) {
 				Config::set('feature_lock', $feature, $val);
 			} else {
-				del_config('feature_lock', $feature);
+				Config::delete('feature_lock', $feature);
 			}
 		}
 	}
diff --git a/mod/dirfind.php b/mod/dirfind.php
index a6fda1f108..da2f1396ef 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -7,7 +7,6 @@ use Friendica\Core\Worker;
 use Friendica\Network\Probe;
 
 require_once 'include/contact_widgets.php';
-require_once 'include/probe.php';
 require_once 'include/socgraph.php';
 require_once 'include/Contact.php';
 require_once 'include/contact_selectors.php';
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index ef4c3799ca..70a36559e4 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -53,8 +53,8 @@ function ostatus_subscribe_content(App $a) {
 
 	if ($counter >= $total) {
 		$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/settings/connectors">';
-		del_pconfig($uid, "ostatus", "legacy_friends");
-		del_pconfig($uid, "ostatus", "legacy_contact");
+		PConfig::delete($uid, "ostatus", "legacy_friends");
+		PConfig::delete($uid, "ostatus", "legacy_contact");
 		$o .= t("Done");
 		return $o;
 	}
diff --git a/update.php b/update.php
index 2464872df8..e1c5a0de08 100644
--- a/update.php
+++ b/update.php
@@ -1659,7 +1659,7 @@ function update_1188() {
 	if (strlen(Config::get('system','directory_submit_url')) &&
 		!strlen(Config::get('system','directory'))) {
 		Config::set('system','directory', dirname(Config::get('system','directory_submit_url')));
-		del_config('system','directory_submit_url');
+		Config::delete('system','directory_submit_url');
 	}
 
 	return UPDATE_SUCCESS;
@@ -1705,20 +1705,20 @@ function update_1190() {
 			$value = $rr['v'];
 
 			if ($key === 'randomise')
-				del_pconfig($uid,$family,$key);
+				PConfig::delete($uid,$family,$key);
 
 			if ($key === 'show_on_profile') {
 				if ($value)
 					PConfig::set($uid,feature,forumlist_profile,$value);
 
-				del_pconfig($uid,$family,$key);
+				PConfig::delete($uid,$family,$key);
 			}
 
 			if ($key === 'show_on_network') {
 				if ($value)
 					PConfig::set($uid,feature,forumlist_widget,$value);
 
-				del_pconfig($uid,$family,$key);
+				PConfig::delete($uid,$family,$key);
 			}
 		}
 	}
diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
index d279cb36e3..ee71029929 100644
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -6,6 +6,9 @@
 ?>
 <!DOCTYPE html >
 <?php
+	use Friendica\Core\Config;
+	use Friendica\Core\PConfig;
+	use Friendica\Core\System;
 	require_once('view/theme/frio/php/frio_boot.php');
 
 //	$minimal = is_modal();
@@ -17,9 +20,9 @@
 <head>
 	<title><?php if(x($page,'title')) echo $page['title'] ?></title>
 	<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
-	<script  type="text/javascript">var baseurl="<?php echo Friendica\Core\System::baseUrl() ?>";</script>
+	<script  type="text/javascript">var baseurl="<?php echo System::baseUrl() ?>";</script>
 	<script type="text/javascript">var frio="<?php echo "view/theme/frio"; ?>";</script>
-	<?php $baseurl = Friendica\Core\System::baseUrl(); ?>
+	<?php $baseurl = System::baseUrl(); ?>
 	<?php $frio = "view/theme/frio"; ?>
 	<?php
 		// Because we use minimal for modals the header and the included js stuff should be only loaded
@@ -37,14 +40,14 @@
 		if (is_null($uid)) {
 			$uid = get_theme_uid();
 		}
-		$schema = Friendica\Core\PConfig::get($uid, 'frio', 'schema');
+		$schema = PConfig::get($uid, 'frio', 'schema');
 		if (($schema) && ($schema != '---')) {
 			if (file_exists('view/theme/frio/schema/'.$schema.'.php')) {
 				$schemefile = 'view/theme/frio/schema/'.$schema.'.php';
 				require_once($schemefile);
 			}
 		} else {
-			$nav_bg = Friendica\Core\PConfig::get($uid, 'frio', 'nav_bg');
+			$nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
 		}
 		if (!$nav_bg) {
 			$nav_bg = "#708fa0";
@@ -66,8 +69,8 @@ else
 <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
 <?php
 	if(x($page,'nav') && (!$minimal)){
-	echo	str_replace("~config.sitename~",Friendica\Core\Config::get('config','sitename'),
-			str_replace("~system.banner~",Friendica\Core\Config::get('system','banner'),
+	echo	str_replace("~config.sitename~",Config::get('config','sitename'),
+			str_replace("~system.banner~",Config::get('system','banner'),
 			$page['nav']
 	));};