Serialization: further cleaning