Remove envelopes from Bender

The envelope are not necessary anymore so removing them will help the code
clarity and prevent bugs.

See Issue #13971