cpp cleanup