2.0 remove old annotations

Removed some old, not used anymore annotations