Fixing how `Promises` are handled within `client` & `data`

Forgot to remove 2 unneeded functions