Issue 826 ez template cleanup