Remove 'MpiPi' stuff, useless now.'