cleanup, bringing up to date with latest ver of cif