Add destructor removal