diff --git a/Cassiopee/Apps/install b/Cassiopee/Apps/install
index 3e1beefbe..83388b1fc 100755
--- a/Cassiopee/Apps/install
+++ b/Cassiopee/Apps/install
@@ -23,33 +23,29 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
 
 # Compilation et installation
-if [ $PRODMODE -eq 0 ]; then
+if [ $PRODMODE -eq 0 ]; then # setup
     python setup.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
-elif [ $PRODMODE -eq 1 ]; then
+elif [ $PRODMODE -eq 1 ]; then # pip
+    python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+    [ $? != 0 ] && exit 1;
+elif [ $PRODMODE -eq 2 ]; then # pip+wheel
+    # wheels in $INSTALLPATH
     TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Check installation
 python test/t1.py
diff --git a/Cassiopee/CPlot/install b/Cassiopee/CPlot/install
index 52f684bb3..39cb57ef3 100755
--- a/Cassiopee/CPlot/install
+++ b/Cassiopee/CPlot/install
@@ -23,16 +23,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -60,11 +57,13 @@ if [ $PRODMODE -le 1 ]; then
     rm -f build/lib.*/CPlot/cplot-*.*
     rm -f build/lib.*/CPlot/cplotOSMesa.*
     rm -f build/lib.*/CPlot/cplotOSMesa-*.*
-
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 0 ] && exit 1;
     fi
@@ -73,11 +72,6 @@ else
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 cp test/cplot "$INSTALLPATH"
 cp test/cplot.py "$INSTALLPATH"
 # Copie les applications
diff --git a/Cassiopee/Compressor/install b/Cassiopee/Compressor/install
index bee17a050..af6b0b760 100755
--- a/Cassiopee/Compressor/install
+++ b/Cassiopee/Compressor/install
@@ -22,16 +22,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -63,7 +60,10 @@ if [ $PRODMODE -le 1 ]; then
     if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then # pip+wheel
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 0 ] && exit 1;
     fi
@@ -72,10 +72,5 @@ else
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Test l'installation
 python test/t1.py
diff --git a/Cassiopee/Connector/install b/Cassiopee/Connector/install
index 99e790802..a8db417ab 100755
--- a/Cassiopee/Connector/install
+++ b/Cassiopee/Connector/install
@@ -25,16 +25,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -61,23 +58,21 @@ if [ $PRODMODE -le 1 ]; then
     #touch Connector/connector.cpp
     rm -f build/lib.*/Connector/connector.*
     rm -f build/lib.*/Connector/connector-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then # pip+wheel
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
-        [ $? != 0 ] && exit 1; 
+        [ $? != 0 ] && exit 1;
     fi
 else
     python setupLegacy.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Install libconnector
 python installLib.py
 
diff --git a/Cassiopee/Converter/install b/Cassiopee/Converter/install
index 7b6a3e283..cab745c33 100755
--- a/Cassiopee/Converter/install
+++ b/Cassiopee/Converter/install
@@ -25,16 +25,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -61,10 +58,13 @@ if [ $PRODMODE -le 1 ]; then
     rm -f build/lib.*/Converter/converter.*
     rm -f build/lib.*/Converter/converter-*.*
     rm -f build/lib.*/Converter/expression.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 0 ] && exit 1;
     fi
@@ -73,11 +73,6 @@ else
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 cp test/ediff "$INSTALLPATH"
 cp test/ediff.py "$INSTALLPATH"
 cp Converter/kpython "$INSTALLPATH"
diff --git a/Cassiopee/Dist2Walls/install b/Cassiopee/Dist2Walls/install
index dedafc1a0..cc718056e 100755
--- a/Cassiopee/Dist2Walls/install
+++ b/Cassiopee/Dist2Walls/install
@@ -23,16 +23,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -58,10 +55,13 @@ if [ $PRODMODE -le 1 ]; then
     #touch Dist2Walls/dist2walls.cpp
     rm -f build/lib.*/Dist2Walls/dist2walls.*
     rm -f build/lib.*/Dist2Walls/dist2walls-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 0 ] && exit 1;
     fi
@@ -70,10 +70,5 @@ else
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Test l'installation
 python test/t1.py
