Better output
Remove unused code