Remove all of the old serialization cruft