Not directly related to these changes but can we add an annotation of `@TODO - clean up legacy handling` so we can grep for it later?