Removed some fields from custody flow