Cleanup of old relay logic