diff --git a/bin/generate-genesis-block.sh b/bin/generate-genesis-block.sh
deleted file mode 100755
index a5f3442861708e4dc677c3959417196c19d9bec8..0000000000000000000000000000000000000000
--- a/bin/generate-genesis-block.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash -x
-# Robert Martin-Legene <robert@nic.ar>
-
-if [ -z "${BFAHOME}" ]; then echo "\$BFAHOME not set. Did you source bfa/bin/env ?" >&2; exit 1; fi
-source ${BFAHOME}/bin/libbfa.sh || exit 1
-
-if [ -d "${BFANODEDIR}/geth/chaindata" ]
-then
-    mkdir -p "${BFANODEDIR}"
-    echo "Node is not initialised. Initialising with genesis."
-    geth --config "${BFANETWORKDIR}/config.toml" --cache 0 init "${BFANETWORKDIR}/genesis.json"
-fi
diff --git a/bin/libbfa.sh b/bin/libbfa.sh
index 2490830c885356cc8d41d905e81b5590c0e08adf..9e4ed5e85598e8e209608d7b271965995863cbcc 100644
--- a/bin/libbfa.sh
+++ b/bin/libbfa.sh
@@ -192,8 +192,13 @@ function bfainit
             echo "Unknown socket type. Supported types are http, ws, ipc" >&2
             exit 1
     esac
-    #
-    generate-genesis-block.sh
+    # Init the blockchain with the genesis block
+    if [ -d "${BFANODEDIR}/geth/chaindata" ]
+    then
+        mkdir -p "${BFANODEDIR}"
+        echo "Node is not initialised. Initialising with genesis."
+        geth --config "${BFANETWORKDIR}/config.toml" --cache 0 init "${BFANETWORKDIR}/genesis.json"
+    fi
 }
 
 if [ -z "$SOURCED_BFAINIT_SH" ]