diff --git a/fmpcb/test/t-cos_pi.c b/fmpcb/test/t-cos_pi.c
index a5e2d333..09a1032a 100644
--- a/fmpcb/test/t-cos_pi.c
+++ b/fmpcb/test/t-cos_pi.c
@@ -97,7 +97,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-cot.c b/fmpcb/test/t-cot.c
index 3d55b2c9..9d05faec 100644
--- a/fmpcb/test/t-cot.c
+++ b/fmpcb/test/t-cot.c
@@ -105,7 +105,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-cot_pi.c b/fmpcb/test/t-cot_pi.c
index 0c25a742..dca49fcc 100644
--- a/fmpcb/test/t-cot_pi.c
+++ b/fmpcb/test/t-cot_pi.c
@@ -97,7 +97,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-digamma.c b/fmpcb/test/t-digamma.c
index 75867caa..17712553 100644
--- a/fmpcb/test/t-digamma.c
+++ b/fmpcb/test/t-digamma.c
@@ -83,7 +83,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-exp.c b/fmpcb/test/t-exp.c
index 900ab34c..d277fd23 100644
--- a/fmpcb/test/t-exp.c
+++ b/fmpcb/test/t-exp.c
@@ -78,7 +78,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-gamma.c b/fmpcb/test/t-gamma.c
index 2f44f22a..fcc1ca63 100644
--- a/fmpcb/test/t-gamma.c
+++ b/fmpcb/test/t-gamma.c
@@ -82,7 +82,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-hurwitz_zeta.c b/fmpcb/test/t-hurwitz_zeta.c
index abe34762..1b353c27 100644
--- a/fmpcb/test/t-hurwitz_zeta.c
+++ b/fmpcb/test/t-hurwitz_zeta.c
@@ -74,7 +74,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-lgamma.c b/fmpcb/test/t-lgamma.c
index 5f665031..523b2d0a 100644
--- a/fmpcb/test/t-lgamma.c
+++ b/fmpcb/test/t-lgamma.c
@@ -84,7 +84,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-mul.c b/fmpcb/test/t-mul.c
index ec59f6d2..0de53187 100644
--- a/fmpcb/test/t-mul.c
+++ b/fmpcb/test/t-mul.c
@@ -215,7 +215,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-mul_alt.c b/fmpcb/test/t-mul_alt.c
index 57ed5747..f66465eb 100644
--- a/fmpcb/test/t-mul_alt.c
+++ b/fmpcb/test/t-mul_alt.c
@@ -215,7 +215,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-pow.c b/fmpcb/test/t-pow.c
index 083ecbaf..ab1862d0 100644
--- a/fmpcb/test/t-pow.c
+++ b/fmpcb/test/t-pow.c
@@ -97,7 +97,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-pow_fmpz.c b/fmpcb/test/t-pow_fmpz.c
index 7ab4368a..22efb0cb 100644
--- a/fmpcb/test/t-pow_fmpz.c
+++ b/fmpcb/test/t-pow_fmpz.c
@@ -98,7 +98,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-rgamma.c b/fmpcb/test/t-rgamma.c
index 1dd52e9b..017f0415 100644
--- a/fmpcb/test/t-rgamma.c
+++ b/fmpcb/test/t-rgamma.c
@@ -82,7 +82,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-root.c b/fmpcb/test/t-root.c
index 7465a316..848742f1 100644
--- a/fmpcb/test/t-root.c
+++ b/fmpcb/test/t-root.c
@@ -86,7 +86,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-root_exp.c b/fmpcb/test/t-root_exp.c
index d16d8693..c0524f92 100644
--- a/fmpcb/test/t-root_exp.c
+++ b/fmpcb/test/t-root_exp.c
@@ -86,7 +86,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-root_newton.c b/fmpcb/test/t-root_newton.c
index e1b35f6e..5ec90d8d 100644
--- a/fmpcb/test/t-root_newton.c
+++ b/fmpcb/test/t-root_newton.c
@@ -89,7 +89,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-sin_cos.c b/fmpcb/test/t-sin_cos.c
index 9ec0e898..2b848770 100644
--- a/fmpcb/test/t-sin_cos.c
+++ b/fmpcb/test/t-sin_cos.c
@@ -134,7 +134,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-sin_pi.c b/fmpcb/test/t-sin_pi.c
index 21695a26..92ee24fc 100644
--- a/fmpcb/test/t-sin_pi.c
+++ b/fmpcb/test/t-sin_pi.c
@@ -97,7 +97,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-sqrt.c b/fmpcb/test/t-sqrt.c
index eeeb6f62..dda14f05 100644
--- a/fmpcb/test/t-sqrt.c
+++ b/fmpcb/test/t-sqrt.c
@@ -77,7 +77,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-tan.c b/fmpcb/test/t-tan.c
index 21d32322..0d8d29b8 100644
--- a/fmpcb/test/t-tan.c
+++ b/fmpcb/test/t-tan.c
@@ -106,7 +106,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-tan_pi.c b/fmpcb/test/t-tan_pi.c
index 704c21c4..30ae0d95 100644
--- a/fmpcb/test/t-tan_pi.c
+++ b/fmpcb/test/t-tan_pi.c
@@ -97,7 +97,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb/test/t-zeta.c b/fmpcb/test/t-zeta.c
index ff0aa3d5..9d31116f 100644
--- a/fmpcb/test/t-zeta.c
+++ b/fmpcb/test/t-zeta.c
@@ -68,7 +68,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_mat/test/t-det.c b/fmpcb_mat/test/t-det.c
index 714863f3..92f39166 100644
--- a/fmpcb_mat/test/t-det.c
+++ b/fmpcb_mat/test/t-det.c
@@ -82,7 +82,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_mat/test/t-inv.c b/fmpcb_mat/test/t-inv.c
index 0a164522..a03989a6 100644
--- a/fmpcb_mat/test/t-inv.c
+++ b/fmpcb_mat/test/t-inv.c
@@ -129,7 +129,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_mat/test/t-lu.c b/fmpcb_mat/test/t-lu.c
index 3759a273..0129190d 100644
--- a/fmpcb_mat/test/t-lu.c
+++ b/fmpcb_mat/test/t-lu.c
@@ -151,7 +151,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_mat/test/t-mul.c b/fmpcb_mat/test/t-mul.c
index 51ab1f25..a306223d 100644
--- a/fmpcb_mat/test/t-mul.c
+++ b/fmpcb_mat/test/t-mul.c
@@ -122,7 +122,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_mat/test/t-solve.c b/fmpcb_mat/test/t-solve.c
index e94d978e..8e8457b4 100644
--- a/fmpcb_mat/test/t-solve.c
+++ b/fmpcb_mat/test/t-solve.c
@@ -143,7 +143,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-add.c b/fmpcb_poly/test/t-add.c
index 12d2fca7..0cb50a86 100644
--- a/fmpcb_poly/test/t-add.c
+++ b/fmpcb_poly/test/t-add.c
@@ -113,7 +113,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-atan_series.c b/fmpcb_poly/test/t-atan_series.c
index 15acca0b..90c8fa47 100644
--- a/fmpcb_poly/test/t-atan_series.c
+++ b/fmpcb_poly/test/t-atan_series.c
@@ -106,7 +106,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-compose.c b/fmpcb_poly/test/t-compose.c
index cfe1c073..3fa8b7e5 100644
--- a/fmpcb_poly/test/t-compose.c
+++ b/fmpcb_poly/test/t-compose.c
@@ -108,7 +108,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-compose_divconquer.c b/fmpcb_poly/test/t-compose_divconquer.c
index 68086ff8..34cb5edf 100644
--- a/fmpcb_poly/test/t-compose_divconquer.c
+++ b/fmpcb_poly/test/t-compose_divconquer.c
@@ -108,7 +108,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-compose_horner.c b/fmpcb_poly/test/t-compose_horner.c
index 376a57ad..a48212d0 100644
--- a/fmpcb_poly/test/t-compose_horner.c
+++ b/fmpcb_poly/test/t-compose_horner.c
@@ -108,7 +108,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-compose_series.c b/fmpcb_poly/test/t-compose_series.c
index 905fb6f2..bc3c67a4 100644
--- a/fmpcb_poly/test/t-compose_series.c
+++ b/fmpcb_poly/test/t-compose_series.c
@@ -110,7 +110,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-compose_series_brent_kung.c b/fmpcb_poly/test/t-compose_series_brent_kung.c
index b3d3c85d..62b61e8e 100644
--- a/fmpcb_poly/test/t-compose_series_brent_kung.c
+++ b/fmpcb_poly/test/t-compose_series_brent_kung.c
@@ -110,7 +110,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-compose_series_horner.c b/fmpcb_poly/test/t-compose_series_horner.c
index 3b259e76..c42dc8f8 100644
--- a/fmpcb_poly/test/t-compose_series_horner.c
+++ b/fmpcb_poly/test/t-compose_series_horner.c
@@ -110,7 +110,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-div_series.c b/fmpcb_poly/test/t-div_series.c
index ca5276c5..5cd03dbd 100644
--- a/fmpcb_poly/test/t-div_series.c
+++ b/fmpcb_poly/test/t-div_series.c
@@ -122,7 +122,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-divrem.c b/fmpcb_poly/test/t-divrem.c
index 4be607dc..dae94f90 100644
--- a/fmpcb_poly/test/t-divrem.c
+++ b/fmpcb_poly/test/t-divrem.c
@@ -130,7 +130,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-evaluate.c b/fmpcb_poly/test/t-evaluate.c
index 91d3a92d..410338eb 100644
--- a/fmpcb_poly/test/t-evaluate.c
+++ b/fmpcb_poly/test/t-evaluate.c
@@ -98,7 +98,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-evaluate2.c b/fmpcb_poly/test/t-evaluate2.c
index 96230027..2388ae25 100644
--- a/fmpcb_poly/test/t-evaluate2.c
+++ b/fmpcb_poly/test/t-evaluate2.c
@@ -80,7 +80,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-evaluate2_horner.c b/fmpcb_poly/test/t-evaluate2_horner.c
index 1ebacd74..885d2086 100644
--- a/fmpcb_poly/test/t-evaluate2_horner.c
+++ b/fmpcb_poly/test/t-evaluate2_horner.c
@@ -80,7 +80,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-evaluate2_rectangular.c b/fmpcb_poly/test/t-evaluate2_rectangular.c
index e55082ca..ce0f411f 100644
--- a/fmpcb_poly/test/t-evaluate2_rectangular.c
+++ b/fmpcb_poly/test/t-evaluate2_rectangular.c
@@ -80,7 +80,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-evaluate_horner.c b/fmpcb_poly/test/t-evaluate_horner.c
index 3b9a957b..b3cdd901 100644
--- a/fmpcb_poly/test/t-evaluate_horner.c
+++ b/fmpcb_poly/test/t-evaluate_horner.c
@@ -98,7 +98,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-evaluate_rectangular.c b/fmpcb_poly/test/t-evaluate_rectangular.c
index bb205e31..7c1ffe4a 100644
--- a/fmpcb_poly/test/t-evaluate_rectangular.c
+++ b/fmpcb_poly/test/t-evaluate_rectangular.c
@@ -68,7 +68,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-evaluate_vec_fast.c b/fmpcb_poly/test/t-evaluate_vec_fast.c
index 73b96e6e..590bfd72 100644
--- a/fmpcb_poly/test/t-evaluate_vec_fast.c
+++ b/fmpcb_poly/test/t-evaluate_vec_fast.c
@@ -98,7 +98,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-evaluate_vec_iter.c b/fmpcb_poly/test/t-evaluate_vec_iter.c
index d001820e..fbdc3f58 100644
--- a/fmpcb_poly/test/t-evaluate_vec_iter.c
+++ b/fmpcb_poly/test/t-evaluate_vec_iter.c
@@ -98,7 +98,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-exp_series.c b/fmpcb_poly/test/t-exp_series.c
index 79cc7f61..43fdcf58 100644
--- a/fmpcb_poly/test/t-exp_series.c
+++ b/fmpcb_poly/test/t-exp_series.c
@@ -81,7 +81,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-exp_series_basecase.c b/fmpcb_poly/test/t-exp_series_basecase.c
index 3d36c479..6366ef99 100644
--- a/fmpcb_poly/test/t-exp_series_basecase.c
+++ b/fmpcb_poly/test/t-exp_series_basecase.c
@@ -81,7 +81,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-find_roots.c b/fmpcb_poly/test/t-find_roots.c
index 83e85f70..caa868a1 100644
--- a/fmpcb_poly/test/t-find_roots.c
+++ b/fmpcb_poly/test/t-find_roots.c
@@ -106,7 +106,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-gamma_series.c b/fmpcb_poly/test/t-gamma_series.c
index 4ce15b3c..3962aa27 100644
--- a/fmpcb_poly/test/t-gamma_series.c
+++ b/fmpcb_poly/test/t-gamma_series.c
@@ -107,7 +107,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-get_coeff_ptr.c b/fmpcb_poly/test/t-get_coeff_ptr.c
index 560b2498..f9c4a4e5 100644
--- a/fmpcb_poly/test/t-get_coeff_ptr.c
+++ b/fmpcb_poly/test/t-get_coeff_ptr.c
@@ -66,7 +66,7 @@ main(void)
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return 0;
 }
