properly removing our subs when needed