Clean up of XBOX related code in many files of code base