diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h
index 5cf04f70ef34658559edb64164b1471a98de7bd3..14051ca81ae8934e181deb0d9b22c07900f94ef8 100644
--- a/src/include/optimizer/internal.h
+++ b/src/include/optimizer/internal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: internal.h,v 1.23 1999/07/25 23:07:23 tgl Exp $
+ * $Id: internal.h,v 1.24 2000/01/11 03:59:31 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,9 +32,6 @@
 #define _CPU_PAGE_WEIGHT_  0.033  /* CPU-heap-to-page cost weighting factor */
 #define _CPU_INDEX_PAGE_WEIGHT_ 0.017	/* CPU-index-to-page cost
 										 * weighting factor */
-#define _MAX_KEYS_	   INDEX_MAX_KEYS	/* maximum number of keys in an
-										 * index */
-#define _TID_SIZE_	   6		/* sizeof(itemid) (from ../h/itemid.h) */
 
 /*
  *		Size estimates
@@ -50,9 +47,9 @@
 #define _NONAME_RELATION_PAGES_			1
 #define _NONAME_RELATION_TUPLES_	10
 
-/*	   The length of a variable-length field in bytes
+/*	   The length of a variable-length field in bytes (stupid estimate...)
  */
-#define _DEFAULT_ATTRIBUTE_WIDTH_ (2 * _TID_SIZE_)
+#define _DEFAULT_ATTRIBUTE_WIDTH_ 12
 
 /*
  *		Flags and identifiers
@@ -63,9 +60,6 @@
 /* used to be -1 */
 #define _NONAME_RELATION_ID_	 InvalidOid
 
-/* #define deactivate_joininfo(joininfo)		joininfo->inactive=true*/
-/*#define joininfo_inactive(joininfo)	joininfo->inactive */
-
 /* GEQO switch according to number of relations in a query */
 #define GEQO_RELS 11