diff --git a/bsx-addcoin b/bsx-addcoin
index 7fb16b8..4a296d3 100755
--- a/bsx-addcoin
+++ b/bsx-addcoin
@@ -42,5 +42,5 @@ read -p 'Select an option [1|2]: ' l
         esac
 done
 
-. $SWAP_DATADIR/venv/bin/activate && python -V
+. $SWAP_DATADIR/venv/bin/activate
 $HOME/.local/bin/bsx/addcoin.sh
diff --git a/bsx-disabletor b/bsx-disabletor
index d1bd38f..92a5613 100755
--- a/bsx-disabletor
+++ b/bsx-disabletor
@@ -42,5 +42,5 @@ read -p 'Select an option [1|2]: ' l
         esac
 done
 
-. $SWAP_DATADIR/venv/bin/activate && python -V
+. $SWAP_DATADIR/venv/bin/activate
 $HOME/.local/bin/bsx/disabletor.sh
diff --git a/bsx-enabletor b/bsx-enabletor
index 7622993..c8ae1d4 100755
--- a/bsx-enabletor
+++ b/bsx-enabletor
@@ -42,5 +42,5 @@ read -p 'Select an option [1|2]: ' l
         esac
 done
 
-. $SWAP_DATADIR/venv/bin/activate && python -V
+. $SWAP_DATADIR/venv/bin/activate
 $HOME/.local/bin/bsx/enabletor.sh
diff --git a/bsx-removecoin b/bsx-removecoin
index 2e871d9..f0225d5 100755
--- a/bsx-removecoin
+++ b/bsx-removecoin
@@ -42,5 +42,5 @@ read -p 'Select an option [1|2]: ' l
         esac
 done
 
-. $SWAP_DATADIR/venv/bin/activate && python -V
+. $SWAP_DATADIR/venv/bin/activate
 $HOME/.local/bin/bsx/removecoin.sh
diff --git a/bsx-update b/bsx-update
index 056a19d..c7b8482 100755
--- a/bsx-update
+++ b/bsx-update
@@ -18,7 +18,7 @@ if [[ -f $SWAP_DATADIR/particl/particl.pid ]]; then
     fi
 fi
 
-. $SWAP_DATADIR/venv/bin/activate && python -V
+. $SWAP_DATADIR/venv/bin/activate
 
 if [ -f /usr/local/bin/bsx/update.sh ]; then
 	/usr/local/bin/bsx/update.sh
diff --git a/bsx/setup.sh b/bsx/setup.sh
index 6060e10..da78efa 100755
--- a/bsx/setup.sh
+++ b/bsx/setup.sh
@@ -5,22 +5,18 @@ red="echo -e -n \e[31;1m"
 green="echo -e -n \e[32;1m"
 nocolor="echo -e -n \e[0m"
 
-## Download & Install coincurve stuff
-cd $SWAP_DATADIR
-git clone https://github.com/basicswap/coincurve -b basicswap_v0.2 coincurve-basicswap
-cd $SWAP_DATADIR/coincurve-basicswap
-$SWAP_DATADIR/venv/bin/pip install .
-
 ## Clone basicswap git
 cd $SWAP_DATADIR
 git clone https://github.com/basicswap/basicswap
 cd $SWAP_DATADIR/basicswap
+
 ## Macos
 if [[ $MACOS ]]; then
     $SWAP_DATADIR/venv/bin/pip install certifi
 fi
-## Install basicswap
-$SWAP_DATADIR/venv/bin/pip install wheel
+
+## Install basicswap, coincurve, and pip dependencies
+$SWAP_DATADIR/venv/bin/pip install -r requirements.txt --require-hashes
 $SWAP_DATADIR/venv/bin/pip install .
 
 ## Decide a source for Monero's restore height
diff --git a/bsx/update.sh b/bsx/update.sh
index 8c0a4dd..eba8153 100755
--- a/bsx/update.sh
+++ b/bsx/update.sh
@@ -5,18 +5,7 @@ echo "Updating BasicSwapDEX" && sleep 1
 # Delete dangling build folder. Same as --no-cache for docker
 rm -rf $SWAP_DATADIR/basicswap/build
 
-# Coincurve
-cd $SWAP_DATADIR
-if [[ -d coincurve-basicswap ]]; then
-    cd coincurve-basicswap
-    git fetch
-    git checkout basicswap_v$COINCURVE
-else
-    git clone https://github.com/basicswap/coincurve -b basicswap_v$COINCURVE coincurve-basicswap && cd $_
-fi
-$SWAP_DATADIR/venv/bin/pip install .
-
-# BasicSwap
+# BasicSwap, coincurve, and dependencies
 # Switch to new repo: basicswap/basicswap
 cd $SWAP_DATADIR/basicswap
 git remote set-url origin https://github.com/basicswap/basicswap
@@ -24,6 +13,7 @@ git remote set-url origin https://github.com/basicswap/basicswap
 git pull
 
 # Update BasicSwap
+$SWAP_DATADIR/venv/bin/pip install -r requirements.txt --require-hashes
 $SWAP_DATADIR/venv/bin/pip install .
 
 # Update Coin Cores
diff --git a/install.sh b/install.sh
index 2231023..7d2f220 100755
--- a/install.sh
+++ b/install.sh
@@ -50,7 +50,7 @@ detect_os_arch() {
         # Debian / Ubuntu / Mint
         INSTALL="sudo apt install"
         UPDATE="sudo apt update"
-        DEPENDENCY="python-is-python3 python3-pip python3-venv gnupg pkg-config"
+        DEPENDENCY="python3-pip python3-venv gnupg pkg-config"
     elif type -P dnf > /dev/null; then
         # Fedora
         INSTALL="sudo dnf install"