Rough remove of MPQ code