RAZ-2241: Removing files could end up in a long thread