diff --git a/Cassiopee/Distributor2/install b/Cassiopee/Distributor2/install
index 903416958..a6b4e5326 100755
--- a/Cassiopee/Distributor2/install
+++ b/Cassiopee/Distributor2/install
@@ -26,16 +26,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -61,10 +58,13 @@ if [ $PRODMODE -le 2 ]; then
     #touch Distributor2/distributor2.cpp
     rm -f build/lib.*/Distributor2/distributor2.*
     rm -f build/lib.*/Distributor2/distributor2-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 0 ] && exit 1;
     fi
@@ -73,10 +73,5 @@ else
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Test installation
 python test/t1.py
diff --git a/Cassiopee/Envs/env_Cassiopee_local b/Cassiopee/Envs/env_Cassiopee_local
index 763a68785..4a375be0a 100644
--- a/Cassiopee/Envs/env_Cassiopee_local
+++ b/Cassiopee/Envs/env_Cassiopee_local
@@ -70,7 +70,6 @@ else
 endif
 set EXT=$INTTYPE$DBGMODE
 
-set CLEAN_WHEELS_CASSIOPEE=1
 
 # ----------------------------- Prods ------------------------------------------
 
diff --git a/Cassiopee/Envs/sh_Cassiopee_local b/Cassiopee/Envs/sh_Cassiopee_local
index 46ea8ec6c..428b0fa7b 100644
--- a/Cassiopee/Envs/sh_Cassiopee_local
+++ b/Cassiopee/Envs/sh_Cassiopee_local
@@ -76,7 +76,6 @@ case $MACHINETMP in
 esac
 unset MACHINETMP
 EXT=$INTTYPE$DBGMODE
-export CLEAN_WHEELS_CASSIOPEE=1
 
 # ----------------------------- Prods ------------------------------------------
 if [ "$MAC" = "ld_eos8" ]; then
@@ -165,9 +164,8 @@ elif [ "$MAC" = "azure" ]; then
     export ELSAPROD=$ELSAPROD$EXT
     export OMP_NUM_THREADS=4
     export PYTHONEXE=python3
-    export PRODMODE=1
+    export PRODMODE=2
     export PIP_DISABLE_PIP_VERSION_CHECK=1
-    export CLEAN_WHEELS_CASSIOPEE=0
 
 elif [ "$MAC" = "visio" ]; then
 #----------------------------- visio -----------------------------------------
diff --git a/Cassiopee/Generator/install b/Cassiopee/Generator/install
index 6fc67c1da..a0c02b05c 100755
--- a/Cassiopee/Generator/install
+++ b/Cassiopee/Generator/install
@@ -25,16 +25,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -60,23 +57,21 @@ if [ $PRODMODE -le 1 ]; then
     #touch Generator/generator.cpp
     rm -f build/lib.*/Generator/generator.*
     rm -f build/lib.*/Generator/generator-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
-        [ $? != 0 ] && exit 1;    
+        [ $? != 0 ] && exit 1;
     fi
 else
     python setupLegacy.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Install libgenerator
 python installLib.py
 
diff --git a/Cassiopee/Geom/install b/Cassiopee/Geom/install
index acddb4fb7..ff6e2820b 100755
--- a/Cassiopee/Geom/install
+++ b/Cassiopee/Geom/install
@@ -26,16 +26,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -61,22 +58,20 @@ if [ $PRODMODE -le 1 ]; then
     #touch Geom/geom.cpp
     rm -f build/lib.*/Geom/geom.*
     rm -f build/lib.*/Geom/geom-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
-        [ $? != 0 ] && exit 1;    
+        [ $? != 0 ] && exit 1;
     fi
 else
     python setupLegacy.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Test l'installation
 python test/t1.py
diff --git a/Cassiopee/Initiator/install b/Cassiopee/Initiator/install
index 19c30cc02..c54a8f254 100755
--- a/Cassiopee/Initiator/install
+++ b/Cassiopee/Initiator/install
@@ -26,16 +26,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -61,10 +58,13 @@ if [ $PRODMODE -le 1 ]; then
     #touch Initiator/initiator.cpp
     rm -f build/lib.*/Initiator/initiator.*
     rm -f build/lib.*/Initiator/initiator-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 0 ] && exit 1;
     fi
