Remove use of deprecated AnnotationCheckFactory