mwl8787: rebase damage and cleanup