Fixing leaking DOM elements on destory
Hacked in delete hook until I can refactor it