Changed onDestroy