Get rid of more useless template functions