domain cleanups, reduced interface pollution