remove var context wrapper in annotator