Removal of XBOX code in server and command-line parsing