Removing more template stuff.