Remove default address as per issue #23