[1603] Object de-serialization cleanup