cleanup field extraction