Assign value when resolving subscription promises
Remove unnecessary client-side code