I think it would be safe to remove these annotations since we already know about (and you're already working) #4 . I would prefer to track the two issues separately, personally.