This CL removes some unused methods from CFG, makes the constructor explicit and moves the using statement to the cpp file where it's used.
