[#1789] remove all undefined pets once and for all