Yet again revised the reference removal for serialization