Removing CP/CNP refrences