diff --git a/.github/workflows/binary_artifact.yml b/.github/workflows/binary_artifact.yml
index 6c81c4c710..731249ccc3 100644
--- a/.github/workflows/binary_artifact.yml
+++ b/.github/workflows/binary_artifact.yml
@@ -17,15 +17,17 @@ jobs:
       - uses: actions/checkout@v1
       - name: Compile
         run: |
-          make -j4
-          ./v -cc $CC -prod -o v cmd/v
-          ./v -cc $CC -prod cmd/tools/vup.v
-          ./v -cc $CC -prod cmd/tools/vdoctor.v
+          make
+          ./v -skip-unused -cc $CC -prod -o v cmd/v
+          ./v -skip-unused -cc $CC -prod cmd/tools/vup.v
+          ./v -skip-unused -cc $CC -prod cmd/tools/vdoctor.v
       - name: Remove excluded
         run: |
-           rm -rf .git
+           rm -rf .git/
+           rm -rf thirdparty/tcc/.git/
            rm -rf vc/
            rm -rf v_old
+           rm -rf vlib/v/tests/bench/gcboehm/*.svg
       - name: Create ZIP archive
         run: |
            cd ..
@@ -47,15 +49,17 @@ jobs:
       - uses: actions/checkout@v1
       - name: Compile
         run: |
-          make -j4
-          ./v -cc $CC -prod -o v cmd/v
-          ./v -cc $CC -prod cmd/tools/vup.v
-          ./v -cc $CC -prod cmd/tools/vdoctor.v
+          make
+          ./v -skip-unused -cc $CC -prod -o v cmd/v
+          ./v -skip-unused -cc $CC -prod cmd/tools/vup.v
+          ./v -skip-unused -cc $CC -prod cmd/tools/vdoctor.v
       - name: Remove excluded
         run: |
-           rm -rf .git
+           rm -rf .git/
+           rm -rf thirdparty/tcc/.git/
            rm -rf vc/
            rm -rf v_old
+           rm -rf vlib/v/tests/bench/gcboehm/*.svg
       - name: Create ZIP archive
         run: |
            cd ..
@@ -76,17 +80,22 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - uses: msys2/setup-msys2@v2
-      - name: Compile
+      - name: Compile needed executables with -prod
         run: |
-          .\make.bat -tcc
-          .\v.exe cmd\tools\vup.v
-          .\v.exe cmd\tools\vdoctor.v
+          .\make.bat -msvc
+          .\v.exe -skip-unused -prod -cc msvc -o cmd/vprod.exe cmd/v
+          del *.exe
+          move /y cmd\vprod.exe v.exe
+          .\v.exe -skip-unused -prod -cc msvc cmd\tools\vup.v
+          .\v.exe -skip-unused -prod -cc msvc cmd\tools\vdoctor.v
       - name: Remove excluded
         shell: msys2 {0}
         run: |
-           rm -rf .git
+           rm -rf .git/
+           rm -rf thirdparty/tcc/.git/
            rm -rf vc/
            rm -rf v_old.exe
+           rm -rf vlib/v/tests/bench/gcboehm/*.svg
       - name: Create archive
         shell: msys2 {0}
         run: |
diff --git a/.github/workflows/linux_ci.yml b/.github/workflows/linux_ci.yml
index 99507038ee..24e5dc593a 100644
--- a/.github/workflows/linux_ci.yml
+++ b/.github/workflows/linux_ci.yml
@@ -52,8 +52,7 @@ jobs:
       - name: v self compilation with -skip-unused
         run: ./v -skip-unused -o v2 cmd/v && ./v2 -skip-unused -o v3 cmd/v && ./v3 -skip-unused -o v4 cmd/v
       - name: v doctor
-        run: |
-          ./v doctor
+        run: ./v doctor
       - name: Verify `v test` works
         run: |
           echo $VFLAGS
@@ -104,7 +103,6 @@ jobs:
           ./v examples/readline/readline_ci.v
           ./v examples/readline/readline.vsh
 
-
   ubuntu-tcc-boehm-gc:
     runs-on: ubuntu-20.04
     if: github.event_name != 'push' || github.event.ref == 'refs/heads/master' || github.event.repository.full_name != 'vlang/v'
@@ -256,6 +254,11 @@ jobs:
           ../../vprod -backend native -o 1m 1m.v
           echo "Running it..."
           ls
+      - name: compile vdoctor.v with -skip-unused and -prod
+        run: ./v -showcc -skip-unused -cc gcc -prod cmd/tools/vdoctor.v
+      - name: compile vup.v with -skip-unused and -prod
+        run: ./v -showcc -skip-unused -cc gcc -prod cmd/tools/vup.v
+
 
   #        ./1m
   # run: echo "TODO" #cd examples/native && ../../v -native hello_world.v && ./hello_world
diff --git a/.github/workflows/windows_ci.yml b/.github/workflows/windows_ci.yml
index 0ede2f539d..d9651f8f06 100644
--- a/.github/workflows/windows_ci.yml
+++ b/.github/workflows/windows_ci.yml
@@ -75,7 +75,11 @@ jobs:
       - name: Build examples
         run: ./v build-examples
       - name: v2 self compilation
-        run: .\v.exe -o v2.exe cmd/v && .\v2.exe -o v3.exe cmd/v
+        run: ./v -o v2.exe cmd/v && .\v2.exe -o v3.exe cmd/v
+      - name: compile vdoctor.v with -skip-unused and -prod
+        run: ./v -showcc -skip-unused -prod cmd/tools/vdoctor.v
+      - name: compile vup.v with -skip-unused and -prod
+        run: ./v -showcc -skip-unused -prod cmd/tools/vup.v
 
   windows-msvc:
     runs-on: windows-2019