Cosmetics.
More clever files removal at cleanup.