Remove vestigial comment-related code