Removed cases where entities didn't get removed properly.