Remove DynamicAnnotations.h?