obsolete template conditional logic removed