Remove TODO items that are no longer applicable