Merge "Remove unused key uploadedfiles"