Hotfix/remove old annotation