Would onStop() be a better choice?