CPP files cleanup