Solution 9, template cleanup