--- a/main/branches/4.2.0/trunk/interpreter/RexxClasses/CoreClasses.orx
+++ b/main/branches/4.2.0/trunk/interpreter/RexxClasses/CoreClasses.orx
@@ -50,9 +50,6 @@
 .kernel~objectname = "The kernel directory"
 .nil~objectname = "The NIL object"
 
--- Add serialization support
-call "Serializable.orx"
-
 -- add string class constant methods
 .String~!define_class_method("NL", .methods~string_cls_nl)
 .String~!define_class_method("CR", .methods~string_cls_cr)
@@ -123,43 +120,6 @@
 .Bag~define('[]=', .methods['PUT'])
 .Bag~!REXXDefined
 
-Say "Adding serialization support..."
-.Array~inherit(.Serializable)
-array_methods = .Table~new
-array_methods~put(.methods~array_wo, "WRITEOBJECT")
-array_methods~put(.methods~array_ro, "READOBJECT")
-.Array~!define_methods(array_methods)
-
-.Directory~inherit(.Serializable)
-directory_methods = .Table~new
-directory_methods~put(.methods~directory_wo, "WRITEOBJECT")
-directory_methods~put(.methods~directory_ro, "READOBJECT")
-.Directory~!define_methods(directory_methods)
-
-mb_methods = .Table~new
-mb_methods~put(.methods~mutablebuffer_wo, "WRITEOBJECT")
-mb_methods~put(.methods~mutablebuffer_ro, "READOBJECT")
-.MutableBuffer~inherit(.Serializable)
-.MutableBuffer~!define_methods(mb_methods)
-
-.Relation~inherit(.Serializable)
-.Relation~!define_methods(directory_methods)
-
-.Table~inherit(.Serializable)
-.Table~!define_methods(directory_methods)
-
-.Stem~inherit(.Serializable)
-stem_methods = .Table~new
-stem_methods~put(.methods~stem_wo, "WRITEOBJECT")
-stem_methods~put(.methods~stem_ro, "READOBJECT")
-.Stem~!define_methods(stem_methods)
-
-.Queue~inherit(.Serializable)
-queue_methods = .Table~new
-queue_methods~put(.methods~queue_wo, "WRITEOBJECT")
-queue_methods~put(.methods~queue_ro, "READOBJECT")
-.Queue~!define_methods(queue_methods)
-
 .Alarm~!REXXDefined
 .CircularQueue~!REXXDefined
 .Properties~!REXXDefined
@@ -176,9 +136,6 @@
 .environment~setentry('DATETIME', .DateTime)
 .environment~setentry('TIMESPAN', .TimeSpan)
 .environment~setentry('ARGUTIL', .ArgUtil)
-
-.environment~setEntry('SERIALIZABLE', .Serializable)
-.environment~setEntry('SERIALIZEFUNCTIONS', .SerializeFunctions)
 
 call 'StreamClasses.orx'
 
@@ -212,104 +169,6 @@
 ::METHOD string_cls_null
  return "00"x
 
-::METHOD array_test
-  say "Hello"
-
-/* Serializable support methods */
-::METHOD array_wo
-    use strict arg handler
-    handler~writeNumber(self~items)
-    do i over self
-        handler~writeObject(i)
-    end
-
-::METHOD array_ro
-    use strict arg handler
-    count = handler~readNumber
-    self[count] = .nil
-    do i = 1 to count
-        self[i] = handler~readObject
-    end
-
-::METHOD queue_wo
-    use strict arg handler
-    handler~writeNumber(self~items)
-    do i over self
-        handler~writeObject(i)
-    end
-
-::METHOD queue_ro
-    use strict arg handler
-    count = handler~readNumber
-    do i = 1 to count
-        self~append(handler~readObject)
-    end
-
-::METHOD stem_wo
-    use strict arg handler
-    handler~writeObject(self[])
-    handler~writeNumber(self~items)
-    do i over self
-        handler~writeObject(i)
-    end
-
-::METHOD stem_ro
-    use strict arg handler
-    self[] = handler~readObject
-    count = handler~readNumber
-    self[count] = .nil
-    do i = 1 to count
-        self[i] = handler~readObject
-    end
-
--- directory methods are also used for relation and table
-::METHOD directory_wo
-    use strict arg handler
-    handler~writeNumber(self~items)
-    content = self~supplier
-    do while content~available
-        handler~writeObject(content~index)
-        handler~writeObject(content~item)
-        content~next
-    end
-
-::METHOD directory_ro
-    use strict arg handler
-    count = handler~readNumber
-    do i = 1 to count
-        index = handler~readObject
-        item = handler~readObject
-        self[index] = item
-    end
-
-::METHOD mutablebuffer_wo
-    use strict arg handler
-    handler~writeObject(self~string)
-
-::METHOD mutablebuffer_ro
-    use strict arg handler
-    -- just append the string representation to the empty buffer
-    self~append(handler~readObject)
-
--- Methods cannot be serialized at the moment - later this code may be used.
-/*
-::METHOD method_wo
-    use strict arg handler
-    if Object~source~size = 0 then
-        raise syntax 93.900 array ("Unable to serialize method without source")
-    handler~writeNumber(self~isGuarded*4+self~isPrivate*2+self~isProtected)
-    handler~writeObject(self~source)
-
--- This does not work yet.
-::METHOD method_ro
-    use strict arg handler
-    m =    .Method~new('', Caller~FromSerializedData(arguments))
-    if mode~bitAnd(4) = 4 then m~setGuarded
-    if mode~bitAnd(2) = 2 then m~setPrivate
-    if mode~bitAnd(1) = 1 then m~setProtected
-    return m
-
-*/
 /*============================================================================*/
 /*    Additional S U P P L I E R methods                                      */
 /*============================================================================*/
@@ -826,13 +685,6 @@
       -- an unknown method is an argument problem.  report it as such.
   raise syntax 93.948 array(1, "Collection")
 
-/** Serialization support **/
-::CLASS "Serializable" MIXINCLASS Object PUBLIC
-::METHOD writeObject ABSTRACT
-::METHOD readObject ABSTRACT
-
-
-
 -- methods defined for OrderedCollection classes
 ::CLASS 'OrderedCollection' MIXINCLASS Collection
 -- abstract methods for ordered insertion/deletion
@@ -1084,23 +936,7 @@
   return self~allIndexes
 
 
-::CLASS 'SetCollection' MIXINCLASS Collection INHERIT Serializable
-::METHOD writeObject
-    use strict arg handler
-    handler~writeNumber(items)
-    do i over self
-        handler~writeObject(i)
-    end
-
-::METHOD readObject
-    use strict arg handler
-    count = handler~readNumber
-    do i = 1 to count
-        o = handler~readObject
-        self~put(o, o)
-    end
-
-
+::CLASS 'SetCollection' MIXINCLASS Collection
 -- sort comparison classes.
 ::CLASS 'Comparable' MIXINCLASS Object
 ::METHOD compareTo ABSTRACT
@@ -1996,10 +1832,6 @@
   end
   return storage              -- return instance
 
-::METHOD readObject CLASS
-    use strict arg handler
-    return self~new(handler~readNumber)
-
 ::method init                 -- create an instance, memorizes the size
   expose size
   use strict arg size
@@ -2010,12 +1842,6 @@
 
   self~init:super
   return
-
-::METHOD writeObject
-    expose size
-    use strict arg handler
-    handler~writeNumber(size)
-    forward class (super)
 
 ::METHOD size                 -- return size
   expose size