This is the removal of the code that was #if 0'ed last commit.

Its looking like this will be a tic-toc iterative process:
 1. Use Doxygen to identify orphan code, #if 0 it out
 2. Delete #if 0'ed routines
Validating before each commit.