eliminated direct gmp calls