diff --git a/KAEOpensslEngine/src/v1/alg/dh/hpre_dh.c b/KAEOpensslEngine/src/v1/alg/dh/hpre_dh.c
index 01bde4767215fcc38bfee2f3d633ce2b1bdc1227..d8b592f03e09f3db05786122c1a9297866977316 100644
--- a/KAEOpensslEngine/src/v1/alg/dh/hpre_dh.c
+++ b/KAEOpensslEngine/src/v1/alg/dh/hpre_dh.c
@@ -294,10 +294,8 @@ static int hpre_dh_generate_key(DH *dh)
 		return HPRE_DH_FAIL;
 	}
 
-#if OPENSSL_VERSION_NUMBER < 0x30000000
 	// check whether it is dsa parameter.
 	CHECK_AND_GOTO(q != NULL, end_soft, "q is not null, then switch to soft!");
-#endif
 
 	// check whether bits exceeds the limit.
 	if (bits > OPENSSL_DH_MAX_MODULUS_BITS) {
@@ -384,10 +382,8 @@ static int hpre_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh
 		return HPRE_DH_FAIL;
 	}
 
-#if OPENSSL_VERSION_NUMBER < 0x30000000
 	// check whether it is dsa parameter.
 	CHECK_AND_GOTO(q != NULL, end_soft, "q is not null, then switch to soft!");
-#endif
 
 	// check whether bits exceeds the limit.
 	if (bits > OPENSSL_DH_MAX_MODULUS_BITS) {
diff --git a/uadk/Makefile.am b/uadk/Makefile.am
index e2a8ba1b4e1cf7a006c55bef75903c1e8a27bae2..b39afc2104713e4ca386f6d53ecb30dfea14c00f 100644
--- a/uadk/Makefile.am
+++ b/uadk/Makefile.am
@@ -138,4 +138,3 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = lib/libwd_crypto.pc lib/libwd_comp.pc lib/libwd.pc
 CLEANFILES += $(pkgconfig_DATA)
 
-SUBDIRS=. test v1/test uadk_tool sample
diff --git a/uadk/cleanup.sh b/uadk/cleanup.sh
index 60adc9889193ec47526f6c4775bceb99b1727f9a..2f6d72e6a63f358c4620bce24b31701bc8734126 100644
--- a/uadk/cleanup.sh
+++ b/uadk/cleanup.sh
@@ -10,9 +10,7 @@ FILES="aclocal.m4 autom4te.cache compile config.guess config.h.in config.log \
        ar-lib m4 Makefile.in missing src/Makefile src/Makefile.in	     \
        test/Makefile test/Makefile.in test/hisi_hpre_test/Makefile.in	     \
        test/hisi_hpre_test/Makefile test/hisi_sec_test/Makefile              \
-       test/hisi_sec_test/Makefile.in test/hisi_zip_test/Makefile            \
-       test/hisi_zip_test/Makefile.in uadk_tool/Makefile            \
-       uadk_tool/Makefile.in         \
+       test/hisi_sec_test/Makefile.in             \
        v1/Makefile.in v1/Makefile.in v1/test/Makefile v1/test/Makefile.in    \
        v1/test/test_mm/Makefile v1/test/test_mm/Makefile.in		     \
        v1/test/bmm_test/Makefile v1/test/bmm_test/Makefile.in"
diff --git a/uadk/configure.ac b/uadk/configure.ac
index 2692175dc1f64805836e3057569570d817977f38..81d5cad5c0b1efbd6193cb6bfdbd1d60b5066558 100644
--- a/uadk/configure.ac
+++ b/uadk/configure.ac
@@ -91,8 +91,6 @@ AC_CONFIG_FILES([Makefile
 		 lib/libwd_crypto.pc lib/libwd_comp.pc lib/libwd.pc
 		 test/Makefile
 		 test/hisi_hpre_test/Makefile
-		 test/hisi_zip_test/Makefile
-		 uadk_tool/Makefile
 		 sample/Makefile
 		 v1/test/Makefile
 		 v1/test/bmm_test/Makefile
@@ -101,6 +99,5 @@ AC_CONFIG_FILES([Makefile
 		 v1/test/hisi_trng_test/Makefile
 		 v1/test/hisi_sec_test/Makefile
 		 v1/test/hisi_sec_test_sgl/Makefile
-		 v1/test/hisi_zip_test/Makefile
 		 v1/test/hisi_zip_test_sgl/Makefile])
 AC_OUTPUT
diff --git a/uadk/test/Makefile.am b/uadk/test/Makefile.am
index 5666000cd3b83aee016f1b422f1eb483f6bfdfac..c7918f320547e97c12f8b6137a6831199ceb309c 100644
--- a/uadk/test/Makefile.am
+++ b/uadk/test/Makefile.am
@@ -16,8 +16,4 @@ SUBDIRS = .
 if HAVE_CRYPTO
 SUBDIRS += hisi_hpre_test
 
-if HAVE_ZLIB
-SUBDIRS += hisi_zip_test
-endif
-
 endif
diff --git a/uadk/v1/test/Makefile.am b/uadk/v1/test/Makefile.am
index bd41cfe0d7b60ee29feefba609bf01f6f1c25e2d..ea370fc521fd4fba97c3d348d1f580ee02cebebf 100644
--- a/uadk/v1/test/Makefile.am
+++ b/uadk/v1/test/Makefile.am
@@ -2,10 +2,6 @@ AM_CFLAGS=-Wall -O0 -fno-strict-aliasing -I$(top_srcdir)/v1/internal -I$(top_src
 
 SUBDIRS=. test_mm bmm_test
 
-if HAVE_ZLIB
-SUBDIRS+=hisi_zip_test
-endif
-
 SUBDIRS+=hisi_zip_test_sgl
 SUBDIRS+=hisi_trng_test