Fixed subscription clean up when using external subs