(XDK) Cleanups