[scd] properly cleanup implicit sub on oir update

[scd] properly cleanup implicit sub on oir update #665