Removed temporary template class