Removing system template code
Merge pull request #1769 from daviddavis/rm_system_templates

Removing system templates
merge conflict fix