Remove unused code
Remove some debug statements