@@ -73,10 +73,5 @@ else
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Test installation
 python test/t1.py
diff --git a/Cassiopee/Intersector/install b/Cassiopee/Intersector/install
index 02ba3e160..01dca21f6 100755
--- a/Cassiopee/Intersector/install
+++ b/Cassiopee/Intersector/install
@@ -26,16 +26,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -61,22 +58,20 @@ if [ $PRODMODE -le 1 ]; then
     #touch Intersector/intersector.cpp
     rm -f build/lib.*/Intersector/intersector.*
     rm -f build/lib.*/Intersector/intersector-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
-        [ $? != 0 ] && exit 1;    
+        [ $? != 0 ] && exit 1;
     fi
 else
     python setupLegacy.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Test l'installation
 python test/t1.py
diff --git a/Cassiopee/KCore/install b/Cassiopee/KCore/install
index d2fabdada..3e8c3e3e4 100755
--- a/Cassiopee/KCore/install
+++ b/Cassiopee/KCore/install
@@ -29,16 +29,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -69,7 +66,10 @@ if [ $PRODMODE -le 1 ]; then
     if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then # pip+wheel
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
         [ $? != 0 ] && exit 1;
     fi
@@ -78,11 +78,6 @@ else
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Install libkcore
 python installLib.py
 
diff --git a/Cassiopee/Modeler/install b/Cassiopee/Modeler/install
index da40a1a9c..5bc2f7d16 100755
--- a/Cassiopee/Modeler/install
+++ b/Cassiopee/Modeler/install
@@ -23,33 +23,28 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
 
 # Compilation et installation
-if [ $PRODMODE -eq 0 ] || [ $PRODMODE -eq 2 ]; then
+if [ $PRODMODE -eq 0 ]; then # setup
     python setup.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
-elif [ $PRODMODE -eq 1 ]; then
+elif [ $PRODMODE -eq 1 ]; then # pip
+    python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+    [ $? != 0 ] && exit 1;
+elif [ $PRODMODE -eq 2 ]; then # pip+wheel
     TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Check installation
 python test/t1.py
diff --git a/Cassiopee/OCC/install b/Cassiopee/OCC/install
index 64ad595cb..c3020c72b 100755
--- a/Cassiopee/OCC/install
+++ b/Cassiopee/OCC/install
@@ -23,16 +23,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -64,23 +61,21 @@ if [ $PRODMODE -le 1 ]; then
     #touch OCC/occ.cpp
     rm -f build/lib.*/OCC/occ.*
     rm -f build/lib.*/OCC/occ-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
-        [ $? != 0 ] && exit 1;    
+        [ $? != 0 ] && exit 1;
     fi
 else
     python setupLegacy.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # remove
 cd OCC
 #rm -fr occ_inc
diff --git a/Cassiopee/Post/install b/Cassiopee/Post/install
index 9079f876c..6ef6bdafc 100755
--- a/Cassiopee/Post/install
+++ b/Cassiopee/Post/install
@@ -25,16 +25,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -62,22 +59,20 @@ if [ $PRODMODE -le 1 ]; then
     #touch Post/post.cpp
     rm -f build/lib.*/Post/post.*
     rm -f build/lib.*/Post/post-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
-        [ $? != 0 ] && exit 1;    
+        [ $? != 0 ] && exit 1;
     fi
 else
     python setupLegacy.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Test de l'installation
 python test/t1.py
diff --git a/Cassiopee/RigidMotion/install b/Cassiopee/RigidMotion/install
index da8eb794a..7675ce80d 100755
--- a/Cassiopee/RigidMotion/install
+++ b/Cassiopee/RigidMotion/install
@@ -23,16 +23,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -58,22 +55,20 @@ if [ $PRODMODE -le 1 ]; then
     #touch RigidMotion/rigidMotion.cpp
     rm -f build/lib.*/RigidMotion/rigidMotion.*
     rm -f build/lib.*/RigidMotion/rigidMotion-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
-        [ $? != 0 ] && exit 1;    
+        [ $? != 0 ] && exit 1;
     fi
 else
     python setupLegacy.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Test l'installation
 python test/t1.py
