Remove References to NBCF