Remove References to the NBCF