Got rid of hand-maded commenter