Removing superfluous template stuff.