Removes never-called checks from creation
Filters character types without templates from creation
Removes unnecessarily complicated aggregation code from template collection