diff --git a/include/cache.php b/include/cache.php
index 98799bcf40..b56906c544 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -5,8 +5,8 @@
  * @brief Class for storing data for a short time
  */
 
-use \Friendica\Core\Config;
-use \Friendica\Core\PConfig;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 
 class Cache {
 	/**
@@ -121,9 +121,9 @@ class Cache {
 
 	/**
 	 * @brief Put data in the cache according to the key
-	 * 
+	 *
 	 * The input $value can have multiple formats.
-	 * 
+	 *
 	 * @param string $key The key to the cached data
 	 * @param mixed $valie The value that is about to be stored
 	 * @param integer $duration The cache lifespan
diff --git a/include/config.php b/include/config.php
index c51db4ec7b..1c8b119bcc 100644
--- a/include/config.php
+++ b/include/config.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file include/config.php
- * 
+ *
  *  @brief (Deprecated) Arbitrary configuration storage
  * Note:
  * Please do not store booleans - convert to 0/1 integer values
@@ -12,8 +12,8 @@
  * configurations need to be fixed as of 10/08/2011.
  */
 
-use \Friendica\Core\Config;
-use \Friendica\Core\PConfig;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 
 /**
  * @brief (Deprecated) Loads all configuration values of family into a cached storage.
diff --git a/include/cron.php b/include/cron.php
index c4299dd4c2..bac9c8a3d8 100644
--- a/include/cron.php
+++ b/include/cron.php
@@ -1,5 +1,6 @@
 <?php
-use \Friendica\Core\Config;
+
+use Friendica\Core\Config;
 
 function cron_run(&$argv, &$argc){
 	global $a;
diff --git a/include/cronhooks.php b/include/cronhooks.php
index a519dee224..2c378aa39c 100644
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -1,6 +1,6 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 function cronhooks_run(&$argv, &$argc) {
 	global $a;
diff --git a/include/datetime.php b/include/datetime.php
index a840aa0a58..3578698240 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -4,7 +4,7 @@
  * @brief Some functions for date and time related tasks.
  */
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 /**
  * @brief Two-level sort for timezones.
@@ -34,7 +34,7 @@ function timezone_cmp($a, $b) {
 
 /**
  * @brief Emit a timezone selector grouped (primarily) by continent
- * 
+ *
  * @param string $current Timezone
  * @return string Parsed HTML output
  */
@@ -81,17 +81,17 @@ function select_timezone($current = 'America/Los_Angeles') {
 
 /**
  * @brief Generating a Timezone selector
- * 
+ *
  * Return a select using 'field_select_raw' template, with timezones
  * groupped (primarily) by continent
  * arguments follow convetion as other field_* template array:
  * 'name', 'label', $value, 'help'
- * 
+ *
  * @param string $name Name of the selector
  * @param string $label Label for the selector
  * @param string $current Timezone
  * @param string $help Help text
- * 
+ *
  * @return string Parsed HTML
  */
 function field_timezone($name='timezone', $label='', $current = 'America/Los_Angeles', $help){
@@ -114,7 +114,7 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang
  * @param string $s Some parseable date/time string
  * @param string $fmt Output format recognised from php's DateTime class
  *   http://www.php.net/manual/en/datetime.format.php
- * 
+ *
  * @return string Formatted date according to given format
  */
 function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d H:i:s") {
@@ -212,7 +212,7 @@ function dob($dob) {
 
 /**
  * @brief Returns a date selector
- * 
+ *
  * @param string $format
  *  Format string, e.g. 'ymd' or 'mdy'. Not currently supported
  * @param string $min
@@ -223,7 +223,7 @@ function dob($dob) {
  *  Unix timestamp of default date
  * @param string $id
  *  ID and name of datetimepicker (defaults to "datetimepicker")
- * 
+ *
  * @return string Parsed HTML output.
  */
 function datesel($format, $min, $max, $default, $id = 'datepicker') {
@@ -232,7 +232,7 @@ function datesel($format, $min, $max, $default, $id = 'datepicker') {
 
 /**
  * @brief Returns a time selector
- * 
+ *
  * @param string $format
  *  Format string, e.g. 'ymd' or 'mdy'. Not currently supported
  * @param $h
@@ -241,7 +241,7 @@ function datesel($format, $min, $max, $default, $id = 'datepicker') {
  *  Already selected minute
  * @param string $id
  *  ID and name of datetimepicker (defaults to "timepicker")
- * 
+ *
  * @return string Parsed HTML output.
  */
 function timesel($format, $h, $m, $id = 'timepicker') {
@@ -270,7 +270,7 @@ function timesel($format, $h, $m, $id = 'timepicker') {
  * @param $maxfrom
  *  set maximum date from picker with id $maxfrom (none by default)
  * @param bool $required default false
- * 
+ *
  * @return string Parsed HTML output.
  *
  * @todo Once browser support is better this could probably be replaced with
@@ -417,7 +417,7 @@ function relative_date($posted_date, $format = null) {
  * @param string $dob Date of Birth
  * @param string $owner_tz (optional) Timezone of the person of interest
  * @param string $viewer_tz (optional) Timezone of the person viewing
- * 
+ *
  * @return int Age in years
  */
 function age($dob, $owner_tz = '', $viewer_tz = '') {
@@ -452,7 +452,7 @@ function age($dob, $owner_tz = '', $viewer_tz = '') {
  *
  * @param int $y Year
  * @param int $m Month (1=January, 12=December)
- * 
+ *
  * @return int Number of days in the given month
  */
 function get_dim($y, $m) {
@@ -477,7 +477,7 @@ function get_dim($y, $m) {
  *
  * @param int $y Year
  * @param int $m Month (1=January, 12=December)
- * 
+ *
  * @return string day 0 = Sunday through 6 = Saturday
  */
 function get_first_dim($y,$m) {
@@ -498,7 +498,7 @@ function get_first_dim($y,$m) {
  * @param int $m Month
  * @param bool $links (default false)
  * @param string $class
- * 
+ *
  * @return string
  *
  * @todo Provide (prev,next) links, define class variations for different size calendars
diff --git a/include/dbclean.php b/include/dbclean.php
index 6643a6314e..f31bfef8ab 100644
--- a/include/dbclean.php
+++ b/include/dbclean.php
@@ -4,7 +4,7 @@
  * @brief The script is called from time to time to clean the database entries and remove orphaned data.
  */
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 function dbclean_run(&$argv, &$argc) {
 	if (!Config::get('system', 'dbclean', false)) {
diff --git a/include/dbupdate.php b/include/dbupdate.php
index 725eca7370..799ca262c8 100644
--- a/include/dbupdate.php
+++ b/include/dbupdate.php
@@ -1,6 +1,6 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 function dbupdate_run(&$argv, &$argc) {
 	global $a;
diff --git a/include/directory.php b/include/directory.php
index 41a3dd784c..e507a939f8 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -1,9 +1,9 @@
 <?php
-/// @TODO no longer used?
-use \Friendica\Core\Config;
+
+use Friendica\Core\Config;
 
 function directory_run(&$argv, &$argc){
-	$dir = get_config('system', 'directory');
+	$dir = Config::get('system', 'directory');
 
 	if (!strlen($dir)) {
 		return;
diff --git a/include/discover_poco.php b/include/discover_poco.php
index ff97b0e592..e371080d19 100644
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -1,6 +1,6 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 require_once('include/socgraph.php');
 require_once('include/datetime.php');
diff --git a/include/expire.php b/include/expire.php
index 098125a798..da121157d2 100644
--- a/include/expire.php
+++ b/include/expire.php
@@ -1,6 +1,6 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 function expire_run(&$argv, &$argc){
 	global $a;
diff --git a/include/gprobe.php b/include/gprobe.php
index e79cc64764..55ce4c7061 100644
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -1,6 +1,6 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 require_once('include/Scrape.php');
 require_once('include/socgraph.php');
diff --git a/include/onepoll.php b/include/onepoll.php
index 5227b61a1a..3483d24930 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -1,6 +1,6 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 require_once('include/follow.php');
 
diff --git a/include/pgettext.php b/include/pgettext.php
index b42dcec119..9b541e8e3c 100644
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -10,7 +10,7 @@
  *
  */
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 require_once("include/dba.php");
 
diff --git a/include/photos.php b/include/photos.php
index e872532a48..38cda3f2ba 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -4,8 +4,8 @@
  * @brief Functions related to photo handling.
  */
 
-use \Friendica\Core\Config;
-use \Friendica\Core\PConfig;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 
 function getGps($exifCoord, $hemi) {
 	$degrees = count($exifCoord) > 0 ? gps2Num($exifCoord[0]) : 0;
diff --git a/include/queue.php b/include/queue.php
index c0c73cda61..b21bf676ba 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -1,6 +1,6 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 require_once('include/queue_fn.php');
 require_once('include/dfrn.php');
diff --git a/include/remove_contact.php b/include/remove_contact.php
index bd736e5484..a3938ad8ec 100644
--- a/include/remove_contact.php
+++ b/include/remove_contact.php
@@ -4,7 +4,7 @@
  * @brief Removes orphaned data from deleted contacts
  */
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 function remove_contact_run($argv, $argc) {
 	if ($argc != 2) {
diff --git a/include/spool_post.php b/include/spool_post.php
index b3fd5c6b0b..2b21e41965 100644
--- a/include/spool_post.php
+++ b/include/spool_post.php
@@ -4,7 +4,7 @@
  * @brief Posts items that wer spooled because they couldn't be posted.
  */
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 require_once("include/items.php");
 
diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index 883a229895..7a3e48937e 100644
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -1,6 +1,6 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 function update_gcontact_run(&$argv, &$argc) {
 	global $a;
diff --git a/mod/worker.php b/mod/worker.php
index 4949b830f4..62f9bd3dde 100644
--- a/mod/worker.php
+++ b/mod/worker.php
@@ -5,8 +5,8 @@
  */
 require_once("include/poller.php");
 
-use \Friendica\Core\Config;
-use \Friendica\Core\PConfig;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 
 function worker_init($a){
 
diff --git a/src/ParseUrl.php b/src/ParseUrl.php
index e9ac527a1a..943725ffe0 100644
--- a/src/ParseUrl.php
+++ b/src/ParseUrl.php
@@ -7,7 +7,7 @@
 
 namespace Friendica;
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
 require_once("include/network.php");
 require_once("include/Photo.php");