Cleaning up CPP branch