Cleanup after last refactor

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>