Moved destroy logic into module.