Simplify build promise logic