diff --git a/fmpcb_poly/test/t-get_set_coeff_fmprb.c b/fmpcb_poly/test/t-get_set_coeff_fmprb.c
index 38bfc5af..b7f31138 100644
--- a/fmpcb_poly/test/t-get_set_coeff_fmprb.c
+++ b/fmpcb_poly/test/t-get_set_coeff_fmprb.c
@@ -72,7 +72,7 @@ main(void)
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return 0;
 }
diff --git a/fmpcb_poly/test/t-interpolate_barycentric.c b/fmpcb_poly/test/t-interpolate_barycentric.c
index 9a1e4b5c..4fdad597 100644
--- a/fmpcb_poly/test/t-interpolate_barycentric.c
+++ b/fmpcb_poly/test/t-interpolate_barycentric.c
@@ -101,7 +101,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-interpolate_fast.c b/fmpcb_poly/test/t-interpolate_fast.c
index 79e840a7..99d822a9 100644
--- a/fmpcb_poly/test/t-interpolate_fast.c
+++ b/fmpcb_poly/test/t-interpolate_fast.c
@@ -101,7 +101,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-interpolate_newton.c b/fmpcb_poly/test/t-interpolate_newton.c
index b2d8d8e0..ecba343e 100644
--- a/fmpcb_poly/test/t-interpolate_newton.c
+++ b/fmpcb_poly/test/t-interpolate_newton.c
@@ -101,7 +101,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-inv_series.c b/fmpcb_poly/test/t-inv_series.c
index 7095304d..e65268dc 100644
--- a/fmpcb_poly/test/t-inv_series.c
+++ b/fmpcb_poly/test/t-inv_series.c
@@ -134,7 +134,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-lgamma_series.c b/fmpcb_poly/test/t-lgamma_series.c
index f61ea01a..222843cf 100644
--- a/fmpcb_poly/test/t-lgamma_series.c
+++ b/fmpcb_poly/test/t-lgamma_series.c
@@ -108,7 +108,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-log_series.c b/fmpcb_poly/test/t-log_series.c
index b681c9d6..ec1f39ad 100644
--- a/fmpcb_poly/test/t-log_series.c
+++ b/fmpcb_poly/test/t-log_series.c
@@ -182,7 +182,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-mullow.c b/fmpcb_poly/test/t-mullow.c
index c1f05ed7..a0e5561c 100644
--- a/fmpcb_poly/test/t-mullow.c
+++ b/fmpcb_poly/test/t-mullow.c
@@ -180,7 +180,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-mullow_classical.c b/fmpcb_poly/test/t-mullow_classical.c
index 4e79b3fc..ea9d2b2a 100644
--- a/fmpcb_poly/test/t-mullow_classical.c
+++ b/fmpcb_poly/test/t-mullow_classical.c
@@ -192,7 +192,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-mullow_transpose.c b/fmpcb_poly/test/t-mullow_transpose.c
index d61f87f8..2837d896 100644
--- a/fmpcb_poly/test/t-mullow_transpose.c
+++ b/fmpcb_poly/test/t-mullow_transpose.c
@@ -180,7 +180,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-mullow_transpose_gauss.c b/fmpcb_poly/test/t-mullow_transpose_gauss.c
index 36f6646a..47752da8 100644
--- a/fmpcb_poly/test/t-mullow_transpose_gauss.c
+++ b/fmpcb_poly/test/t-mullow_transpose_gauss.c
@@ -180,7 +180,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-revert_series.c b/fmpcb_poly/test/t-revert_series.c
index 87d40f02..60e857b5 100644
--- a/fmpcb_poly/test/t-revert_series.c
+++ b/fmpcb_poly/test/t-revert_series.c
@@ -95,7 +95,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-revert_series_lagrange.c b/fmpcb_poly/test/t-revert_series_lagrange.c
index fb4e4553..a3b4d83f 100644
--- a/fmpcb_poly/test/t-revert_series_lagrange.c
+++ b/fmpcb_poly/test/t-revert_series_lagrange.c
@@ -95,7 +95,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-revert_series_lagrange_fast.c b/fmpcb_poly/test/t-revert_series_lagrange_fast.c
index 40c2a920..85f79ef4 100644
--- a/fmpcb_poly/test/t-revert_series_lagrange_fast.c
+++ b/fmpcb_poly/test/t-revert_series_lagrange_fast.c
@@ -95,7 +95,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-revert_series_newton.c b/fmpcb_poly/test/t-revert_series_newton.c
index ae6cbd81..e8f4e87a 100644
--- a/fmpcb_poly/test/t-revert_series_newton.c
+++ b/fmpcb_poly/test/t-revert_series_newton.c
@@ -95,7 +95,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-rgamma_series.c b/fmpcb_poly/test/t-rgamma_series.c
index a31c0432..1d42f785 100644
--- a/fmpcb_poly/test/t-rgamma_series.c
+++ b/fmpcb_poly/test/t-rgamma_series.c
@@ -106,7 +106,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-shift_left_right.c b/fmpcb_poly/test/t-shift_left_right.c
index 7e700fd2..057416e0 100644
--- a/fmpcb_poly/test/t-shift_left_right.c
+++ b/fmpcb_poly/test/t-shift_left_right.c
@@ -119,7 +119,7 @@ main(void)
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return 0;
 }
