Annotation cleanups