dxaml6 + code cleanup