ACTECQ-446 - Code clean up.