Removing old cpp code