Cleanup list of annotations
Avoid NPEs