If I'm reading the new logic flow correctly, you don't need these returns here, since these cases will all fall through to the `return promise` at the end of the function now.