fixed onDestroy cleanup