diff --git a/code/defstruct.lisp b/code/defstruct.lisp
index 1bc8710d94bde95df6e3603972487a9358991458..5fd20dceda42cc30c8a695a008b504477877ab09 100644
--- a/code/defstruct.lisp
+++ b/code/defstruct.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/defstruct.lisp,v 1.38 1993/02/26 08:25:05 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/defstruct.lisp,v 1.39 1993/03/01 20:07:52 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -33,11 +33,6 @@
 
 ;;;; Structure frobbing primitives.
 
-#+ns-boot 
-(defun %instancep (x)
-  (structurep x))
-
-#-ns-boot
 (defun %make-instance (length)
   "Allocate a new instance with LENGTH data slots."
   (declare (type index length))
@@ -46,19 +41,12 @@
 (defun %instance-length (instance)
   "Given an instance, return its length."
   (declare (type instance instance))
-  #+ns-boot
-  (structure-length instance)
-  #-ns-boot
   (%instance-length instance))
 
 (defun %instance-ref (instance index)
   "Return the value from the INDEXth slot of INSTANCE.  This is SETFable."
-  #+ns-boot
-  (structure-ref instance index)
-  #-ns-boot
   (%instance-ref instance index))
 
-#-ns-boot (progn
 (defun %instance-set (instance index new-value)
   "Set the INDEXth slot of INSTANCE to NEW-VALUE."
   (setf (%instance-ref instance index) new-value))
@@ -79,15 +67,9 @@
   (declare (type index index))
   (%raw-set-double vec index val))
 
-); #-ns-boot progn
-
 (defun %instance-layout (instance)
-  #+ns-boot
-  (layout-of instance)
-  #-ns-boot
   (%instance-layout instance))
 
-#-ns-boot
 (defun %set-instance-layout (instance new-value)
   (%set-instance-layout instance new-value))
 
@@ -459,8 +441,7 @@
 
     (let* ((aname (concat-pnames (dd-conc-name defstruct) name))
 	   (existing (info function accessor-for aname)))
-      (if #-ns-boot
-	  (and (structure-class-p existing)
+      (if (and (structure-class-p existing)
 	       (not (eq (class-name existing) (dd-name defstruct)))
 	       (string= (dsd-%name (find aname
 					 (dd-slots
@@ -468,7 +449,6 @@
 					   (class-layout existing)))
 					 :key #'dsd-accessor))
 			name))
-	  #+ns-boot nil
 	  (setf (dsd-accessor islot) nil)
 	  (setf (dsd-accessor islot) aname)))
     
@@ -963,11 +943,6 @@
 ;;; general-case code.  Since the compiler will normally open-code accesors,
 ;;; the (minor) efficiency penalty is not a concern.
 
-#+ns-boot
-(defun %defstruct (&rest ignore)
-  (declare (ignore ignore)))
-
-#-ns-boot(progn
 ;;; Typep-To-Layout  --  Internal
 ;;;
 ;;;    Return true if Obj is an object of the structure type corresponding to
@@ -1078,7 +1053,6 @@
 
   (undefined-value))
 
-); #-ns-boot progn
 
 ;;;; Redefinition stuff:
 
@@ -1107,9 +1081,6 @@
 				   :inheritance-depth (length inherits)
 				   :length (dd-length info)
 				   :info info)))
