CMS-3309 Flatten promise pyramids

Remove unnecessary deferred objects