Some Cleanup of CPP I forgot to remove