more robust annotation switching

+ Removal of redundant annotations