Smarter removal of subs