removed false checking of existing device, since device is always added by server before hand. Change addNewDevice logic to carry on other steps even if it's an old device