commented out debug code
removed unused calls and debugger