Remove more obsolete templates.