diff --git a/lib/constants.py b/lib/constants.py
index a58f797d64a170920e8b7af4df17cd212721a18a..0edd31722ec29f1f7e65d30efdd0f0beaa1bf30f 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -136,7 +136,6 @@ NODED_CERT_FILE = DATA_DIR + "/server.pem"
 RAPI_CERT_FILE = DATA_DIR + "/rapi.pem"
 CONFD_HMAC_KEY = DATA_DIR + "/hmac.key"
 CLUSTER_DOMAIN_SECRET_FILE = DATA_DIR + "/cluster-domain-secret"
-WATCHER_STATEFILE = DATA_DIR + "/watcher.data"
 INSTANCE_STATUS_FILE = RUN_GANETI_DIR + "/instance-status"
 SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts"
 RAPI_USERS_FILE = DATA_DIR + "/rapi/users"
diff --git a/qa/qa_daemon.py b/qa/qa_daemon.py
index 9a043208f57b753f1d213a4dc1f47127bdb996bd..6b0ce9328907ff3275893ebf3748ac7e853b0bf1 100644
--- a/qa/qa_daemon.py
+++ b/qa/qa_daemon.py
@@ -65,7 +65,6 @@ def _ResetWatcherDaemon():
   """Removes the watcher daemon's state file.
 
   """
-  AssertCommand(["rm", "-f", constants.WATCHER_STATEFILE])
   AssertCommand([
     "bash", "-c",
     "rm -vf %s" % (constants.WATCHER_GROUP_STATE_FILE % "*-*-*-*")