More serialization cleanup