Moved PS++ removal before MP installation