Performance

Eliminated some unnecessary calls

@BrettASwift @kadst43 would you mind reviewing?
I don't know how frequent this is - but as a general rule of thumb we should try to avoid remove.  May not be worth it now, but assuming that it's something that's just going to be added back in, maybe we could store it somewhere out of the way, and when we need a new one just reset it?  Much as with your physical garbage... reduce, reuse, recycle... but don't remove.  

In any case... probably not worth it right this moment, but that's the sort of mindset that we need to start to get into if we're going to reduce the number of papercuts...