Template:CP cleanup