diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index d1f75cd..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "external/wolfssl"]
-	path = external/wolfssl
-	url = https://github.com/wolfSSL/wolfssl.git
diff --git a/Android.bp b/Android.bp
index 6f516b4..355aaaf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -66,6 +66,7 @@
     cflags: [
         "-DMAX_SYM_DATA=256",
         "-DDEBUG=YES",
+        "-DUSE_DEBUG_RNG=NO",
         "-DALG_CAMELLIA=ALG_NO",
         "-Wno-logical-op-parentheses",
         "-Wno-empty-body",
diff --git a/METADATA b/METADATA
index 4b8bc26..38d7ca0 100644
--- a/METADATA
+++ b/METADATA
@@ -9,6 +9,7 @@
     value: "https://github.com/microsoft/ms-tpm-20-ref.git"
   }
   version: "f640b4bdb3a0fe944628e9f7df1362e2b9aa647d"
+  license_note: "MCD-ST Liberty SW License Agreement V2"
   license_type: BY_EXCEPTION_ONLY
   last_upgrade_date {
     year: 2020
diff --git a/external/wolfssl b/external/wolfssl
deleted file mode 160000
index 74ebf51..0000000
--- a/external/wolfssl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 74ebf510a3d73e98767eac26082eabdc84e19d31