Annotations cleanup