cleanup code; change hubiquitus properties mechanism & discovery addrs update