Remove the master promise variable for readability