Better match output of original.
Remove unused function