Entity annotation usage removed