Remove Promise (use react instead)