diff --git a/fmpcb_poly/test/t-sin_cos_series.c b/fmpcb_poly/test/t-sin_cos_series.c
index 3864ab4b..19445647 100644
--- a/fmpcb_poly/test/t-sin_cos_series.c
+++ b/fmpcb_poly/test/t-sin_cos_series.c
@@ -102,7 +102,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-sin_cos_series_basecase.c b/fmpcb_poly/test/t-sin_cos_series_basecase.c
index 4f925909..ce3d499c 100644
--- a/fmpcb_poly/test/t-sin_cos_series_basecase.c
+++ b/fmpcb_poly/test/t-sin_cos_series_basecase.c
@@ -102,7 +102,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-sin_cos_series_tangent.c b/fmpcb_poly/test/t-sin_cos_series_tangent.c
index 2ff69167..7c9cd4f3 100644
--- a/fmpcb_poly/test/t-sin_cos_series_tangent.c
+++ b/fmpcb_poly/test/t-sin_cos_series_tangent.c
@@ -102,7 +102,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-sin_series_cos_series.c b/fmpcb_poly/test/t-sin_series_cos_series.c
index 07a44dcb..e8480673 100644
--- a/fmpcb_poly/test/t-sin_series_cos_series.c
+++ b/fmpcb_poly/test/t-sin_series_cos_series.c
@@ -103,7 +103,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-sub.c b/fmpcb_poly/test/t-sub.c
index 06d6d2a1..3fa7434b 100644
--- a/fmpcb_poly/test/t-sub.c
+++ b/fmpcb_poly/test/t-sub.c
@@ -113,7 +113,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-tan_series.c b/fmpcb_poly/test/t-tan_series.c
index 12c0d38f..4e369780 100644
--- a/fmpcb_poly/test/t-tan_series.c
+++ b/fmpcb_poly/test/t-tan_series.c
@@ -93,7 +93,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpcb_poly/test/t-zeta_series.c b/fmpcb_poly/test/t-zeta_series.c
index 1a9d5a31..9d7fbd11 100644
--- a/fmpcb_poly/test/t-zeta_series.c
+++ b/fmpcb_poly/test/t-zeta_series.c
@@ -129,7 +129,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-add.c b/fmpr/test/t-add.c
index 4c7691e1..782f4d36 100644
--- a/fmpr/test/t-add.c
+++ b/fmpr/test/t-add.c
@@ -242,7 +242,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-add_naive.c b/fmpr/test/t-add_naive.c
index 4b4e796f..c64271da 100644
--- a/fmpr/test/t-add_naive.c
+++ b/fmpr/test/t-add_naive.c
@@ -187,7 +187,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-cmp.c b/fmpr/test/t-cmp.c
index 272db64b..c3df2804 100644
--- a/fmpr/test/t-cmp.c
+++ b/fmpr/test/t-cmp.c
@@ -77,7 +77,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-cmp_2exp_si.c b/fmpr/test/t-cmp_2exp_si.c
index 2513ca78..bd35a6ca 100644
--- a/fmpr/test/t-cmp_2exp_si.c
+++ b/fmpr/test/t-cmp_2exp_si.c
@@ -68,7 +68,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-cmpabs.c b/fmpr/test/t-cmpabs.c
index 7a057767..9148c113 100644
--- a/fmpr/test/t-cmpabs.c
+++ b/fmpr/test/t-cmpabs.c
@@ -80,7 +80,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-cmpabs_2exp_si.c b/fmpr/test/t-cmpabs_2exp_si.c
index 4a2046bc..516ba60a 100644
--- a/fmpr/test/t-cmpabs_2exp_si.c
+++ b/fmpr/test/t-cmpabs_2exp_si.c
@@ -68,7 +68,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-div.c b/fmpr/test/t-div.c
index 10927b43..7e474975 100644
--- a/fmpr/test/t-div.c
+++ b/fmpr/test/t-div.c
@@ -110,7 +110,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-divappr_abs_ubound.c b/fmpr/test/t-divappr_abs_ubound.c
index 7befe349..3154a5aa 100644
--- a/fmpr/test/t-divappr_abs_ubound.c
+++ b/fmpr/test/t-divappr_abs_ubound.c
@@ -73,7 +73,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-exp.c b/fmpr/test/t-exp.c
index 0314bb4c..c473794a 100644
--- a/fmpr/test/t-exp.c
+++ b/fmpr/test/t-exp.c
@@ -97,7 +97,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-expm1.c b/fmpr/test/t-expm1.c
index 5139f418..66a191c1 100644
--- a/fmpr/test/t-expm1.c
+++ b/fmpr/test/t-expm1.c
@@ -97,7 +97,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-get_d.c b/fmpr/test/t-get_d.c
index 2e9a5de4..46a68adb 100644
--- a/fmpr/test/t-get_d.c
+++ b/fmpr/test/t-get_d.c
@@ -62,7 +62,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-get_fmpz.c b/fmpr/test/t-get_fmpz.c
index ba2eac62..8b631884 100644
--- a/fmpr/test/t-get_fmpz.c
+++ b/fmpr/test/t-get_fmpz.c
@@ -99,7 +99,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-get_mpfr.c b/fmpr/test/t-get_mpfr.c
index c5451621..a1726964 100644
--- a/fmpr/test/t-get_mpfr.c
+++ b/fmpr/test/t-get_mpfr.c
@@ -66,7 +66,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-log.c b/fmpr/test/t-log.c
index c95a3fc6..a2e6b573 100644
--- a/fmpr/test/t-log.c
+++ b/fmpr/test/t-log.c
@@ -97,7 +97,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-log1p.c b/fmpr/test/t-log1p.c
index c69f6af9..d6cf7e52 100644
--- a/fmpr/test/t-log1p.c
+++ b/fmpr/test/t-log1p.c
@@ -97,7 +97,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-mul.c b/fmpr/test/t-mul.c
index 9e56d3a9..73eabd5d 100644
--- a/fmpr/test/t-mul.c
+++ b/fmpr/test/t-mul.c
@@ -142,7 +142,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-mul_naive.c b/fmpr/test/t-mul_naive.c
index 10cbe1bc..1d0e8b77 100644
--- a/fmpr/test/t-mul_naive.c
+++ b/fmpr/test/t-mul_naive.c
@@ -104,7 +104,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-normalise.c b/fmpr/test/t-normalise.c
index db7400d0..6617d90a 100644
--- a/fmpr/test/t-normalise.c
+++ b/fmpr/test/t-normalise.c
@@ -104,7 +104,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-root.c b/fmpr/test/t-root.c
index 5a9900df..4a6c990a 100644
--- a/fmpr/test/t-root.c
+++ b/fmpr/test/t-root.c
@@ -104,7 +104,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-rsqrt.c b/fmpr/test/t-rsqrt.c
index 5edf4db6..93ef4c6f 100644
--- a/fmpr/test/t-rsqrt.c
+++ b/fmpr/test/t-rsqrt.c
@@ -97,7 +97,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-set_fmpq.c b/fmpr/test/t-set_fmpq.c
index 459835bc..015dd3c2 100644
--- a/fmpr/test/t-set_fmpq.c
+++ b/fmpr/test/t-set_fmpq.c
@@ -71,7 +71,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-set_fmpz_2exp.c b/fmpr/test/t-set_fmpz_2exp.c
index be9596e4..a3f2a12b 100644
--- a/fmpr/test/t-set_fmpz_2exp.c
+++ b/fmpr/test/t-set_fmpz_2exp.c
@@ -74,7 +74,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-set_round_mpn.c b/fmpr/test/t-set_round_mpn.c
index 844a9a56..fb169ed8 100644
--- a/fmpr/test/t-set_round_mpn.c
+++ b/fmpr/test/t-set_round_mpn.c
@@ -94,7 +94,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-set_round_ui_2exp_fmpz.c b/fmpr/test/t-set_round_ui_2exp_fmpz.c
index c81cecef..b68eb195 100644
--- a/fmpr/test/t-set_round_ui_2exp_fmpz.c
+++ b/fmpr/test/t-set_round_ui_2exp_fmpz.c
@@ -93,7 +93,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-set_round_uiui_2exp_fmpz.c b/fmpr/test/t-set_round_uiui_2exp_fmpz.c
index 59559db6..fd65ab3d 100644
--- a/fmpr/test/t-set_round_uiui_2exp_fmpz.c
+++ b/fmpr/test/t-set_round_uiui_2exp_fmpz.c
@@ -95,7 +95,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-sqrt.c b/fmpr/test/t-sqrt.c
index 39580054..71d111b4 100644
--- a/fmpr/test/t-sqrt.c
+++ b/fmpr/test/t-sqrt.c
@@ -101,7 +101,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-sub.c b/fmpr/test/t-sub.c
index a4385d67..92af1a2e 100644
--- a/fmpr/test/t-sub.c
+++ b/fmpr/test/t-sub.c
@@ -187,7 +187,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpr/test/t-sum.c b/fmpr/test/t-sum.c
index 84dbf056..7003f5d6 100644
--- a/fmpr/test/t-sum.c
+++ b/fmpr/test/t-sum.c
@@ -119,7 +119,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-acos.c b/fmprb/test/t-acos.c
index 8b6177ce..6ba44b26 100644
--- a/fmprb/test/t-acos.c
+++ b/fmprb/test/t-acos.c
@@ -123,7 +123,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-add.c b/fmprb/test/t-add.c
index 8b82a4f2..79878d5d 100644
--- a/fmprb/test/t-add.c
+++ b/fmprb/test/t-add.c
@@ -162,7 +162,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-addmul.c b/fmprb/test/t-addmul.c
index 27c9aa9a..5f6550e8 100644
--- a/fmprb/test/t-addmul.c
+++ b/fmprb/test/t-addmul.c
@@ -165,7 +165,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-agm.c b/fmprb/test/t-agm.c
index 07f66f10..3e775fb2 100644
--- a/fmprb/test/t-agm.c
+++ b/fmprb/test/t-agm.c
@@ -95,7 +95,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-asin.c b/fmprb/test/t-asin.c
index 355afba7..4e9ad5d1 100644
--- a/fmprb/test/t-asin.c
+++ b/fmprb/test/t-asin.c
@@ -123,7 +123,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-atan.c b/fmprb/test/t-atan.c
index 139fb2e2..74bda1eb 100644
--- a/fmprb/test/t-atan.c
+++ b/fmprb/test/t-atan.c
@@ -127,7 +127,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-atan2.c b/fmprb/test/t-atan2.c
index b2fd2f5a..b0e95b3b 100644
--- a/fmprb/test/t-atan2.c
+++ b/fmprb/test/t-atan2.c
@@ -82,7 +82,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-const_catalan.c b/fmprb/test/t-const_catalan.c
index 0a22da3f..adf8b4b2 100644
--- a/fmprb/test/t-const_catalan.c
+++ b/fmprb/test/t-const_catalan.c
@@ -71,8 +71,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
-    mpfr_free_cache();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-const_e.c b/fmprb/test/t-const_e.c
index cf4d2884..5881c07e 100644
--- a/fmprb/test/t-const_e.c
+++ b/fmprb/test/t-const_e.c
@@ -72,8 +72,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
-    mpfr_free_cache();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-const_euler.c b/fmprb/test/t-const_euler.c
index 26336bf7..2d6ba13b 100644
--- a/fmprb/test/t-const_euler.c
+++ b/fmprb/test/t-const_euler.c
@@ -71,8 +71,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
-    mpfr_free_cache();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-const_khinchin.c b/fmprb/test/t-const_khinchin.c
index 931117ff..3ee5b508 100644
--- a/fmprb/test/t-const_khinchin.c
+++ b/fmprb/test/t-const_khinchin.c
@@ -70,7 +70,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-const_log10.c b/fmprb/test/t-const_log10.c
index 38ec4139..6e05bf59 100644
--- a/fmprb/test/t-const_log10.c
+++ b/fmprb/test/t-const_log10.c
@@ -72,8 +72,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
-    mpfr_free_cache();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-const_log2.c b/fmprb/test/t-const_log2.c
index 361c8d79..b00de489 100644
--- a/fmprb/test/t-const_log2.c
+++ b/fmprb/test/t-const_log2.c
@@ -71,8 +71,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
-    mpfr_free_cache();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-const_pi_chudnovsky.c b/fmprb/test/t-const_pi_chudnovsky.c
index d29f83bf..51fc8118 100644
--- a/fmprb/test/t-const_pi_chudnovsky.c
+++ b/fmprb/test/t-const_pi_chudnovsky.c
@@ -71,8 +71,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
-    mpfr_free_cache();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-contains.c b/fmprb/test/t-contains.c
index 7ac25e82..01152e7f 100644
--- a/fmprb/test/t-contains.c
+++ b/fmprb/test/t-contains.c
@@ -96,7 +96,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-contains_fmpr.c b/fmprb/test/t-contains_fmpr.c
index bc2b26ee..3b27263d 100644
--- a/fmprb/test/t-contains_fmpr.c
+++ b/fmprb/test/t-contains_fmpr.c
@@ -88,7 +88,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-cos.c b/fmprb/test/t-cos.c
index 456b632f..34c18372 100644
--- a/fmprb/test/t-cos.c
+++ b/fmprb/test/t-cos.c
@@ -130,7 +130,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-cos_pi.c b/fmprb/test/t-cos_pi.c
index d12508b2..bece2a03 100644
--- a/fmprb/test/t-cos_pi.c
+++ b/fmprb/test/t-cos_pi.c
@@ -69,7 +69,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-cos_pi_fmpq.c b/fmprb/test/t-cos_pi_fmpq.c
index 3fb296d9..61d324db 100644
--- a/fmprb/test/t-cos_pi_fmpq.c
+++ b/fmprb/test/t-cos_pi_fmpq.c
@@ -71,7 +71,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-cos_pi_fmpq_algebraic.c b/fmprb/test/t-cos_pi_fmpq_algebraic.c
index 4d5db085..69ffddf3 100644
--- a/fmprb/test/t-cos_pi_fmpq_algebraic.c
+++ b/fmprb/test/t-cos_pi_fmpq_algebraic.c
@@ -83,7 +83,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-cosh.c b/fmprb/test/t-cosh.c
index e28a004d..7be75643 100644
--- a/fmprb/test/t-cosh.c
+++ b/fmprb/test/t-cosh.c
@@ -79,7 +79,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-coth.c b/fmprb/test/t-coth.c
index b0ef3add..cf954b80 100644
--- a/fmprb/test/t-coth.c
+++ b/fmprb/test/t-coth.c
@@ -105,7 +105,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-digamma.c b/fmprb/test/t-digamma.c
index 13e43d43..3f646197 100644
--- a/fmprb/test/t-digamma.c
+++ b/fmprb/test/t-digamma.c
@@ -82,7 +82,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-div.c b/fmprb/test/t-div.c
index d7f9234e..8bb2c61c 100644
--- a/fmprb/test/t-div.c
+++ b/fmprb/test/t-div.c
@@ -168,7 +168,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-div_2expm1_ui.c b/fmprb/test/t-div_2expm1_ui.c
index a50ef67e..dbab3ed3 100644
--- a/fmprb/test/t-div_2expm1_ui.c
+++ b/fmprb/test/t-div_2expm1_ui.c
@@ -89,7 +89,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-exp.c b/fmprb/test/t-exp.c
index 1a5c2a84..c65b5f99 100644
--- a/fmprb/test/t-exp.c
+++ b/fmprb/test/t-exp.c
@@ -133,7 +133,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-expm1.c b/fmprb/test/t-expm1.c
index 174064d4..ee840c70 100644
--- a/fmprb/test/t-expm1.c
+++ b/fmprb/test/t-expm1.c
@@ -131,7 +131,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-gamma.c b/fmprb/test/t-gamma.c
index 0287de78..b47d9c30 100644
--- a/fmprb/test/t-gamma.c
+++ b/fmprb/test/t-gamma.c
@@ -81,7 +81,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-get_interval_fmpz_2exp.c b/fmprb/test/t-get_interval_fmpz_2exp.c
index 6fc96bb9..1a20447f 100644
--- a/fmprb/test/t-get_interval_fmpz_2exp.c
+++ b/fmprb/test/t-get_interval_fmpz_2exp.c
@@ -78,7 +78,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-get_rand_fmpq.c b/fmprb/test/t-get_rand_fmpq.c
index e0de0604..6926e9bb 100644
--- a/fmprb/test/t-get_rand_fmpq.c
+++ b/fmprb/test/t-get_rand_fmpq.c
@@ -58,7 +58,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-get_unique_fmpz.c b/fmprb/test/t-get_unique_fmpz.c
index 57df2efb..a6da970f 100644
--- a/fmprb/test/t-get_unique_fmpz.c
+++ b/fmprb/test/t-get_unique_fmpz.c
@@ -118,7 +118,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-lgamma.c b/fmprb/test/t-lgamma.c
index 79da51ca..74786c7d 100644
--- a/fmprb/test/t-lgamma.c
+++ b/fmprb/test/t-lgamma.c
@@ -75,7 +75,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-log.c b/fmprb/test/t-log.c
index 936f0645..d209963d 100644
--- a/fmprb/test/t-log.c
+++ b/fmprb/test/t-log.c
@@ -133,7 +133,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-mul.c b/fmprb/test/t-mul.c
index 167ce724..1bca945a 100644
--- a/fmprb/test/t-mul.c
+++ b/fmprb/test/t-mul.c
@@ -285,7 +285,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-mul_naive.c b/fmprb/test/t-mul_naive.c
index b985b54b..a5f4b816 100644
--- a/fmprb/test/t-mul_naive.c
+++ b/fmprb/test/t-mul_naive.c
@@ -162,7 +162,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-overlaps.c b/fmprb/test/t-overlaps.c
index 4e679e3f..56e7f15b 100644
--- a/fmprb/test/t-overlaps.c
+++ b/fmprb/test/t-overlaps.c
@@ -94,7 +94,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-pow.c b/fmprb/test/t-pow.c
index 98e97d98..da0d13d1 100644
--- a/fmprb/test/t-pow.c
+++ b/fmprb/test/t-pow.c
@@ -97,7 +97,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-pow_fmpq.c b/fmprb/test/t-pow_fmpq.c
index 4db8bb3b..32fdaaf6 100644
--- a/fmprb/test/t-pow_fmpq.c
+++ b/fmprb/test/t-pow_fmpq.c
@@ -99,7 +99,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-pow_fmpz.c b/fmprb/test/t-pow_fmpz.c
index 54f67796..a29e748a 100644
--- a/fmprb/test/t-pow_fmpz.c
+++ b/fmprb/test/t-pow_fmpz.c
@@ -99,7 +99,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-rgamma.c b/fmprb/test/t-rgamma.c
index c2f26fd9..e05ca542 100644
--- a/fmprb/test/t-rgamma.c
+++ b/fmprb/test/t-rgamma.c
@@ -81,7 +81,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-root.c b/fmprb/test/t-root.c
index 9e8015cd..e5eddd8a 100644
--- a/fmprb/test/t-root.c
+++ b/fmprb/test/t-root.c
@@ -77,7 +77,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-rsqrt.c b/fmprb/test/t-rsqrt.c
index 9be917ea..990f9a5c 100644
--- a/fmprb/test/t-rsqrt.c
+++ b/fmprb/test/t-rsqrt.c
@@ -74,7 +74,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-set_interval_fmpr.c b/fmprb/test/t-set_interval_fmpr.c
index 3ca70d42..09d22a63 100644
--- a/fmprb/test/t-set_interval_fmpr.c
+++ b/fmprb/test/t-set_interval_fmpr.c
@@ -65,7 +65,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-sin.c b/fmprb/test/t-sin.c
index fd983175..50d534f3 100644
--- a/fmprb/test/t-sin.c
+++ b/fmprb/test/t-sin.c
@@ -130,7 +130,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-sin_cos.c b/fmprb/test/t-sin_cos.c
index ca83a2e9..6c80449e 100644
--- a/fmprb/test/t-sin_cos.c
+++ b/fmprb/test/t-sin_cos.c
@@ -137,7 +137,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-sin_cos_pi.c b/fmprb/test/t-sin_cos_pi.c
index 99042ed6..536fb988 100644
--- a/fmprb/test/t-sin_cos_pi.c
+++ b/fmprb/test/t-sin_cos_pi.c
@@ -77,7 +77,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-sin_cos_pi_fmpq.c b/fmprb/test/t-sin_cos_pi_fmpq.c
index 994a7b87..c7063289 100644
--- a/fmprb/test/t-sin_cos_pi_fmpq.c
+++ b/fmprb/test/t-sin_cos_pi_fmpq.c
@@ -77,7 +77,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-sin_cos_pi_fmpq_algebraic.c b/fmprb/test/t-sin_cos_pi_fmpq_algebraic.c
index 132b4f86..c6ea7c74 100644
--- a/fmprb/test/t-sin_cos_pi_fmpq_algebraic.c
+++ b/fmprb/test/t-sin_cos_pi_fmpq_algebraic.c
@@ -106,7 +106,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-sin_pi.c b/fmprb/test/t-sin_pi.c
index fdbbfb51..1823237e 100644
--- a/fmprb/test/t-sin_pi.c
+++ b/fmprb/test/t-sin_pi.c
@@ -69,7 +69,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-sin_pi_fmpq.c b/fmprb/test/t-sin_pi_fmpq.c
index 7155ecfc..fccde01e 100644
--- a/fmprb/test/t-sin_pi_fmpq.c
+++ b/fmprb/test/t-sin_pi_fmpq.c
@@ -71,7 +71,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-sin_pi_fmpq_algebraic.c b/fmprb/test/t-sin_pi_fmpq_algebraic.c
index b66054e3..56b0bf67 100644
--- a/fmprb/test/t-sin_pi_fmpq_algebraic.c
+++ b/fmprb/test/t-sin_pi_fmpq_algebraic.c
@@ -83,7 +83,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-sinh.c b/fmprb/test/t-sinh.c
index fed0ebf6..1a58dbd7 100644
--- a/fmprb/test/t-sinh.c
+++ b/fmprb/test/t-sinh.c
@@ -79,7 +79,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-sinh_cosh.c b/fmprb/test/t-sinh_cosh.c
index ef9d9655..3e129a41 100644
--- a/fmprb/test/t-sinh_cosh.c
+++ b/fmprb/test/t-sinh_cosh.c
@@ -84,7 +84,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-sqrt.c b/fmprb/test/t-sqrt.c
index b15378c6..f5a2f128 100644
--- a/fmprb/test/t-sqrt.c
+++ b/fmprb/test/t-sqrt.c
@@ -72,7 +72,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-sqrtpos.c b/fmprb/test/t-sqrtpos.c
index e9e65598..21d4c20e 100644
--- a/fmprb/test/t-sqrtpos.c
+++ b/fmprb/test/t-sqrtpos.c
@@ -74,7 +74,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-sub.c b/fmprb/test/t-sub.c
index ba7262c7..2f74ac67 100644
--- a/fmprb/test/t-sub.c
+++ b/fmprb/test/t-sub.c
@@ -162,7 +162,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-submul.c b/fmprb/test/t-submul.c
index 5064eee6..aff392f0 100644
--- a/fmprb/test/t-submul.c
+++ b/fmprb/test/t-submul.c
@@ -165,7 +165,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-tanh.c b/fmprb/test/t-tanh.c
index b016ad5c..0bf1db81 100644
--- a/fmprb/test/t-tanh.c
+++ b/fmprb/test/t-tanh.c
@@ -105,7 +105,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-union.c b/fmprb/test/t-union.c
index aa2d8305..02c9b371 100644
--- a/fmprb/test/t-union.c
+++ b/fmprb/test/t-union.c
@@ -87,7 +87,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb/test/t-zeta.c b/fmprb/test/t-zeta.c
index c5408a2a..29205f00 100644
--- a/fmprb/test/t-zeta.c
+++ b/fmprb/test/t-zeta.c
@@ -67,7 +67,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_mat/det.c b/fmprb_mat/det.c
index 441d40e8..827a5d63 100644
--- a/fmprb_mat/det.c
+++ b/fmprb_mat/det.c
@@ -167,10 +167,6 @@ fmprb_mat_det(fmprb_t det, const fmprb_mat_t A, long prec)
         fmprb_mat_t T;
         fmprb_mat_init(T, fmprb_mat_nrows(A), fmprb_mat_ncols(A));
         fmprb_mat_set(T, A);
