More simplifications due to promises