diff --git a/cdrom.c b/cdrom.c
index 5b112a5..e18d6f6 100644
--- a/cdrom.c
+++ b/cdrom.c
@@ -123,8 +123,6 @@ enum return_type cdrom_prepare(void)
 	char * choice;
 	int i, count = 0;
 	enum return_type results;
-	my_insmod("ide-cd", NULL);
-	my_insmod("sr_mod", NULL);
 	update_splash();
 	
 	get_medias(CDROM, &medias, &medias_models);
diff --git a/disk.c b/disk.c
index 8dacf92..e0f473b 100644
--- a/disk.c
+++ b/disk.c
@@ -282,8 +282,6 @@ enum return_type disk_prepare(void)
 	int i, count = 0;
 	enum return_type results;
 
-	my_insmod("ide-disk", NULL);
-	my_insmod("sd_mod", NULL);
 	get_medias(DISK, &medias, &medias_models);
 
 	ptr = medias;
diff --git a/probing.c b/probing.c
index af8532f..a755654 100644
--- a/probing.c
+++ b/probing.c
@@ -121,6 +121,12 @@ static void find_media(void)
 	if (medias)
 		free(medias); /* that does not free the strings, by the way */
 
+	if ((dir = opendir("/sys/module/usb_storage")) != NULL) {
+		wait_message("Waiting for USB storage devices to show up.");
+		sleep(10);
+		remove_wait_message();
+	}
+
 	if ((dir = opendir("/sys/block")) == NULL) {
 		log_message("failed to open /sys/block directory");
 		return;
@@ -174,10 +180,8 @@ static void find_media(void)
 		if (lstat(path, &st) == 0 && S_ISREG(st.st_mode)) {
 			tmp[count].name = strdup(dirent->d_name);
 			tmp[count].type = UNKNOWN_MEDIA;
-			log_message("IDE: name: %s", dirent->d_name);
 			if ((f = fopen(path, "r")) != NULL) {
 				if (fgets(buf, sizeof(buf), f)) {
-					log_message("IDE: type: %s", buf);
 					if (!strncmp("disk", buf, 4))
 						tmp[count].type = DISK;
 					else if (!strncmp("cdrom", buf, 5))