Removed potential NPE attractors from onDestroy methods