WIP: Remove entity annotation.