Finish cleanup of XBOX code... Finally