Additional L2GW CSIT cleanup