diff --git a/dev-tools/ci b/dev-tools/ci
index 9f74c613a05..b501cb30216 100755
--- a/dev-tools/ci
+++ b/dev-tools/ci
@@ -57,20 +57,6 @@ case $key in
             "-Dtests.badapples=true"
         )
         ;;
-    smokeTestSql)  # TODO remove this once we are ready to merge sql down
-        GRADLE_CLI_ARGS=(
-            "--info"
-            "-psql"
-            "check"
-            ":x-pack-elasticsearch:plugin:precommit"
-            ":x-pack-elasticsearch:qa:sql:check"
-            ":x-pack-elasticsearch:qa:sql:multinode:check"
-            ":x-pack-elasticsearch:qa:sql:no-security:check"
-            ":x-pack-elasticsearch:qa:sql:security:check"
-            ":x-pack-elasticsearch:qa:sql:security:no-ssl:check"
-            ":x-pack-elasticsearch:qa:sql:security:ssl:check"
-        )
-        ;;
     releaseTest)
         GRADLE_CLI_ARGS=(
             "--info"
@@ -149,9 +135,7 @@ if [ -z ${USE_EXISTING_ES:+x} ]; then
       echo " -> using CI branch $BRANCH from elastic repo"
     }
 
-    # pick_clone_target NOCOMMIT just use master for testing our feature branch. Do not merge this.....
-    GH_USER="elastic"
-    BRANCH="master"
+    pick_clone_target
 
     DEPTH=1
     if [ -n "$BUILD_METADATA" ]; then