diff --git a/SickBeard.py b/SickBeard.py
index 93b5b140cbdecc857388b2096e71873297daa68c..f6ce75ba73a9863d2e649cc49284aeb4f80bf2f6 100755
--- a/SickBeard.py
+++ b/SickBeard.py
@@ -103,6 +103,15 @@ class SickRage(object):
         self.log_dir = None
         self.consoleLogging = True
 
+    @staticmethod
+    def clear_cache():
+        try:
+            cache_folder = ek(os.path.join, sickbeard.CACHE_DIR, 'mako')
+            if os.path.isdir(cache_folder):
+                shutil.rmtree(cache_folder)
+        except Exception:
+            logger.log(u"Unable to remove the cache/mako directory!", logger.WARNING)
+
     @staticmethod
     def help_message():
         """
@@ -301,16 +310,12 @@ class SickRage(object):
         # Build from the DB to start with
         self.loadShowsFromDB()
 
-        if self.consoleLogging:
-            print "Starting up SickRage " + sickbeard.BRANCH + " from " + sickbeard.CONFIG_FILE
+        logger.log(u"Starting up SickRage [%s] from '%s'" % (sickbeard.BRANCH, sickbeard.CONFIG_FILE))
 
-        # Clean up after update
-        if sickbeard.GIT_NEWVER:
-            shutil.rmtree(ek(os.path.join, sickbeard.CACHE_DIR, 'mako'))
-            sickbeard.GIT_NEWVER = False
+        self.clear_cache()
 
         if self.forcedPort:
-            logger.log(u"Forcing web server to port " + str(self.forcedPort))
+            logger.log(u"Forcing web server to port %s" % self.forcedPort)
             self.startPort = self.forcedPort
         else:
             self.startPort = sickbeard.WEB_PORT
@@ -498,11 +503,8 @@ class SickRage(object):
                 except Exception:
                     pass
 
-            try:
-                logger.log(u"Halt: Trying to remove the cache/mako directory")
-                shutil.rmtree(ek(os.path.join, sickbeard.CACHE_DIR, 'mako'))
-            except Exception:
-                logger.log(u"Halt: Unable to remove the cache/mako directory!", logger.WARNING)
+            # Clean cache
+            self.clear_cache()
 
             # if run as daemon delete the pidfile
             if self.runAsDaemon and self.CREATEPID:
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index e6043c7bb84641e262e46e8ea8b0e475c2405d78..98224fc0078606b1bb2b697c540b75b7d1c43556 100644
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -138,7 +138,6 @@ GIT_USERNAME = None
 GIT_PASSWORD = None
 GIT_PATH = None
 GIT_AUTOISSUES = False
-GIT_NEWVER = False
 DEVELOPER = False
 
 NEWS_URL = 'http://sickrage.github.io/sickrage-news/news.md'
@@ -580,7 +579,7 @@ def get_backlog_cycle_time():
 def initialize(consoleLogging=True):
     with INIT_LOCK:
 
-        global BRANCH, GIT_RESET, GIT_REMOTE, GIT_REMOTE_URL, CUR_COMMIT_HASH, CUR_COMMIT_BRANCH, GIT_NEWVER, ACTUAL_LOG_DIR, LOG_DIR, LOG_NR, LOG_SIZE, WEB_PORT, WEB_LOG, ENCRYPTION_VERSION, ENCRYPTION_SECRET, WEB_ROOT, WEB_USERNAME, WEB_PASSWORD, WEB_HOST, WEB_IPV6, WEB_COOKIE_SECRET, WEB_USE_GZIP, API_KEY, ENABLE_HTTPS, HTTPS_CERT, HTTPS_KEY, \
+        global BRANCH, GIT_RESET, GIT_REMOTE, GIT_REMOTE_URL, CUR_COMMIT_HASH, CUR_COMMIT_BRANCH, ACTUAL_LOG_DIR, LOG_DIR, LOG_NR, LOG_SIZE, WEB_PORT, WEB_LOG, ENCRYPTION_VERSION, ENCRYPTION_SECRET, WEB_ROOT, WEB_USERNAME, WEB_PASSWORD, WEB_HOST, WEB_IPV6, WEB_COOKIE_SECRET, WEB_USE_GZIP, API_KEY, ENABLE_HTTPS, HTTPS_CERT, HTTPS_KEY, \
             HANDLE_REVERSE_PROXY, USE_NZBS, USE_TORRENTS, NZB_METHOD, NZB_DIR, DOWNLOAD_PROPERS, RANDOMIZE_PROVIDERS, CHECK_PROPERS_INTERVAL, ALLOW_HIGH_PRIORITY, SAB_FORCED, TORRENT_METHOD, NOTIFY_ON_LOGIN, \
             SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, SAB_CATEGORY_BACKLOG, SAB_CATEGORY_ANIME, SAB_CATEGORY_ANIME_BACKLOG, SAB_HOST, \
             NZBGET_USERNAME, NZBGET_PASSWORD, NZBGET_CATEGORY, NZBGET_CATEGORY_BACKLOG, NZBGET_CATEGORY_ANIME, NZBGET_CATEGORY_ANIME_BACKLOG, NZBGET_PRIORITY, NZBGET_HOST, NZBGET_USE_HTTPS, backlogSearchScheduler, \
@@ -660,7 +659,6 @@ def initialize(consoleLogging=True):
         # git login info
         GIT_USERNAME = check_setting_str(CFG, 'General', 'git_username', '')
         GIT_PASSWORD = check_setting_str(CFG, 'General', 'git_password', '', censor_log=True)
-        GIT_NEWVER = bool(check_setting_int(CFG, 'General', 'git_newver', 0))
         DEVELOPER = bool(check_setting_int(CFG, 'General', 'developer', 0))
 
         # debugging
@@ -1612,7 +1610,6 @@ def save_config():
     new_config['General']['git_remote_url'] = GIT_REMOTE_URL
     new_config['General']['cur_commit_hash'] = CUR_COMMIT_HASH
     new_config['General']['cur_commit_branch'] = CUR_COMMIT_BRANCH
-    new_config['General']['git_newver'] = int(GIT_NEWVER)
     new_config['General']['config_version'] = CONFIG_VERSION
     new_config['General']['encryption_version'] = int(ENCRYPTION_VERSION)
     new_config['General']['encryption_secret'] = ENCRYPTION_SECRET
diff --git a/sickbeard/versionChecker.py b/sickbeard/versionChecker.py
index e61f258868c26f42fd92c9f989931a0c1cf6e673..dfa6815474ed94e3a3997aeeed879282a39d69c7 100644
--- a/sickbeard/versionChecker.py
+++ b/sickbeard/versionChecker.py
@@ -638,7 +638,6 @@ class GitUpdateManager(UpdateManager):
 
             if exit_status == 0:
                 self._find_installed_version()
-                sickbeard.GIT_NEWVER = True
 
                 # Notify update successful
                 if sickbeard.NOTIFY_ON_UPDATE: