Removed superfluous stuff from CFG visitor