Fix UI - cancel the wrong timeout promise object
Remove unused dependencies