HPCC-12183 component cleanup with HPCC-12093 dependencies

Signed-off-by: Michael Gardner <Michael.Gardner@lexisnexis.com>
Just for simplicity sake.  Trying to keep it simple so it's more readable for me when I have to go back to it in the future.