Remove serialization cruft