more cif cleanup