TMDM-7500: code clean up