Updated annotator. Removed some dead code.