remove unused templates
Merge branch 'fixg2_branch'