Remove unmarshal helper function