remove usage of entities