Cleaning code.
Change in AnnotationExecutor.