Get rid of CFA stuff on master branch -- we don't need it.