Remove validator and comment fields