diff --git a/fb/fbcompose.c b/fb/fbcompose.c
index 03adab456..3a61e975a 100644
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -573,9 +573,9 @@ static fetchProc fetchProcForPicture (PicturePtr pict)
         /* 1bpp formats */
     case PICT_a1: return  fbFetch_a1;
     case PICT_g1: return  fbFetch_g1;
-    default:
-        return NULL;
     }
+
+    return NULL;
 }
 
 /*
@@ -1010,9 +1010,9 @@ static fetchPixelProc fetchPixelProcForPicture (PicturePtr pict)
         /* 1bpp formats */
     case PICT_a1: return  fbFetchPixel_a1;
     case PICT_g1: return  fbFetchPixel_g1;
-    default:
-        return NULL;
     }
+
+    return NULL;
 }
 
 
diff --git a/render/picture.h b/render/picture.h
index e7d86ac39..8184c02c0 100644
--- a/render/picture.h
+++ b/render/picture.h
@@ -102,10 +102,6 @@ typedef enum _PictFormatShort {
    PICT_g8 =		PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0),
 
    PICT_x4a4 =		PICT_FORMAT(8,PICT_TYPE_A,4,0,0,0),
-   PICT_x4r1g2b1 =	PICT_FORMAT(8,PICT_TYPE_ARGB,0,1,2,1),
-   PICT_x4b1g2r1 =	PICT_FORMAT(8,PICT_TYPE_ABGR,0,1,2,1),
-   PICT_x4a1r1g1b1 =	PICT_FORMAT(8,PICT_TYPE_ARGB,1,1,1,1),
-   PICT_x4a1b1g1r1 =	PICT_FORMAT(8,PICT_TYPE_ABGR,1,1,1,1),
 				    
    PICT_x4c4 =		PICT_FORMAT(8,PICT_TYPE_COLOR,0,0,0,0),
    PICT_x4g4 =		PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0),