Revert "Working towards onDestroy bug"

This reverts commit 74cecdc86acbf7333e3ac0c42b65d3e92666e1c4.
Revert "Revert "Working towards onDestroy bug""

This reverts commit fc5dc4c5fccea651ef79ee8f7163c9f342d225f4.
Working with onDestroy