Can you create the issue and a TODO for removal here?