TS-1714 Some more cleanup
Added TS-1714.