-
-        printf("computing det of:\n");
-        fmprb_mat_printd(A, 15); printf("\n");
-
         fmprb_mat_det_inplace(det, T, prec);
         fmprb_mat_clear(T);
     }
diff --git a/fmprb_mat/test/t-det.c b/fmprb_mat/test/t-det.c
index 67c125c3..6a21d749 100644
--- a/fmprb_mat/test/t-det.c
+++ b/fmprb_mat/test/t-det.c
@@ -82,7 +82,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_mat/test/t-inv.c b/fmprb_mat/test/t-inv.c
index da531ead..ee108e9d 100644
--- a/fmprb_mat/test/t-inv.c
+++ b/fmprb_mat/test/t-inv.c
@@ -129,7 +129,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_mat/test/t-lu.c b/fmprb_mat/test/t-lu.c
index 61f2f570..07024333 100644
--- a/fmprb_mat/test/t-lu.c
+++ b/fmprb_mat/test/t-lu.c
@@ -151,7 +151,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_mat/test/t-mul.c b/fmprb_mat/test/t-mul.c
index 4b87d2cf..79259684 100644
--- a/fmprb_mat/test/t-mul.c
+++ b/fmprb_mat/test/t-mul.c
@@ -122,7 +122,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_mat/test/t-solve.c b/fmprb_mat/test/t-solve.c
index 49df94e1..53ee7012 100644
--- a/fmprb_mat/test/t-solve.c
+++ b/fmprb_mat/test/t-solve.c
@@ -143,7 +143,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-acos_series.c b/fmprb_poly/test/t-acos_series.c
index 35d863bb..102dca1e 100644
--- a/fmprb_poly/test/t-acos_series.c
+++ b/fmprb_poly/test/t-acos_series.c
@@ -92,7 +92,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-add.c b/fmprb_poly/test/t-add.c
index 9df469a8..e48b56e9 100644
--- a/fmprb_poly/test/t-add.c
+++ b/fmprb_poly/test/t-add.c
@@ -90,7 +90,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-asin_series.c b/fmprb_poly/test/t-asin_series.c
index bfef33b8..e2c188aa 100644
--- a/fmprb_poly/test/t-asin_series.c
+++ b/fmprb_poly/test/t-asin_series.c
@@ -92,7 +92,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-atan_series.c b/fmprb_poly/test/t-atan_series.c
index 66f4e324..11e25f83 100644
--- a/fmprb_poly/test/t-atan_series.c
+++ b/fmprb_poly/test/t-atan_series.c
@@ -105,7 +105,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-compose.c b/fmprb_poly/test/t-compose.c
index b9983098..b89c5c7c 100644
--- a/fmprb_poly/test/t-compose.c
+++ b/fmprb_poly/test/t-compose.c
@@ -108,7 +108,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-compose_divconquer.c b/fmprb_poly/test/t-compose_divconquer.c
index 3034d792..b85345a3 100644
--- a/fmprb_poly/test/t-compose_divconquer.c
+++ b/fmprb_poly/test/t-compose_divconquer.c
@@ -108,7 +108,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-compose_horner.c b/fmprb_poly/test/t-compose_horner.c
index 2c833450..247f4f45 100644
--- a/fmprb_poly/test/t-compose_horner.c
+++ b/fmprb_poly/test/t-compose_horner.c
@@ -108,7 +108,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-compose_series.c b/fmprb_poly/test/t-compose_series.c
index 438fc264..1c46980c 100644
--- a/fmprb_poly/test/t-compose_series.c
+++ b/fmprb_poly/test/t-compose_series.c
@@ -110,7 +110,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-compose_series_brent_kung.c b/fmprb_poly/test/t-compose_series_brent_kung.c
index 592e5b70..0659afdb 100644
--- a/fmprb_poly/test/t-compose_series_brent_kung.c
+++ b/fmprb_poly/test/t-compose_series_brent_kung.c
@@ -110,7 +110,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-compose_series_horner.c b/fmprb_poly/test/t-compose_series_horner.c
index 664ac3eb..19fc0982 100644
--- a/fmprb_poly/test/t-compose_series_horner.c
+++ b/fmprb_poly/test/t-compose_series_horner.c
@@ -110,7 +110,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-div_series.c b/fmprb_poly/test/t-div_series.c
index f337945b..0c5db579 100644
--- a/fmprb_poly/test/t-div_series.c
+++ b/fmprb_poly/test/t-div_series.c
@@ -122,7 +122,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-divrem.c b/fmprb_poly/test/t-divrem.c
index 31728dc9..c65b87f0 100644
--- a/fmprb_poly/test/t-divrem.c
+++ b/fmprb_poly/test/t-divrem.c
@@ -130,7 +130,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-evaluate.c b/fmprb_poly/test/t-evaluate.c
index 990de8a0..392208e9 100644
--- a/fmprb_poly/test/t-evaluate.c
+++ b/fmprb_poly/test/t-evaluate.c
@@ -98,7 +98,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-evaluate2.c b/fmprb_poly/test/t-evaluate2.c
index e4a74564..b6033077 100644
--- a/fmprb_poly/test/t-evaluate2.c
+++ b/fmprb_poly/test/t-evaluate2.c
@@ -80,7 +80,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-evaluate2_fmpcb_rectangular.c b/fmprb_poly/test/t-evaluate2_fmpcb_rectangular.c
index 18cf2e58..2d929391 100644
--- a/fmprb_poly/test/t-evaluate2_fmpcb_rectangular.c
+++ b/fmprb_poly/test/t-evaluate2_fmpcb_rectangular.c
@@ -80,7 +80,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-evaluate2_horner.c b/fmprb_poly/test/t-evaluate2_horner.c
index 2a29919e..d3043161 100644
--- a/fmprb_poly/test/t-evaluate2_horner.c
+++ b/fmprb_poly/test/t-evaluate2_horner.c
@@ -80,7 +80,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-evaluate2_rectangular.c b/fmprb_poly/test/t-evaluate2_rectangular.c
index c830ddda..b2814f69 100644
--- a/fmprb_poly/test/t-evaluate2_rectangular.c
+++ b/fmprb_poly/test/t-evaluate2_rectangular.c
@@ -80,7 +80,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-evaluate_fmpcb_rectangular.c b/fmprb_poly/test/t-evaluate_fmpcb_rectangular.c
index 17076c4f..4e973600 100644
--- a/fmprb_poly/test/t-evaluate_fmpcb_rectangular.c
+++ b/fmprb_poly/test/t-evaluate_fmpcb_rectangular.c
@@ -68,7 +68,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-evaluate_horner.c b/fmprb_poly/test/t-evaluate_horner.c
index 2264b41f..a4cea0c4 100644
--- a/fmprb_poly/test/t-evaluate_horner.c
+++ b/fmprb_poly/test/t-evaluate_horner.c
@@ -98,7 +98,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-evaluate_rectangular.c b/fmprb_poly/test/t-evaluate_rectangular.c
index 55f85d81..bd29d53e 100644
--- a/fmprb_poly/test/t-evaluate_rectangular.c
+++ b/fmprb_poly/test/t-evaluate_rectangular.c
@@ -68,7 +68,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-evaluate_vec_fast.c b/fmprb_poly/test/t-evaluate_vec_fast.c
index e52f55bf..94cac863 100644
--- a/fmprb_poly/test/t-evaluate_vec_fast.c
+++ b/fmprb_poly/test/t-evaluate_vec_fast.c
@@ -98,7 +98,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-evaluate_vec_iter.c b/fmprb_poly/test/t-evaluate_vec_iter.c
index f3b43c9d..cdd9b22c 100644
--- a/fmprb_poly/test/t-evaluate_vec_iter.c
+++ b/fmprb_poly/test/t-evaluate_vec_iter.c
@@ -98,7 +98,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-exp_series.c b/fmprb_poly/test/t-exp_series.c
index 2469874c..bc8a1217 100644
--- a/fmprb_poly/test/t-exp_series.c
+++ b/fmprb_poly/test/t-exp_series.c
@@ -193,7 +193,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-exp_series_basecase.c b/fmprb_poly/test/t-exp_series_basecase.c
index 8f806ed4..a0e72c5f 100644
--- a/fmprb_poly/test/t-exp_series_basecase.c
+++ b/fmprb_poly/test/t-exp_series_basecase.c
@@ -193,7 +193,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-gamma_series.c b/fmprb_poly/test/t-gamma_series.c
index 5331df04..e1038447 100644
--- a/fmprb_poly/test/t-gamma_series.c
+++ b/fmprb_poly/test/t-gamma_series.c
@@ -114,7 +114,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-get_coeff_ptr.c b/fmprb_poly/test/t-get_coeff_ptr.c
index f0837f53..75e9a34a 100644
--- a/fmprb_poly/test/t-get_coeff_ptr.c
+++ b/fmprb_poly/test/t-get_coeff_ptr.c
@@ -66,7 +66,7 @@ main(void)
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return 0;
 }
