Removed use of AnnotationManager.
Removed Annotation* classes.