remove dead code, by this point all uses of CI are gone.