Implement Relay stuff in RelayRPC only

Moved some code from dispatcher to RelayRCP, two cases