Removed uneeded unmarshalling function