diff --git a/lib/Data/AbstractData.php b/lib/Data/AbstractData.php
index 6f2dee53..52a85a41 100644
--- a/lib/Data/AbstractData.php
+++ b/lib/Data/AbstractData.php
@@ -35,7 +35,7 @@ abstract class AbstractData
      * @static
      * @var    array
      */
-    protected static $_traffic_limiter_cache = array();
+    protected static $_last_cache = array();
 
     /**
      * Enforce singleton, disable constructor
@@ -150,9 +150,9 @@ abstract class AbstractData
     public function purgeValues($namespace, $time)
     {
         if ($namespace === 'traffic_limiter') {
-            foreach (self::$_traffic_limiter_cache as $key => $last_access) {
-                if ($last_access <= $time) {
-                    unset(self::$_traffic_limiter_cache[$key]);
+            foreach (self::$_last_cache as $key => $last_submission) {
+                if ($last_submission <= $time) {
+                    unset(self::$_last_cache[$key]);
                 }
             }
         }
diff --git a/lib/Data/Database.php b/lib/Data/Database.php
index a15b8621..dea1be6d 100644
--- a/lib/Data/Database.php
+++ b/lib/Data/Database.php
@@ -447,9 +447,9 @@ class Database extends AbstractData
     public function setValue($value, $namespace, $key = '')
     {
         if ($namespace === 'traffic_limiter') {
-            self::$_traffic_limiter_cache[$key] = $value;
+            self::$_last_cache[$key] = $value;
             try {
-                $value = Json::encode(self::$_traffic_limiter_cache);
+                $value = Json::encode(self::$_last_cache);
             } catch (Exception $e) {
                 return false;
             }
@@ -492,12 +492,12 @@ class Database extends AbstractData
         }
         if ($value && $namespace === 'traffic_limiter') {
             try {
-                self::$_traffic_limiter_cache = Json::decode($value);
+                self::$_last_cache = Json::decode($value);
             } catch (Exception $e) {
-                self::$_traffic_limiter_cache = array();
+                self::$_last_cache = array();
             }
-            if (array_key_exists($key, self::$_traffic_limiter_cache)) {
-                return self::$_traffic_limiter_cache[$key];
+            if (array_key_exists($key, self::$_last_cache)) {
+                return self::$_last_cache[$key];
             }
         }
         return (string) $value;
diff --git a/lib/Data/Filesystem.php b/lib/Data/Filesystem.php
index 384c72d1..9b8e7ba5 100644
--- a/lib/Data/Filesystem.php
+++ b/lib/Data/Filesystem.php
@@ -263,10 +263,10 @@ class Filesystem extends AbstractData
                     '<?php # |' . $value . '|'
                 );
             case 'traffic_limiter':
-                self::$_traffic_limiter_cache[$key] = $value;
+                self::$_last_cache[$key] = $value;
                 return self::_storeString(
                     self::$_path . DIRECTORY_SEPARATOR . 'traffic_limiter.php',
-                    '<?php' . PHP_EOL . '$GLOBALS[\'traffic_limiter\'] = ' . var_export(self::$_traffic_limiter_cache, true) . ';'
+                    '<?php' . PHP_EOL . '$GLOBALS[\'traffic_limiter\'] = ' . var_export(self::$_last_cache, true) . ';'
                 );
         }
         return false;
@@ -303,9 +303,9 @@ class Filesystem extends AbstractData
                 $file = self::$_path . DIRECTORY_SEPARATOR . 'traffic_limiter.php';
                 if (is_readable($file)) {
                     require $file;
-                    self::$_traffic_limiter_cache = $GLOBALS['traffic_limiter'];
-                    if (array_key_exists($key, self::$_traffic_limiter_cache)) {
-                        return self::$_traffic_limiter_cache[$key];
+                    self::$_last_cache = $GLOBALS['traffic_limiter'];
+                    if (array_key_exists($key, self::$_last_cache)) {
+                        return self::$_last_cache[$key];
                     }
                 }
                 break;
diff --git a/lib/Persistence/ServerSalt.php b/lib/Persistence/ServerSalt.php
index 14f7bd11..50e1cd65 100644
--- a/lib/Persistence/ServerSalt.php
+++ b/lib/Persistence/ServerSalt.php
@@ -26,15 +26,6 @@ use PrivateBin\Data\AbstractData;
  */
 class ServerSalt extends AbstractPersistence
 {
-    /**
-     * file where salt is saved to
-     *
-     * @access private
-     * @static
-     * @var    string
-     */
-    private static $_file = 'salt.php';
-
     /**
      * generated salt
      *