Remove warning til we find a suitable synonym