Remove dependency on yaml_serialization