Remove unneeded C2s