[CLEANUP] Some cgl changes