Fixed stale entries not being removed