VIVO-491 cleaning up some minor address stuff