Demote FIXME to a normal comment
Remove years-old TODO