Removing CP/CNP reference