diff --git a/unskript-ctl/db_utils.py b/unskript-ctl/db_utils.py
index 295360212..6c5f7c768 100644
--- a/unskript-ctl/db_utils.py
+++ b/unskript-ctl/db_utils.py
@@ -287,7 +287,6 @@ def get_creds_by_connector(connector_type: str):
     db.close()
 
     if not retval:
-        print("RETURNING RETVAL AS NONE, NONE")
         retval = (None, None)
 
     return retval
diff --git a/unskript-ctl/unskript-client.py b/unskript-ctl/unskript-client.py
index 85d430bdb..4f2291825 100755
--- a/unskript-ctl/unskript-client.py
+++ b/unskript-ctl/unskript-client.py
@@ -1523,8 +1523,8 @@ def stop_debug():
                         help='Run the given runbook FILENAME [-RUNBOOK_PARM1 VALUE1] etc..')
     parser.add_argument('-rc', '--run-checks', type=str,
                         help='Run all available checks [all | connector | failed]')
-    parser.add_argument('-rs', '--run-suites', type=str,
-                        help='Run Health Check Suites (as defined in the unskript_config.yaml file)')
+    # parser.add_argument('-rs', '--run-suites', type=str,
+    #                     help='Run Health Check Suites (as defined in the unskript_config.yaml file)')
     parser.add_argument('-df', '--display-failed-checks',
                         help='Display Failed Checks [all | connector]')
     parser.add_argument('-lc', '--list-checks', type=str,
@@ -1559,8 +1559,8 @@ def stop_debug():
             parse_runbook_param(args.run_runbook)
     elif args.run_checks not in ('', None):
         run_checks(args.run_checks)
-    elif args.run_suites not in ('', None):
-        run_suites(args.run_suites)
+    # elif args.run_suites not in ('', None):
+    #     run_suites(args.run_suites)
     elif args.display_failed_checks not in ('', None):
         display_failed_checks(args.display_failed_checks)
     elif args.list_checks not in ('', None):
diff --git a/unskript-ctl/unskript_config.yaml.template b/unskript-ctl/unskript_config.yaml.template
index bfe5d5fce..cb3711147 100644
--- a/unskript-ctl/unskript_config.yaml.template
+++ b/unskript-ctl/unskript_config.yaml.template
@@ -5,9 +5,3 @@ globals:
   services: ["calendar", "audit"]
 
 
-suites:
-  awesome-suite: [
-    "588e9f61ddf3343d359958ae195a3d912a7fe4d4341d098c62c2ffa0c6a1814f",
-    "134d70d8685769e42fdf3b014e948b88e3d0efd0b9da0f5a2e60cf6f62069aad"
-  ]
-