comment-cruft removed