More simplification of CFG structure for better performance