TMS-29: Code clean up after merge.