Clean up. Remove integration with BjyModulus