Adapted to the annotation change.
Removed references to the isAnnotated method.
Removed the annotation method left.