diff --git a/fips/aes/fingerprint.sha1 b/fips/aes/fingerprint.sha1
deleted file mode 100644
index 33eafc7820..0000000000
--- a/fips/aes/fingerprint.sha1
+++ /dev/null
@@ -1,3 +0,0 @@
-HMAC-SHA1(fips_aes_core.c)= b70bbbd675efe0613da0d57055310926a0104d55
-HMAC-SHA1(fips_aes_selftest.c)= 98b01502221e7fe529fd981222f2cbb52eb4cbe0
-HMAC-SHA1(fips_aes_locl.h)= a98eb0aa449f1d95b8064e261b2ac2b1f328685e
diff --git a/fips/des/fingerprint.sha1 b/fips/des/fingerprint.sha1
deleted file mode 100644
index 83833d83d1..0000000000
--- a/fips/des/fingerprint.sha1
+++ /dev/null
@@ -1,5 +0,0 @@
-HMAC-SHA1(fips_des_enc.c)= 9527f8ea81602358f1aa11348237fdb1e9eeff32
-HMAC-SHA1(asm/fips-dx86-elf.s)= 2f85e8e86806c92ee4c12cf5354e19eccf6ed47d
-HMAC-SHA1(fips_des_selftest.c)= 3bc574e51647c5f5ab45d1007b2cf461d67764a9
-HMAC-SHA1(fips_set_key.c)= 2858450d3d9c8d4ab8edea683baa54fa34f3a605
-HMAC-SHA1(fips_des_locl.h)= 7053848e884df47f06de9f2248380b92e58ef4e5
diff --git a/fips/dh/fingerprint.sha1 b/fips/dh/fingerprint.sha1
deleted file mode 100644
index 6896d38649..0000000000
--- a/fips/dh/fingerprint.sha1
+++ /dev/null
@@ -1,3 +0,0 @@
-HMAC-SHA1(fips_dh_check.c)= 63347e2007e224381d4a7b6d871633889de72cf3
-HMAC-SHA1(fips_dh_gen.c)= 93fe69b758ca9d70d70cda1c57fff4eb5c668e85
-HMAC-SHA1(fips_dh_key.c)= 7bf23b329a776953bbe7c30ebd7f9faf5249ddbe
diff --git a/fips/dsa/fingerprint.sha1 b/fips/dsa/fingerprint.sha1
deleted file mode 100644
index 4a89db5cf3..0000000000
--- a/fips/dsa/fingerprint.sha1
+++ /dev/null
@@ -1,3 +0,0 @@
-HMAC-SHA1(fips_dsa_ossl.c)= d5f718695397fe56d6bb46f7c410794cb895e206
-HMAC-SHA1(fips_dsa_gen.c)= c252db14699f3ff641db052311da7d7521569c53
-HMAC-SHA1(fips_dsa_selftest.c)= 4bfc5d3a6b977527b053f3a03d0760a822a26135
diff --git a/fips/fingerprint.sha1 b/fips/fingerprint.sha1
deleted file mode 100644
index 3e33d607bd..0000000000
--- a/fips/fingerprint.sha1
+++ /dev/null
@@ -1,4 +0,0 @@
-HMAC-SHA1(fips.c)= 4eef19c535c1f3deacdf93eb806479ea3b374115
-HMAC-SHA1(fips_err_wrapper.c)= d3e2be316062510312269e98f964cb87e7577898
-HMAC-SHA1(fips.h)= 9a7c66b93923f83dc0a9c4acd03506059ddafe5f
-HMAC-SHA1(fips_err.h)= 03468e3b593f7528fd934e49bf052c23cc98d301
diff --git a/fips/fips_check_sha1 b/fips/fips_check_sha1
deleted file mode 100755
index d60404a51c..0000000000
--- a/fips/fips_check_sha1
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-FP=$1
-shift
-
-egrep 'define OPENSSL_FIPS' $TOP/include/openssl/opensslconf.h > /dev/null || exit 0
-
-$TOP/fips/sha1/fips_standalone_sha1 $@ | diff -w $FP - || { echo; echo "*** Your source code does not match the FIPS validated source ***"; echo; exit 1; }
diff --git a/fips/fips_make_sha1 b/fips/fips_make_sha1
deleted file mode 100755
index a326ea3a07..0000000000
--- a/fips/fips_make_sha1
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-S=`pwd`/fips/sha1/fips_standalone_sha1
-
-cd fips/sha1
-$S fips_sha1dgst.c fips_sha1_selftest.c  asm/sx86-elf.s fips_standalone_sha1.c fips_sha_locl.h fips_md32_common.h > standalone.sha1
-
-cd ..
-$S fips.c fips_err_wrapper.c fips.h fips_err.h > fingerprint.sha1
-
-cd rand
-$S fips_rand.c fips_rand.h > fingerprint.sha1
-
-cd ../sha1
-$S fips_sha1dgst.c fips_sha1_selftest.c asm/sx86-elf.s fips_sha_locl.h fips_md32_common.h > fingerprint.sha1
-
-cd ../aes
-$S fips_aes_core.c fips_aes_selftest.c fips_aes_locl.h > fingerprint.sha1
-
-cd ../dsa
-$S fips_dsa_ossl.c fips_dsa_gen.c fips_dsa_selftest.c > fingerprint.sha1
-
-cd ../des
-$S fips_des_enc.c asm/fips-dx86-elf.s fips_des_selftest.c fips_set_key.c fips_des_locl.h > fingerprint.sha1
-
-cd ../rsa
-$S fips_rsa_eay.c fips_rsa_gen.c fips_rsa_selftest.c > fingerprint.sha1
-
-cd ../dh
-$S fips_dh_check.c fips_dh_gen.c fips_dh_key.c > fingerprint.sha1
diff --git a/fips/rand/fingerprint.sha1 b/fips/rand/fingerprint.sha1
deleted file mode 100644
index 0b1d91104f..0000000000
--- a/fips/rand/fingerprint.sha1
+++ /dev/null
@@ -1,2 +0,0 @@
-HMAC-SHA1(fips_rand.c)= 5dc4aa11c0377a049bee01d427e5b0bc3dd9f10f
-HMAC-SHA1(fips_rand.h)= 0567b1fe9b0efe034a537f335659b0b681809791
diff --git a/fips/rsa/fingerprint.sha1 b/fips/rsa/fingerprint.sha1
deleted file mode 100644
index 569434700c..0000000000
--- a/fips/rsa/fingerprint.sha1
+++ /dev/null
@@ -1,3 +0,0 @@
-HMAC-SHA1(fips_rsa_eay.c)= eabab59a2f11f3da4c21e1144efe1684f5e8f1ec
-HMAC-SHA1(fips_rsa_gen.c)= 4bbc0afcade1ac53f469aaa89f84c413678254bf
-HMAC-SHA1(fips_rsa_selftest.c)= 70553a5212e86f65b068564946d39b738a201e22
diff --git a/fips/sha1/Makefile b/fips/sha1/Makefile
index 237faffede..96de60a91e 100644
--- a/fips/sha1/Makefile
+++ b/fips/sha1/Makefile
@@ -38,10 +38,7 @@ ALL=    $(GENERAL) $(SRC) $(HEADER)
 top:
 	(cd $(TOP); $(MAKE) DIRS=fips SDIRS=$(DIR) sub_all)
 
-all:	check_standalone lib
-
-check_standalone:	fips_standalone_sha1$(EXE_EXT)
-	TOP=`pwd`/$(TOP) ../fips_check_sha1 standalone.sha1 $(SRC) $(HEADER)
+all:	fips_standalone_sha1$(EXE_EXT) lib
 
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
diff --git a/fips/sha1/fingerprint.sha1 b/fips/sha1/fingerprint.sha1
deleted file mode 100644
index 5cb919fdc5..0000000000
--- a/fips/sha1/fingerprint.sha1
+++ /dev/null
@@ -1,5 +0,0 @@
-HMAC-SHA1(fips_sha1dgst.c)= 10575600a9540eb15188a7d3b0b031e60aedbc18
-HMAC-SHA1(fips_sha1_selftest.c)= 98910a0c85eff1688bd7adb23e738dc75b39546e
-HMAC-SHA1(asm/sx86-elf.s)= ae66fb23ab8e1a2287e87a0a2dd30a4b9039fe63
-HMAC-SHA1(fips_sha_locl.h)= c1b4c82eec5f0ee119658456690f3ea9d77ed1c5
-HMAC-SHA1(fips_md32_common.h)= 08a057a7b94acf5df4301ea6c894ce14082e1ec4