diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index d4b5b50..fa29492 100644
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -15,15 +15,6 @@
 // voltha-2.x e2e tests
 // uses bbsim to simulate OLT/ONUs
 
-// TODO remove this and load the keywords as global
-library identifier: 'cord-jenkins-libraries@master',
-    //'master' refers to a valid git-ref
-    //'mylibraryname' can be any name you like
-    retriever: modernSCM([
-      $class: 'GitSCMSource',
-      remote: 'https://gerrit.opencord.org/ci-management.git'
-])
-
 def customImageFlags(image) {
   return "--set images.${image}.tag=citest,images.${image}.pullPolicy=Never "
 }
@@ -105,7 +96,7 @@
     label "${params.buildNode}"
   }
   options {
-    timeout(time: 90, unit: 'MINUTES')
+    timeout(time: 30, unit: 'MINUTES')
   }
   environment {
     PATH="$PATH:$WORKSPACE/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin"
diff --git a/vars/loadToKind.groovy b/vars/loadToKind.groovy
index 520aee2..7df6bc5 100644
--- a/vars/loadToKind.groovy
+++ b/vars/loadToKind.groovy
@@ -19,7 +19,12 @@
   def list = images.split("\n")
 
   for(int i = 0;i<list.size();i++) {
-    def image = list[i]
+    def image = list[i].trim()
+
+    if (!image) {
+      return
+    }
+
     println "Loading image ${image} on Kind cluster ${cfg.name}"
 
     sh """