diff --git a/app/__pycache__/__init__.cpython-38.pyc b/app/__pycache__/__init__.cpython-38.pyc
deleted file mode 100644
index 42da53cc..00000000
Binary files a/app/__pycache__/__init__.cpython-38.pyc and /dev/null differ
diff --git a/app/__pycache__/__init__.cpython-39.pyc b/app/__pycache__/__init__.cpython-39.pyc
deleted file mode 100644
index 00879fd4..00000000
Binary files a/app/__pycache__/__init__.cpython-39.pyc and /dev/null differ
diff --git a/app/__pycache__/build_containers.cpython-38.pyc b/app/__pycache__/build_containers.cpython-38.pyc
deleted file mode 100644
index 0a58c334..00000000
Binary files a/app/__pycache__/build_containers.cpython-38.pyc and /dev/null differ
diff --git a/app/__pycache__/build_containers.cpython-39.pyc b/app/__pycache__/build_containers.cpython-39.pyc
deleted file mode 100644
index 5e544127..00000000
Binary files a/app/__pycache__/build_containers.cpython-39.pyc and /dev/null differ
diff --git a/app/__pycache__/deploy_system.cpython-38.pyc b/app/__pycache__/deploy_system.cpython-38.pyc
deleted file mode 100644
index f507c8bd..00000000
Binary files a/app/__pycache__/deploy_system.cpython-38.pyc and /dev/null differ
diff --git a/app/__pycache__/deploy_system.cpython-39.pyc b/app/__pycache__/deploy_system.cpython-39.pyc
deleted file mode 100644
index 82705c0d..00000000
Binary files a/app/__pycache__/deploy_system.cpython-39.pyc and /dev/null differ
diff --git a/app/__pycache__/setup_repositories.cpython-38.pyc b/app/__pycache__/setup_repositories.cpython-38.pyc
deleted file mode 100644
index 37c8fa4f..00000000
Binary files a/app/__pycache__/setup_repositories.cpython-38.pyc and /dev/null differ
diff --git a/app/__pycache__/setup_repositories.cpython-39.pyc b/app/__pycache__/setup_repositories.cpython-39.pyc
deleted file mode 100644
index f21b25d8..00000000
Binary files a/app/__pycache__/setup_repositories.cpython-39.pyc and /dev/null differ
diff --git a/app/deploy_system.py b/app/deploy_system.py
index b45905d2..020fb671 100644
--- a/app/deploy_system.py
+++ b/app/deploy_system.py
@@ -34,7 +34,7 @@ def include_exclude_check(s, include, exclude):
 @click.command()
 @click.option('--include', help="only start these components")
 @click.option('--exclude', help="don\'t start these components")
-@click.argument('command' help="command: up|down|ps")
+@click.argument('command') # help: command: up|down|ps
 @click.pass_context
 def command(ctx, include, exclude, command):
     '''deploy a stack'''
diff --git a/app/setup_repositories.py b/app/setup_repositories.py
index 9eb2ab69..a93a3e2a 100644
--- a/app/setup_repositories.py
+++ b/app/setup_repositories.py
@@ -47,19 +47,19 @@ def is_git_repo(path):
 #   )
 
 @click.command()
-@click.option('--check-only', default=False)
-@click.option('--pull', default=False)
+@click.option('--check-only', is_flag=True, default=False)
+@click.option('--pull', is_flag=True, default=False)
 @click.pass_context
 def command(ctx, check_only, pull):
     '''git clone the set of repositories required to build the complete system from source'''
 
     quiet = ctx.obj.quiet
     verbose = ctx.obj.verbose
-    dry_run = ctx.obj.verbose
+    dry_run = ctx.obj.dry_run
 
     dev_root_path = os.path.expanduser(config("DEV_ROOT", default="~/cerc"))
 
-    if not args.quiet:
+    if not quiet:
         print(f'Dev Root is: {dev_root_path}')
 
     if not os.path.isdir(dev_root_path):
diff --git a/cli.py b/cli.py
index dda2b4a5..057ce1a3 100644
--- a/cli.py
+++ b/cli.py
@@ -28,9 +28,9 @@ class Options(object):
         self.dry_run = dry_run
 
 @click.group(context_settings=CONTEXT_SETTINGS)
-@click.option('--quiet', default=False)
-@click.option('--verbose', default=False)
-@click.option('--dry-run', default=False)
+@click.option('--quiet', is_flag=True, default=False)
+@click.option('--verbose', is_flag=True, default=False)
+@click.option('--dry-run', is_flag=True, default=False)
 # See: https://click.palletsprojects.com/en/8.1.x/complex/#building-a-git-clone
 @click.pass_context
 def cli(ctx, quiet, verbose, dry_run):