HH-69 - more cleanup
Signed-off-by: rpastrana <rodrigo.pastrana@lexisnexis.com>