Moved things to onDestroy()