Trying to fix removal of stale nodes after animation