Get rid of `address` field

Fixes #5