diff --git a/functions.php b/functions.php
index b768d217d..572ecf105 100644
--- a/functions.php
+++ b/functions.php
@@ -5798,12 +5798,6 @@
 		// Send feed digests by email if needed.
 		if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
 
-		purge_orphans($link);
-
-		$rc = cleanup_tags($link, 14, 50000);
-
-		if ($debug) _debug("$rc uncached tags cleaned.");
-
 	} // function update_daemon_common
 
 	function sanitize_article_content($text) {
diff --git a/update.php b/update.php
index ac1d84c8e..873928b66 100755
--- a/update.php
+++ b/update.php
@@ -85,7 +85,13 @@
 			update_daemon_common($link);
 		} else {
 			$count = update_feedbrowser_cache($link);
-			_debug("Finished, $count feeds processed.");
+			_debug("Feedbrowser updated, $count feeds processed.");
+
+			purge_orphans($link, true);
+	
+			$rc = cleanup_tags($link, 14, 50000);
+
+			_debug("Cleaned $rc cached tags.");
 		}
 
 	}
diff --git a/update_daemon2.php b/update_daemon2.php
index 5ffc4f549..63f218cc4 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -214,7 +214,14 @@
 						update_daemon_common($link);
 					} else {
 						$count = update_feedbrowser_cache($link);
-						_debug("Finished, $count feeds processed.");
+						_debug("Feedbrowser updated, $count feeds processed.");
+
+						purge_orphans($link, true);
+
+						$rc = cleanup_tags($link, 14, 50000);
+
+						_debug("Cleaned $rc cached tags.");
+
 					}
 
 					_debug("Elapsed time: " . (time() - $start_timestamp) . " second(s)");