fix remaining remove_entity usages