When modal is dismissed, pass the modal only as argument to the listener
Add destroy methods