diff --git a/rln/librln.h b/rln/librln.h
index eed8e44..d0a78f8 100644
--- a/rln/librln.h
+++ b/rln/librln.h
@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#define TEST_PARAMETERS_INDEX 2
+#define TEST_TREE_HEIGHT 20
 
 /**
  * The RLN object.
@@ -71,10 +71,6 @@ bool generate_rln_proof(struct RLN *ctx,
                         const struct Buffer *input_buffer,
                         struct Buffer *output_buffer);
 
-bool generate_rln_proof_with_witness(struct RLN *ctx,
-                                     const struct Buffer *input_buffer,
-                                     struct Buffer *output_buffer);
-
 bool verify_rln_proof(const struct RLN *ctx,
                       const struct Buffer *proof_buffer,
                       bool *proof_is_valid_ptr);
diff --git a/rln/wrapper.go b/rln/wrapper.go
index e01efb7..32d850d 100644
--- a/rln/wrapper.go
+++ b/rln/wrapper.go
@@ -160,16 +160,20 @@ func (r *RLN) GenerateRLNProof(input []byte) ([]byte, error) {
 }
 
 func (r *RLN) GenerateRLNProofWithWitness(input []byte) ([]byte, error) {
-	inputBuffer := toCBufferPtr(input)
+	// TODO: Temporally disabled. In RLNv2 this is not enabled yet.
+	return nil, errors.New("not implemented")
+	/*
+		inputBuffer := toCBufferPtr(input)
 
-	var output []byte
-	out := toBuffer(output)
+		var output []byte
+		out := toBuffer(output)
 
-	if !bool(C.generate_rln_proof_with_witness(r.ptr, inputBuffer, &out)) {
-		return nil, errors.New("could not generate the proof with witness")
-	}
+		if !bool(C.generate_rln_proof_with_witness(r.ptr, inputBuffer, &out)) {
+			return nil, errors.New("could not generate the proof with witness")
+		}
 
-	return C.GoBytes(unsafe.Pointer(out.ptr), C.int(out.len)), nil
+		return C.GoBytes(unsafe.Pointer(out.ptr), C.int(out.len)), nil
+	*/
 }
 
 func (r *RLN) VerifyWithRoots(input []byte, roots []byte) (bool, error) {
diff --git a/zerokit b/zerokit
index b0be329..7790954 160000
--- a/zerokit
+++ b/zerokit
@@ -1 +1 @@
-Subproject commit b0be32943e94de9f3c905c97ebd849e446e58f77
+Subproject commit 7790954c4a450808e807837cec89700032b0adb8