(XDK D3D) Cleanups #2