Cleanups/moving data out of libpromises