One more missing refactor and simplification for "clean" task

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