Final clean up
removed debugger logging