Drop use of template library