new templates, file cleanup