mpz and old stuff cleanup