removing unnecessary CPP.