Continue removal of XBOX code in renderer