Removed redundant component from template, CORE-435

I'd prefer redundant code to be removed instead of just commented out.