Format
Remove unused code