Enhance destroy hook