remove most comments, add logging line