relay: cleanup code & gradle