Timing indications + CG code cleanup