Serialization cleanup