get rid of all these cgitrc experiments

Change-Id: I7fbc07fca00ef41d456dab950e369adc474a1fca