Remove --target option
Merge unmarshal functions