Remove gazillions of deprecated CP declarations