Remove warning
Changes for MTS