diff --git a/fmprb_poly/test/t-get_set_coeff_fmprb.c b/fmprb_poly/test/t-get_set_coeff_fmprb.c
index 6ada34c1..bf7a41f0 100644
--- a/fmprb_poly/test/t-get_set_coeff_fmprb.c
+++ b/fmprb_poly/test/t-get_set_coeff_fmprb.c
@@ -72,7 +72,7 @@ main(void)
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return 0;
 }
diff --git a/fmprb_poly/test/t-interpolate_barycentric.c b/fmprb_poly/test/t-interpolate_barycentric.c
index 4675f01b..2649cea0 100644
--- a/fmprb_poly/test/t-interpolate_barycentric.c
+++ b/fmprb_poly/test/t-interpolate_barycentric.c
@@ -101,7 +101,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-interpolate_fast.c b/fmprb_poly/test/t-interpolate_fast.c
index aac948f9..cf20ee04 100644
--- a/fmprb_poly/test/t-interpolate_fast.c
+++ b/fmprb_poly/test/t-interpolate_fast.c
@@ -101,7 +101,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-interpolate_newton.c b/fmprb_poly/test/t-interpolate_newton.c
index 148aa164..1f426d7c 100644
--- a/fmprb_poly/test/t-interpolate_newton.c
+++ b/fmprb_poly/test/t-interpolate_newton.c
@@ -101,7 +101,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-inv_series.c b/fmprb_poly/test/t-inv_series.c
index e7242fa3..f03bcfe5 100644
--- a/fmprb_poly/test/t-inv_series.c
+++ b/fmprb_poly/test/t-inv_series.c
@@ -92,7 +92,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-lgamma_series.c b/fmprb_poly/test/t-lgamma_series.c
index 1952b8e1..a0b5b952 100644
--- a/fmprb_poly/test/t-lgamma_series.c
+++ b/fmprb_poly/test/t-lgamma_series.c
@@ -116,7 +116,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-log_series.c b/fmprb_poly/test/t-log_series.c
index 866aad3c..6f4baf48 100644
--- a/fmprb_poly/test/t-log_series.c
+++ b/fmprb_poly/test/t-log_series.c
@@ -182,7 +182,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-mul.c b/fmprb_poly/test/t-mul.c
index 28b41126..0dcc1c2d 100644
--- a/fmprb_poly/test/t-mul.c
+++ b/fmprb_poly/test/t-mul.c
@@ -135,7 +135,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-mullow.c b/fmprb_poly/test/t-mullow.c
index c1586b96..7875f92a 100644
--- a/fmprb_poly/test/t-mullow.c
+++ b/fmprb_poly/test/t-mullow.c
@@ -138,7 +138,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-mullow_block.c b/fmprb_poly/test/t-mullow_block.c
index 54f3dd07..c5a86a1a 100644
--- a/fmprb_poly/test/t-mullow_block.c
+++ b/fmprb_poly/test/t-mullow_block.c
@@ -216,7 +216,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-mullow_classical.c b/fmprb_poly/test/t-mullow_classical.c
index 9ebb57e0..61ac34d8 100644
--- a/fmprb_poly/test/t-mullow_classical.c
+++ b/fmprb_poly/test/t-mullow_classical.c
@@ -138,7 +138,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-mullow_ztrunc.c b/fmprb_poly/test/t-mullow_ztrunc.c
index a13560f5..051c284d 100644
--- a/fmprb_poly/test/t-mullow_ztrunc.c
+++ b/fmprb_poly/test/t-mullow_ztrunc.c
@@ -138,7 +138,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-revert_series.c b/fmprb_poly/test/t-revert_series.c
index 958af3dd..3bd1a8f8 100644
--- a/fmprb_poly/test/t-revert_series.c
+++ b/fmprb_poly/test/t-revert_series.c
@@ -95,7 +95,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-revert_series_lagrange.c b/fmprb_poly/test/t-revert_series_lagrange.c
index b60b29f5..9c2e02ed 100644
--- a/fmprb_poly/test/t-revert_series_lagrange.c
+++ b/fmprb_poly/test/t-revert_series_lagrange.c
@@ -95,7 +95,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-revert_series_lagrange_fast.c b/fmprb_poly/test/t-revert_series_lagrange_fast.c
index c19c0fc8..8d49d01a 100644
--- a/fmprb_poly/test/t-revert_series_lagrange_fast.c
+++ b/fmprb_poly/test/t-revert_series_lagrange_fast.c
@@ -95,7 +95,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-revert_series_newton.c b/fmprb_poly/test/t-revert_series_newton.c
index 5b98ead4..fabbf2e0 100644
--- a/fmprb_poly/test/t-revert_series_newton.c
+++ b/fmprb_poly/test/t-revert_series_newton.c
@@ -95,7 +95,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-rfac_series_ui.c b/fmprb_poly/test/t-rfac_series_ui.c
index 1a9e23ee..623b53ba 100644
--- a/fmprb_poly/test/t-rfac_series_ui.c
+++ b/fmprb_poly/test/t-rfac_series_ui.c
@@ -122,7 +122,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-rgamma_series.c b/fmprb_poly/test/t-rgamma_series.c
index 3be36fb7..873e2f5b 100644
--- a/fmprb_poly/test/t-rgamma_series.c
+++ b/fmprb_poly/test/t-rgamma_series.c
@@ -113,7 +113,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-rsqrt_series.c b/fmprb_poly/test/t-rsqrt_series.c
index b3168c2b..6714e3c4 100644
--- a/fmprb_poly/test/t-rsqrt_series.c
+++ b/fmprb_poly/test/t-rsqrt_series.c
@@ -90,7 +90,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-shift_left_right.c b/fmprb_poly/test/t-shift_left_right.c
index ad75347f..87361c26 100644
--- a/fmprb_poly/test/t-shift_left_right.c
+++ b/fmprb_poly/test/t-shift_left_right.c
@@ -119,7 +119,7 @@ main(void)
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return 0;
 }
