Revert to 2.2.1 and  Override onDestroy