VIVO-806 Remove deprecation warnings.