Removed more legacy template handling functions.