Remove from TODO by line number
Upstream update