Merge "Delete service.token file"