VP-297: First pass at removing VP's relay and using UIO's relay. Code not fully cleaned up, tests not yet updated.