Clean up TODO items.