Remove unused code
Remove unused code