diff --git a/fmprb_poly/test/t-sin_cos_series.c b/fmprb_poly/test/t-sin_cos_series.c
index 3c6046fb..57807cf1 100644
--- a/fmprb_poly/test/t-sin_cos_series.c
+++ b/fmprb_poly/test/t-sin_cos_series.c
@@ -107,7 +107,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-sin_cos_series_basecase.c b/fmprb_poly/test/t-sin_cos_series_basecase.c
index f442aae8..0b9a54bc 100644
--- a/fmprb_poly/test/t-sin_cos_series_basecase.c
+++ b/fmprb_poly/test/t-sin_cos_series_basecase.c
@@ -107,7 +107,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-sin_cos_series_tangent.c b/fmprb_poly/test/t-sin_cos_series_tangent.c
index 25c982ac..15b648b6 100644
--- a/fmprb_poly/test/t-sin_cos_series_tangent.c
+++ b/fmprb_poly/test/t-sin_cos_series_tangent.c
@@ -107,7 +107,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-sin_series_cos_series.c b/fmprb_poly/test/t-sin_series_cos_series.c
index 99284388..7e937dc2 100644
--- a/fmprb_poly/test/t-sin_series_cos_series.c
+++ b/fmprb_poly/test/t-sin_series_cos_series.c
@@ -108,7 +108,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-sqrt_series.c b/fmprb_poly/test/t-sqrt_series.c
index 7d8cf43a..c298dbd4 100644
--- a/fmprb_poly/test/t-sqrt_series.c
+++ b/fmprb_poly/test/t-sqrt_series.c
@@ -89,7 +89,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-sub.c b/fmprb_poly/test/t-sub.c
index 5111f277..018654d9 100644
--- a/fmprb_poly/test/t-sub.c
+++ b/fmprb_poly/test/t-sub.c
@@ -90,7 +90,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-tan_series.c b/fmprb_poly/test/t-tan_series.c
index b54df613..0cd327b7 100644
--- a/fmprb_poly/test/t-tan_series.c
+++ b/fmprb_poly/test/t-tan_series.c
@@ -98,7 +98,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmprb_poly/test/t-zeta_series.c b/fmprb_poly/test/t-zeta_series.c
index b623d2a3..072e81c1 100644
--- a/fmprb_poly/test/t-zeta_series.c
+++ b/fmprb_poly/test/t-zeta_series.c
@@ -128,7 +128,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpz_extras/test/t-add2_fmpz_si_inline.c b/fmpz_extras/test/t-add2_fmpz_si_inline.c
index 7fb09783..aab2c752 100644
--- a/fmpz_extras/test/t-add2_fmpz_si_inline.c
+++ b/fmpz_extras/test/t-add2_fmpz_si_inline.c
@@ -127,7 +127,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpz_extras/test/t-add_inline.c b/fmpz_extras/test/t-add_inline.c
index 76f1dbf2..accbc04b 100644
--- a/fmpz_extras/test/t-add_inline.c
+++ b/fmpz_extras/test/t-add_inline.c
@@ -116,7 +116,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpz_extras/test/t-add_si_inline.c b/fmpz_extras/test/t-add_si_inline.c
index ddeb7910..b8fc538f 100644
--- a/fmpz_extras/test/t-add_si_inline.c
+++ b/fmpz_extras/test/t-add_si_inline.c
@@ -79,7 +79,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpz_extras/test/t-add_ui_inline.c b/fmpz_extras/test/t-add_ui_inline.c
index 7747aaa4..aca0d693 100644
--- a/fmpz_extras/test/t-add_ui_inline.c
+++ b/fmpz_extras/test/t-add_ui_inline.c
@@ -79,7 +79,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpz_extras/test/t-sub_si_inline.c b/fmpz_extras/test/t-sub_si_inline.c
index 764c92be..3e11c280 100644
--- a/fmpz_extras/test/t-sub_si_inline.c
+++ b/fmpz_extras/test/t-sub_si_inline.c
@@ -79,7 +79,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpz_holonomic/test/t-forward_fmprb_mat.c b/fmpz_holonomic/test/t-forward_fmprb_mat.c
index 6eb55005..9851e7bd 100644
--- a/fmpz_holonomic/test/t-forward_fmprb_mat.c
+++ b/fmpz_holonomic/test/t-forward_fmprb_mat.c
@@ -86,7 +86,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpz_holonomic/test/t-forward_fmpz_mat.c b/fmpz_holonomic/test/t-forward_fmpz_mat.c
index 77e0cd19..9b360437 100644
--- a/fmpz_holonomic/test/t-forward_fmpz_mat.c
+++ b/fmpz_holonomic/test/t-forward_fmpz_mat.c
@@ -96,7 +96,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpz_holonomic/test/t-forward_nmod_mat.c b/fmpz_holonomic/test/t-forward_nmod_mat.c
index 423e6788..8cddabe3 100644
--- a/fmpz_holonomic/test/t-forward_nmod_mat.c
+++ b/fmpz_holonomic/test/t-forward_nmod_mat.c
@@ -96,7 +96,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpz_holonomic/test/t-get_series.c b/fmpz_holonomic/test/t-get_series.c
index 1f8fa51e..676845d0 100644
--- a/fmpz_holonomic/test/t-get_series.c
+++ b/fmpz_holonomic/test/t-get_series.c
@@ -162,7 +162,7 @@ int main()
         fmpq_clear(s);
     }
 
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpz_holonomic/test/t-seq_set_factorial.c b/fmpz_holonomic/test/t-seq_set_factorial.c
index 69a5ebf1..7ca84edd 100644
--- a/fmpz_holonomic/test/t-seq_set_factorial.c
+++ b/fmpz_holonomic/test/t-seq_set_factorial.c
@@ -64,7 +64,7 @@ int main()
 
     }
 
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpz_holonomic/test/t-seq_set_fibonacci.c b/fmpz_holonomic/test/t-seq_set_fibonacci.c
index 44c21ced..8720bfec 100644
--- a/fmpz_holonomic/test/t-seq_set_fibonacci.c
+++ b/fmpz_holonomic/test/t-seq_set_fibonacci.c
@@ -65,7 +65,7 @@ int main()
 
     }
 
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpz_holonomic/test/t-seq_set_fmpq_pow.c b/fmpz_holonomic/test/t-seq_set_fmpq_pow.c
index de74a9b8..3e45f04e 100644
--- a/fmpz_holonomic/test/t-seq_set_fmpq_pow.c
+++ b/fmpz_holonomic/test/t-seq_set_fmpq_pow.c
@@ -73,7 +73,7 @@ int main()
 
     }
 
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpz_holonomic/test/t-seq_set_fmpz_pow.c b/fmpz_holonomic/test/t-seq_set_fmpz_pow.c
index 4b23a96f..836efbc8 100644
--- a/fmpz_holonomic/test/t-seq_set_fmpz_pow.c
+++ b/fmpz_holonomic/test/t-seq_set_fmpz_pow.c
@@ -70,7 +70,7 @@ int main()
         fmpz_holonomic_clear(op);
     }
 
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/fmpz_holonomic/test/t-seq_set_harmonic.c b/fmpz_holonomic/test/t-seq_set_harmonic.c
index 1d595495..5c21b4e0 100644
--- a/fmpz_holonomic/test/t-seq_set_harmonic.c
+++ b/fmpz_holonomic/test/t-seq_set_harmonic.c
@@ -69,7 +69,7 @@ int main()
 
     }
 
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/partitions/test/t-partitions_fmpz_ui.c b/partitions/test/t-partitions_fmpz_ui.c
index bdf70d23..3fdaf397 100644
--- a/partitions/test/t-partitions_fmpz_ui.c
+++ b/partitions/test/t-partitions_fmpz_ui.c
@@ -152,8 +152,7 @@ int main(void)
     }
 
     flint_randclear(state);
