Annotation Tools: Removing opaque_keys reference