relay: multiple cleanups & updates