relay: strip out more code