No filename automation (apart from cov) + clean up