Get rid of the MP6 stuff.