more domain cleanups