Use the New Annotation Handlers in AnnotationSubscriber

AnnotationSubscriber still needs a lot of cleanup.
Remove now unused annotation code