Moved (some) promise resolutions to state def