Remove a file also when it is no longer a file
Shorter progress-bar labels