diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f3c59a64c..426ef14306 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -136,124 +136,32 @@ jobs:
           paths: project/
       - clear_environment:
           cache_key: leo-executable-cache
-#
-#  leo-new:
-#    docker:
-#      - image: cimg/rust:1.62
-#    resource_class: xlarge
-#    steps:
-#      - attach_workspace:
-#          at: /home/circleci/project/
-#      - run:
-#          name: leo new
-#          command: |
-#            export LEO=/home/circleci/project/project/bin/leo
-#            ./project/.circleci/leo-new.sh
-#
-#  leo-init:
-#    docker:
-#      - image: cimg/rust:1.62
-#    resource_class: xlarge
-#    steps:
-#      - attach_workspace:
-#          at: /home/circleci/project/
-#      - run:
-#          name: leo init
-#          command: |
-#            export LEO=/home/circleci/project/project/bin/leo
-#            ./project/.circleci/leo-init.sh
-#
-#  leo-clean:
-#    docker:
-#      - image: cimg/rust:1.62
-#    resource_class: xlarge
-#    steps:
-#      - attach_workspace:
-#          at: /home/circleci/project/
-#      - run:
-#          name: leo clean
-#          command: |
-#            export LEO=/home/circleci/project/project/bin/leo
-#            ./project/.circleci/leo-clean.sh
-#
-#  leo-setup:
-#    docker:
-#      - image: cimg/rust:1.62
-#    resource_class: xlarge
-#    steps:
-#      - attach_workspace:
-#          at: /home/circleci/project/
-#      - run:
-#          name: leo setup
-#          command: |
-#            export LEO=/home/circleci/project/project/bin/leo
-#            ./project/.circleci/leo-setup.sh
 
-  # leo-add-remove:
-  #   docker:
-  #     - image: cimg/rust:1.62
-  #   resource_class: xlarge
-  #   steps:
-  #     - attach_workspace:
-  #         at: /home/circleci/project/
-  #     - run:
-  #         name: leo add & remove
-  #         command: |
-  #           export LEO=/home/circleci/project/project/bin/leo
-  #           ./project/.circleci/leo-add-remove.sh
+  leo-new:
+    docker:
+      - image: cimg/rust:1.62
+    resource_class: xlarge
+    steps:
+      - attach_workspace:
+          at: /home/circleci/project/
+      - run:
+          name: leo new
+          command: |
+            export LEO=/home/circleci/project/project/bin/leo
+            ./project/.circleci/leo-new.sh
 
-# todo (collin): uncomment after compiler refactor
-#  leo-check-constraints:
-#    docker:
-#       - image: cimg/rust:1.62
-#    resource_class: xlarge
-#    steps:
-#      - attach_workspace:
-#          at: /home/circleci/project/
-#      - run:
-#          name: leo check constraints for Pedersen Hash
-#          command: |
-#            export LEO=/home/circleci/project/project/bin/leo
-#            ./project/.circleci/leo-check-constraints.sh
-#
-#  leo-login-logout:
-#    docker:
-#      - image: cimg/rust:1.62
-#    resource_class: xlarge
-#    steps:
-#      - attach_workspace:
-#          at: /home/circleci/project/
-#      - run:
-#          name: leo login & logout
-#          command: |
-#            export LEO=/home/circleci/project/project/bin/leo
-#            ./project/.circleci/leo-login-logout.sh
-#
-#  leo-clone:
-#    docker:
-#      - image: cimg/rust:1.62
-#    resource_class: xlarge
-#    steps:
-#      - attach_workspace:
-#          at: /home/circleci/project/
-#      - run:
-#          name: leo clone
-#          command: |
-#            export LEO=/home/circleci/project/project/bin/leo
-#            ./project/.circleci/leo-clone.sh
-#
-#  leo-publish:
-#    docker:
-#      - image: cimg/rust:1.62
-#    resource_class: xlarge
-#    steps:
-#      - attach_workspace:
-#          at: /home/circleci/project/
-#      - run:
-#          name: leo publish
-#          command: |
-#            export LEO=/home/circleci/project/project/bin/leo
-#            ./project/.circleci/leo-publish.sh
+  leo-clean:
+    docker:
+      - image: cimg/rust:1.62
+    resource_class: xlarge
+    steps:
+      - attach_workspace:
+          at: /home/circleci/project/
+      - run:
+          name: leo clean
+          command: |
+            export LEO=/home/circleci/project/project/bin/leo
+            ./project/.circleci/leo-clean.sh
 
 workflows:
   version: 2
@@ -262,30 +170,9 @@ workflows:
       - check-style
       - clippy
       - leo-executable
-#      - leo-new:
-#          requires:
-#            - leo-executable
-#      - leo-init:
-#          requires:
-#            - leo-executable
-#      - leo-clean:
-#          requires:
-#            - leo-executable
-#      - leo-setup:
-#          requires:
-#            - leo-executable
-#       - leo-add-remove:
-#           requires:
-#             - leo-executable
-#      - leo-check-constraints:
-#          requires:
-#            - leo-executable
-#      - leo-login-logout:
-#          requires:
-#            - leo-executable
-#      - leo-clone:
-#          requires:
-#            - leo-executable
-#      - leo-publish:
-#          requires:
-#            - leo-executable
+      - leo-new:
+          requires:
+            - leo-executable
+      - leo-clean:
+          requires:
+            - leo-executable
diff --git a/.circleci/leo-clean.sh b/.circleci/leo-clean.sh
index 8448ae24c2..d2ede6a74d 100755
--- a/.circleci/leo-clean.sh
+++ b/.circleci/leo-clean.sh
@@ -1,38 +1,23 @@
-# leo new hello-world
-
-$LEO new hello-world
+# Create a new Leo program named `foo`.
+$LEO new foo
 ls -la
-cd hello-world && ls -la
+cd foo && ls -la
+
+# Run `leo build`.
 $LEO build
 
-# Assert that the 'outputs' folder is not empty
-
-cd outputs || exit 1
-if [ "$(ls -A $DIR)" ]; then
-  echo "$DIR is not empty"
+# Assert that the 'build' folder exists.
+if [ "$(ls -A build)" ]; then
+  echo "build is not empty"
 else
-  echo "$DIR is empty"
+  echo "build is empty"
   exit 1
 fi
-cd ..
-
-# leo clean
 
+# Run `leo clean`
 $LEO clean
-cd outputs && ls -la
-cd ..
-
-# Assert that the 'outputs' folder is empty
-
-if [ "$(ls -A outputs)" ]; then
-  echo "outputs is not empty"
-  exit 1
-else
-  echo "outputs is empty"
-fi
-
-# Assert that the 'build' folder is empty
 
+# Assert that the 'build' folder is empty.
 if [ "$(ls -A build)" ]; then
   echo "build is not empty"
   exit 1
diff --git a/.circleci/leo-new.sh b/.circleci/leo-new.sh
index 46d4e3790b..02a0c32f1a 100755
--- a/.circleci/leo-new.sh
+++ b/.circleci/leo-new.sh
@@ -1,7 +1,7 @@
-# Create a new foo project.
+# Create a new Leo program named `foo`.
 $LEO new foo
 ls -la
 cd foo && ls -la
 
-# Try to compile and run the template project.
+# Try to run `leo build`.
 $LEO run