I’m cool with removing them, but I feel like if we’re going to do that, then we should update the generators, or else we’re just perpetuating this issue and making the next gateway implementor’s job more complex.

@odorcicd what do you think?