DomainMapper cleanups