Intentions: drop deprecated code in runtime, switch last uses of Intention to IntentionFactory