-      #+ns-boot
-      (when (and old-layout (not (layout-info old-layout)))
-	(setf (layout-info old-layout) info))
       (cond
        ((not old-layout)
 	(values class new-layout nil))
@@ -1356,7 +1327,6 @@
 ;;;
 ;;;    Copy any old kind of structure.
 ;;;
-#-ns-boot
 (defun copy-structure (structure)
   "Return a copy of Structure with the same (EQL) slot values."
   (declare (type structure-object structure) (optimize (speed 3) (safety 0)))
@@ -1387,7 +1357,6 @@
 
 ;;; Default print and make-load-form methods.
 
-#-ns-boot
 (defun default-structure-print (structure stream depth)
   (declare (ignore depth))
   (let* ((type (%instance-layout structure))
@@ -1433,7 +1402,6 @@
 	    (write-char #\space stream)
 	    (output-object (%instance-ref structure index) stream))))))
 
-#-ns-boot
 (defun make-structure-load-form (structure)
   (declare (type structure-object structure))
   (let* ((class (layout-class (%instance-layout structure)))
diff --git a/code/macros.lisp b/code/macros.lisp
index 35ede13b2d7f523be1e4f15bb3d2258d3ea03589..00145e8d2217b2c4e3ab8b5607e1b3dd5f259a58 100644
--- a/code/macros.lisp
+++ b/code/macros.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/macros.lisp,v 1.36 1993/02/26 08:25:51 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/macros.lisp,v 1.37 1993/03/01 20:11:18 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -168,11 +168,6 @@
     (:primitive
      (when *type-system-initialized*
        (error "Illegal to redefine standard type: ~S." name)))
-    #+ns-boot
-    (:structure
-     (warn "Redefining structure type ~S with DEFTYPE." name)
-     (c::undefine-structure (info type structure-info name))
-     (setf (info type kind name) :defined))
     (:instance
      (warn "Redefining class ~S to be a DEFTYPE." name)
      (undefine-structure (layout-info (class-layout (info type class name))))
diff --git a/code/type-boot.lisp b/code/type-boot.lisp
index 2d554f2e84a4f9bd10b1b8fb943ef458b76cb364..764c92ce7b44c189e3da96ad6d1b887f88da5666 100644
--- a/code/type-boot.lisp
+++ b/code/type-boot.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/type-boot.lisp,v 1.7 1993/02/26 08:26:22 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/type-boot.lisp,v 1.8 1993/03/01 20:11:52 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -35,7 +35,6 @@
 	    (%instance-ref tc i)))
     new))
 
-#-ns-boot
 ;;; Define the STRUCTURE-OBJECT class as a subclass of INSTANCE.  This must be
 ;;; the first DEFSTRUCT executed.
 ;;;
diff --git a/code/type.lisp b/code/type.lisp
index f5fab7a22cb25d1bed82971e912566fb127d7173..9cbf6d6986eee6e6e3bff8f9aced0329c4018504 100644
--- a/code/type.lisp
+++ b/code/type.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/type.lisp,v 1.6 1993/02/25 02:24:32 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/type.lisp,v 1.7 1993/03/01 20:09:44 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -780,9 +780,6 @@
 	       (info type builtin spec)))
 	 ((eq (info type kind spec) :instance)
 	  (find-class spec))
-	 #+ns-boot
-	 ((eq (info type kind spec) :structure)
-	  (find-class spec))
 	 ((typep spec 'class)
 	  (if (typep spec 'built-in-class)
 	      (or (built-in-class-translation spec) spec)
@@ -2105,10 +2102,9 @@
     ((or numeric-type named-type member-type array-type built-in-class)
      (values (%typep obj type) t))
     (class
-     (if #-ns-boot(if (csubtypep type (specifier-type 'generic-function))
-		      (funcallable-instance-p obj)
-		      (%instancep obj))
-	 #+ns-boot(structurep obj)
+     (if (if (csubtypep type (specifier-type 'generic-function))
+	     (funcallable-instance-p obj)
+	     (%instancep obj))
 	 (if (eq (class-layout type)
 		 (info type compiler-layout (class-name type)))
 	     (values (typep obj type) t)
@@ -2198,12 +2194,8 @@
 	      (setf (numeric-type-low res) num)
 	      (setf (numeric-type-high res) num)))
        res))
-    #-ns-boot
     (instance
      (layout-class (%instance-layout x)))
-    #+ns-boot
-    (structure
-     (find-class (structure-ref x 0)))
     (array
      (let ((etype (specifier-type (array-element-type x))))
        (make-array-type :dimensions (array-dimensions x)