Remove NULL check for comments