Cleaned up some un-needed stuff on NCPB