TDI-30683:remove the extra properties.