-    mpfr_free_cache();
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return 0;
 }
diff --git a/partitions/test/t-partitions_fmpz_ui_using_doubles.c b/partitions/test/t-partitions_fmpz_ui_using_doubles.c
index 0e9b223f..908606c5 100644
--- a/partitions/test/t-partitions_fmpz_ui_using_doubles.c
+++ b/partitions/test/t-partitions_fmpz_ui_using_doubles.c
@@ -152,8 +152,7 @@ int main(void)
     }
 
     flint_randclear(state);
-    mpfr_free_cache();
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return 0;
 }
diff --git a/zeta/test/t-apery_bsplit.c b/zeta/test/t-apery_bsplit.c
index 67fb5b59..a0443d59 100644
--- a/zeta/test/t-apery_bsplit.c
+++ b/zeta/test/t-apery_bsplit.c
@@ -71,8 +71,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
-    mpfr_free_cache();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/zeta/test/t-series.c b/zeta/test/t-series.c
index 77122123..2b000d62 100644
--- a/zeta/test/t-series.c
+++ b/zeta/test/t-series.c
@@ -103,7 +103,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/zeta/test/t-ui.c b/zeta/test/t-ui.c
index dd3f5ec5..26e1bd88 100644
--- a/zeta/test/t-ui.c
+++ b/zeta/test/t-ui.c
@@ -74,7 +74,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/zeta/test/t-ui_asymp.c b/zeta/test/t-ui_asymp.c
index 2fa24590..32099877 100644
--- a/zeta/test/t-ui_asymp.c
+++ b/zeta/test/t-ui_asymp.c
@@ -65,7 +65,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/zeta/test/t-ui_bernoulli.c b/zeta/test/t-ui_bernoulli.c
index f5b08290..2085a820 100644
--- a/zeta/test/t-ui_bernoulli.c
+++ b/zeta/test/t-ui_bernoulli.c
@@ -75,7 +75,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/zeta/test/t-ui_borwein_bsplit.c b/zeta/test/t-ui_borwein_bsplit.c
index 4d85b1ec..0b133581 100644
--- a/zeta/test/t-ui_borwein_bsplit.c
+++ b/zeta/test/t-ui_borwein_bsplit.c
@@ -74,7 +74,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/zeta/test/t-ui_euler_product.c b/zeta/test/t-ui_euler_product.c
index 2cca5cf7..c10bf140 100644
--- a/zeta/test/t-ui_euler_product.c
+++ b/zeta/test/t-ui_euler_product.c
@@ -74,7 +74,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/zeta/test/t-ui_vec.c b/zeta/test/t-ui_vec.c
index 53adbf65..bf0f24ea 100644
--- a/zeta/test/t-ui_vec.c
+++ b/zeta/test/t-ui_vec.c
@@ -81,7 +81,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }
diff --git a/zeta/test/t-ui_vec_borwein.c b/zeta/test/t-ui_vec_borwein.c
index c1f4232c..a27b0f9c 100644
--- a/zeta/test/t-ui_vec_borwein.c
+++ b/zeta/test/t-ui_vec_borwein.c
@@ -82,7 +82,7 @@ int main()
     }
 
     flint_randclear(state);
-    _fmpz_cleanup();
+    flint_cleanup();
     printf("PASS\n");
     return EXIT_SUCCESS;
 }