Updated expunge-entities following PR review