diff --git a/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh b/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh
index f82ae1b..43173bb 100644
--- a/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh
+++ b/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh
@@ -121,8 +121,6 @@ checklnnode() {
 }
 
 checkservice() {
-  echo -e "\r\n\e[1;36mTesting if Cyphernode is up and running... \e[0;36mI will keep trying during up to 5 minutes to give time to Docker to deploy everything...\e[0;32m" > /dev/console
-
   local interval=10
   local totaltime=120
   local outcome
@@ -130,6 +128,8 @@ checkservice() {
   local endtime=$(($(date +%s) + ${totaltime}))
   local result
 
+  echo -e "\r\n\e[1;36mTesting if Cyphernode is up and running... \e[0;36mI will keep trying during up to $((${totaltime} / 60)) minutes to give time to Docker to deploy everything...\e[0;32m" > /dev/console
+
   while :
   do
     outcome=0
@@ -183,7 +183,7 @@ timeout_feature() {
   local totaltime=60
   local testwhat=${1}
   local returncode
-  local endtime=$(($(date +%s) + 120))
+  local endtime=$(($(date +%s) + ${totaltime}))
 
   while :
   do
diff --git a/proxy_docker/app/script/requesthandler.sh b/proxy_docker/app/script/requesthandler.sh
index 4be59ed..433ffba 100644
--- a/proxy_docker/app/script/requesthandler.sh
+++ b/proxy_docker/app/script/requesthandler.sh
@@ -18,7 +18,6 @@
 . ./bitcoin.sh
 . ./call_lightningd.sh
 . ./ots.sh
-. ./statuspage.sh
 
 main()
 {