Added proper destructors