Removed the CN_xxx macros since they are not used, do not correspond to