HPCC-12183 component cleanup with HPCC-12093 dependencies

Signed-off-by: Michael Gardner <Michael.Gardner@lexisnexis.com>
ya that's equivalent and cleaner.