removing double-promises