domain: attempt to more properly remove domain