Removed redundant component from template, CORE-435