diff --git a/ChangeLog b/ChangeLog
index 2768eae531..68a5e6d0d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-05  David Schleef  <ds@schleef.org>
+
+	* gst/gstcpuid_i386.s:  Remove unused code
+	* libs/gst/getbits/getbits.c: (gst_getbits_init),
+	(gst_getbits_newbuf): Remove MMX code
+	* libs/gst/getbits/getbits.h: Remove MMX code
+
 2004-03-04  David I. Lehn  <dlehn@users.sourceforge.net>
 
 	* debian/.cvsignore:
diff --git a/gst/gstcpuid_i386.s b/gst/gstcpuid_i386.s
index 5600c8eaa4..9215f697a1 100644
--- a/gst/gstcpuid_i386.s
+++ b/gst/gstcpuid_i386.s
@@ -34,12 +34,3 @@ L4:	popl %edx
 	popl %ebp
 	ret
 
-/ doesn't work in user mode (MSRs are privileged)
-.globl siddisable
-siddisable:
-	movl 0x119,%ecx
-	rdmsr
-	orl 0x200000,%eax
-	wrmsr
-	ret
-	
diff --git a/libs/gst/getbits/getbits.c b/libs/gst/getbits/getbits.c
index 6c521013bc..adf4522d62 100644
--- a/libs/gst/getbits/getbits.c
+++ b/libs/gst/getbits/getbits.c
@@ -42,7 +42,7 @@ unsigned long _getbits_masks[] = {
   0x1fffffff, 0x3fffffff, 0x7fffffff, 0xffffffff,
 };
 
-#ifdef HAVE_LIBMMX
+#ifdef unused
 unsigned long _getbits_64_minus_index[] = {
   64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,
   40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,
@@ -160,7 +160,7 @@ void gst_getbits_init(gst_getbits_t *gb, GstGetbitsCallback callback, void *data
   gb->callback = callback;
   gb->data = data;
 
-#ifdef HAVE_LIBMMX
+#ifdef unused
   if (1) {
     gb->getbits = _gst_getbits_mmx;
 /*    gb->backbits = _gst_getbits_back_mmx; */
@@ -207,7 +207,7 @@ void gst_getbits_newbuf(gst_getbits_t *gb,unsigned char *buffer, unsigned long l
   gb->ptr = buffer;
   gb->endptr = buffer+len;
   gb->bits = 0;
-#ifdef HAVE_LIBMMX
+#ifdef unused
 /*  gb->qword = 0; */
 #endif /* HAVE_LIBMMX */
 }
diff --git a/libs/gst/getbits/getbits.h b/libs/gst/getbits/getbits.h
index 8d27e66bbe..c070939298 100644
--- a/libs/gst/getbits/getbits.h
+++ b/libs/gst/getbits/getbits.h
@@ -7,16 +7,6 @@
 #define GST_DEBUG_FORCE_DISABLE
 #include <gst/gst.h>
 
-/* disabled for now */
-#undef HAVE_LIBMMX
-
-#ifdef HAVE_LIBMMX
-#include <mmx.h>
-#endif /* HAVE_LIBMMX */
-#ifdef HAVE_LIBSSE
-#include <sse.h>
-#endif /* HAVE_LIBSSE */
-
 #define swab32(x) GUINT32_FROM_BE(x)
 
 typedef struct _gst_getbits_t gst_getbits_t;
@@ -44,14 +34,6 @@ struct _gst_getbits_t {
   unsigned long (*showbits)(gst_getbits_t *gb, unsigned long bits);
   void (*flushbits)(gst_getbits_t *gb, unsigned long bits);	
   void (*backbits)(gst_getbits_t *gb, unsigned long bits);
-
-#ifdef HAVE_LIBMMX
-  mmx_t qword;			/* qword */
-#endif /* HAVE_LIBMMX */
-
-#ifdef HAVE_LIBSSE
-  sse_t oword;			/* oword */
-#endif /* HAVE_LIBSSE */
 };