diff --git a/avrdude/Usage b/avrdude/Usage
deleted file mode 100644
index e70c69f6..00000000
--- a/avrdude/Usage
+++ /dev/null
@@ -1,29 +0,0 @@
-Usage:  avrprog [options]
-
-  Available Options:
-
-    -m MemType    : select memory type for reading or writing
-                      \"e\", \"eeprom\" = EEPROM
-                      \"f\", \"flash\"  = FLASH (default)
-
-    -i Filename   : select input file, \"-\" = stdin
-
-    -o Filename   : select output file, \"-\" = stdout
-
-    -f Format     : select input / output file format
-                      \"i\" = Intel Hex
-                      \"s\" = Motorola S-Record
-                      \"r\" = Raw binary (default for output)
-                      \"a\" = Auto detect (default for input)
-                              (valid for input only)
-                              
-
-    -p Part       : select Atmel part number (see below for valid parts)
-
-    -P Parallel   : select parallel port device name (default = /dev/ppi0)
-
-    -F            : override invalid device signature check
-
-    -t            : enter terminal mode (or read commands from stdin)
-
-    -e            : perform a chip erase (required before programming)
diff --git a/avrdude/avr.h b/avrdude/avr.h
index d3c8edda..29e88a4a 100644
--- a/avrdude/avr.h
+++ b/avrdude/avr.h
@@ -37,7 +37,8 @@
 /*
  * AVR memory designations; the order of these is important, these are
  * used as indexes into statically initialized data, don't change them
- * around.
+ * around.  Specifically, avr_read_byte() and avr_write_byte() rely on
+ * the order.
  */
 typedef enum {
   AVR_EEPROM,
@@ -48,7 +49,6 @@ typedef enum {
 
 #if 0
 struct avrmem {
-  AVRMEM          memtype;
   int             startaddr;
   int             size;
   unsigned char * buf;
@@ -67,11 +67,18 @@ struct avrpart {
   int             min_write_delay;  /* microseconds */
   int             max_write_delay;  /* microseconds */
   int             chip_erase_delay; /* microseconds */
+#if 1
   unsigned char * mem[AVR_MAXMEMTYPES]; /* pointers to avr memory
                                            buffers, indexed by
                                            AVR_EEPROM or AVR_FLASH */
+#else
+  struct avrmem * mem[AVR_MAXMEMTYPES]; /* pointers to avr memory
+                                           buffers, indexed by
+                                           AVR_EEPROM or AVR_FLASH */
+#endif
 };
 
+
 extern struct avrpart parts[];