Last commit of some unused changes for the XNA-version.