cleanup, plus move more code to safeGetBBDomainInfo
and fix up removing of domains, also under load