code cleanup
use new named relay interface