moved cleanup from onStop to onPause