Ensure modal views also get cleaned up with destroy()