diff --git a/src/libopensc/card-etoken.c b/src/libopensc/card-etoken.c
index 86d4120b..8bc4d364 100644
--- a/src/libopensc/card-etoken.c
+++ b/src/libopensc/card-etoken.c
@@ -817,14 +817,6 @@ etoken_generate_key(sc_card_t *card,
 	u8		data[8];
 	int		r;
 
-	if (args->random_len) {
-		/* XXX FIXME: do a GIVE_RANDOM command with this data */
-		sc_error(card->ctx,
-			"initialization of card's random pool "
-			"not yet implemented\n");
-		return SC_ERROR_INTERNAL;
-	}
-
 	data[0] = 0x20;		/* store as PSO object */
 	data[1] = args->key_id;
 	data[2] = args->fid >> 8;
diff --git a/src/libopensc/cardctl.h b/src/libopensc/cardctl.h
index ef1d3e8d..7a182ea7 100644
--- a/src/libopensc/cardctl.h
+++ b/src/libopensc/cardctl.h
@@ -194,8 +194,6 @@ struct sc_cardctl_etoken_obj_info {
 };
 
 struct sc_cardctl_etoken_genkey_info {
-	u8 *		random_data;
-	size_t		random_len;
 	unsigned int	key_id;
 	unsigned int	key_bits;
 	unsigned short	fid;
diff --git a/src/pkcs15init/pkcs15-etoken.c b/src/pkcs15init/pkcs15-etoken.c
index f2167404..d037b732 100644
--- a/src/pkcs15init/pkcs15-etoken.c
+++ b/src/pkcs15init/pkcs15-etoken.c
@@ -337,19 +337,6 @@ etoken_generate_key(sc_profile_t *profile, sc_card_t *card,
 		goto out;
 
 	memset(&args, 0, sizeof(args));
-#ifdef notyet
-	if ((r = scrandom_get_data(randbuf, sizeof(randbuf))) < 0)
-		goto out;
-
-	/* For now, we have to rely on the card's internal number
-	 * generator because libscrandom is static, which causes
-	 * all sorts of headaches when linking against it
-	 * (some platforms don't allow non-PIC code in a shared lib,
-	 * such as ia64).
-	 */
-	args.random_data = randbuf;
-	args.random_len = sizeof(randbuf);
-#endif
 	args.key_id = key_info->key_reference;
 	args.key_bits = keybits;
 	args.fid = temp->id;