Removing the annotate from the encoder.  We're going to get rid of the need for that shortly.