Actually, this is the opposite. We have never done a massive CS cleanup because we want to easier possible backports.