Removed redundant component from template, CORE-435
Removed commented out code, CORE-435
Merge pull request #2044 from reciprocity/hotfix/CORE-435

Removed redundant component from template, CORE-435