diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index e47f149618..5577d632ea 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -1,4 +1,3 @@
-test_codec.c
 /* plugins common to all models */
 battery_bench.c
 chessclock.c
@@ -153,7 +152,3 @@ superdom.c
 #endif /* m:robe 500 */
 
 md5sum.c
-
-#ifdef GIGABEAT_F
-gigabeat_flash.c
-#endif
diff --git a/firmware/export/config-clip.h b/firmware/export/config-clip.h
index 40630bb75a..0a6164fbb6 100644
--- a/firmware/export/config-clip.h
+++ b/firmware/export/config-clip.h
@@ -34,13 +34,13 @@
 #define HAVE_BUTTON_LIGHT
 
 /* define this if you have access to the quickscreen */
-//#define HAVE_QUICKSCREEN
+#define HAVE_QUICKSCREEN
 
 /* define this if you have access to the pitchscreen */
-//#define HAVE_PITCHSCREEN
+#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
-//#define HAVE_TAGCACHE
+#define HAVE_TAGCACHE
 
 /* LCD dimensions */
 #define LCD_WIDTH  128
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h
index 9f825bb77b..edeb834ef7 100644
--- a/firmware/export/config-cowond2.h
+++ b/firmware/export/config-cowond2.h
@@ -8,7 +8,7 @@
 
 #define MODEL_NAME   "Cowon D2"
 
-#if 1
+#if 0
 #define HAVE_USBSTACK
 #define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0e21
diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c
index 1152448f97..f71de7fdc0 100644
--- a/firmware/target/arm/as3525/ata_sd_as3525.c
+++ b/firmware/target/arm/as3525/ata_sd_as3525.c
@@ -601,10 +601,10 @@ static int sd_transfer_sectors(IF_MV2(int drive,) unsigned long start,
 
     if (card_info[drive].initialized <= 0)
     {
-        int ret = sd_init_card(drive);
+        sd_init_card(drive);
         if (!(card_info[drive].initialized))
         {
-            panicf("card not initialised %d",ret);
+            panicf("card not initialised");
             goto sd_transfer_error;
         }
     }