Improve two phase pkg removal: do the check for all entry types.