diff --git a/initrd/bin/kexec-save-default b/initrd/bin/kexec-save-default
index fb2bd29d9..2527dcc86 100755
--- a/initrd/bin/kexec-save-default
+++ b/initrd/bin/kexec-save-default
@@ -280,12 +280,6 @@ if [ "$CONFIG_TPM" = "y" ] && [ "$CONFIG_TPM_NO_LUKS_DISK_UNLOCK" != "y" ] && [
 			save_key_params+=("${key_devices[*]}")
 		fi
 
-		#TODO REMOVE THIS TROUBLESHOOTING HACK
-		DEBUG "Outputting logs to USB drive. Please wait..."
-		mount-usb --mode rw
-		dmesg >/media/dmesg.txt
-		DEBUG "Done. You can CTRL-Alt-Delete now to reboot, files will be synced to USB drive before rebooting"
-
 		kexec-save-key "${save_key_params[@]}" ||
 			die "Failed to save the TPM Disk Unlock Key"
 	fi
diff --git a/initrd/bin/kexec-seal-key b/initrd/bin/kexec-seal-key
index 36aad18e4..3c6a94d89 100755
--- a/initrd/bin/kexec-seal-key
+++ b/initrd/bin/kexec-seal-key
@@ -117,7 +117,7 @@ for dev in $(cat "$KEY_DEVICES" | cut -d\  -f1); do
 		$dev 1 ||
 		warn "$dev: removal of TPM Disk Unlock Key in LUKS slot 1 failed: might not exist. Continuing"
 
-	echo "++++++ $dev: Adding TPM DISK Unlock Key to LUKS slot 1"
+	echo "++++++ $dev: Adding TPM Disk Unlock Key to LUKS slot 1"
 	cryptsetup luksAddKey \
 		--key-file "$RECOVERY_KEY" \
 		--key-slot 1 \
diff --git a/prompt b/prompt
deleted file mode 100644
index d4aee3451..000000000
--- a/prompt
+++ /dev/null
@@ -1,25 +0,0 @@
-The present code properly detects and populates devices_suggest with /dev/sda2 /dev/sdc1 prior of entering function prompt_for_existing_encrypted_lvms_or_disks. 
-
-As can be seen under real hardware produced DEBUG trace as follow:
-
-'''
-[   24.118128] TRACE: Under /bin/kexec-save-default
-[   24.458491] DEBUG: LVM num_lvm: 0, lvm_suggest:
-[   24.479242] DEBUG: LUKS num_devices: 2, devices_suggest: /dev/sda2 /dev/sdb1
-[   24.482668] DEBUG: TPM is enabled and TPM_NO_LUKS_DISK_UNLOCK is not set
-[   24.484955] DEBUG: Checking if a a TPM Disk Unlock Key was previously set up from /boot/kexec_key_devices.txt
-[   24.487162] DEBUG: No previous TPM Disk Unlock Key was set up for LUKS devices, confirming to add a Disk Encryption Key to the TPM
-[   26.429913] DEBUG: User confirmed desire to add a Disk Encryption Key to the TPM
-[   26.432147] DEBUG: No previous TPM Disk Unlock Key was set up for LUKS devices, setting up new one
-[   26.434217] TRACE: Under kexec-save-default:prompt_for_existing_encrypted_lvms_or_disks
-[   26.436331] DEBUG: num_lvm: 0, lvm_suggest:  , num_devices: 2, devices_suggest: /dev/sda2 /dev/sdb1
-[   26.440067] DEBUG: LUKS num_devices before array: 2, devices_array: /dev/sda2 /dev/sdb1
-[   26.442249] DEBUG: LUKS num_devices after array: 1, devices_array: /dev/sda2 /dev/sdb1
-[   26.445824] DEBUG: Outputting logs to USB drive. Please wait...
-'''
-
-So here:
-- "DEBUG: LUKS num_devices: 2, devices_suggest: /dev/sda2 /dev/sdb1" is right.
-- "DEBUG: LUKS num_devices before array: 2, devices_array: /dev/sda2 /dev/sdb1" is still right
-- "DEBUG: LUKS num_devices after array: 1, devices_array: /dev/sda2 /dev/sdb1" shows there is 2 elelements in array, while num_devices is now 1, which is wrong
-