Code cleanup. TENMARKS-4933