Switch to use promises where possible

Why is this state setup removed? I believe we need these set while the XHR is going.