Fix domx build
Clean up to match CM tree