Remove promise dependency, fix didNot[Action]