Remove dependency on general-entity

No match.