Updated annotator, and removed obsolete option