Removing TODO from CnP.