diff --git a/bbfdmd/ubus/common.c b/bbfdmd/ubus/common.c
index b9b368b9..0e0494f9 100644
--- a/bbfdmd/ubus/common.c
+++ b/bbfdmd/ubus/common.c
@@ -126,7 +126,7 @@ void run_sync_call(const char *ubus_obj, const char *ubus_method, struct blob_at
 		}
 	}
 
-	BBFDM_DEBUG("### ubus call %s %s '%s' ###", ubus_obj, ubus_method, blobmsg_format_json_indent(req_buf.head, true, -1));
+	//BBFDM_DEBUG("### ubus call %s %s '%s' ###", ubus_obj, ubus_method, blobmsg_format_json_indent(req_buf.head, true, -1));
 
 	BBFDM_UBUS_INVOKE_SYNC(ubus_obj, ubus_method, req_buf.head, 2000, sync_callback, bb_response);
 
diff --git a/bbfdmd/ubus/get.c b/bbfdmd/ubus/get.c
index 44236531..0f8087d9 100644
--- a/bbfdmd/ubus/get.c
+++ b/bbfdmd/ubus/get.c
@@ -297,7 +297,7 @@ void run_async_call(struct async_request_context *ctx, const char *ubus_obj, str
 	tracker->timeout.cb = handle_request_timeout;
 	uloop_timeout_set(&tracker->timeout, SERVICE_CALL_TIMEOUT);
 
-	BBFDM_DEBUG("### ubus call %s %s '%s' ###", ubus_obj, ctx->ubus_method, blobmsg_format_json_indent(req_buf.head, true, -1));
+	//BBFDM_DEBUG("### ubus call %s %s '%s' ###", ubus_obj, ctx->ubus_method, blobmsg_format_json_indent(req_buf.head, true, -1));
 
 	if (ubus_invoke_async(ctx->ubus_ctx, id, ctx->ubus_method, req_buf.head, &tracker->async_request)) {
 		BBFDM_ERR("Failed to invoke async method for object: %s", tracker->request_name);
diff --git a/bbfdmd/ubus/service.c b/bbfdmd/ubus/service.c
index 7a4f237f..33f30b42 100644
--- a/bbfdmd/ubus/service.c
+++ b/bbfdmd/ubus/service.c
@@ -303,7 +303,7 @@ char *get_reference_data(const char *path, const char *method_name)
 
 	blobmsg_add_string(&req_buf, "path", path);
 
-	BBFDM_DEBUG("### ubus call %s %s '%s' ###", ubus_obj, method_name, blobmsg_format_json_indent(req_buf.head, true, -1));
+	//BBFDM_DEBUG("### ubus call %s %s '%s' ###", ubus_obj, method_name, blobmsg_format_json_indent(req_buf.head, true, -1));
 
 	BBFDM_UBUS_INVOKE_SYNC(ubus_obj, method_name, req_buf.head, 2000, reference_data_callback, &reference_value);
 
diff --git a/gitlab-ci/setup.sh b/gitlab-ci/setup.sh
index 8c577781..38473d51 100755
--- a/gitlab-ci/setup.sh
+++ b/gitlab-ci/setup.sh
@@ -5,6 +5,10 @@ echo "# Preparation script ..."
 # link '/bin/sh' to bash instead of dash
 ln -sf bash /bin/sh
 
+#cleanup
+rm -f /etc/config/*
+rm -rf /tmp/bbfdm/.bbfdm/* /tmp/bbfdm/.cwmp/* /tmp/bbfdm/.usp/*
+
 echo "Installing bbfdm rpcd utilities"
 cp -r ./test/files/etc/* /etc/
 cp -r ./test/files/usr/* /usr/