Updated to latest version of OpenXDX. Code cleanup.