diff --git a/planetstack/hpc_observer/steps/sync_contentprovider.py b/planetstack/hpc_observer/steps/sync_contentprovider.py
index cebe186..b3c2f66 100644
--- a/planetstack/hpc_observer/steps/sync_contentprovider.py
+++ b/planetstack/hpc_observer/steps/sync_contentprovider.py
@@ -25,11 +25,14 @@
         HpcLibrary.__init__(self)
 
     def fetch_pending(self, deleted):
-        self.sanity_check()
+        #self.consistency_check()
 
         return SyncStep.fetch_pending(self, deleted)
 
-    def sanity_check(self):
+    def consistency_check(self):
+        # set to true if something changed
+        result=False
+
         # sanity check to make sure our PS objects have CMI objects behind them
         all_cp_ids = [x["content_provider_id"] for x in self.client.onev.ListAll("ContentProvider")]
         for cp in ContentProvider.objects.all():
@@ -37,11 +40,13 @@
                 logger.info("Content provider %s was not found on CMI" % cp.content_provider_id)
                 cp.content_provider_id=None
                 cp.save()
+                result = True
+
+        return result
 
     def sync_record(self, cp):
         logger.info("sync'ing content provider %s" % str(cp))
         account_name = self.make_account_name(cp.name)
-        print "XXX", cp.name, account_name
 
         if (not cp.serviceProvider) or (not cp.serviceProvider.service_provider_id):
             return
