diff --git a/src/i830_driver.c b/src/i830_driver.c
index 7818ee4..224406e 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v 1.50 2004/02/20 00:06:00 alanh Exp $ */
 /**************************************************************************
 
 Copyright 2001 VA Linux Systems Inc., Fremont, California.
@@ -28,19 +27,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 **************************************************************************/
 
 /*
- * Reformatted with GNU indent (2.2.8), using the following options:
- *
- *    -bad -bap -c41 -cd0 -ncdb -ci6 -cli0 -cp0 -ncs -d0 -di3 -i3 -ip3 -l78
- *    -lp -npcs -psl -sob -ss -br -ce -sc -hnl
- *
- * This provides a good match with the original i810 code and preferred
- * XFree86 formatting conventions.
- *
- * When editing this driver, please follow the existing formatting, and edit
- * with <TAB> characters expanded at 8-column intervals.
- */
-
-/*
  * Authors: Jeff Hartmann <jhartmann@valinux.com>
  *          Abraham van der Merwe <abraham@2d3d.co.za>
  *          David Dawes <dawes@xfree86.org>
@@ -103,12 +89,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  *    18/10/2001
  *        - Fixed a bug in I830BIOSLeaveVT() which caused a bug when you
  *          switched VT's
- */
-/*
+ *
+ *
  *    07/2002 David Dawes
  *        - Add Intel(R) 855GM/852GM support.
- */
-/*
+ *
+ *
  *    07/2002 David Dawes
  *        - Cleanup code formatting.
  *        - Improve VESA mode selection, and fix refresh rate selection.
@@ -219,10 +205,6 @@ const char *I830exaSymbols[] = {
 };
 #endif
 
-#define BIT(x) (1 << (x))
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#define NB_OF(x) (sizeof (x) / sizeof (*x))
-
 /* *INDENT-OFF* */
 static SymTabRec I830Chipsets[] = {
    {PCI_CHIP_I830_M,		"i830"},
@@ -426,9 +408,6 @@ I830DetectMemory(ScrnInfoPtr pScrn)
    uint16_t gmch_ctrl;
    int memsize = 0, gtt_size;
    int range;
-#if 0
-   VbeInfoBlock *vbeInfo;
-#endif
 
 #if XSERVER_LIBPCIACCESS
    struct pci_device *bridge = intel_host_bridge ();
@@ -534,11 +513,6 @@ I830DetectMemory(ScrnInfoPtr pScrn)
       }
    }
 
-#if 0
-   /* And 64KB page aligned */
-   memsize &= ~0xFFFF;
-#endif
-
    if (memsize > 0) {
       xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		 "detected %d kB stolen memory.\n", memsize / 1024);