Removed some deprecated annotations