Merge "remove file check" into main