Merge "use FileRepo api to delete and check for files"