removed comment fields