Speed up deletion of entities