Removing over-promises