relay: minor cleanups