diff --git a/home.admin/BBcreateInvoice.sh b/home.admin/BBcreateInvoice.sh
index a291bf1a7..f6c63427a 100755
--- a/home.admin/BBcreateInvoice.sh
+++ b/home.admin/BBcreateInvoice.sh
@@ -14,9 +14,30 @@ if [ ${#chain} -eq 0 ]; then
   chain=$(${network}-cli getblockchaininfo | jq -r '.chain')
 fi
 
-# Check if ready (chain in sync and channels open)
-./XXchainInSync.sh $network $chain
-if [ $? != 0 ]; then
+# check if chain is in sync
+cmdChainInSync="lncli --chain=${network} --network=${chain}net getinfo | grep '"synced_to_chain": true' -c"
+chainInSync=${cmdChainInSync}
+while [ "${chainInSync}" == "0" ]; do
+  dialog --title "Fail: not in sync" \
+	 --ok-label "Try now" \
+	 --cancel-label "Give up" \
+	 --pause "\n\n'lncli getinfo' shows 'synced_to_chain': false\n\nTry again in a few seconds." 15 60 5
+  
+  if [ $? -gt 0 ]; then
+      exit 1
+  fi
+  chainInSync=${cmdChainInSync}
+done
+
+# check number of connected peers
+echo "check for open channels"
+openChannels=$(sudo -u bitcoin /usr/local/bin/lncli --chain=${network} --network=${chain}net listchannels 2>/dev/null | grep chan_id -c)
+if [ ${openChannels} -eq 0 ]; then
+  echo ""
+  echo "!!!!!!!!!!!!!!!!!!!"
+  echo "FAIL - You have NO ESTABLISHED CHANNELS .. open a channel first."
+  echo "!!!!!!!!!!!!!!!!!!!"
+  echo ""
   exit 1
 fi
 
diff --git a/home.admin/BBpayInvoice.sh b/home.admin/BBpayInvoice.sh
index aafcc8418..59fb8c3b0 100755
--- a/home.admin/BBpayInvoice.sh
+++ b/home.admin/BBpayInvoice.sh
@@ -14,10 +14,31 @@ if [ ${#chain} -eq 0 ]; then
   chain=$(${network}-cli getblockchaininfo | jq -r '.chain')
 fi
 
-# Check if ready (chain in sync and channels open)
-./XXchainInSync.sh $network $chain
-if [ $? != 0 ]; then
-    exit 1
+# check if chain is in sync
+cmdChainInSync="lncli --chain=${network} --network=${chain}net getinfo | grep '"synced_to_chain": true' -c"
+chainInSync=${cmdChainInSync}
+while [ "${chainInSync}" == "0" ]; do
+  dialog --title "Fail: not in sync" \
+	 --ok-label "Try now" \
+	 --cancel-label "Give up" \
+	 --pause "\n\n'lncli getinfo' shows 'synced_to_chain': false\n\nTry again in a few seconds." 15 60 5
+  
+  if [ $? -gt 0 ]; then
+      exit 1
+  fi
+  chainInSync=${cmdChainInSync}
+done
+
+# check number of connected peers
+echo "check for open channels"
+openChannels=$(sudo -u bitcoin /usr/local/bin/lncli --chain=${network} --network=${chain}net listchannels 2>/dev/null | grep chan_id -c)
+if [ ${openChannels} -eq 0 ]; then
+  echo ""
+  echo "!!!!!!!!!!!!!!!!!!!"
+  echo "FAIL - You have NO ESTABLISHED CHANNELS .. open a channel first."
+  echo "!!!!!!!!!!!!!!!!!!!"
+  echo ""
+  exit 1
 fi
 
 paymentRequestStart="???"
diff --git a/home.admin/XXchainInSync.sh b/home.admin/XXchainInSync.sh
deleted file mode 100755
index 9e102072e..000000000
--- a/home.admin/XXchainInSync.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# Check if lnd is synced to chain and channels are open
-# If it isn't, wait until it is
-# exits with 1 if it isn't.
-
-network=$1
-chain=$2
-
-# check if chain is in sync
-cmdChainInSync="lncli --chain=${network} --network=${chain}net getinfo | grep '"synced_to_chain": true' -c"
-chainInSync=${cmdChainInSync}
-while [ "${chainInSync}" == "0" ]; do
-  dialog --title "Fail: not in sync" \
-	 --ok-label "Try now" \
-	 --cancel-label "Give up" \
-	 --pause "\n\n'lncli getinfo' shows 'synced_to_chain': false\n\nTry again in a few seconds." 15 60 5
-  
-  if [ $? -gt 0 ]; then
-      exit 1
-  fi
-  chainInSync=${cmdChainInSync}
-done
-
-# check number of connected peers
-echo "check for open channels"
-openChannels=$(sudo -u bitcoin /usr/local/bin/lncli --chain=${network} --network=${chain}net listchannels 2>/dev/null | grep chan_id -c)
-if [ ${openChannels} -eq 0 ]; then
-  echo ""
-  echo "!!!!!!!!!!!!!!!!!!!"
-  echo "FAIL - You have NO ESTABLISHED CHANNELS .. open a channel first."
-  echo "!!!!!!!!!!!!!!!!!!!"
-  echo ""
-  exit 1
-fi
-
-exit 0