code cleanup
code cleanup
more code cleanup
removed debug.go
code cleanup