Can we deprecate rather than remove?