Significant cleanup of dominator.i7x