Removed duplicated accountId