It is used elsewhere. I consolidated them pretty much as you said.