Getting CCS to update the list of setup/loops in an Energia sketch

[JRDavisUF 5]

I'm using CCSv8 and Energia on a Win10 machine.  In my energia code, I have a bunch of setup/loop routines (setupA/loopA, setupB/loopB, etc.) routines as separate files .  I'd like to be able to use CPP (#define/#ifdef/etc.) to control whether certain setup/loop tasks are included in the build by essentially making the content of an individual file empty.

If I build the code with a certain setup/loop included and then try to use CPP to exclude it, the compiler is still looking for the one I have now excluded and fails the compilation process.  I understand that because the setup/loops were in the previous build, that the setup/loop I have now excluded is still included in the build process somewhere, however, I cannot figure out how to get CCS to re-parse all of the files and recognize that this setup/loop is no longer needed.  I thought the "rebuild" or "clean" options would do this, but they don't.  I am using the Debug build and I can delete that whole directory and it's still looking for the excluded setup/loop.  I tried creating an empty .ino file and that seems ok, so I know empty files don't actually require setup/loops within them.  None of the files within the CCS GUI seem to mention the excluded file.  If I add a new setup/loop, CCS finds it just fine, it's just the removal of them that seems problematic.   As a work around, I can create a new project and then copy all of the needed files (not the excluded one) over to it, but this is a bit of a pain and seems like overkill.

Does anyone know how to get CCS to update the list of needed setup/loops in the build process for an existing project?

thx,

jrd