Get rid of no-longer-needed CPP junk.