Remove dependency on addressable.