Drop obsolete code in built-in serialization