Remove the Template library dependency