Clean up ser/deser