clean up comments, remove debugger