Remove CVS_IP as not needed anymore