Maybe. Should be part of a follow-up cleanup migration as well.