NDL: cosmetic adjustments, removed one obsolete template.