util.format
Remove commented old code