Fix comments, remove debug code