Will be useful as kinds of "#ifdef"s during xcomp.
and remove cfspack, which will not ever be used again.