Eliminated unneeded template