Issue 113. Remove unused AnnotationProvider and associated implementation classes