Don't remove the deprecated stuff in the runtime though. That needs more consideration since it might break older consumers
