L1A/L23 interface (L1CTL) cleanup