Combine handlers for redundant endpoints

[Carifio24]

We have a few cases where multiple endpoints are doing the same thing, so we might as well combine the handlers.