[scd] properly cleanup implicit sub on oir update (#1109)

[scd] properly cleanup implicit sub on oir update (#1109) #680