Remove new Promise(...) stuff