Fix useless entry removal