Removed template definitions that C++11 made unnecessary