Removed use of promise.done/fail