[Fixed] Stability issue
[Removed] some redundant code
[Added] pets are moved out of a destroying structure

Change-Id: I153257da17b675749b9defa2d06b62f1aaf97693