some hotfix cleanup related to wild selmon-> destruction