Removed some old annotations