[FIX] Remove unneeded Annotator