Cleanup to CloudService.apk