Remove some TODO items after creating issues for them.