TS-1896 Cleanup of unused defines, sometimes duplicated
Added TS-1896.