[899753] Cleaned up promises work