diff --git a/Cassiopee/Template/install b/Cassiopee/Template/install
index 40e60b57a..c5fce0977 100755
--- a/Cassiopee/Template/install
+++ b/Cassiopee/Template/install
@@ -23,16 +23,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -58,22 +55,20 @@ if [ $PRODMODE -le 0 ]; then
     #touch Template/template.cpp
     rm -f build/lib.*/Template/template.*
     rm -f build/lib.*/Template/template-.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
-        [ $? != 0 ] && exit 1;    
+        [ $? != 0 ] && exit 1;
     fi
 else
     python setupLegacy.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Check installation
 python test/t1.py
diff --git a/Cassiopee/Transform/install b/Cassiopee/Transform/install
index a78cffe57..2f7714289 100755
--- a/Cassiopee/Transform/install
+++ b/Cassiopee/Transform/install
@@ -25,16 +25,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -60,22 +57,20 @@ if [ $PRODMODE -le 1 ]; then
     #touch Transform/transform.cpp
     rm -f build/lib.*/Transform/transform.*
     rm -f build/lib.*/Transform/transform-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
-        [ $? != 0 ] && exit 1;   
+        [ $? != 0 ] && exit 1;
     fi
 else
     python setupLegacy.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Test de l'installation
 python test/t1.py
diff --git a/Cassiopee/XCore/install b/Cassiopee/XCore/install
index e18cf9032..54c1907d7 100755
--- a/Cassiopee/XCore/install
+++ b/Cassiopee/XCore/install
@@ -28,16 +28,13 @@ else
     echo 'install <dir>: install in directory <dir>.'
     exit 1
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # if specific python exe name
 if [ "$PYTHONEXE" != "" ]; then
     alias python=$PYTHONEXE
 fi
 
-# set production mode (0: scons+setup, 1: scons+pip, 2: setup legacy)
+# set production mode (0: scons+setup, 1: scons+pip, 2: scons+pip+wheel)
 if [ "$PRODMODE" = "" ]; then
     PRODMODE=0
 fi
@@ -66,23 +63,21 @@ if [ $PRODMODE -le 1 ]; then
     #touch KCore/xcore.cpp
     rm -f build/lib.*/XCore/xcore.*
     rm -f build/lib.*/XCore/xcore-*.*
-    if [ $PRODMODE -eq 0 ]; then
+    if [ $PRODMODE -eq 0 ]; then # setup
         python setup.py install --prefix="$INSTALLPATH"
         [ $? != 0 ] && exit 1;
-    elif [ $PRODMODE -eq 1 ]; then
+    elif [ $PRODMODE -eq 1 ]; then # pip
+        python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" .
+        [ $? != 0 ] && exit 1;
+    elif [ $PRODMODE -eq 2 ]; then # pip+wheel
         TMPDIR=$INSTALLPATH python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" --no-clean .
-        [ $? != 0 ] && exit 1;    
+        [ $? != 0 ] && exit 1;
     fi
 else
     python setupLegacy.py install --prefix="$INSTALLPATH"
     [ $? != 0 ] && exit 1;
 fi
 
-# Clean temporary folder containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi
-
 # Install libxcore
 python installLib.py
 
diff --git a/Cassiopee/install b/Cassiopee/install
index 4c8c29e0f..01fdc9f7f 100755
--- a/Cassiopee/install
+++ b/Cassiopee/install
@@ -51,9 +51,6 @@ if [ "$ELSAPROD" = "" ]; then
     echo "This variable identifies the processor type."
     usage
 fi
-if [ -z "${CLEAN_WHEELS_CASSIOPEE+x}" ]; then
-    CLEAN_WHEELS_CASSIOPEE=1
-fi
 
 # Set install path and load module names
 INSTALLPATH="$CASSIOPEE/Dist/bin/$ELSAPROD"
@@ -96,8 +93,3 @@ fi
 # Copy environment scripts
 cp Envs/env_Cassiopee* "$CASSIOPEE"/Dist
 cp Envs/sh_Cassiopee*  "$CASSIOPEE"/Dist
-
-# Clean temporary folders containing wheels
-if [ "$CLEAN_WHEELS_CASSIOPEE" -eq 1 ]; then
-    rm -rf "$INSTALLPATH"/pip-*
-fi